Changeset 327

Timestamp:

04/03/06 17:11:48

Author:

johnsa

Message:

began the styling of subscriptions in personal client (still incomplete); functionality is now mostly in place.

Files:

• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (5 diffs)
• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (5 diffs)
• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl (modified) (1 diff)
• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/print.css (modified) (1 diff)

trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css

@@ -6 +6 @@
-  padding: 0.75em 1em 0em 1em;
-}
+/* Generic selectors*/
+h2 {
+  margin: 0em;
+  padding: 1em 0.2em 0em 0.2em;
+  font-size: 1.4em;
+}
+h3 {
+  margin: 0em;
+  padding: 1em 0.2em 0em 0.2em;
+  font-size: 1.1em;
+}
+h4 {
+  margin: 0em;
+  padding: 1em 0.2em 0em 0.2em;
+  font-size: 1em;
+}
+/* Header IDs and classes */
-#logoTable {
-  padding: 0em;
@@ -318 +335 @@
-  background-color: #ffa;
-}
-
+
+
-  /*background-color: black;
-  color: #eee;*/
@@ -357 +375 @@
-  width: 100%;
-}
+#commonTable th,
-#commonTable th.fieldname {
-  text-align: left;
@@ -434 +453 @@
-  margin: 0;
-  padding: 0;
-}
-#calPageTable {
-  width: 100%;
-  font-size: 100%;
-  margin: 0;
-  padding: 0;
-}
-#calPageTable td {
-  width: 50%;
-  vertical-align: top;
-  padding: 0.5em 2em 1em 3em;
-}
-#calPageTable th {
-  padding: 4px 0;
-  font-size: 1.2em;
-  background-color: #ccc;
-  color: black;
-  font-weight: bold;
-}
-#calPageTable td.leftCell {
-  border-right : thin dashed #999;
-}
-
-#calPageTable ul.calendarTree li {
-  font-weight: bold;
-}
-#calPageTable ul.calendarTree li ul li {
-  font-weight: normal;
-}
-#calPageTable ul.calendarTree li.folder {
-  list-style-image: url(../../resources/catIcon.gif);
-  padding-top: 0.25em;
-  padding-bottom: 0.25em;
-}
-#calPageTable ul.calendarTree li.calendar {
-  list-style-image: url(../../resources/calIcon-sm.gif);
-}
-#calPageTable td.infoCell {
-  background-color: #eee;
-  color: black;
-  text-align: center;
-  padding: 4px;
-}
-#dayCalendarTable {
@@ -857 +834 @@
-  padding: 1em;
-}
+/* Calendars and Subscriptions */
+#calendarTable td,
+#subsTable td {
+  padding: 0 0.5em;
+  vertical-align: top;
+}
+#calendarTable td.cals,
+#subsTable td.cals {
+  border-right: 1px solid #aaa;
+  font-size: 0.9em;
+  width: 200px;
+}
+#calendarTable td.cals {
+  width: 300px;
+}
+#subsTable td.cals {
+  width: 200px;
+}
+#calendarTree ul {
+  padding-left: 10px;
+  margin-left: 10px;
+}
+#calendarTree li {
+  padding-top: 0.25em;
+  /*font-weight: bold;*/
+}
+#calendarTree li.folder {
+  list-style-image: url(../../resources/catIcon.gif);
+}
+#calendarTree li.calendar {
+  list-style-image: url(../../resources/calIcon-sm.gif);
+}
+#calendarTree a:link,
+#calendarTree a:active,
+#calendarTree a:visited {
+  text-decoration: none;
+}
+#calendarTree a:hover {
+  color: black;
+  background-color: #ff3;
+}
+#submitTable {
+  width: 98%; /* less than 100% helps avoid IE weirdness */
+  margin-top: 1em;
+}
+p.note {
+  margin: 0;
+  padding: 0 0 1em 0;
+  font-size: 0.8em;
+  font-style: italic;
+}
+/* Footer */
-#footer {
-  font-size: 0.7em;

trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

@@ -1039 +1039 @@
-              </xsl:when>
-              <xsl:otherwise>
-fetchPublicCalendars
+subscriptions-fetch
-                  Manage Subscriptions
-                </a>
@@ -1798 +1798 @@
-          </p>
-          <ul id="calendarTree">
-admin
+
-          </ul>
-        </td>
-        <td class="subs">
-          <xsl:choose>
-admin
+
-              <xsl:call-template name="subscriptionList"/>
-            </xsl:when>
-admin
+
-              <xsl:apply-templates select="subscription" mode="addSubscription"/>
-            </xsl:when>
@@ -1844 +1844 @@
-    <p class="note">*the subsciption name must be unique</p>
-    <form name="subscribeForm" action="{$subscriptions-subscribe}" method="post">
-eventForm
+common
-        <tr>
-          <th>Name*:</th>
@@ -1898 +1898 @@
-    <h2>Modify Subscription</h2>
-    <form name="subscribeForm" action="{$subscriptions-subscribe}" method="post">
-eventForm
+common
-        <tr>
-          <th>Name*:</th>
@@ -1981 +1981 @@
-  <xsl:template name="subscriptionList">
-    <h3>Current subscriptions</h3>
-List
+
-      <tr>
-        <th>Name</th>

trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl

@@ -33 +33 @@
-          Unknown timezone <xsl:value-of select="param"/>
-      </xsl:when>
+      <xsl:when test="id='org.bedework.client.error.subscription.reffed'">
+          Cannot remove: the subscription is referenced by View "<xsl:value-of select="param"/>"
+      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="id"/> = <xsl:value-of select="param"/>

trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/print.css

@@ -7 +7 @@
-  font-size: 10pt;
-}
-@page {
-  margin:  0in;
-}
-tr {
-  page-break-inside: avoid;