]> err.no Git - scalable-opengroupware.org/commitdiff
complete style for yearoverview and accompanied fixes
authorznek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Fri, 23 Jul 2004 10:56:08 +0000 (10:56 +0000)
committerznek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Fri, 23 Jul 2004 10:56:08 +0000 (10:56 +0000)
git-svn-id: http://svn.opengroupware.org/SOGo/trunk@154 d1b88da0-ebda-0310-925b-ed51d893ca5b

SOGo/SOGo.xcode/project.pbxproj
SOGo/UI/Common/ChangeLog
SOGo/UI/Common/calendar.css
SOGo/UI/Scheduler/ChangeLog
SOGo/UI/Scheduler/UIxCalInlineMonthOverview.m
SOGo/UI/Scheduler/UIxCalInlineMonthOverview.wox
SOGo/UI/Scheduler/UIxCalYearOverview.m
SOGo/UI/Scheduler/UIxCalYearOverview.wox
SOGo/UI/Scheduler/Version

index 3eaa5a1c887e007e69935cc0ece2cec25741056c..d26e64881a667a225164e77e7985594e557fae6d 100644 (file)
                };
                E87206C30692E3D10099CBBD = {
                        children = (
-                               E87207470692E3D20099CBBD,
-                               E87207480692E3D20099CBBD,
                                E87207490692E3D20099CBBD,
+                               E87207470692E3D20099CBBD,
                                E87207C40692E3D20099CBBD,
+                               E87207480692E3D20099CBBD,
                                E87207E70692E3D20099CBBD,
                                E87207E60692E3D20099CBBD,
                                E8720A490692E4CE0099CBBD,
                        path = ChangeLog;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 4;
+                       usesTabs = 1;
                };
                E872074A0692E3D20099CBBD = {
                        fileEncoding = 4;
index 3ebb328bb102efb73b67fe537b4f040b8a182615..40abc9289d719def06c48bb99c999c98af5a7b59 100644 (file)
@@ -1,3 +1,8 @@
+2004-07-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * calendar.css: complete style for 'yearoverview' and fixed style in
+         'monthoverview'.
+
 2004-07-16  Helge Hess  <helge.hess@skyrix.com>
 
        * UIxAppNavView.m: some fixes to navigation URLs
index 34553bb4cdf345c33c6c3087ba9f1d5f4be226da..94e4f3d72c47df789493898fa5b49b0b7f7b8ab5 100644 (file)
   font-size:        9pt;
   height:           60;
 }
-
 .monthoverview_content a {
   font-style:       italic;
   font-weight:      bold;
 }
-
 .monthoverview_content td {
-  text-align:       let;
+  text-align:       left;
   vertical-align:   top;
 }
 
-
 .monthoverview_content_hilite {
   background-color: #fffff0;
   font-size:        9pt;
   height:           60;
 }
-
 .monthoverview_content_hilite a {
   font-style:       italic;
   font-weight:      bold;
 }
+.monthoverview_content_hilite td {
+  text-align:       left;
+  vertical-align:   top;
+}
 
 .monthoverview_content_dimmed {
   background-color: #d2d2cc;
   font-size:        9pt;
   height:           60;
 }
-
 .monthoverview_content_dimmed a {
   font-style:       normal;
   font-weight:      normal;
 }
+.monthoverview_content_dimmed td {
+  text-align:       left;
+  vertical-align:   top;
+}
 
 .monthoverview_day a {
   color:            #000000;
   font-style:       normal;
   font-weight:      normal;
 }
+
+
+.yearoverview {
+  color:            #000000;
+  font-family:      Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+  font-size:        10pt;
+  letter-spacing:   0pt;
+  padding:          0px 0px 0px 0px;
+  margin:           0px 0px 0px 0px;
+}
+
+.yearoverview table {
+  padding:          0px 0px 0px 0px;
+  margin:           0px 0px 0px 0px;
+}
+
+.yearoverview td {
+  padding:          0px 0px 0px 0px;
+  margin:           0px 0px 0px 0px;
+}
+
+.yearoverview a {
+  color:            #000000;
+  font-family:      Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+  font-size:        10pt;
+  letter-spacing:   0pt;
+  padding:          0px;
+  text-decoration:  none;
+}
+.yearoverview a:hover {
+  text-decoration:  underline;
+}
+
+.yearoverview_title {
+  background-color: #d2d2cc;
+  text-align:       center;
+  font-size:        10pt;
+  font-weight:      bold;
+  letter-spacing:   0pt;
+}
+
+.yearoverview_day_header {
+  background-color: #d2d2cc;
+  text-align:       center;
+  vertical-align:   middle;
+  font-size:        10pt;
+  width:            18px; /* this delimits all td's! */
+}
+
+.yearoverview_content {
+  color:            #0033cc;
+  background-color: #e8e8e0;
+  text-align:       center;
+  vertical-align:   middle;
+  font-weight:      bold;
+  font-style:       italic;
+}
+.yearoverview_content a {
+  color:            #0033cc;
+}
+.yearoverview_content a:hover {
+  color:            #ff0000;
+}
+
+.yearoverview_content_hilite {
+  color:            #0033cc;
+  background-color: #fffff0;
+  text-align:       center;
+  vertical-align:   middle;
+  font-weight:      bold;
+  font-style:       italic;
+}
+.yearoverview_content_hilite a {
+  color:            #0033cc;
+}
+.yearoverview_content_hilite a:hover {
+  color:            #ff0000;
+}
+
+.yearoverview_content_dimmed {
+  color:            #0033cc;
+  background-color: #d2d2cc;
+  text-align:       center;
+  vertical-align:   middle;
+}
+.yearoverview_content_dimmed a {
+  color:            #0033cc;
+}
+.yearoverview_content_dimmed a:hover {
+  color:            #ff0000;
+}
+
+.yearoverview_week {
+  background-color: #d2d2cc;
+  width:            16pt;
+  text-align:       center;
+  vertical-align:   middle;
+}
+
+.yearoverview_week_hilite {
+  background-color: #fffff0;
+  width:            16pt;
+  text-align:       center;
+  vertical-align:   middle;
+}
index 1681d01ee1c4aad89d3b5e715b1ccb8bc2f51f87..bce60ab074056f1335069d7976201c6f23e76b3f 100644 (file)
@@ -1,3 +1,17 @@
+2004-07-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.5
+
+       * UIxCalInlineMonthOverview.m: new "style" binding for setting the global
+         style all elements will inherit from. Makes styling much easier.
+
+       * UIxCalYearOverview.wox: uses all appropriate styles now. Slight fixes
+         to alignment.
+
+       * UIxCalInlineMonthOverview.wox: uses new "style" binding and fixes a bug
+
+       * UIxCalYearOverview.m: fixed warnings.
+
 2004-07-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.4
index cc6fa7b77a927ad5cfb3466dade3689210ec75bd..6eebf48557201cf526d03c70e902996df9e8fc04 100644 (file)
@@ -28,6 +28,7 @@
 @interface UIxCalInlineMonthOverview : UIxCalMonthOverview
 {
     NSCalendarDate *selectedDate;
+    NSString *style;
     NSString *headerStyle;
     NSString *weekStyle;
     NSString *todayWeekStyle;
@@ -50,6 +51,7 @@
 
 - (void)dealloc {
     [self->selectedDate release];
+    [self->style release];
     [self->headerStyle release];
     [self->weekStyle release];
     [self->todayWeekStyle release];
 - (NSCalendarDate *)selectedDate {
     return self->selectedDate;
 }
+- (void)setStyle:(NSString *)_style {
+    ASSIGN(self->style, _style);
+}
+- (NSString *)style {
+    return self->style;
+}
 - (void)setHeaderStyle:(NSString *)_style {
     ASSIGN(self->headerStyle, _style);
 }
index 5414385f730dc86258b2061c36c42c1ddd8a681a..6aa83379488a7ca11df21425b46588ef1b9635de 100644 (file)
@@ -5,6 +5,7 @@
        xmlns:const="http://www.skyrix.com/od/constant"
        xmlns:rsrc="OGo:url"
        xmlns:label="OGo:label"
+       var:class="style"
 >
        <tr var:class="headerStyle">
                <td>
@@ -33,7 +34,7 @@
                 <var:if condition="showWeekColumn">
                     <var:month-label const:orientation="left"
                                      weekOfYear="weekOfYear"
-                                     class="weekStyle"
+                                     class="currentWeekStyle"
                     >
                         <var:if condition="hasWeekSelectionHref">
                             <a var:href="weekSelectionHref"
index 202eeee5573ac710e8ad3bcbf7976b76acc7053f..a0eb463dfcfd3aec7f0bbd4da073ec41405bc30f 100644 (file)
@@ -23,6 +23,7 @@
 
 #include <SOGoUI/UIxComponent.h>
 #include <Foundation/Foundation.h>
+#include <NGExtensions/NGExtensions.h>
 
 
 @interface UIxCalYearOverview : UIxComponent
@@ -76,7 +77,7 @@
     NSCalendarDate *startDate;
     NSMutableArray *result, *tmp;
     unsigned rowIdx, columnIdx;
-    int month = 0;
+    int monthOffset = 0;
 
     startDate = [self startDate];
     result = [[NSMutableArray alloc] initWithCapacity:3];
             NSCalendarDate *date;
             
             date = [startDate dateByAddingYears:0
-                                         months:month
+                                         months:monthOffset
                                            days:0];
             [tmp addObject:date];
-            month++;
+            monthOffset++;
         }
         [result addObject:tmp];
         [tmp release];
index 5a36f29f49848f10d0d5e4ac9f81ad7734409e81..3e24d92f702e1b12a2a5919ae5ce1765eeea7876 100644 (file)
@@ -1,10 +1,11 @@
 <?xml version='1.0' standalone='yes'?>
-<var:component className="UIxPageFrame" title="name"
-  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"
-  xmlns:label="OGo:label"
+<var:component className="UIxPageFrame"
+               title="name"
+               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"
+               xmlns:label="OGo:label"
 >
 
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
   <table cellpadding="0" cellspacing="0" width="100%">
   <tr>
   <td width="5"/>
-  <td class="wintitle"><var:component className="UIxCalDateLabel" startDate="startDate" endDate="endDate" const:selection="year" /></td>
+  <td class="wintitle"><var:component className="UIxCalDateLabel"
+                                      startDate="startDate"
+                                      endDate="endDate"
+                                      const:selection="year"
+                       /></td>
   <td width="36" align="right" valign="center">
   <var:component className="UIxWinClose" />
   </td>
@@ -52,7 +57,7 @@
   >
     <table>
         <var:foreach list="arrayOfDateArrays" item="row">
-            <tr>
+            <tr valign="top">
                 <var:foreach list="row" item="month">
                     <td>
                         <var:component className="UIxCalInlineMonthOverview"
                                        const:daySelectionHref="dayoverview"
                                        const:showWeekColumn="1"
                                        const:weekSelectionHref="weekoverview"
+                                       const:style="yearoverview"
+                                       const:headerStyle="yearoverview_title"
+                                       const:weekStyle="yearoverview_week"
+                                       const:todayWeekStyle="yearoverview_week_hilite"
+                                       const:dayHeaderStyle="yearoverview_day_header"
+                                       const:dayBodyStyle="yearoverview_content"
+                                       const:todayBodyStyle="yearoverview_content_hilite"
+                                       const:inactiveDayBodyStyle="yearoverview_content_dimmed"
                         />
                     </td>
                 </var:foreach>
   </tr>
   <tr bgcolor="#F5F5E9">
   <td align="left" width="10"><var:entity const:name="nbsp"/></td>
-  <td align="right"><img border="0" alt="" src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif" /></td>
+  <td align="right"><img border="0"
+                         alt=""
+                         src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"
+                    /></td>
   </tr>
   <tr>
   <td colspan="2" bgcolor="#F5F5E9">
index 38b76bc34efaa97ee15117fc1fe812f321fa9491..86b0e4dd1bb40eae92692079db28ea4a64e5a3ca 100644 (file)
@@ -1,5 +1,5 @@
 # $Id$
 
-SUBMINOR_VERSION:=4
+SUBMINOR_VERSION:=5
 
 # 1.1.0 requires NGObjWeb 4.2.202