work in progress

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

diff --git a/ZideStore/UI-X/ChangeLog b/ZideStore/UI-X/ChangeLog
index f6ba8d7d138c34a105284f6d9a21007522308d81..096558972b970e003e04dede9048f7e6748ebcad 100644 (file)
--- a/ZideStore/UI-X/ChangeLog
+++ b/ZideStore/UI-X/ChangeLog
@@ -1,3 +1,15 @@
+2004-06-16  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * Common/zidestoreui.css: new style for button_auto.
+
+       * Scheduler/OGoCalView.[hm]: API for completing hrefs with necessary
+         query parts.
+
+       * Scheduler/OGoCalWeekView.m: bugfix for startDate.
+
+       * Scheduler/product.plist: added still missing views -> point to
+         weekoverview for the time being.
+       
 2004-06-15  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * Common/UIxTabView.m: removed class from <a> tag, removed rendering

diff --git a/ZideStore/UI-X/Common/zidestoreui.css b/ZideStore/UI-X/Common/zidestoreui.css
index a339b0681198f8e599bd69d032c8cda07c9dda5b..be032b4629048c51b7a691c3cab95420a390970b 100644 (file)
--- a/ZideStore/UI-X/Common/zidestoreui.css
+++ b/ZideStore/UI-X/Common/zidestoreui.css
@@ -85,13 +85,32 @@ font.defaultfont {
 
 /* buttons */
 
+.button_auto_env {
+  height:           16px;
+  text-align:       center;
+  vertical-align:   middle;
+  padding:          0px 0px 0px 0px;
+  margin:           0px 0px 0px 0px;
+  overflow:         hidden;
+}
+
+.button_auto_env a {
+  text-decoration:  none;
+  color:            #000000;
+}
+
+.button_auto_env a:hover {
+  text-decoration:  underline;
+  color:            #ff0000;
+}
+
 .button_auto {
   height:           20px;
   border-style:     outset;
   border-color:     #DDDDDD;
   border-width:     2px;
   color:            #000000;
-//  background-color: #FFFFFF;
+  background-color: #e8e8e0;
   font-size:        8pt;
   font-family:      Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
   letter-spacing:   0pt;
@@ -106,45 +125,6 @@ font.defaultfont {
   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 */
 

diff --git a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m
index ae426b74c8caf7b96c69b59e78eeb99c47be644d..223a3129ca7eab01140371ac9c86ef9db92cf3a6 100644 (file)
--- a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m
+++ b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.m
@@ -31,6 +31,8 @@
     NSCalendarDate *currentDate;
 }
 
+- (NSString *)completedLinkForOverview:(NSString *)_overview;
+
 @end
 
 
@@ -58,6 +60,10 @@
     return self->currentDate;
 }
 
+
+/* labels */
+
+
 - (NSString *)dayLabel {
     NSCalendarDate *date;
 
@@ -85,4 +91,32 @@
     return [self->currentDate descriptionWithCalendarFormat:@"%Y"];
 }
 
+
+/* hrefs */
+
+
+- (NSString *)completedLinkForOverview:(NSString *)_overview {
+    NSString *dateString;
+
+    dateString = [[[self context] request] formValueForKey:@"startDate"];
+    return [_overview stringByAppendingFormat:@"?startDate=%@", dateString];
+}
+
+- (NSString *)dayoverviewLink {
+    return [self completedLinkForOverview:@"dayoverview"];
+}
+
+- (NSString *)weekoverviewLink {
+    return [self completedLinkForOverview:@"weekoverview"];
+}
+
+- (NSString *)monthoverviewLink {
+    return [self completedLinkForOverview:@"monthoverview"];
+}
+
+- (NSString *)yearoverviewLink {
+    return [self completedLinkForOverview:@"yearoverview"];
+}
+
+
 @end

diff --git a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.wox b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.wox
index d2e5422328073e53fc4036fd4b2d0ca617b58d8a..532232e7d7257dd66c2e0d3a5d9c62b94cdabb3c 100644 (file)
--- a/ZideStore/UI-X/Scheduler/OGoCalSelectTab.wox
+++ b/ZideStore/UI-X/Scheduler/OGoCalSelectTab.wox
@@ -10,16 +10,16 @@
              const:selectedTabStyle="tab_selected"
              const:bodyStyle="tabview_body"
 >
-     <uix:tab const:key="day" var:label="dayLabel" const:href="dayoverview">
+     <uix:tab const:key="day" var:label="dayLabel" var:href="dayoverviewLink">
      <var:component-content />
      </uix:tab>
-     <uix:tab const:key="week" var:label="weekLabel" const:href="weekoverview">
+     <uix:tab const:key="week" var:label="weekLabel" var:href="weekoverviewLink">
      <var:component-content />
      </uix:tab>
-     <uix:tab const:key="month" var:label="monthLabel" const:href="monthoverview">
+     <uix:tab const:key="month" var:label="monthLabel" var:href="monthoverviewLink">
      <var:component-content />
      </uix:tab>
-     <uix:tab const:key="year" var:label="yearLabel" const:href="yearoverview">
+     <uix:tab const:key="year" var:label="yearLabel" var:href="yearoverviewLink">
      <var:component-content />
      </uix:tab>
 </uix:tabview>

diff --git a/ZideStore/UI-X/Scheduler/OGoCalView.h b/ZideStore/UI-X/Scheduler/OGoCalView.h
index a5d99746a037b3ee993cf46f6a175423ff5d532f..6468c7f76c4cc5a9e8691b68b265f0810e4abad2 100644 (file)
--- a/ZideStore/UI-X/Scheduler/OGoCalView.h
+++ b/ZideStore/UI-X/Scheduler/OGoCalView.h
@@ -24,6 +24,7 @@
 - (NSString *)appointmentViewURL;
 - (NSString *)ownMethodName;
 - (NSString *)dateNavigationURLWithNewStartDate:(NSCalendarDate *)_newDate;
+- (NSString *)completedLinkForView:(NSString *)_view;
 
 /* backend */
 

diff --git a/ZideStore/UI-X/Scheduler/OGoCalView.m b/ZideStore/UI-X/Scheduler/OGoCalView.m
index 2888ec5021b1b24ff2f8e8f221e02fb3109903b6..d08551c6e9270d2ce8e3e074501ca110659a5f70 100644 (file)
--- a/ZideStore/UI-X/Scheduler/OGoCalView.m
+++ b/ZideStore/UI-X/Scheduler/OGoCalView.m
@@ -153,4 +153,14 @@
   return [NSCalendarDate dateWithString:_dateString calendarFormat:@"%Y%m%d"];
 }
   
+- (NSString *)completedLinkForView:(NSString *)_view {
+    NSString *dateString;
+    
+    dateString = [[[self context] request] formValueForKey:@"startDate"];
+    if(dateString)
+        return [_view stringByAppendingFormat:@"?startDate=%@", dateString];
+    return _view;
+}
+
+
 @end /* OGoCalView */

diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox b/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox
index b2548da0a447f66fa7498c817f810a37cd9b228f..da13fc596a9e8716c89db880c1806548ab320750 100644 (file)
--- a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox
+++ b/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox
@@ -26,14 +26,14 @@
   <tr>
   <td id="skywinbodycell" class="wincontent">
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
-    <tr bgcolor="#E0E0E0">
+    <tr bgcolor="#e8e8e0">
     <td align="left" valign="middle" width="80%">other stuff</td><!-- 99% -->
     <td align="right">
     <table border="0">
     <tr>
     <td align="right" valign="middle">
     <a var:href="prevWeekURL"><img rsrc:src="previous_week.gif" alt="previous week" border="0"/></a></td>
-    <td align="right" valign="middle">
+    <td align="right" valign="middle" class="button_auto_env">
     <a var:href="thisWeekURL" class="button_auto">this<var:entity const:name="nbsp"/>week</a>
     </td>
     <td align="right" valign="middle">
@@ -60,10 +60,10 @@
               <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="weekchartview"><img rsrc:src="icon_apt_chart.gif" title="Chart" alt="Chart" border="0" valign="top" /></a></td>
+                  <td><a href="weeklistview"><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>
+                    <a href="weekcolumnview"><img rsrc:src="icon_apt_column_view.gif" title="Columns" alt="Columns" border="0" valign="top" /></a>
                   </td>
                </tr>
               </table>
@@ -72,11 +72,11 @@
             <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 class="button_auto_env" nowrap="true" valign='middle' align='center'>
+                            <a class="button_auto" var:href="weekprintviewLink" target="SOGoPrintView">printview</a>
                         </td>
-                        <td class="button_bezel" nowrap="true" valign='middle' align='center'>
-                            <span class="button_bezel_inner"><a href="proposal">proposal</a></span>
+                        <td class="button_auto_env" nowrap="true" valign='middle' align='center'>
+                            <a class="button_auto" var:href="proposalLink">proposal</a>
                         </td>
                     </tr>
                 </table>

diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekView.m b/ZideStore/UI-X/Scheduler/OGoCalWeekView.m
index 310ec86028b0ca9fadc672a2b3a5aa4fa81a28b9..8ccdcd037309e644fe3d80d445c6abc2483f6be1 100644 (file)
--- a/ZideStore/UI-X/Scheduler/OGoCalWeekView.m
+++ b/ZideStore/UI-X/Scheduler/OGoCalWeekView.m
@@ -12,9 +12,9 @@
   dateString = [[[self context] request] formValueForKey:@"startDate"];
   startDate = dateString
     ? [self dateForDateString:dateString]
-    : [[NSCalendarDate date] mondayOfWeek];
+    : [NSCalendarDate date];
   
-  return startDate;
+  return [startDate mondayOfWeek];
 }
 
 - (NSCalendarDate *)endDate {
@@ -47,4 +47,13 @@
   return [self dateNavigationURLWithNewStartDate:newWeekDate];
 }
 
+
+- (NSString *)weekprintviewLink {
+    return [self completedLinkForView:@"weekprintview"];
+}
+
+- (NSString *)proposalLink {
+    return [self completedLinkForView:@"proposal"];
+}
+
 @end /* OGoCalWeekView */

diff --git a/ZideStore/UI-X/Scheduler/product.plist b/ZideStore/UI-X/Scheduler/product.plist
index 180156a48338cdfa62360a87ed31af01eceafd60..8051cd3eb6bebe769cc326669deb21f296af3221 100644 (file)
--- a/ZideStore/UI-X/Scheduler/product.plist
+++ b/ZideStore/UI-X/Scheduler/product.plist
@@ -25,6 +25,22 @@
           protectedBy = "View";
           pageName    = "OGoCalWeekOverview"; 
         };
+        "weekchartview" = { 
+          protectedBy = "View";
+          pageName    = "OGoCalWeekOverview"; 
+        };
+        "weeklistview" = { 
+          protectedBy = "View";
+          pageName    = "OGoCalWeekOverview"; 
+        };
+        "weekcolumnview" = { 
+          protectedBy = "View";
+          pageName    = "OGoCalWeekOverview"; 
+        };
+        "weekprintview" = { 
+          protectedBy = "View";
+          pageName    = "OGoCalWeekOverview"; 
+        };
         "monthoverview" = { 
           protectedBy = "View";
           pageName    = "OGoCalMonthOverview";