Index: sandbox/2.4.2-expresso2/library/ckeditor/plugins/expresso/plugin.js
===================================================================
--- sandbox/2.4.2-expresso2/library/ckeditor/plugins/expresso/plugin.js (revision 6875)
+++ sandbox/2.4.2-expresso2/library/ckeditor/plugins/expresso/plugin.js (revision 6918)
@@ -181,5 +181,6 @@
adjust: {
resize: true,
- scroll: true
+ scroll: true,
+ screen: show
}
},
@@ -193,4 +194,8 @@
width: 1,
radius: 5
+ },
+ width: {
+ min: 75,
+ max : 1000
},
padding: 3,
@@ -250,5 +255,6 @@
adjust: {
resize: true,
- scroll: true
+ scroll: true,
+ screen: show
}
},
@@ -263,4 +269,8 @@
radius: 5
},
+ width: {
+ min: 75,
+ max : 1000
+ },
padding: 3,
textAlign: 'left',
Index: sandbox/2.4.2-expresso2/prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs
===================================================================
--- sandbox/2.4.2-expresso2/prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs (revision 6760)
+++ sandbox/2.4.2-expresso2/prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs (revision 6918)
@@ -1,18 +1,18 @@
-
- File Name:
- <%=data.attach.fullFileName%>
-
-
-
- File Size:
- <%=data.attach.fileSize%>
-
-
-
- Status:
- <%if(typeof(data.attach.error) == "boolean"){%>
- <%=(data.attach.error ? "Loading... " : "Success")%>
- <%}else{%>
- <%=data.attach.error%>
- <%}%>
-
+
+
+ <%=get_lang("File name") %>:
+ <%=data.attach.fullFileName%>
+
+
+ <%=get_lang("Size") %>:
+ <%=data.attach.fileSize%>
+
+
+ Status:
+ <%if(typeof(data.attach.error) == "boolean"){%>
+ <%=(data.attach.error ? get_lang("Loading") : get_lang("Success"))%>
+ <%}else{%>
+ <%=data.attach.error%>
+ <%}%>
+
+
Index: sandbox/2.4.2-expresso2/expressoMail1_2/setup/phpgw_pt-br.lang
===================================================================
--- sandbox/2.4.2-expresso2/expressoMail1_2/setup/phpgw_pt-br.lang (revision 6889)
+++ sandbox/2.4.2-expresso2/expressoMail1_2/setup/phpgw_pt-br.lang (revision 6918)
@@ -920,2 +920,3 @@
The contact was moved from recent contacts to personal contacts successful. expressoMail1_2 pt-br O Contato foi movido dos contatos recentes para os contatos pessoais com sucesso.
Permission denied expressoMail1_2 pt-br Permissão negada
+Success expressoMail1_2 pt-br Concluído
Index: sandbox/2.4.2-expresso2/expressoMail1_2/js/main.js
===================================================================
--- sandbox/2.4.2-expresso2/expressoMail1_2/js/main.js (revision 6890)
+++ sandbox/2.4.2-expresso2/expressoMail1_2/js/main.js (revision 6918)
@@ -2231,5 +2231,6 @@
adjust: {
resize: true,
- scroll: true
+ scroll: true,
+ screen: show
}
},
@@ -2244,4 +2245,8 @@
radius: 5
},
+ width: {
+ min: 75,
+ max : 1000
+ },
padding: 3,
textAlign: 'left',
@@ -2315,5 +2320,6 @@
adjust: {
resize: true,
- scroll: true
+ scroll: true,
+ screen: show
}
},
@@ -2328,4 +2334,8 @@
radius: 5
},
+ width: {
+ min: 75,
+ max : 1000
+ },
padding: 3,
textAlign: 'left',
@@ -2410,5 +2420,6 @@
adjust: {
resize: true,
- scroll: true
+ scroll: true,
+ screen: show
}
},
@@ -2423,4 +2434,8 @@
radius: 5
},
+ width: {
+ min: 75,
+ max : 1000
+ },
padding: 3,
textAlign: 'left',
@@ -4278,4 +4293,13 @@
function create_new_folder(name_folder, base_path){
+ //Limit reached folders
+ if(preferences.imap_max_folders){
+ if(cp_tree1.length == parseInt(preferences.imap_max_folders)){
+ $(".folders-loading").removeClass("folders-loading");
+ cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+ return write_msg(get_lang("Limit reached folders"));
+ }
+ }
+
$.ajax({
url : "controller.php?action=$this.imap_functions.create_mailbox",
Index: sandbox/2.4.2-expresso2/expressoMail1_2/js/draw_api.js
===================================================================
--- sandbox/2.4.2-expresso2/expressoMail1_2/js/draw_api.js (revision 6890)
+++ sandbox/2.4.2-expresso2/expressoMail1_2/js/draw_api.js (revision 6918)
@@ -4563,4 +4563,5 @@
$.each(fileUploadMSG.find(".attachments-list .att-box"), function(index, value){
$(this).qtip("api").updatePosition();
+ $(this).qtip("api").updateWidth();
});
});
@@ -4640,5 +4641,6 @@
adjust: {
resize: true,
- scroll: true
+ scroll: true,
+ screen: true
}
},
@@ -4652,4 +4654,8 @@
width: 1,
radius: 5
+ },
+ width: {
+ min: 75,
+ max : 1000
},
padding: 3,
@@ -4705,5 +4711,6 @@
adjust: {
resize: true,
- scroll: true
+ scroll: true,
+ screen: true
}
},
@@ -4718,4 +4725,8 @@
radius: 5
},
+ width: {
+ min: 75,
+ max : 1000
+ },
padding: 3,
textAlign: 'left',
@@ -4816,4 +4827,8 @@
width: 1,
radius: 5
+ },
+ width: {
+ min: 75,
+ max : 1000
},
padding: 5,