Changeset 3147 in subversion

Timestamp:

Dec 1, 2009 9:51:37 AM (3 years ago)

Author:

alec

Message:

• better styling for messagelist options menu

Location:

branches/devel-threads

Files:

• program/js/app.js (modified) (2 diffs)
• program/localization/en_US/labels.inc (modified) (2 diffs)
• program/localization/pl_PL/labels.inc (modified) (1 diff)
• skins/default/functions.js (modified) (4 diffs)
• skins/default/iehacks.css (modified) (1 diff)
• skins/default/mail.css (modified) (1 diff)
• skins/default/templates/mail.html (modified) (3 diffs)

branches/devel-threads/program/js/app.js

@@ -176 +176 @@
           this.set_message_coltypes(this.env.coltypes);
           this.message_list.init();
-          this.enable_command('toggle_status', 'toggle_flag', 'menu-open', true);
+          this.enable_command('toggle_status', 'toggle_flag', 'menu-open', 'menu-save', true);
           
           if (this.gui_objects.mailcontframe)
@@ -486 +486 @@
 
       case 'menu-open':
-        this.triggerEvent('menu-open', {props:props});
+      case 'menu-save':
+        this.triggerEvent(command, {props:props});
         return false;
         break;

branches/devel-threads/program/localization/en_US/labels.inc

@@ -167 +167 @@
 $labels['flag'] = 'Flag';
 $labels['attachment'] = 'Attachment';
-$labels['nonedefault'] = 'None (default)';
+$labels['nonesort'] = 'None';
+$labels['list'] = 'List';
 $labels['sentdate'] = 'Sent date';
 $labels['arrival'] = 'Arrival date';
 $labels['asc'] = 'ascending';
 $labels['desc'] = 'descending';
-$labels['listcolumns'] = 'Select list columns:';
-$labels['listsorting'] = 'Select list sorting:';
-$labels['listorder'] = 'Select sorting order:';
-$labels['listgroups'] = 'Select messages grouping mode:';
+$labels['listcolumns'] = 'List columns:';
+$labels['listsorting'] = 'Sorting column:';
+$labels['listorder'] = 'Sorting order:';
+$labels['listmode'] = 'List view mode:';
 
 $labels['compact'] = 'Compact';
@@ -340 +341 @@
 $labels['subscribed']  = 'Subscribed';
 $labels['messagecount'] = 'Messages';
-$labels['threaded'] = 'Threaded';
 $labels['create']  = 'Create';
 $labels['createfolder']  = 'Create new folder';

branches/devel-threads/program/localization/pl_PL/labels.inc

@@ -141 +141 @@
 $labels['select'] = 'Zaznacz';
 $labels['all'] = 'Wszystkie';
-$labels['none'] = 'Anuluj';
+$labels['none'] = 'Brak';
 $labels['unread'] = 'Nieprzeczytane';
 $labels['flagged'] = 'Oznaczone';

branches/devel-threads/skins/default/functions.js

@@ -212 +212 @@
     }
   }
+
   this.listmenu[show?'show':'hide']();
-},
-
-listmenu_open: function(e)
-{
-  this.show_listmenu(true);
+
+  if (show) {
+    var maxheight=0;
+    $('#listmenu fieldset').each(function() {
+      var height = $(this).height();
+      if (height > maxheight) {
+        maxheight = height;
+      }
+    });
+    $('#listmenu fieldset').css("min-height", maxheight+"px")
+    // IE6 complains if you set this attribute using either method:
+    //$('#listmenu fieldset').css({'height':'auto !important'});
+    //$('#listmenu fieldset').css("height","auto !important");
+      .height(maxheight);
+  };
+},
+
+open_listmenu: function(e)
+{
+  this.show_listmenu();
 },
 
@@ -235 +251 @@
 body_mouseup: function(evt, p)
 {
-  if (this.markmenu && this.markmenu.is(':visible') && rcube_event.get_target(evt) != rcube_find_object('markreadbutton'))
+  var target = rcube_event.get_target(evt);
+
+  if (this.markmenu && this.markmenu.is(':visible') && target != rcube_find_object('markreadbutton'))
     this.show_markmenu(false);
-  else if (this.messagemenu && this.messagemenu.is(':visible') && rcube_event.get_target(evt) != rcube_find_object('messagemenulink'))
+  else if (this.messagemenu && this.messagemenu.is(':visible') && target != rcube_find_object('messagemenulink'))
     this.show_messagemenu(false);
-  else if (this.listmenu && this.listmenu.is(':visible') && rcube_event.get_target(evt) != rcube_find_object('listmenulink')) {
+  else if (this.listmenu && this.listmenu.is(':visible') && target != rcube_find_object('listmenulink')) {
     var menu = rcube_find_object('listmenu');
-    var target = rcube_event.get_target(evt);
     while (target.parentNode) {
       if (target.parentNode == menu)
@@ -249 +266 @@
     this.show_listmenu(false);
   }
-  else if (this.searchmenu && this.searchmenu.is(':visible') && rcube_event.get_target(evt) != rcube_find_object('searchmod')) {
+  else if (this.searchmenu && this.searchmenu.is(':visible') && target != rcube_find_object('searchmod')) {
     var menu = rcube_find_object('searchmenu');
-    var target = rcube_event.get_target(evt);
     while (target.parentNode) {
       if (target.parentNode == menu)
@@ -284 +300 @@
   rcube_event.add_listener({ object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
   rcube_event.add_listener({ object:rcmail_ui, method:'body_keypress', event:'keypress' });
-  rcmail.addEventListener('menu-open', 'listmenu_open', rcmail_ui);
-}
+  rcmail.addEventListener('menu-open', 'open_listmenu', rcmail_ui);
+  rcmail.addEventListener('menu-save', 'save_listmenu', rcmail_ui);
+}

branches/devel-threads/skins/default/iehacks.css

@@ -279 +279 @@
   height: 19px;
 }
+
+#listmenu fieldset
+{
+  margin: 2px;
+  padding: 0.5em;
+}

branches/devel-threads/skins/default/mail.css

@@ -1350 +1350 @@
   font-weight: bold;
 }
+
+#listmenu
+{
+  padding: 0px 4px;
+}
+
+#listmenu legend
+{
+  color: #999999;
+}
+
+#listmenu fieldset
+{
+  border: 1px solid #999999;
+  float: left;
+}
+
+#listmenu div
+{
+  padding: 5px;
+  text-align: center;
+  clear: both;
+}

branches/devel-threads/skins/default/templates/mail.html

@@ -154 +154 @@
 
 <div id="listmenu">
-<div><roundcube:label name="listcolumns" /></div>
+<fieldset><legend><roundcube:label name="listcolumns" /></legend>
   <ul class="toolbarmenu">
     <li><input type="checkbox" name="list_col[]" value="subject" id="cols_subject" checked="checked" disabled="disabled" /><label for="cols_subject" class="disabled"><roundcube:label name="subject" /></label></li>
@@ -165 +165 @@
     <li><input type="checkbox" name="list_col[]" value="attachment" id="cols_attachment" /><label for="cols_attachment"><roundcube:label name="attachment" /></label></li>
   </ul>
-<div><roundcube:label name="listsorting" /></div>
-  <ul class="toolbarmenu">
-    <li><input type="radio" name="sort_col" value="" id="sort_default" /><label for="sort_default"><roundcube:label name="nonedefault" /></label></li>
+</fieldset>
+<fieldset><legend><roundcube:label name="listmode" /></legend>
+  <ul class="toolbarmenu">
+    <li><input type="radio" name="view" value="list" id="view_default" /><label for="view_default"><roundcube:label name="list" /></label></li>
+    <roundcube:if condition="env:threads" />
+    <li><input type="radio" name="view" value="thread" id="view_thread" /><label for="view_thread"><roundcube:label name="threads" /></label></li>
+    <roundcube:else />
+    <li><input type="radio" name="view" value="thread" id="view_thread" disabled="disabled" /><label for="view_thread" class="disabled"><roundcube:label name="threads" /></label></li>
+    <roundcube:endif />
+  </ul>
+</fieldset>
+<fieldset><legend><roundcube:label name="listsorting" /></legend>
+  <ul class="toolbarmenu">
+    <li><input type="radio" name="sort_col" value="" id="sort_default" /><label for="sort_default"><roundcube:label name="nonesort" /></label></li>
     <li><input type="radio" name="sort_col" value="arrival" id="sort_arrival" /><label for="sort_arrival"><roundcube:label name="arrival" /></label></li>
     <li><input type="radio" name="sort_col" value="date" id="sort_date" /><label for="sort_date"><roundcube:label name="sentdate" /></label></li>
@@ -176 +187 @@
     <li><input type="radio" name="sort_col" value="size" id="sort_size" /><label for="sort_size"><roundcube:label name="size" /></label></li>
   </ul>
-<div><roundcube:label name="listorder" /></div>
+</fieldset>
+<fieldset><legend><roundcube:label name="listorder" /></legend>
   <ul class="toolbarmenu">
     <li><input type="radio" name="sort_ord" value="ASC" id="sort_asc" /><label for="sort_asc"><roundcube:label name="asc" /></label></li>
     <li><input type="radio" name="sort_ord" value="DESC" id="sort_desc" /><label for="sort_desc"><roundcube:label name="desc" /></label></li>
   </ul>
-<div><roundcube:label name="listgroups" /></div>
-  <ul class="toolbarmenu">
-    <li><input type="radio" name="view" value="list" id="view_default" /><label for="view_default"><roundcube:label name="nonedefault" /></label></li>
-    <roundcube:if condition="env:threads" />
-    <li><input type="radio" name="view" value="thread" id="view_thread" /><label for="view_thread"><roundcube:label name="threaded" /></label></li>
-    <roundcube:else />
-    <li><input type="radio" name="view" value="thread" id="view_thread" disabled="disabled" /><label for="view_thread" class="disabled"><roundcube:label name="threaded" /></label></li>
-    <roundcube:endif />
-  </ul>
-<a href="javascript:rcmail_ui.save_listmenu()"><roundcube:label name="save" /></a>
+</fieldset>
+<div>
+    <roundcube:button command="menu-save" id="listmenusave" type="input" class="button mainaction" label="save" />
+</div>
 </div>