Changeset 374 in subversion

Timestamp:

Nov 21, 2006 3:02:48 AM (7 years ago)

Author:

robin

Message:

Add first and last buttons.

Location:

trunk/roundcubemail

Files:

• program/js/app.js (modified) (5 diffs)
• program/localization/en_US/labels.inc (modified) (2 diffs)
• program/steps/mail/show.inc (modified) (4 diffs)
• skins/default/images/buttons/first_act.png (added)
• skins/default/images/buttons/first_pas.png (added)
• skins/default/images/buttons/first_sel.png (added)
• skins/default/images/buttons/last_act.png (added)
• skins/default/images/buttons/last_pas.png (added)
• skins/default/images/buttons/last_sel.png (added)
• skins/default/templates/addressbook.html (modified) (1 diff)
• skins/default/templates/mail.html (modified) (1 diff)
• skins/default/templates/message.html (modified) (1 diff)

trunk/roundcubemail/program/js/app.js

@@ -142 +142 @@
           this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 'viewsource', 'print', 'load-attachment', true);
           if (this.env.next_uid)
+            {
             this.enable_command('nextmessage', true);
+            this.enable_command('lastmessage', true);
+            }
           if (this.env.prev_uid)
+            {
             this.enable_command('previousmessage', true);
+            this.enable_command('firstmessage', true);
+            }
           }
 
@@ -479 +485 @@
         break;
 
+      case 'lastpage':
+        this.list_page('last');
+        break;
+
       case 'previouspage':
         this.list_page('prev');
+        break;
+
+      case 'firstpage':
+        this.list_page('first');
         break;
 
@@ -657 +671 @@
         break;
 
+          case 'lastmessage':
+        if (this.env.last_uid)
+          this.show_message(this.env.last_uid);
+        break;
+
       case 'previousmessage':
         if (this.env.prev_uid)
           this.show_message(this.env.prev_uid);
+        break;
+
+      case 'firstmessage':
+        if (this.env.first_uid)
+          this.show_message(this.env.first_uid);
         break;
       
@@ -1096 +1120 @@
     if (page=='next')
       page = this.env.current_page+1;
+    if (page=='last')
+      page = this.env.pagecount;
     if (page=='prev' && this.env.current_page>1)
       page = this.env.current_page-1;
+    if (page=='first' && this.env.current_page>1)
+      page = 1;
       
     if (page > 0 && page <= this.env.pagecount)
@@ -2635 +2663 @@
     {
     this.enable_command('nextpage', (this.env.pagecount > this.env.current_page));
+    this.enable_command('lastpage', (this.env.pagecount > this.env.current_page));
     this.enable_command('previouspage', (this.env.current_page > 1));
+    this.enable_command('firstpage', (this.env.current_page > 1));
     }
 

trunk/roundcubemail/program/localization/en_US/labels.inc

@@ -99 +99 @@
 $labels['printmessage']     = 'Print this message';
 $labels['previousmessages'] = 'Show previous set of messages';
+$labels['firstmessages']    = 'Show first set of messages';
 $labels['nextmessages']     = 'Show next set of messages';
+$labels['lastmessages']     = 'Show last set of messages';
 $labels['backtolist']       = 'Back to message list';
 $labels['viewsource']       = 'Show source';
@@ -172 +174 @@
 
 $labels['previouspage']   = 'Show previous set';
+$labels['firstpage']      = 'Show first set';
 $labels['nextpage']       = 'Show next set';
+$labels['lastpage']       = 'Show last set';
 
 

trunk/roundcubemail/program/steps/mail/show.inc

@@ -61 +61 @@
 
   $next = $prev = -1;
-  // get previous and next message UID
+  // get previous, first, next and last message UID
   if (!($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC') && 
       $IMAP->get_capability('sort')) 
@@ -70 +70 @@
     $MESSAGE['index'] = array_search((string)$MESSAGE['UID'], $a_msg_index, TRUE);
     $prev = isset($a_msg_index[$MESSAGE['index']-1]) ? $a_msg_index[$MESSAGE['index']-1] : -1 ;
+    $first = count($a_msg_index)>0 ? $a_msg_index[0] : -1;
     $next = isset($a_msg_index[$MESSAGE['index']+1]) ? $a_msg_index[$MESSAGE['index']+1] : -1 ;
+    $last = count($a_msg_index)>0 ? $a_msg_index[count($a_msg_index)-1] : -1;
     }
   else
@@ -77 +79 @@
     $seq = $IMAP->get_id($MESSAGE['UID']);
     $prev = $IMAP->get_uid($seq + 1);
+    $first = $IMAP->get_uid($IMAP->messagecount());
     $next = $IMAP->get_uid($seq - 1);
+    $last = $IMAP->get_uid(1);
     $MESSAGE['index'] = $IMAP->messagecount() - $seq;
     }
@@ -83 +87 @@
   if ($prev > 0)
     $javascript .= sprintf("\n%s.set_env('prev_uid', '%s');", $JS_OBJECT_NAME, $prev);
+  if ($first >0)
+    $javascript .= sprintf("\n%s.set_env('first_uid', '%s');", $JS_OBJECT_NAME, $first);
   if ($next > 0)
     $javascript .= sprintf("\n%s.set_env('next_uid', '%s');", $JS_OBJECT_NAME, $next);
+  if ($last >0)
+    $javascript .= sprintf("\n%s.set_env('last_uid', '%s');", $JS_OBJECT_NAME, $last);
 
   $OUTPUT->add_script($javascript);

trunk/roundcubemail/skins/default/templates/addressbook.html

@@ -21 +21 @@
 
 <div id="abookcountbar">
+<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstpage" />
 <roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previouspage" />
 &nbsp;<roundcube:object name="recordsCountDisplay" />&nbsp;
 <roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextpage" />
+<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastpage" />
 </div>
 

trunk/roundcubemail/skins/default/templates/mail.html

@@ -26 +26 @@
 
 <div id="messagecountbar">
+<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" />
 <roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
 &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp;
 <roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
+<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" />
 </div>
 

trunk/roundcubemail/skins/default/templates/message.html

@@ -12 +12 @@
 
 <div id="messagecountbar">
+<roundcube:button command="firstmessage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" />
 <roundcube:button command="previousmessage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
 &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp;
 <roundcube:button command="nextmessage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
+<roundcube:button command="lastmessage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" />
 </div>