diff options
| -rw-r--r-- | program/include/main.inc | 5 | ||||
| -rw-r--r-- | program/localization/pl_PL/labels.inc | 1 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 14 | ||||
| -rw-r--r-- | skins/default/iehacks.css | 8 | ||||
| -rw-r--r-- | skins/default/mail.css | 4 | ||||
| -rw-r--r-- | skins/default/settings.css | 29 | ||||
| -rw-r--r-- | skins/default/templates/editidentity.html | 22 | ||||
| -rw-r--r-- | skins/default/templates/identities.html | 22 |
8 files changed, 64 insertions, 41 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index e8e92161d..f98e4311e 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -732,8 +732,9 @@ function rcube_table_output($attrib, $table_data, $a_show_cols, $id_col) $table = new html_table(/*array('cols' => count($a_show_cols))*/); // add table header - foreach ($a_show_cols as $col) - $table->add_header($col, Q(rcube_label($col))); + if (!$attrib['noheader']) + foreach ($a_show_cols as $col) + $table->add_header($col, Q(rcube_label($col))); $c = 0; if (!is_array($table_data)) diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc index a1e858112..639cf0b95 100644 --- a/program/localization/pl_PL/labels.inc +++ b/program/localization/pl_PL/labels.inc @@ -344,5 +344,6 @@ $labels['vietnamese'] = 'wietnamski'; $labels['japanese'] = 'japoński'; $labels['korean'] = 'koreański'; $labels['chinese'] = 'chiński'; +$labels['folderctions'] = 'Działania na folderach...'; ?> diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 1516b9810..f22cad8ef 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -69,14 +69,20 @@ function rcmail_identities_list($attrib) if (!strlen($attrib['id'])) $attrib['id'] = 'rcmIdentitiesList'; + // get identities list and define 'mail' column + $list = $USER->list_identities(); + foreach ($list as $idx => $row) + $list[$idx]['mail'] = trim($row['name'] . ' <' . $row['email'] .'>'); + // get all identites from DB and define list of cols to be displayed $plugin = $RCMAIL->plugins->exec_hook('list_identities', array( - 'list' => $USER->list_identities(), - 'cols' => array('name', 'email'))); + 'list' => $list, + 'cols' => array('mail'))); - // create XHTML table + // @TODO: use <UL> instead of <TABLE> for identities list + // create XHTML table $out = rcube_table_output($attrib, $plugin['list'], $plugin['cols'], 'identity_id'); - + // set client env $OUTPUT->add_gui_object('identitieslist', $attrib['id']); diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css index 46650e436..6888094c7 100644 --- a/skins/default/iehacks.css +++ b/skins/default/iehacks.css @@ -38,11 +38,6 @@ input, textarea height: expression((parseInt(document.documentElement.clientHeight)-235)+'px'); } -#identities-list -{ - height: expression((parseInt(document.documentElement.clientHeight)-155)+'px'); -} - #messagetoolbar { width: expression((parseInt(document.documentElement.clientWidth)-215)+'px'); @@ -95,7 +90,8 @@ input, textarea } #addresslist, -#sectionslist +#sectionslist, +#identities-list { height: expression(parseInt(this.parentNode.offsetHeight)+'px'); } diff --git a/skins/default/mail.css b/skins/default/mail.css index dfa091384..b29688492 100644 --- a/skins/default/mail.css +++ b/skins/default/mail.css @@ -384,7 +384,7 @@ td.formlinks a:visited bottom: 20px; border: 1px solid #999; background-color: #F9F9F9; - overflow: auto; + overflow: hidden; } #mailboxlist @@ -919,7 +919,7 @@ td span.branch div.l3 .quota_text_high { color: white; } .quota_text_mid { color: #666; } .quota_text_low { color: #666; } - + /** message view styles */ diff --git a/skins/default/settings.css b/skins/default/settings.css index b41391964..46a02d81f 100644 --- a/skins/default/settings.css +++ b/skins/default/settings.css @@ -50,7 +50,6 @@ span.tablink-selected a width: 300px; } -#identities-list, #folder-manager { position: absolute; @@ -73,13 +72,6 @@ span.tablink-selected a background-color: #FFFFA6; } -#identities-list -{ - bottom: 30px; - width: 420px; - border: 1px solid #999999; -} - #listbuttons { position: absolute; @@ -109,16 +101,7 @@ span.tablink-selected a cursor: default; overflow: hidden; text-overflow: ellipsis; -} - -#identities-table thead td.name -{ - width: 55%; -} - -#identities-table thead td.email -{ - width: 45%; + -o-text-overflow: ellipsis; } #subscription-table tbody td @@ -189,10 +172,9 @@ span.tablink-selected a #identity-details { position: absolute; - top: 95px; - left: 450px; - right: 20px; - bottom: 30px; + top: 0; + right: 0; + bottom: 0; border: 1px solid #999999; overflow: auto; background-color: #F2F2F2; @@ -246,6 +228,7 @@ legend left: 20px; } +#identities-list, #sectionslist { position: absolute; @@ -254,7 +237,7 @@ legend bottom: 0px; border: 1px solid #999999; background-color: #F9F9F9; - overflow: auto; + overflow: hidden; } #sections-table diff --git a/skins/default/templates/editidentity.html b/skins/default/templates/editidentity.html index 30177ade0..5b4c75386 100644 --- a/skins/default/templates/editidentity.html +++ b/skins/default/templates/editidentity.html @@ -4,6 +4,14 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> <script type="text/javascript" src="/functions.js"></script> +<script type="text/javascript" src="/splitter.js"></script> +<style type="text/css"> +#identities-list { width: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter-5 : 295" />px; } +#identity-details { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px; + <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305).')+\\'px\\');') : ''" /> +} +</style> + </head> <body> @@ -11,15 +19,23 @@ <roundcube:include file="/includes/header.html" /> <roundcube:include file="/includes/settingstabs.html" /> +<div id="prefsscreen"> + <div id="identities-list"> -<div class="boxlistcontent" style="top: 0px"> -<roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" editIcon="" /> +<div id="identity-title" class="boxtitle"><roundcube:label name="identities" /></div> +<div class="boxlistcontent"> +<roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" noheader="true" editIcon="" /> </div> <div class="boxfooter"> <roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" /> </div> </div> +<script type="text/javascript"> + var identviewsplit = new rcube_splitter({id:'identviewsplitter', p1: 'identities-list', p2: 'identity-details', orientation: 'v', relative: true, start: 300 }); + rcmail.add_onload('identviewsplit.init()'); +</script> + <div id="identity-details"> <div id="identity-title" class="boxtitle"><roundcube:object name="steptitle" /></div> @@ -33,5 +49,7 @@ </div> </div> +</div> + </body> </html> diff --git a/skins/default/templates/identities.html b/skins/default/templates/identities.html index 55094a061..04fa9816c 100644 --- a/skins/default/templates/identities.html +++ b/skins/default/templates/identities.html @@ -4,6 +4,14 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> <script type="text/javascript" src="/functions.js"></script> +<script type="text/javascript" src="/splitter.js"></script> +<style type="text/css"> +#identities-list { width: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter-5 : 295" />px; } +#identity-details { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px; + <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305).')+\\'px\\');') : ''" /> +} +</style> + </head> <body> @@ -11,20 +19,30 @@ <roundcube:include file="/includes/header.html" /> <roundcube:include file="/includes/settingstabs.html" /> +<div id="prefsscreen"> + <div id="identities-list"> -<div class="boxlistcontent" style="top: 0px"> -<roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" editIcon="" /> +<div id="identity-title" class="boxtitle"><roundcube:label name="identities" /></div> +<div class="boxlistcontent"> +<roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" noheader="true" editIcon="" /> </div> <div class="boxfooter"> <roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" /> </div> </div> +<script type="text/javascript"> + var identviewsplit = new rcube_splitter({id:'identviewsplitter', p1: 'identities-list', p2: 'identity-details', orientation: 'v', relative: true, start: 300 }); + rcmail.add_onload('identviewsplit.init()'); +</script> + <div id="identity-details"> <div style="margin:10px auto; text-align:center"> <img src="/images/watermark.gif" width="260" height="228" alt="" /> </div> </div> +</div> + </body> </html> |