banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- some improvements + added splitter in Identities

Browse Source
release-0.6
alecpl 14 years ago
parent ff38d0e55b
commit 54759ce120
8 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File

5
program/include/main.inc
Unescape Escape View File

@ -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))

1
program/localization/pl_PL/labels.inc
Unescape Escape View File

@ -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...';
?>

14
program/steps/settings/func.inc
Unescape Escape View File

@ -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']);

8
skins/default/iehacks.css
Unescape Escape View File

@ -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');
}

4
skins/default/mail.css
Unescape Escape View File

@ -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 */

29
skins/default/settings.css
Unescape Escape View File

@ -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

22
skins/default/templates/editidentity.html
Unescape Escape View File

@ -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>

22
skins/default/templates/identities.html
Unescape Escape View File

@ -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>

Write Preview
Loading…
Cancel
Save