sync with Version-1_0_0-branch

calendar/templates/jerryr/app.css

@@ -1,8 +1,14 @@
 /* CSS Document */
+
+.to_continue
+{
+	font-size: 9px;
+}
+
 A.minicalendar 
 { 
 	color: #666666; 
-	font-size: 12px;
+	font-size: 9px;
 	
 }
 
@@ -11,7 +17,7 @@ A.bminicalendar
 	color: #336699; 
 	font-style: italic;
 	font-weight: bold;
-	font-size: 10px; 
+	font-size: 9px; 
 }
 
 A.minicalendargrey 
@@ -107,18 +113,150 @@ A.bminicalgreyhol
 	border: thin solid black;
 }
 
+/* common */
+.calendar_link_print
+{
+	text-align: center;
+	font-size: 10px;
+}
 
-// week view
+//Mini Calendar
+
+.calendar_minical_table
+{
+	width: 180px;
+	font-weight: bold;
+}
+
+.calendar_minical_daytable
+{
+	width: 100%;
+}
+
+.calendar_minical_dayname
+{
+	font-size: 9px;
+	text-align: right;
+}
+
+.calendar_minical_hrule
+{
+	width: 96%;
+}
+
+/* Header */
+.calendar_dropbuttons
+{
+	align: center;
+	text-align: center;
+	vertical-align: bottom;
+	font-weight: bold;
+	font-size: 8px;
+}
 
 .calendar-weekidentifier
 {
 	font-size:16px;
 	font-weight: bold;
+	text-align: center;
 }
 
 .calendar_header
 {
-	font-size:16px;
+	font-size: 16px;
 	font-weight: bold;
 	text-align: center;
 }
+
+.calendar_dayview_table_header
+{
+	font-size: 13px;
+	font-weight: bold;
+	text-align: center;
+}
+
+.calendar_dayview_todo_header
+{
+	margin: 0px; 
+	padding: 2px;
+	font-weight: bold;
+}
+
+/* week view */
+.calendar_week_identifier_table
+{
+	border: 0px solid black;
+	width: 100%;
+}
+
+.calendar_week_identifier
+{
+	font-size: 13px;
+	text-align: center;
+	font-weight: bold;
+}
+
+.calendar_weekview_daytitle
+{
+	font-weight: bold;
+	font-size: 12px;
+	background: #D3DCE3;
+}
+
+.calendar_m_w_table
+{
+	table-layout:fixed;
+	overflow:auto;
+	height: 100%;
+	width: 100%;
+	border: 0px #000000 solid;
+}
+
+.calendar_m_w_table_row
+{
+	height: 80px;
+}
+
+.calendar_m_w_tablecell
+{
+	vertical-align: top;
+	padding-left: 4px;
+	padding-right: 4px;
+	padding-bottom: 6px;
+}
+
+A.event_entry
+{
+	font-size:10px;
+}
+
+/* month view */
+
+.calendar_month_identifier
+{
+	font-size:14px;
+	font-weight: bold;
+}
+
+.calendar_user_identifier
+{
+	font-size:12px;
+	color: #009999;
+	font-weight: bold;
+}
+
+.calendar_week_minical_table
+{
+	width:100%;
+	border: 0px solid #000000
+}
+
+.calendar_weekinfo
+{
+	color: #000000;
+	padding-left: 2px;
+	padding-right: 2px;
+	font-size: 10px;
+	font-weight: bold;
+	font-style: italic;
+}

calendar/templates/jerryr/day.tpl

@@ -69,7 +69,7 @@
 <!-- END day -->
 <!-- BEGIN day_event -->
     <tr>
-     <td>
+     <td valign="top">
 {daily_events}
      </td>
     </tr>

calendar/templates/jerryr/footer.tpl

@@ -1,32 +1,39 @@
 <!-- $Id$ -->
 <!-- BEGIN footer_table -->
-		<tr><td height="10"></td></tr>
+<!--
-       <font size="-1">
+<tr>
-       <table border="0" width="100%" cellpadding="0" cellspacing="0">
+    <td>1</td>
-        <tr>
+</tr>
-{table_row}
+-->
-	</tr>
 
-       <tr>
+<table border="0" width="100%" cellpadding="0" cellspacing="0">
+    <tr>
+	{table_row}
+    </tr>
+</table>
+<!--       <tr>-->
 <!-- END footer_table -->
-<!-- BEGIN footer_row -->
+
-         <td valign="top" width="33%">
+
-          <font size="-1">
+<!-- BEGIN footer_row -->
-           <form action="{action_url}" method="post" name="{form_name}">
+
-            <B>{label}:</B>
+    <form action="{action_url}" method="post" name="{form_name}">
-			{hidden_vars}
+<td valign="top">
-            <select name="{form_label}" onchange="{form_onchange}">
+	<span style="font-size:9px; font-weight:bold;">{label}:</span>
-	     {row}
+	{hidden_vars}
-	    </select>
+	<select name="{form_label}" onchange="{form_onchange}">
-            <noscript><input type="submit" value="{go}"></noscript>
+	{row}
-	   </form>
+	</select>
-	  </font>
+	<noscript><input type="submit" value="{go}"></noscript>
-	 </td>
+</td>
-<!-- END footer_row -->
+    </form>
-<!-- BEGIN blank_row -->
+
-         <td>
+<!-- END footer_row -->
-          {b_row}
+
-         </td>
+<!-- BEGIN blank_row -->
-<!-- END blank_row -->
+     <td>
-<td>
+    {b_row}
+    </td>
+<!-- END blank_row -->
+<!-- <td> -->
 

calendar/templates/jerryr/index.tpl

@@ -20,7 +20,7 @@
 		<tr>
 			<td>{large_month}</td>
 		</tr>
-	</table><p>{print}
+	</table><p style="font-size:10px; text-align:center">{print}</p>
 </td>
 </tr>
 </table>

calendar/templates/jerryr/view.tpl

@@ -17,12 +17,14 @@
 </table>
 </center>
 <!-- END view_event -->
+
 <!-- BEGIN list -->
   <tr bgcolor="{tr_color}">
    <td valign="top" width="30%">&nbsp;<b>{field}:</b></td>
    <td colspan="2" valign="top" width="70%">{data}</td>
   </tr>
 <!-- END list -->
+
 <!-- BEGIN hr -->
  <tr>
   <td colspan="3" bgcolor="{th_bg}" align="center">

calendar/templates/jerryr/week.tpl

@@ -53,7 +53,7 @@
 						<td class="calRtMidFoot"></td>
 						<td class="calRtRtFoot"></td>
 					</tr>	
-			</table><p>{print}
+			</table><p style="font-size:10px; text-align:center;">{print}</p>
 </td>
 	</tr>
 </table>