]> err.no Git - scalable-opengroupware.org/commitdiff
cosmetic changes
authorznek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Tue, 15 Jun 2004 17:52:39 +0000 (17:52 +0000)
committerznek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Tue, 15 Jun 2004 17:52:39 +0000 (17:52 +0000)
git-svn-id: http://svn.opengroupware.org/SOGo/trunk@37 d1b88da0-ebda-0310-925b-ed51d893ca5b

16 files changed:
ZideStore/UI-X/ChangeLog
ZideStore/UI-X/Common/OGoWinClose.wox
ZideStore/UI-X/Common/UIxTabView.m
ZideStore/UI-X/Common/zidestoreui.css
ZideStore/UI-X/Scheduler/GNUmakefile
ZideStore/UI-X/Scheduler/OGoCalDateLabel.wox
ZideStore/UI-X/Scheduler/OGoCalMonthOverview.wox
ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox
ZideStore/UI-X/Scheduler/images/icon_apt_chart.gif [new file with mode: 0644]
ZideStore/UI-X/Scheduler/images/icon_apt_chart_inactive.gif [new file with mode: 0644]
ZideStore/UI-X/Scheduler/images/icon_apt_column_view.gif [new file with mode: 0644]
ZideStore/UI-X/Scheduler/images/icon_apt_list.gif [new file with mode: 0644]
ZideStore/UI-X/Scheduler/images/icon_apt_list_inactive.gif [new file with mode: 0644]
ZideStore/UI-X/Scheduler/images/icon_apt_overview.gif [new file with mode: 0644]
ZideStore/UI-X/Scheduler/images/icon_apt_overview_inactive.gif [new file with mode: 0644]
ZideStore/UI-X/Scheduler/product.plist

index 373dcff1c291ba5f4a4bc8757ee1abf6e61e1e5a..f6ba8d7d138c34a105284f6d9a21007522308d81 100644 (file)
@@ -1,3 +1,13 @@
+2004-06-15  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * Common/UIxTabView.m: removed class from <a> tag, removed rendering
+         of headerFooter (what's that good for anyways?)
+
+       * Several resources which resolved to wrong products added statically
+         in templates.
+
+       * Cosmetic changes in templates.
+
 2004-06-14  Helge Hess  <helge.hess@opengroupware.org>
 
        * Scheduler/OGoCalMonthOverview.wox: added missing rsrc namespace
index a787dd475b4b4c78d1946e20cb117d2d7e22eb21..35769e42977b9e51f82e7bb8afb5d32b5d36c948 100644 (file)
@@ -3,4 +3,4 @@
    xmlns:var="http://www.skyrix.com/od/binding"
    xmlns:const="http://www.skyrix.com/od/constant"
    xmlns:rsrc="OGo:url"
-   href="javascript:history.back()"><img border="0" alt="X" rsrc:src="closewindow.gif"/></a>
+   href="javascript:history.back()"><img border="0" alt="X" src="/ZideStore/so/ControlPanel/Products/CommonUI/Resources/closewindow.gif"/></a>
index 19fb8729387aac53f4b9e5997d2d9d2c4ee026dc..ac635c3e2269faba89f9d29a7cad82b19961870b 100644 (file)
@@ -349,11 +349,6 @@ static NSNumber *YesNumber;
   [_response appendContentString:@"\" "];
   [_response appendContentString:
                [NSString stringWithFormat:@"name='%@TabLink'", _info->key]];
-  if (styleName) {
-      [_response appendContentString:@" class='"];
-      [_response appendContentHTMLAttributeValue:styleName];
-      [_response appendContentCharacter:'\''];
-  }
   [_response appendContentString:@">"];
   
   if ([label length] < 1)
@@ -797,14 +792,16 @@ static NSNumber *YesNumber;
   
   [_ctx deleteLastElementIDComponent]; // 'h' for head
   [_ctx removeObjectForKey:UIxTabView_HEAD];
-  
+
+#if 0
   /* header foot row */
-  
+
   [self _appendHeaderFootRowToResponse:_response inContext:_ctx
         bgcolor:bgcolor
         doScript:doScript
         isLeftActive:isLeftActive];
-  
+#endif
+
   /* body row */
   
   [self _appendBodyRowToResponse:_response inContext:_ctx
index 00804b54fe71c49f3cd953aa6be1416e0259221a..a339b0681198f8e599bd69d032c8cda07c9dda5b 100644 (file)
@@ -54,7 +54,7 @@ font.defaultfont {
   border-right:     1px solid #06348b;
 }
 
-a.tab, a.tab:active, a.tab:link, a.tab:visited, a.tab:hover {
+.tab a {
   color:            #000000;
   border:           none;
   text-decoration:  none;
@@ -72,7 +72,7 @@ a.tab, a.tab:active, a.tab:link, a.tab:visited, a.tab:hover {
   border-right:     1px solid #06348b;
 }
 
-a.tab_selected, a.tab_selected:active, a.tab_selected:link, a.tab_selected:visited, a.tab_selected:hover {
+.tab_selected a {
   color:            #000000;
   border:           none;
   text-decoration:  none;
@@ -106,6 +106,45 @@ a.tab_selected, a.tab_selected:active, a.tab_selected:link, a.tab_selected:visit
   overflow:         hidden;
 }
 
+.button_bezel {
+  height:           16px;
+  background-color: #e8e8e0;
+  text-align:       center;
+  vertical-align:   middle;
+  padding:          0px;
+  margin:           0px;
+  border-top:       1px solid #c0c0c0;
+  border-left:      1px solid #c0c0c0;
+  border-bottom:    1px solid #333333;
+  border-right:     1px solid #333333;
+  overflow:         hidden;
+}
+
+.button_bezel_inner {
+  font-size:        8pt;
+  font-family:      Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+  letter-spacing:   0pt;
+  padding-left:     2px;
+  padding-right:    2px;
+  padding-top:      0px;
+  padding-bottom:   0px;
+  margin:           0px;
+//  border-top:       1px solid #ffffff;
+//  border-bottom:    1px solid #8c8c8c;
+  border-left:      1px solid #ffffff;
+  border-right:     1px solid #8c8c8c;
+}
+
+.button_bezel a {
+  text-decoration:  none;
+  color:            #000000;
+}
+
+.button_bezel a:hover {
+  text-decoration:  underline;
+  color:            #ff0000;
+}
+
 
 /* header */
 
index d841062ac037c643459ea28f410aaaa2a1d3ef0d..3dc43ea204a89c1fbc25575c5ad21f23a81382b1 100644 (file)
@@ -32,8 +32,15 @@ SchedulerUI_RESOURCE_FILES += \
        OGoCalSelectTab.wox \
        OGoCalDateLabel.wox \
        images/next_week.gif            \
-       images/previous_week.gif        \
-       
+       images/previous_week.gif                                                \
+       images/icon_apt_chart.gif                                               \
+       images/icon_apt_overview.gif                            \
+       images/icon_apt_chart_inactive.gif              \
+       images/icon_apt_overview_inactive.gif \
+       images/icon_apt_column_view.gif                         \
+       images/icon_apt_list.gif                                                        \
+       images/icon_apt_list_inactive.gif                       \
+
 
 ifeq ($(FOUNDATION_LIB),apple)
 ZIDESTORE=$(GNUSTEP_USER_ROOT)/Library/Headers/ZideStore12
index 8dfff7be36f03014141d29550431b48cff3995f1..c5d8b16849b76b7dade535b451dbfc360b1f106e 100644 (file)
@@ -1,9 +1,8 @@
 <?xml version='1.0' standalone='yes'?>
 
-<var:string xmlns="http://www.w3.org/1999/xhtml"
-            xmlns:var="http://www.skyrix.com/od/binding"
-            xmlns:const="http://www.skyrix.com/od/constant"
-            xmlns:rsrc="OGo:url"
-            var:value="label"
-            const:escapeHTML="NO"
-/>
\ No newline at end of file
+<span xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:var="http://www.skyrix.com/od/binding"
+      xmlns:const="http://www.skyrix.com/od/constant"
+      xmlns:rsrc="OGo:url"
+      const:class="date_label"
+><var:string value="label" const:escapeHTML="NO" /></span>
\ No newline at end of file
index ceb54d9860e9722e2e48482c952c4e9e1b4de3c4..70e08a8e445f0e745ef7ebf7fbca73698f04568e 100644 (file)
     <table border="0">
     <tr>
     <td align="right" valign="middle">
-    <a var:href="prevMonthURL"><img rsrc:src="previous_week.gif" alt="previous month" border="0"/></a></td>
+    <a var:href="prevMonthURL"><img src="/ZideStore/so/ControlPanel/Products/SchedulerUI/Resources/previous_week.gif" alt="previous month" border="0"/></a></td>
     <td align="right" valign="middle">
     <a var:href="thisMonthURL" class="button_auto">this<var:entity const:name="nbsp"/>month</a>
     </td>
     <td align="right" valign="middle">
-    <a var:href="nextMonthURL"><img rsrc:src="next_week.gif" alt="next month" border="0"/></a>
+    <a var:href="nextMonthURL"><img src="/ZideStore/so/ControlPanel/Products/SchedulerUI/Resources/next_week.gif" alt="next month" border="0"/></a>
     </td>
     </tr>
     </table>
@@ -72,7 +72,7 @@
   </tr>
   <tr bgcolor="#F5F5E9">
   <td align="left" width="10"><var:entity const:name="nbsp"/></td>
-  <td align="right"><img border="0" alt="" rsrc:src="corner_right.gif"/></td>
+  <td align="right"><img border="0" alt="" src="/ZideStore/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"/></td>
   </tr>
   <tr>
   <td colspan="2" bgcolor="#F5F5E9">
index 73699bea515333b43844be849e2f59d92c59e419..b2548da0a447f66fa7498c817f810a37cd9b228f 100644 (file)
   <tr>
   <td colspan="2">
   <var:component className="OGoCalSelectTab" const:selection="week" currentDate="startDate">
+
+        <table border="0" cellpadding="4" width="100%" cellspacing="2">
+          <tr>
+            <td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
+              <table border='0' cellpadding='0' cellspacing='0'>
+               <tr>
+                  <td><img rsrc:src="icon_apt_overview_inactive.gif" title="Overview" alt="Overview" border="0" valign="top" /></td>
+                  <td><a href="?mode=chart"><img rsrc:src="icon_apt_chart.gif" title="Chart" alt="Chart" border="0" valign="top" /></a></td>
+                  <td><a href="?mode=list"><img rsrc:src="icon_apt_list.gif" title="List" alt="List" border="0" valign="top" /></a></td>
+                  <td>
+                    <a href="?mode=column"><img rsrc:src="icon_apt_column_view.gif" title="Columns" alt="Columns" border="0" valign="top" /></a>
+                  </td>
+               </tr>
+              </table>
+            </td>
+          
+            <td align="right" bgcolor="#e8e8e0">
+                <table border='0' cellpadding='0' cellspacing='1'>
+                    <tr>
+                        <td class="button_bezel" nowrap="true" valign='middle' align='center'>
+                            <span class="button_bezel_inner"><a href="printweekoverview" target="SOGoPrintView">printview</a></span>
+                        </td>
+                        <td class="button_bezel" nowrap="true" valign='middle' align='center'>
+                            <span class="button_bezel_inner"><a href="proposal">proposal</a></span>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+          </tr>
+        </table>
+
   <var:week-overview list="appointments" item="appointment" weekStart="startDate" const:startDateKey="startDate" const:endDateKey="endDate" const:titleStyle="weekoverview_title" const:contentStyle="weekoverview_content">
   <var:week>
   <a var:href="appointmentViewURL"><var:string value="appointment.title"/></a>
@@ -63,7 +94,7 @@
   </tr>
   <tr bgcolor="#F5F5E9">
   <td align="left" width="10"><var:entity const:name="nbsp"/></td>
-  <td align="right"><img border="0" alt="" rsrc:src="corner_right.gif"/></td>
+  <td align="right"><img border="0" alt="" src="/ZideStore/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"/></td>
   </tr>
   <tr>
   <td colspan="2" bgcolor="#F5F5E9">
diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_chart.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_chart.gif
new file mode 100644 (file)
index 0000000..ba0f740
Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_chart.gif differ
diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_chart_inactive.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_chart_inactive.gif
new file mode 100644 (file)
index 0000000..240f1e8
Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_chart_inactive.gif differ
diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_column_view.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_column_view.gif
new file mode 100644 (file)
index 0000000..4af2fa1
Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_column_view.gif differ
diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_list.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_list.gif
new file mode 100644 (file)
index 0000000..857db76
Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_list.gif differ
diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_list_inactive.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_list_inactive.gif
new file mode 100644 (file)
index 0000000..4e8debf
Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_list_inactive.gif differ
diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_overview.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_overview.gif
new file mode 100644 (file)
index 0000000..43ac796
Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_overview.gif differ
diff --git a/ZideStore/UI-X/Scheduler/images/icon_apt_overview_inactive.gif b/ZideStore/UI-X/Scheduler/images/icon_apt_overview_inactive.gif
new file mode 100644 (file)
index 0000000..7736f48
Binary files /dev/null and b/ZideStore/UI-X/Scheduler/images/icon_apt_overview_inactive.gif differ
index 50568069ada8b2ce79a3f3af64cd734f4310d945..180156a48338cdfa62360a87ed31af01eceafd60 100644 (file)
@@ -3,7 +3,16 @@
 
   publicResources = (
     previous_week.gif,
-    next_week.gif
+    next_week.gif,
+    next_week.gif,
+    previous_week.gif,
+    icon_apt_chart.gif,
+    icon_apt_overview.gif,
+    icon_apt_chart_inactive.gif,
+    icon_apt_overview_inactive.gif,
+    icon_apt_column_view.gif,
+    icon_apt_list.gif,
+    icon_apt_list_inactive.gif
   );
 
   factories = {