[Bedework-commit] bedework r1828 - in trunk/deployment/webpublic/webapp/resources/demoskins: MainCampus/default/default SoEDepartmental/default/default

[svnadmin at bedework.org]

Author: johnsa
Date: 2008-04-15 03:01:51 -0400 (Tue, 15 Apr 2008)
New Revision: 1828

Modified:
   trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css
   trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
   trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css
   trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/print.css
   trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css
   trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
   trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.css
Log:
public client: display event image next to description in detail view

Modified: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css	2008-04-15 07:00:44 UTC (rev 1827)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css	2008-04-15 07:01:51 UTC (rev 1828)
@@ -1012,6 +1012,10 @@
   text-align: right;
   padding-right: 2em;
 }
+.bwEventImage {
+  float: right;
+  margin: 0 0 1em 1em;
+}
 .indent {
   margin-left: 1em;
 }

Modified: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl	2008-04-15 07:00:44 UTC (rev 1827)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl	2008-04-15 07:01:51 UTC (rev 1828)
@@ -771,7 +771,11 @@
       </tr>
       <tr>
         <td class="fieldname">Description:</td>
-        <td colspan="2" class="fieldval description">
+        <td colspan="2" class="fieldval description">
+          <xsl:if test="xproperties/node()[name()='X-BEDEWORK-IMAGEURL']">
+            <xsl:variable name="bwImageUrl"><xsl:value-of select="xproperties/node()[name()='X-BEDEWORK-IMAGEURL']/values/text"/></xsl:variable>
+            <img src="{$bwImageUrl}" class="bwEventImage"/>
+          </xsl:if>
           <xsl:call-template name="replace">
             <xsl:with-param name="string" select="description"/>
             <xsl:with-param name="pattern" select="'&#xA;'"/>
@@ -1805,7 +1809,7 @@
               <option value="{$setViewPeriod}&amp;viewType=todayView&amp;skinName=videocal">video feed</option>
               <option value="{$setup}&amp;skinNameSticky=default">reset to calendar default</option>
             </select>
-          </form>
+          </form>
         </td>
       </tr>
     </table>

Modified: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css	2008-04-15 07:00:44 UTC (rev 1827)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css	2008-04-15 07:01:51 UTC (rev 1828)
@@ -1012,6 +1012,10 @@
   text-align: right;
   padding-right: 2em;
 }
+.bwEventImage {
+  float: right;
+  margin: 0 0 1em 1em;
+}
 .indent {
   margin-left: 1em;
 }

Modified: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/print.css
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/print.css	2008-04-15 07:00:44 UTC (rev 1827)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/print.css	2008-04-15 07:01:51 UTC (rev 1828)
@@ -400,4 +400,11 @@
 }
 a.submitPublicEvent {
   display: none;
-}
\ No newline at end of file
+}
+.bwEventImage {
+  float: right;
+  margin: 0 0 1em 1em;
+}
+.indent {
+  margin-left: 1em;
+}

Modified: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css	2008-04-15 07:00:44 UTC (rev 1827)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css	2008-04-15 07:01:51 UTC (rev 1828)
@@ -1013,6 +1013,10 @@
   text-align: right;
   padding-right: 2em;
 }
+.bwEventImage {
+  float: right;
+  margin: 0 0 1em 1em;
+}
 .indent {
   margin-left: 1em;
 }

Modified: trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl	2008-04-15 07:00:44 UTC (rev 1827)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl	2008-04-15 07:01:51 UTC (rev 1828)
@@ -764,7 +764,11 @@
       </tr>
       <tr>
         <td class="fieldname">Description:</td>
-        <td colspan="2" class="fieldval description">
+        <td colspan="2" class="fieldval description">
+          <xsl:if test="xproperties/node()[name()='X-BEDEWORK-IMAGEURL']">
+            <xsl:variable name="bwImageUrl"><xsl:value-of select="xproperties/node()[name()='X-BEDEWORK-IMAGEURL']/values/text"/></xsl:variable>
+            <img src="{$bwImageUrl}" class="bwEventImage"/>
+          </xsl:if>
           <xsl:call-template name="replace">
             <xsl:with-param name="string" select="description"/>
             <xsl:with-param name="pattern" select="'&#xA;'"/>

Modified: trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.css
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.css	2008-04-15 07:00:44 UTC (rev 1827)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.css	2008-04-15 07:01:51 UTC (rev 1828)
@@ -993,6 +993,10 @@
 #statsTable td.label {
   text-align: right;
   padding-right: 2em;
+}
+.bwEventImage {
+  float: right;
+  margin: 0 0 1em 1em;
 }
 .indent {
   margin-left: 1em;