More clean up of code and elements in stylesheets.

svn: r12394

src/data/Web_Print-Default.css

@@ -178,7 +178,7 @@ ol {
 
 /* Navigation
 ----------------------------------------------------- */
-#navigation { display:none; }
+#navigation, #subnavigation { display:none; }
 
 /* Main Table
 ----------------------------------------------------- */
@@ -669,3 +669,25 @@ body#WebCal a {
     font-size:12pt;
     color:#999;
 }
+/* Calendar : Full Year */
+body#fullyearlinked div.content {
+    width:963px;
+    margin:0 auto;
+    padding:15px 0 2px 2px;
+}
+body#fullyearlinked table.calendar {
+    float:left;
+    width:320px;
+    height:18em;
+    border:solid 1px #000;
+}
+body#fullyearlinked table.calendar thead tr th {
+    height:2em;
+}
+body#fullyearlinked table.calendar thead tr th.monthName {
+    font-size:1.2em;
+    padding:2px 0;
+}
+body#fullyearlinked table.calendar tbody tr td {
+    height:3em;
+}

src/data/Web_Visually.css

@@ -1206,9 +1206,3 @@ body#fullyearlinked table.calendar thead tr th.monthName {
 body#fullyearlinked table.calendar tbody tr td {
     height:3em;
 }
-body#fullyearlinked table.calendar tbody tr td.saturday {
-    border-right:solid 2px #000;
-}
-body#fullyearlinked able.calendar tbody tr td.sunday {
-    border:solid 2px #000;
-}

src/plugins/webreport/WebCal.py

@@ -1785,6 +1785,8 @@ def get_day_list(event_date, holiday_list, bday_anniv_list):
     # number of years have to be at least zero
     bday_anniv_list = [(t, e, d) for t, e, d in bday_anniv_list
                        if (event_date.get_year() - d.get_year()) >= 0]
+
+    # birthday and anniversary list
     for text, event, date in bday_anniv_list:
 
         # number of years married, ex: 10
@@ -1803,7 +1805,7 @@ def get_day_list(event_date, holiday_list, bday_anniv_list):
             + '</em>')
 
         # an anniversary
-        elif event == 'Anniversary':
+        else:
 
             if nyears == 0:
                 txt_str = _('%(couple)s, <em>wedding</em>') % {
@@ -1819,10 +1821,14 @@ def get_day_list(event_date, holiday_list, bday_anniv_list):
         day_list.append((nyears, date, txt_str, event))
 
     # a holiday
+    # will force holidays to be on top
+    nyears = 0
+
     for text, event, date in holiday_list:
-            day_list.append((0, date, text, 'Holiday'))
+            day_list.append((nyears, date, text, event))
 
     # sort them based on number of years
+    # holidays will always be on top of event list
     day_list.sort()
  
     # return to its caller calendar_build()