Changeset 087c7dc in github
- Timestamp:
- Jun 29, 2010 3:27:26 PM (3 years ago)
- Branches:
- master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
- Children:
- 98570f6
- Parents:
- 02cc63c
- Files:
-
- 25 edited
-
CHANGELOG (modified) (1 diff)
-
program/js/app.js (modified) (4 diffs)
-
program/js/editor.js (modified) (4 diffs)
-
program/js/googiespell.js (modified) (2 diffs)
-
program/steps/mail/compose.inc (modified) (7 diffs)
-
skins/default/addressbook.css (modified) (4 diffs)
-
skins/default/common.css (modified) (6 diffs)
-
skins/default/functions.js (modified) (7 diffs)
-
skins/default/ie6hacks.css (modified) (2 diffs)
-
skins/default/iehacks.css (modified) (10 diffs)
-
skins/default/mail.css (modified) (15 diffs)
-
skins/default/settings.css (modified) (5 diffs)
-
skins/default/splitter.js (modified) (1 diff)
-
skins/default/templates/addressbook.html (modified) (1 diff)
-
skins/default/templates/compose.html (modified) (2 diffs)
-
skins/default/templates/editidentity.html (modified) (2 diffs)
-
skins/default/templates/error.html (modified) (1 diff)
-
skins/default/templates/identities.html (modified) (2 diffs)
-
skins/default/templates/importcontacts.html (modified) (2 diffs)
-
skins/default/templates/mail.html (modified) (1 diff)
-
skins/default/templates/managefolders.html (modified) (3 diffs)
-
skins/default/templates/message.html (modified) (1 diff)
-
skins/default/templates/messageerror.html (modified) (1 diff)
-
skins/default/templates/plugin.html (modified) (1 diff)
-
skins/default/templates/settings.html (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
CHANGELOG
rbdb13a5 r087c7dc 2 2 =========================== 3 3 4 - Improved compose screen: resizable body and attachments list, vertical splitter, options menu 4 5 - Fix RC forgets search results (#1483883) 5 6 - TinyMCE 3.3.7 -
program/js/app.js
rbdb13a5 r087c7dc 226 226 } 227 227 else if (this.env.action == 'compose') { 228 this.enable_command(' add-attachment', 'send-attachment', 'remove-attachment', 'send', true);228 this.enable_command('send-attachment', 'remove-attachment', 'send', true); 229 229 230 230 if (this.env.spellcheck) { … … 873 873 break; 874 874 875 case 'add-attachment':876 this.show_attachment_form(true);877 878 875 case 'send-attachment': 879 876 // Reset the auto-save timer … … 3069 3066 }; 3070 3067 3071 this.show_attachment_form = function(a)3072 {3073 if (!this.gui_objects.uploadbox)3074 return false;3075 3076 var elm, list;3077 if (elm = this.gui_objects.uploadbox) {3078 if (a && (list = this.gui_objects.attachmentlist)) {3079 var pos = $(list).offset();3080 elm.style.top = (pos.top + list.offsetHeight + 10) + 'px';3081 elm.style.left = pos.left + 'px';3082 }3083 3084 $(elm).toggle();3085 }3086 3087 // clear upload form3088 try {3089 if (!a && this.gui_objects.attachmentform != this.gui_objects.messageform)3090 this.gui_objects.attachmentform.reset();3091 }3092 catch(e){} // ignore errors3093 3094 return true;3095 };3096 3097 3068 // upload attachment file 3098 3069 this.upload_file = function(form) … … 3157 3128 form.submit(); 3158 3129 3159 // hide upload form3160 this.show_attachment_form(false);3161 3130 // display upload indicator and cancel button 3162 3131 var content = this.get_label('uploading'); -
program/js/editor.js
rf4f6291 r087c7dc 104 104 ishtml = select.value == 'html'; 105 105 106 if (ishtml) 107 { 106 if (ishtml) { 108 107 rcmail.display_spellcheck_controls(false); 109 108 … … 114 113 if (flagElement && (flag = rcube_find_object(flagElement))) 115 114 flag.value = '1'; 116 } 117 else 118 { 115 } 116 else { 119 117 var thisMCE = tinyMCE.get(textAreaId); 120 118 var existingHtml = thisMCE.getContent(); … … 123 121 if (!confirm(rcmail.get_label('editorwarning'))) { 124 122 if (select.tagName == 'SELECT') 125 select.value = 'html';123 select.value = 'html'; 126 124 return false; 127 }125 } 128 126 129 127 rcmail.html2plain(existingHtml, textAreaId); 130 }128 } 131 129 132 130 tinyMCE.execCommand('mceRemoveControl', false, textAreaId); … … 134 132 if (flagElement && (flag = rcube_find_object(flagElement))) 135 133 flag.value = '0'; 136 }137 } ;134 } 135 } -
program/js/googiespell.js
rae8a2a55 r087c7dc 768 768 }; 769 769 770 this.showLangWindow = function(elm) { 771 if (this.show_menu_observer) 772 this.show_menu_observer(this); 773 774 this.createLangWindow(); 775 $('body').append(this.language_window); 776 777 var pos = $(elm).offset(), 778 height = $(elm).height(), 779 width = $(elm).width(), 780 h = $(this.language_window).height(), 781 pageheight = $(document).height(), 782 left = this.change_lang_pic_placement == 'right' ? 783 pos.left - 100 + width : pos.left + width, 784 top = pos.top + h < pageheight ? pos.top + height : pos.top - h - 4; 785 786 $(this.language_window).css({'visibility': 'visible', 'top' : top+'px','left' : left+'px'}); 787 788 this.highlightCurSel(); 789 }; 790 770 791 this.deHighlightCurSel = function() { 771 792 $(this.lang_cur_elm).removeClass().addClass('googie_list_onout'); … … 777 798 for (var i=0; i < this.lang_elms.length; i++) { 778 799 if ($(this.lang_elms[i]).attr('googieId') == GOOGIE_CUR_LANG) { 779 this.lang_elms[i].className = "googie_list_selected";800 this.lang_elms[i].className = 'googie_list_selected'; 780 801 this.lang_cur_elm = this.lang_elms[i]; 781 802 } 782 803 else { 783 this.lang_elms[i].className = "googie_list_onout"; 784 } 785 } 786 }; 787 788 this.showLangWindow = function(elm) { 789 if (this.show_menu_observer) 790 this.show_menu_observer(this); 791 792 this.createLangWindow(); 793 $('body').append(this.language_window); 794 795 var pos = $(elm).offset(), 796 top = pos.top + $(elm).height(), 797 left = this.change_lang_pic_placement == 'right' ? 798 pos.left - 100 + $(elm).width() : pos.left + $(elm).width(); 799 800 $(this.language_window).css({'visibility': 'visible', 'top' : top+'px','left' : left+'px'}); 801 802 this.highlightCurSel(); 804 this.lang_elms[i].className = 'googie_list_onout'; 805 } 806 } 803 807 }; 804 808 -
program/steps/mail/compose.inc
rb25dfd0 r087c7dc 189 189 } 190 190 191 // process $MESSAGE body/attachments, set $MESSAGE_BODY/$HTML_MODE vars and some session data 192 $MESSAGE_BODY = rcmail_prepare_message_body(); 193 194 191 195 /****** compose mode functions ********/ 192 193 196 194 197 function rcmail_compose_headers($attrib) … … 319 322 320 323 321 322 324 function rcmail_compose_header_from($attrib) 323 325 { … … 417 419 418 420 419 function rcmail_compose_body($attrib) 420 { 421 global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode, $LINE_LENGTH; 422 423 list($form_start, $form_end) = get_form_tags($attrib); 424 unset($attrib['form']); 425 426 if (empty($attrib['id'])) 427 $attrib['id'] = 'rcmComposeBody'; 428 429 $attrib['name'] = '_message'; 421 function rcmail_prepare_message_body() 422 { 423 global $RCMAIL, $CONFIG, $MESSAGE, $compose_mode, $LINE_LENGTH, $HTML_MODE; 430 424 431 425 if ($CONFIG['htmleditor'] || (($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) && $MESSAGE->has_html_part())) … … 495 489 } 496 490 491 $HTML_MODE = $isHtml; 492 493 return $body; 494 } 495 496 function rcmail_compose_body($attrib) 497 { 498 global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode, $LINE_LENGTH, $HTML_MODE, $MESSAGE_BODY; 499 500 list($form_start, $form_end) = get_form_tags($attrib); 501 unset($attrib['form']); 502 503 if (empty($attrib['id'])) 504 $attrib['id'] = 'rcmComposeBody'; 505 506 $attrib['name'] = '_message'; 507 508 $isHtml = $HTML_MODE; 509 497 510 $out = $form_start ? "$form_start\n" : ''; 498 511 … … 509 522 if ($isHtml) $attrib['class'] = 'mce_editor'; 510 523 $textarea = new html_textarea($attrib); 511 $out .= $textarea->show($ body);524 $out .= $textarea->show($MESSAGE_BODY); 512 525 $out .= $form_end ? "\n$form_end" : ''; 513 526 … … 909 922 $out = "\n"; 910 923 $jslist = array(); 911 924 912 925 if (is_array($_SESSION['compose']['attachments'])) 913 926 { … … 973 986 html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) . 974 987 html::div('buttons', 975 $button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .988 // $button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' . 976 989 $button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)")) 977 990 ) -
skins/default/addressbook.css
rce06d32 r087c7dc 85 85 top: 85px; 86 86 right: 20px; 87 bottom: 30px;87 bottom: 20px; 88 88 left: 225px; 89 89 } … … 93 93 position: absolute; 94 94 top: 85px; 95 bottom: 30px;95 bottom: 20px; 96 96 left: 20px; 97 97 width: 195px; … … 110 110 { 111 111 position: absolute; 112 top: 0 px;113 bottom: 0 px;112 top: 0; 113 bottom: 0; 114 114 border: 1px solid #999999; 115 115 background-color: #F9F9F9; … … 122 122 } 123 123 124 #importbox125 {126 position: absolute;127 top: 85px;128 bottom: 30px;129 left: 20px;130 right: 20px;131 border: 1px solid #999999;132 background-color: #F2F2F2;133 padding-bottom: 4ex;134 overflow: auto;135 }136 137 124 #addresslist 138 125 { 139 126 left: 0px; 140 127 width: 280px; 141 }142 143 #importbox a144 {145 color: blue;146 128 } 147 129 -
skins/default/common.css
ra2e81736 r087c7dc 129 129 /** common user interface objects */ 130 130 131 #mainscreen 132 { 133 position: absolute; 134 top: 85px; 135 right: 20px; 136 bottom: 20px; 137 left: 20px; 138 } 139 131 140 #header 132 141 { … … 236 245 } 237 246 238 #pagecontent 239 { 240 position: absolute; 241 top: 95px; 242 left: 20px; 247 .box 248 { 249 border: 1px solid #999; 243 250 } 244 251 … … 251 258 font-size: 11px; 252 259 font-weight: bold; 260 overflow: hidden; 253 261 background: url(images/listheader.gif) top left repeat-x #CCC; 254 262 } … … 276 284 overflow-y: auto; 277 285 overflow-x: hidden; 286 } 287 288 .boxsubject 289 { 290 position: absolute; 291 top: 0px; 292 left: 0px; 293 right: 0px; 294 overflow: hidden; 295 height: 22px; 296 border-bottom: 1px solid #999; 297 background: url(images/listheader.gif) top left repeat-x #CCC; 278 298 } 279 299 … … 319 339 font-size: 11px; 320 340 text-shadow: white 1px 1px; 341 white-space: nowrap; 321 342 } 322 343 … … 729 750 color: #999; 730 751 } 752 753 font.bold 754 { 755 font-weight: bold; 756 } 757 -
skins/default/functions.js
r129997f r087c7dc 42 42 headers_div = document.getElementById('compose-headers-div'); 43 43 row.style.display = (document.all && !window.opera) ? 'block' : 'table-row'; 44 div.style.top = parseInt(headers_div.offsetHeight, 10) + 'px'; 44 div.style.top = (parseInt(headers_div.offsetHeight, 10) + 1) + 'px'; 45 rcmail_resize_compose_body(); 45 46 } 46 47 … … 72 73 headers_div = document.getElementById('compose-headers-div'); 73 74 row.style.display = 'none'; 74 div.style.top = parseInt(headers_div.offsetHeight, 10) + 'px'; 75 div.style.top = (parseInt(headers_div.offsetHeight, 10) + 1) + 'px'; 76 rcmail_resize_compose_body(); 75 77 } 76 78 … … 116 118 } 117 119 118 // fix editor position on some browsers 119 div.style.top = parseInt(headers_div.offsetHeight, 10) + 'px'; 120 $(window).resize(function() { 121 rcmail_resize_compose_body(); 122 }); 123 124 $('#compose-container').resize(function() { 125 rcmail_resize_compose_body(); 126 }); 127 128 div.style.top = (parseInt(headers_div.offsetHeight, 10) + 1) + 'px'; 129 $(window).resize(); 130 } 131 132 function rcmail_resize_compose_body(elem) 133 { 134 var ed, div = $('#compose-div'), w = div.width(), h = div.height(); 135 w = w-4; 136 h = h-25; 137 138 $('#compose-body').width(w-(bw.ie || bw.opera || bw.safari ? 2 : 0)+'px').height(h+'px'); 139 140 if (window.tinyMCE && tinyMCE.get('compose-body')) { 141 $('#compose-body_tbl').width((w+4)+'px').height(''); 142 $('#compose-body_ifr').width((w+2)+'px').height((h-54)+'px'); 143 } 120 144 } 121 145 … … 133 157 dragmessagemenu:'dragmessagemenu', 134 158 groupmenu:'groupoptionsmenu', 135 mailboxmenu:'mailboxoptionsmenu' 159 mailboxmenu:'mailboxoptionsmenu', 160 composemenu:'composeoptionsmenu', 161 uploadform:'attachment-form' 136 162 }; 137 163 … … 178 204 { 179 205 this.show_popupmenu(this.mailboxmenu, 'mboxactionslink', show, true); 206 }, 207 208 show_composemenu: function(show) 209 { 210 this.show_popupmenu(this.composemenu, 'composemenulink', show, true); 211 }, 212 213 show_uploadform: function(show) 214 { 215 if (typeof show == 'object') // called as event handler 216 show = false; 217 if (!show) 218 $('input[type=file]').val(''); 219 this.show_popupmenu(this.uploadform, 'uploadformlink', show, true); 180 220 }, 181 221 … … 298 338 else if (this.mailboxmenu && this.mailboxmenu.is(':visible') && target != rcube_find_object('mboxactionslink')) 299 339 this.show_mailboxmenu(false); 300 else if (this.listmenu && this.listmenu.is(':visible') && target != rcube_find_object('listmenulink')) { 301 var menu = rcube_find_object('listmenu'); 302 while (target.parentNode) { 303 if (target.parentNode == menu) 304 return; 305 target = target.parentNode; 306 } 340 else if (this.composemenu && this.composemenu.is(':visible') && target != rcube_find_object('composemenulink') 341 && !this.target_overlaps(target, this.popupmenus.composemenu)) { 342 this.show_composemenu(false); 343 } 344 else if (this.uploadform && this.uploadform.is(':visible') && target != rcube_find_object('uploadformlink') 345 && !this.target_overlaps(target, this.popupmenus.uploadform)) { 346 this.show_uploadform(false); 347 } 348 else if (this.listmenu && this.listmenu.is(':visible') && target != rcube_find_object('listmenulink') 349 && !this.target_overlaps(target, this.popupmenus.listmenu)) { 307 350 this.show_listmenu(false); 308 351 } 309 else if (this.searchmenu && this.searchmenu.is(':visible') && target != rcube_find_object('searchmod')) { 310 var menu = rcube_find_object('searchmenu'); 311 while (target.parentNode) { 312 if (target.parentNode == menu) 313 return; 314 target = target.parentNode; 315 } 352 else if (this.searchmenu && this.searchmenu.is(':visible') && target != rcube_find_object('searchmod') 353 && !this.target_overlaps(target, this.popupmenus.searchmenu)) { 316 354 this.show_searchmenu(false); 317 355 } 356 }, 357 358 target_overlaps: function (target, elementid) 359 { 360 var element = rcube_find_object(elementid); 361 while (target.parentNode) { 362 if (target.parentNode == element) 363 return true; 364 target = target.parentNode; 365 } 366 return false; 318 367 }, 319 368 … … 387 436 rcmail.addEventListener('menu-open', 'open_listmenu', rcmail_ui); 388 437 rcmail.addEventListener('menu-save', 'save_listmenu', rcmail_ui); 438 rcmail.addEventListener('aftersend-attachment', 'show_uploadform', rcmail_ui); 389 439 rcmail.gui_object('message_dragmenu', 'dragmessagemenu'); 390 440 } -
skins/default/ie6hacks.css
ra2e81736 r087c7dc 56 56 } 57 57 58 .pagenav 59 { 60 width: 200px; 61 } 62 58 63 .pagenav a.button, 59 64 .pagenav a.buttonPas … … 108 113 height: expression((parseInt(this.parentNode.offsetHeight)-24-parseInt(this.style.top?this.style.top:21))+'px'); 109 114 } 115 116 #directorylistbox 117 { 118 height: expression((parseInt(document.documentElement.clientHeight)-105)+'px'); 119 } -
skins/default/iehacks.css
rce06d32 r087c7dc 33 33 } 34 34 35 #mainscreen 36 { 37 width: expression((parseInt(document.documentElement.clientWidth)-40)+'px'); 38 height: expression((parseInt(document.documentElement.clientHeight)-105)+'px'); 39 } 40 35 41 #folder-manager 36 42 { 37 height: expression((parseInt( document.documentElement.clientHeight)-235)+'px');43 height: expression((parseInt(this.parentNode.offsetHeight)-105)+'px'); 38 44 } 39 45 … … 70 76 { 71 77 z-index: 250; 72 }73 74 #mainscreen75 {76 width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');77 height: expression((parseInt(document.documentElement.clientHeight)-96)+'px');78 }79 80 #directorylistbox81 {82 height: expression((parseInt(document.documentElement.clientHeight)-115)+'px');83 78 } 84 79 … … 87 82 #identities-list, 88 83 #mailleftcontainer, 84 #mailrightcontainer, 85 #compose-container, 86 #compose-attachments, 89 87 #mailcontframe, 90 #identity-details 88 #mailboxlist-container, 89 #mailrightcontent, 90 #messageframe, 91 #identity-details, 92 #contacts-box, 93 #prefs-box 91 94 { 92 95 height: expression(parseInt(this.parentNode.offsetHeight)+'px'); … … 96 99 { 97 100 width: expression((parseInt(this.parentNode.offsetWidth)-170)+'px'); 98 height: expression(parseInt(this.parentNode.offsetHeight)+'px');99 101 } 100 102 … … 107 109 #mailrightcontent 108 110 { 109 height: expression((parseInt(this.parentNode.offsetHeight)-20)+'px');110 111 width: 100%; 111 112 } 112 113 114 #compose-div 115 { 116 height: expression((parseInt(this.parentNode.offsetHeight)-1-parseInt(document.getElementById('compose-headers').offsetHeight))+'px'); 117 } 118 113 119 #partheader 114 120 { 115 121 width: expression((parseInt(document.documentElement.clientWidth)-240)+'px'); 116 }117 118 #mailboxlist-container119 {120 height: expression((parseInt(this.parentNode.offsetHeight)-20)+'px');121 122 } 122 123 … … 138 139 height: 18px; 139 140 } 140 141 141 142 #messagelist tbody tr.unroot td.subject 142 143 { … … 147 148 { 148 149 width: expression((parseInt(this.parentNode.offsetWidth)-180)+'px'); 149 height: expression((parseInt(this.parentNode.offsetHeight)-20)+'px');150 150 overflow: hidden; 151 151 } … … 162 162 } 163 163 164 #compose-container165 {166 width: expression((parseInt(document.documentElement.clientWidth)-230)+'px');167 height: expression((parseInt(document.documentElement.clientHeight)-120)+'px');168 }169 170 #compose-body,171 164 #compose-headers td textarea, 172 165 #compose-headers td input … … 185 178 { 186 179 width: expression((parseInt(document.documentElement.clientWidth)-245)+'px'); 187 height: expression((parseInt(document.documentElement.clientHeight)-115)+'px'); 188 } 189 190 #prefsscreen 191 { 192 width: expression((parseInt(document.documentElement.clientWidth)-40)+'px'); 193 height: expression((parseInt(document.documentElement.clientHeight)-125)+'px'); 194 } 195 196 #importbox 197 { 198 width: expression((parseInt(document.documentElement.clientWidth)-40)+'px'); 199 height: expression((parseInt(document.documentElement.clientHeight)-140)+'px'); 180 height: expression((parseInt(document.documentElement.clientHeight)-105)+'px'); 200 181 } 201 182 … … 208 189 #prefs-box 209 190 { 210 height: expression(parseInt(this.parentNode.offsetHeight)+'px');211 191 width: expression((parseInt(this.parentNode.offsetWidth)-555)+'px'); 212 192 } -
skins/default/mail.css
r4b96ed7 r087c7dc 247 247 } 248 248 249 td.formlinks a,250 td.formlinks a:visited251 {252 color: #999999;253 font-size: 11px;254 text-decoration: none;255 }256 257 td.formlinks a,258 td.formlinks a:visited259 {260 color: #CC0000;261 }262 263 #mainscreen264 {265 position: absolute;266 top: 85px;267 right: 20px;268 bottom: 30px;269 left: 20px;270 }271 272 249 #mailleftcontainer 273 250 { … … 516 493 white-space: nowrap; 517 494 left: 4px; 518 height: 22px;495 line-height: 22px; 519 496 width: auto; 520 497 min-width: 300px; … … 526 503 display: block; 527 504 float: left; 528 margin-top: 4px;529 505 font-size: 11px; 530 506 } … … 543 519 height: 15px; 544 520 padding: 0; 521 margin-top: 4px; 545 522 margin-right: 2px; 546 523 overflow: hidden; … … 1116 1093 /** message compose styles */ 1117 1094 1118 #compose-toolbar1119 {1120 white-space: nowrap;1121 }1122 1123 1095 #compose-container 1124 1096 { 1125 1097 position: absolute; 1126 top: 90px; 1127 left: 205px; 1128 right: 25px; 1129 bottom: 30px; 1130 margin: 0px; 1131 } 1132 1133 #spellcheck-control 1134 { 1135 text-align: right; 1136 padding-top: 3px; 1098 top: 0; 1099 left: 185px; 1100 right: 0; 1101 bottom: 0; 1102 margin: 0; 1137 1103 } 1138 1104 … … 1140 1106 { 1141 1107 position: absolute; 1142 top: 130px; 1143 bottom: 30px; 1108 top: 85px; 1109 bottom: 0; 1110 margin: 0; 1144 1111 width: 100%; 1145 vertical-align: top; 1146 padding-top: 2px; 1112 border: 1px solid #999; 1113 } 1114 1115 #compose-body 1116 { 1117 position: absolute; 1118 left: 0; 1119 right: 0; 1120 top: 0; 1121 bottom: 0; 1122 margin: 0; 1123 font-size: 9pt; 1124 border: none; 1125 font-family: monospace; 1126 resize: none; 1147 1127 } 1148 1128 … … 1150 1130 { 1151 1131 width: 100%; 1132 } 1133 1134 #compose-headers td.editfield 1135 { 1136 padding-right: 5px; 1137 min-width: 200px; 1152 1138 } 1153 1139 … … 1161 1147 { 1162 1148 width: 80px !important; 1163 color: #666;1164 1149 font-size: 11px; 1165 1150 font-weight: bold; … … 1168 1153 } 1169 1154 1170 #compose-body,1171 1155 #compose-headers td textarea, 1172 1156 #compose-headers td input 1173 1157 { 1158 resize: none; 1174 1159 width: 100%; 1160 border: 1px solid #999; 1161 } 1162 1163 #compose-headers td select 1164 { 1165 width: 100%; 1175 1166 } 1176 1167 1177 1168 #compose-headers td textarea 1178 1169 { 1179 height: 3 8px;1170 height: 32px; 1180 1171 } 1181 1172 … … 1187 1178 } 1188 1179 1189 #compose-body 1190 { 1191 min-height: 100px; 1192 height: 100%; 1193 font-size: 9pt; 1194 font-family: monospace; 1180 #formlinks 1181 { 1182 text-align: right; 1183 white-space: nowrap; 1184 width: 1%; 1185 padding-left: 5px; 1186 } 1187 1188 #formlinks a, 1189 #formlinks a:visited 1190 { 1191 color: #999999; 1192 font-size: 11px; 1193 text-decoration: none; 1194 } 1195 1196 #formlinks a, 1197 #formlinks a:visited 1198 { 1199 color: #CC0000; 1200 } 1201 1202 #compose-editorfooter 1203 { 1204 position: absolute; 1205 right: 5px; 1206 bottom: 0; 1207 text-align: right; 1208 line-height: 22px; 1209 } 1210 1211 #compose-buttons 1212 { 1213 position: absolute; 1214 left: 40px; 1215 top: 1px; 1195 1216 } 1196 1217 … … 1198 1219 { 1199 1220 position: absolute; 1200 top: 100px; 1201 left: 20px; 1221 top: 0; 1222 left: 0; 1223 bottom: 0; 1202 1224 width: 175px; 1225 border: 1px solid #999; 1226 background-color: #F9F9F9; 1203 1227 } 1204 1228 … … 1207 1231 margin: 0px; 1208 1232 padding: 0px; 1209 border: 1px solid #CCCCCC; 1210 background-color: #F9F9F9; 1233 background-color: #FFF; 1211 1234 list-style-image: none; 1212 1235 list-style-type: none; … … 1231 1254 } 1232 1255 1233 #attachment-title1234 {1235 color: #666666;1236 font-weight: bold;1237 font-size: 11px;1238 background: url(images/icons/attachment.png) top left no-repeat;1239 padding: 0px 0px 3px 18px;1240 margin-left: 3px;1241 }1242 1243 1256 #attachment-form 1244 1257 { … … 1254 1267 { 1255 1268 margin-top: 4px; 1256 }1257 1258 #editor-select1259 {1260 float: left;1261 white-space: nowrap;1262 width: auto;1263 }1264 1265 #editor-select label1266 {1267 color: #666;1268 font-size: 11px;1269 font-weight: bold;1270 padding-left: 20px;1271 }1272 1273 #editor-select input1274 {1275 width: auto !important;1276 1269 } 1277 1270 … … 1307 1300 } 1308 1301 1309 font.bold1310 {1311 font-weight: bold;1312 }1313 1314 1302 #listmenu 1315 1303 { -
skins/default/settings.css
rf865b68 r087c7dc 54 54 { 55 55 position: absolute; 56 top: 95px;57 left: 20px;58 overflow: auto;59 }60 61 #folder-manager62 {63 56 width: 600px; 64 bottom: 140px; 57 top: 0; 58 left: 0; 59 bottom: 105px; 65 60 overflow: auto; 66 61 border: 1px solid #999999; … … 196 191 position: absolute; 197 192 width: 600px; 198 height: 120px; 199 left: 20px; 200 bottom: 25px; 201 } 202 203 div.settingsbox 204 { 205 width: 600px; 206 margin-top: 20px; 207 border: 1px solid #999999; 193 height: 95px; 194 left: 0; 195 bottom: 0; 208 196 } 209 197 … … 218 206 { 219 207 color: #999999; 220 }221 222 #prefsscreen223 {224 position: absolute;225 top: 95px;226 right: 20px;227 bottom: 30px;228 left: 20px;229 208 } 230 209 … … 233 212 { 234 213 position: absolute; 235 top: 0 px;236 left: 0 px;237 bottom: 0 px;214 top: 0; 215 left: 0; 216 bottom: 0; 238 217 border: 1px solid #999999; 239 218 background-color: #F9F9F9; … … 255 234 { 256 235 position: absolute; 257 top: 0 px;258 right: 0 px;259 bottom: 0 px;236 top: 0; 237 right: 0; 238 bottom: 0; 260 239 border: 1px solid #999999; 261 240 overflow: hidden; -
skins/default/splitter.js
red60fef r087c7dc 83 83 } 84 84 } 85 $(this.p2).resize(); 86 $(this.p1).resize(); 85 87 }; 86 88 -
skins/default/templates/addressbook.html
rce06d32 r087c7dc 83 83 </div> 84 84 85 <div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>86 87 85 </body> 88 86 </html> -
skins/default/templates/compose.html
rce06d32 r087c7dc 6 6 <link rel="stylesheet" type="text/css" href="/googiespell.css" /> 7 7 <script type="text/javascript" src="/functions.js"></script> 8 <script type="text/javascript" src="/splitter.js"></script> 9 <style type="text/css"> 10 #compose-attachments { width: <roundcube:exp expression="!empty(cookie:composesplitterv) ? cookie:composesplitterv-5 : 175" />px; } 11 #compose-container { left: <roundcube:exp expression="!empty(cookie:composesplitterv) ? cookie:composesplitterv+5 : 185" />px; 12 <roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:composesplitterv) ? cookie:composesplitterv+5 : 180).')+\\'px\\');') : ''" /> 13 } 14 </style> 8 15 </head> 9 <body onload="rcmail_init_compose_form() ">16 <body onload="rcmail_init_compose_form(); rcube_init_mail_ui()"> 10 17 11 18 <roundcube:include file="/includes/taskbar.html" /> … … 15 22 16 23 <div id="messagetoolbar"> 17 <table border="0" cellspacing="0" cellpadding="0"><tr> 18 <td id="compose-toolbar"> 19 <roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " /> 20 <roundcube:button command="send" type="link" class="buttonPas send" classAct="button send" classSel="button sendSel" title="sendmessage" content=" " /> 21 <roundcube:button command="spellcheck" type="link" class="buttonPas spellcheck" classAct="button spellcheck" classSel="button spellcheckSel" title="checkspelling" content=" " /> 22 <roundcube:button command="add-attachment" type="link" class="buttonPas attach" classAct="button attach" classSel="button attachSel" title="addattachment" content=" " /> 23 <roundcube:button command="insert-sig" type="link" class="buttonPas insertsig" classAct="button insertsig" classSel="button insertsigSel" title="insertsignature" content=" " /> 24 <roundcube:button command="savedraft" type="link" class="buttonPas savedraft" classAct="button savedraft" classSel="button savedraftSel" title="savemessage" content=" " /> 25 <roundcube:container name="toolbar" id="compose-toolbar" /> 26 </td> 27 </tr></table> 24 <roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " /> 25 <roundcube:button command="send" type="link" class="buttonPas send" classAct="button send" classSel="button sendSel" title="sendmessage" content=" " /> 26 <roundcube:button command="spellcheck" type="link" class="buttonPas spellcheck" classAct="button spellcheck" classSel="button spellcheckSel" title="checkspelling" content=" " /> 27 <roundcube:button command="insert-sig" type="link" class="buttonPas insertsig" classAct="button insertsig" classSel="button insertsigSel" title="insertsignature" content=" " /> 28 <roundcube:button command="savedraft" type="link" class="buttonPas savedraft" classAct="button savedraft" classSel="button savedraftSel" title="savemessage" content=" " /> 29 <roundcube:container name="toolbar" id="compose-toolbar" /> 28 30 </div> 31 32 <div id="mainscreen"> 33 34 <div id="compose-attachments"> 35 <div class="boxtitle"><roundcube:label name="attachments" /></div> 36 <div class="boxlistcontent"> 37 <roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" /> 38 </div> 39 <div class="boxfooter"> 40 <roundcube:button name="uploadform" id="uploadformlink" type="link" title="addattachment" class="button addgroup" onclick="rcmail_ui.show_uploadform();return false" content=" " /> 41 </div> 42 </div> 43 44 <script type="text/javascript"> 45 var composesplitv = new rcube_splitter({id:'composesplitterv', p1: 'compose-attachments', p2: 'compose-container', orientation: 'v', relative: true, start: 165}); 46 rcmail.add_onload('composesplitv.init()'); 47 </script> 29 48 30 49 <div id="compose-container"> 31 50 <div id="compose-headers-div" style="width: 100%;"> 32 <table border="0" cellspacing="0" cellpadding="1" id="compose-headers" summary=""> 33 <tbody> 51 <table border="0" cellspacing="0" cellpadding="1" id="compose-headers"> 34 52 <tr> 35 <td class="title"><label for="_from"><roundcube:label name="from" /></label></td> 36 <td><roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" /></td> 53 <td class="title"><label for="_from"><roundcube:label name="from" /></label></td> 54 <td class="editfield"> 55 <roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" /> 56 </td> 57 <td id="formlinks"> 58 <a href="#cc" onclick="return rcmail_show_header_form('cc')" id="cc-link"><roundcube:label name="addcc" /></a> 59 <span class="separator">|</span> 60 <a href="#bcc" onclick="return rcmail_show_header_form('bcc')" id="bcc-link"><roundcube:label name="addbcc" /></a> 61 <span class="separator">|</span> 62 <a href="#reply-to" onclick="return rcmail_show_header_form('replyto')" id="replyto-link"><roundcube:label name="addreplyto" /></a> 63 </td> 37 64 </tr><tr> 38 <td class="title top"><label for="_to"><roundcube:label name="to" /></label></td> 39 <td><roundcube:object name="composeHeaders" part="to" form="form" id="_to" cols="70" rows="2" tabindex="2" /></td> 65 <td class="title top"><label for="_to"><roundcube:label name="to" /></label></td> 66 <td colspan="2" class="editfield"> 67 <roundcube:object name="composeHeaders" part="to" form="form" id="_to" cols="70" rows="2" tabindex="2" /> 68 </td> 40 69 </tr><tr id="compose-cc"> 41 <td class="title top"><a href="#cc" onclick="return rcmail_hide_header_form('cc');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 42 <label for="_cc"><roundcube:label name="cc" /></label></td> 43 <td><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="2" tabindex="3" /></td> 70 <td class="title top"> 71 <a href="#cc" onclick="return rcmail_hide_header_form('cc');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 72 <label for="_cc"><roundcube:label name="cc" /></label> 73 </td> 74 <td colspan="2" class="editfield"> 75 <roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="2" tabindex="3" /> 76 </td> 44 77 </tr><tr id="compose-bcc"> 45 <td class="title top"><a href="#bcc" onclick="return rcmail_hide_header_form('bcc');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 46 <label for="_bcc"><roundcube:label name="bcc" /></label></td> 47 <td><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="2" tabindex="4" /></td> 78 <td class="title top"> 79 <a href="#bcc" onclick="return rcmail_hide_header_form('bcc');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 80 <label for="_bcc"><roundcube:label name="bcc" /></label> 81 </td> 82 <td colspan="2" class="editfield"> 83 <roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="2" tabindex="4" /> 84 </td> 48 85 </tr><tr id="compose-replyto"> 49 <td class="title top"><a href="#replyto" onclick="return rcmail_hide_header_form('replyto');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 50 <label for="_replyto"><roundcube:label name="replyto" /></label></td> 51 <td><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td> 52 </tr><tr id="compose-links"> 53 <td></td> 54 <td class="formlinks"> 55 <a href="#cc" onclick="return rcmail_show_header_form('cc')" id="cc-link"><roundcube:label name="addcc" /></a> 56 <span class="separator">|</span> 57 <a href="#bcc" onclick="return rcmail_show_header_form('bcc')" id="bcc-link"><roundcube:label name="addbcc" /></a> 58 <span class="separator">|</span> 59 <a href="#reply-to" onclick="return rcmail_show_header_form('replyto')" id="replyto-link"><roundcube:label name="addreplyto" /></a> 60 </td> 61 </tr><tr> 62 <td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td> 63 <td><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" /></td> 64 </tr><tr> 65 <td class="title"><roundcube:label name="editortype" /></td> 66 <td> 67 <div id="editor-select"> 68 <roundcube:object name="editorSelector" editorid="compose-body" tabindex="7" /> 69 <label for="rcmcomposepriority"><roundcube:label name="priority" /></label> 70 <roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /> 71 <label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" /></label> 72 <roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /> 73 </div> 74 <div id="spellcheck-control"></div> 75 </td> 76 </tr> 77 </tbody> 78 </table> 86 <td class="title top"> 87 <a href="#replyto" onclick="return rcmail_hide_header_form('replyto');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 88 <label for="_replyto"><roundcube:label name="replyto" /></label> 89 </td> 90 <td colspan="2" class="editfield"> 91 <roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /> 92 </td> 93 </tr><tr> 94 <td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td> 95 <td colspan="2" class="editfield"> 96 <roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" /> 97 </td> 98 </table> 79 99 </div> 80 100 <div id="compose-div"> 81 <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="8" /> 82 <table border="0" cellspacing="0" summary="" style="width:100%; margin-top: 5px;"><tbody> 83 <tr> 84 <td style="white-space: nowrap"> 85 <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="9" /> 86 <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="10" /> 87 </td> 88 <td style="text-align:right; white-space: nowrap"> 89 <label><roundcube:label name="savesentmessagein" />: <roundcube:object name="storetarget" maxlength="30" tabindex="11" /></label> 90 </td> 91 </tr> 92 </tbody></table> 101 <div class="boxlistcontent" style="overflow: hidden; top: 0"> 102 <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="7" /> 103 </div> 104 <div class="boxfooter"> 105 <roundcube:button name="messageoptions" id="composemenulink" type="link" title="messageoptions" class="button groupactions" onclick="rcmail_ui.show_composemenu();return false" content=" " /> 106 <span id="compose-buttons"> 107 <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="8" /> 108 <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" /> 109 </span> 110 <div id="compose-editorfooter" class="pagenav"> 111 <span id="spellcheck-control" style="margin-right: 10px"></span> 112 <span> 113 <roundcube:label name="editortype" /> 114 <roundcube:object name="editorSelector" editorid="compose-body" tabindex="10" /> 115 </span> 116 </div> 117 </div> 93 118 </div> 94 119 </div> 95 120 96 <div id="compose-attachments"> 97 <div id="attachment-title"><roundcube:label name="attachments" /></div> 98 <roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" /> 99 <p><roundcube:button command="add-attachment" imagePas="/images/buttons/add_pas.png" imageSel="/images/buttons/add_sel.png" imageAct="/images/buttons/add_act.png" width="23" height="18" title="addattachment" /></p> 121 </div> 122 123 <div id="composeoptionsmenu" class="popupmenu"> 124 <table> 125 <tr><td><label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" />:</label></td> 126 <td><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /></td> 127 </tr> 128 <tr><td><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label></td> 129 <td><roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></td> 130 </tr> 131 <tr><td><label><roundcube:label name="savesentmessagein" />:</label></td> 132 <td><roundcube:object name="storetarget" maxlength="30" /></td> 133 </tr> 134 </table> 100 135 </div> 101 136 -
skins/default/templates/editidentity.html
rce06d32 r087c7dc 20 20 <roundcube:include file="/includes/settingstabs.html" /> 21 21 22 <div id=" prefsscreen">22 <div id="mainscreen"> 23 23 24 24 <div id="identities-list"> … … 52 52 </div> 53 53 54 <div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>55 56 54 </body> 57 55 </html> -
skins/default/templates/error.html
rce06d32 r087c7dc 13 13 </div> 14 14 15 <div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>16 17 15 </body> 18 16 </html> -
skins/default/templates/identities.html
rce06d32 r087c7dc 20 20 <roundcube:include file="/includes/settingstabs.html" /> 21 21 22 <div id=" prefsscreen">22 <div id="mainscreen"> 23 23 24 24 <div id="identities-list"> … … 45 45 </div> 46 46 47 <div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>48 49 47 </body> 50 48 </html> -
skins/default/templates/importcontacts.html
rce06d32 r087c7dc 10 10 <roundcube:include file="/includes/header.html" /> 11 11 12 <div id=" importbox">12 <div id="mainscreen" class="box"> 13 13 <div class="boxtitle"><roundcube:label name="importcontacts" /></div> 14 14 … … 23 23 </div> 24 24 25 <div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>26 27 25 </body> 28 26 </html> -
skins/default/templates/mail.html
rf821fec r087c7dc 231 231 </div> 232 232 233 <div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>234 235 233 </body> 236 234 </html> -
skins/default/templates/managefolders.html
rce06d32 r087c7dc 14 14 <form name="subscriptionform" action="./" onsubmit="rcmail.command('create-folder');return false;"> 15 15 16 <div id="mainscreen"> 17 16 18 <div id="folder-manager"> 17 19 <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table" … … 21 23 </div> 22 24 23 <div id="bottomboxes"> 24 <div class="settingsbox"> 25 <div id="bottomboxes" class="box"> 25 26 <div class="boxtitle"><roundcube:label name="createfolder" /></div> 26 27 … … 37 38 </form> 38 39 39 <div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>40 41 40 </body> 42 41 </html> -
skins/default/templates/message.html
rce06d32 r087c7dc 80 80 </div> 81 81 82 <div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>83 84 82 </body> 85 83 </html> -
skins/default/templates/messageerror.html
rce06d32 r087c7dc 73 73 </div> 74 74 75 <div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>76 77 75 </body> 78 76 <roundcube:endif /> -
skins/default/templates/plugin.html
rb4f7c66 r087c7dc 14 14 <roundcube:endif /> 15 15 16 <div id=" pagecontent">16 <div id="mainscreen"> 17 17 <roundcube:object name="plugin.body" /> 18 18 </div> -
skins/default/templates/settings.html
r479a9915 r087c7dc 21 21 <roundcube:include file="/includes/settingstabs.html" /> 22 22 23 <div id=" prefsscreen">23 <div id="mainscreen"> 24 24 25 25 <div id="sectionslist"> … … 38 38 </div> 39 39 40 <div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>41 42 40 </body> 43 41 </html>
Note: See TracChangeset
for help on using the changeset viewer.
