added toolbar

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@332 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 664b86321b8744ea206a69d02b0f2552e30daeb5..47845a4bfdd309de86975c25d0133a3eace32b5b 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,7 @@
 2004-09-29  Helge Hess  <helge.hess@opengroupware.org>
 
+       * added toolbar images (v0.9.6)
+
        * UIxMailTree.m: use new tree navigation methods in SoObjects (v0.9.5)
 
 2004-09-28  Helge Hess  <helge.hess@opengroupware.org>

diff --git a/SOGo/UI/Mailer/GNUmakefile b/SOGo/UI/Mailer/GNUmakefile
index 3f5e08abc5fa1ae93eb159567b6aff5704d53500..33066efe0cc28c5cbd4e7df5c737c573e6dcd805 100644 (file)
--- a/SOGo/UI/Mailer/GNUmakefile
+++ b/SOGo/UI/Mailer/GNUmakefile
@@ -40,7 +40,8 @@ MailerUI_RESOURCE_FILES += \
 
 MailerUI_RESOURCE_FILES += \
        screenshots/*.png       \
-       Images/*.gif
+       Images/tbtv_*.gif       \
+       Images/tbtb_*.png       \
 
 MailerUI_LOCALIZED_RESOURCE_FILES += \
        default.strings

diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox
index 8894d22ac3ce8b39da5d8e435d66f7e7a3caa574..b9f4ed7fe6a29fd53c954c00bcf522b57ecb09ff 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailListView.wox
+++ b/SOGo/UI/Mailer/UIxMailListView.wox
@@ -11,10 +11,14 @@
 >
   <div class="titlediv">
     View:
-    [popup all]
+    <select name="viewfilter">
+     <option value="all"   >All</option>
+     <option value="unread">Unread</option>
+    </select>
+    <!-- var:popup -->
     Subject or Sender contains:
-    [search field]
-    [clear]
+    <input name="searchtext" type="text" />
+    <input name="clear" type="submit" value="Clear" />
   </div>
 
   <div class="embedwhite_out">

diff --git a/SOGo/UI/Mailer/UIxMailMainFrame.wox b/SOGo/UI/Mailer/UIxMailMainFrame.wox
index 1778e49a1e50584dd66b0ded88b11a0c31078f8b..4e91dc6c675b2c81ff0cfe311000719098ffe9e3 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailMainFrame.wox
+++ b/SOGo/UI/Mailer/UIxMailMainFrame.wox
@@ -21,31 +21,46 @@
     <table border="0" width="100%" cellspacing="0" cellpadding="2">
       <tr>
         <td valign="top" class="vertframerow">
+<!--
           Toolbar - different for the pages<br />
           Mail:
-
-          <span style="padding-right: 16px;">          
-            <span>Get Mail</span>
-            <span>Write</span>
-            <span>Address Book</span>
-          </span>
-          <span style="padding-right: 16px;">          
-            <span>Reply</span>
-            <span>Reply All</span>
-            <span>Forward</span>
-          </span>
-          <span style="padding-right: 16px;">          
-            <span>Delete</span>
-            <span>Junk</span>
-          </span>
-          <span style="padding-right: 16px;">          
-            <span>Print</span>
-            <span>Stop</span>
-          </span>
+-->
+          <table border="0">
+            <tr>
+              <td class="tb_icon"><a href="#" class="tbicon_getmail"> </a></td>
+              <td class="tb_icon"><a href="#" class="tbicon_compose"> </a></td>
+              <td class="tb_icon"><a href="#" class="tbicon_addressbook"> </a></td>
+              <td class="tb_spacer"> </td>
+              <td class="tb_icon"><a href="#" class="tbicon_reply"   > </a></td>
+              <td class="tb_icon"><a href="#" class="tbicon_replyall"> </a></td>
+              <td class="tb_icon"><a href="#" class="tbicon_forward" > </a></td>
+              <td class="tb_spacer"> </td>
+              <td class="tb_icon"><a href="#" class="tbicon_delete"> </a></td>
+              <td class="tb_icon"><a href="#" class="tbicon_junk"  > </a></td>
+              <td class="tb_spacer"> </td>
+              <td class="tb_icon"><a href="#" class="tbicon_print"> </a></td>
+              <td class="tb_icon"><a href="#" class="tbicon_stop" > </a></td>
+            </tr>
+            <tr>
+              <td class="tb_label">Get Mail</td>
+              <td class="tb_label">Write</td>
+              <td class="tb_label">Address Book</td>
+              <td class="tb_spacer"> </td>
+              <td class="tb_label">Reply</td>
+              <td class="tb_label">Reply All</td>
+              <td class="tb_label">Forward</td>
+              <td class="tb_spacer"> </td>
+              <td class="tb_label">Delete</td>
+              <td class="tb_label">Junk</td>
+              <td class="tb_spacer"> </td>
+              <td class="tb_label">Print</td>
+              <td class="tb_label">Stop</td>
+            </tr>
+          </table>
         </td>
         <td align="right" width="80" class="vertframerow">
           <!-- right: Thunderbird/OGo Icon? -->
-          OGo
+          SOGo
         </td>
       </tr>
       <tr class="vertframerow">

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 749d66dc7109fb3f49932aae8e0c044ad7d4e6c0..0eb47da345be1d4c8ac5a363234ca3f2c77473cb 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=4
+SUBMINOR_VERSION:=6

diff --git a/SOGo/UI/Mailer/mailer.css b/SOGo/UI/Mailer/mailer.css
index 25682e68c404f70938035b3924fdb259a4d6b262..b32121b6dba192850fb2bcfb6f74024035ad898a 100644 (file)
--- a/SOGo/UI/Mailer/mailer.css
+++ b/SOGo/UI/Mailer/mailer.css
@@ -108,9 +108,9 @@
   text-align:       center;
   vertical-align:   top;
   font-size:        11pt;
-//  width:            24px;
-//  padding:          2px 2px 2px 2px;
-//  margin:           2px 2px 2px 2px;
+/* width:            24px; */
+/* padding:          2px 2px 2px 2px; */
+/*  margin:           2px 2px 2px 2px; */
 }
 
 .dayoverview_cal_content {
@@ -788,6 +788,7 @@ td.monthprintview_content_dimmed {
   height:         24px;
   vertical-align: middle;
   padding-top:    6px;
+  padding-left:   6px;
 }
 
 .whitesec_title {
@@ -801,3 +802,44 @@ td.monthprintview_content_dimmed {
   color:       black;
   vertical-align: bottom;
 }
+
+/* toolbar */
+
+.tb_toolbar {
+  height:        30px;
+}
+.tb_toolbar_group {
+  height:        30px;
+  padding-right: 16px;
+}
+
+td.tb_icon {
+  text-align: center;
+}
+td.tb_label {
+  font-size:   9pt;
+  font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+  color:       #000000;
+  text-align:  center;
+}
+td.tb_spacer { 
+  width: 16px;
+}
+
+td.tb_icon a {
+  width:   30px;
+  height:  30px;
+  margin:  0px auto;
+  display: block;
+}
+
+.tbicon_getmail     { background-image: url(tbtb_getmail.png);     }
+.tbicon_compose     { background-image: url(tbtb_compose.png);     }
+.tbicon_addressbook { background-image: url(tbtb_addressbook.png); }
+.tbicon_reply       { background-image: url(tbtb_reply.png);       }
+.tbicon_replyall    { background-image: url(tbtb_replyall.png);    }
+.tbicon_forward     { background-image: url(tbtb_forward.png);     }
+.tbicon_delete      { background-image: url(tbtb_delete.png);      }
+.tbicon_junk        { background-image: url(tbtb_trash.png);       }
+.tbicon_print       { background-image: url(tbtb_print.png);       }
+.tbicon_stop        { background-image: url(tbtb_deletedoc.png);   }

diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/Mailer/product.plist
index 75964731a18727999e1679c1f2c19284105b2324..68a4b7ec09641c4335bd20bdd917b95e80657e55 100644 (file)
--- a/SOGo/UI/Mailer/product.plist
+++ b/SOGo/UI/Mailer/product.plist
@@ -5,17 +5,6 @@
     "uix.css",
     "mailer.css",
 
-    "treeview_corner.gif",
-    "treeview_corner_minus.gif",
-    "treeview_corner_plus.gif",
-    "treeview_junction.gif",
-    "treeview_leaf.gif",
-    "treeview_leaf_corner.gif",
-    "treeview_line.gif",
-    "treeview_minus.gif",
-    "treeview_plus.gif",
-    "treeview_space.gif",
-
     "tbtv_account_17x17.gif",
     "tbtv_drafts_17x17.gif",
     "tbtv_inbox_17x17.gif",
@@ -31,6 +20,21 @@
     "tbtv_sent_17x17.gif",
     "tbtv_trash_17x17.gif",
     
+    "tbtb_addressbook.png",
+    "tbtb_compose.png",
+    "tbtb_delete.png",
+    "tbtb_deletedoc.png",
+    "tbtb_filetofolder.png",
+    "tbtb_forward.png",
+    "tbtb_getmail.png",
+    "tbtb_next.png",
+    "tbtb_previous.png",
+    "tbtb_print.png",
+    "tbtb_reply.png",
+    "tbtb_replyall.png",
+    "tbtb_search.png",
+    "tbtb_trash.png",
+    
     "tbird_073_accountview.png",
     "tbird_073_compose.png",
     "tbird_073_mailwelcome.png",