Wed Feb 11 11:02:03 EST 2009

Author: johnsa
Date: 2009-02-11 11:02:01 -0500 (Wed, 11 Feb 2009)
New Revision: 2054

Modified:
   trunk/deployment/webadmin/portlet/resources/resources/bwClock.js
   trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
   trunk/deployment/webadmin/webapp/resources/resources/bwClock.js
   trunk/deployment/webconfig/webapp/resources/default/default/default.xsl
   trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/PDA/default.xsl
   trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
   trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
   trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
   trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
Log:
UI updates:
- change xsl output method to xml from xhtml (required due to xalan upgrade)
- update clock javascript to correct for IE bug

Modified: trunk/deployment/webadmin/portlet/resources/resources/bwClock.js
===================================================================

--- trunk/deployment/webadmin/portlet/resources/resources/bwClock.js	2009-02-10 21:51:32 UTC (rev 2053)
+++ trunk/deployment/webadmin/portlet/resources/resources/bwClock.js	2009-02-11 16:02:01 UTC (rev 2054)
@@ -4,51 +4,72 @@
 var bwClockCurrentType = null;
 
 function bwClockLaunch(type) {
-  if ((document.getElementById("clock").className == "shown") && (bwClockCurrentType == type)) {
-    changeClass("clock","invisible"); // if the clock with the same type is showing, toggle it off
-  } else { // otherwise, turn it on and display the correct type
+  // type: type of clock "eventStartDate" or "eventEndDate"
+  if ((document.getElementById("clock").className == "visible") && (bwClockCurrentType == type)) {
+    // if the clock with the same type is visible, toggle it off
+    changeClass("clock","invisible");
+  } else {
+    // otherwise, turn it on and display the correct type
+    changeClass("clock","visible");
     bwClockRequestedType = type;
     bwClockCurrentType = type;
-    changeClass("clock","shown");
-    // the following is for Internet Explorer.  IE draws "windowed" objects
-    // and unwindowed objects on seperate "planes"; windowed objects are always
-    // drawn obove unwindowed objects and select boxes are "windowed";
-    // this is required to make IE not overwrite the clock div with
-    // the select boxes that fall below it on the page.  Note: we set them
-    // to display:hidden (not none) so their space is still occupied (and the
-    // browser window doesn't shift around)
-   changeClass("eventFormPrefLocationList","hidden");
-   changeClass("eventFormLocationList","hidden");
-   changeClass("eventFormSponsorList","hidden");
-   changeClass("eventFormPrefSponsorList","hidden");
-    bwClockIndicator = document.getElementById("bwClockDateTypeIndicator");
+    // reset hours and minutes to null
+    bwClockHour = null;
+    bwClockMinute = null;
+    var bwClockIndicator = document.getElementById("bwClockDateTypeIndicator");
+    var bwClockSwitch = document.getElementById("bwClockSwitch");
+    document.getElementById("bwClockTime").innerHTML = "select time";
     if (type == 'eventStartDate') {
-      bwClockIndicator.innerHTML = "Start Time"
+      bwClockIndicator.innerHTML = "Start Time";
+      bwClockSwitch.innerHTML = '<a href="javascript:bwClockLaunch(\'eventEndDate\');">switch to end</a>';
     } else {
-      bwClockIndicator.innerHTML = "End Time"
+      bwClockIndicator.innerHTML = "End Time";
+      bwClockSwitch.innerHTML = '<a href="javascript:bwClockLaunch(\'eventStartDate\');">switch to start</a>';
     }
   }
 }
 
 function bwClockClose() {
   changeClass("clock","invisible");
-  changeClass("eventFormPrefLocationList","shown");
-  changeClass("eventFormLocationList","shown");
-  changeClass("eventFormSponsorList","shown");
-  changeClass("eventFormPrefSponsorList","shown");
 }
 
-function bwClockUpdateDateTimeForm(type,val) {
+function bwClockUpdateDateTimeForm(valType,val,hour24) {
+  // valType: "hour" or "minute"
+  // val: hour or minute value as integer
+  // hour24: true (24hr clock) or false (12hr clock + am/pm)
   if (bwClockRequestedType) {
     try {
-      if (type == 'minute') {
+      if (valType == 'minute') {
         var fieldName = bwClockRequestedType + ".minute"
-        window.document.peForm[fieldName].value = val;
+        window.document.eventForm[fieldName].value = val;
+        if (val < 10) {
+          val = "0" + val; // pad the value for display
+        }
         bwClockMinute = val;
       } else {
         var fieldName = bwClockRequestedType + ".hour"
-        window.document.peForm[fieldName].value = val;
-        bwClockHour = val;
+        if (hour24) {
+          window.document.eventForm[fieldName].value = val;
+          if (val < 10) {
+            val = "0" + val; // pad the value for display
+          }
+          bwClockHour = val;
+        } else {
+          var hour12 = val;
+          if (hour12 > 12) {
+            hour12 -= 12;
+          } else if (hour12 == 12) {
+            hour12 = 0; // noon and midnight are both represented by '0' in 12hr mode
+          }
+          window.document.eventForm[fieldName].value = hour12;
+          if (val < 10) {
+            val = "0" + val; // pad the value for display
+          }
+          bwClockHour = val;
+          // now set the am/pm field
+          fieldName = bwClockRequestedType + ".ampm";
+          window.document.eventForm[fieldName].value = bwClockGetAmPm(bwClockHour);
+        }
       }
       if (bwClockHour && bwClockMinute) {
         document.getElementById("bwClockTime").innerHTML = bwClockHour + ":" + bwClockMinute + " , " + bwClockConvertAmPm(bwClockHour) + ":" + bwClockMinute + " " + bwClockGetAmPm(bwClockHour);
@@ -79,8 +100,8 @@
 function bwClockGetAmPm(hour24) {
   hour24 = parseInt(hour24,10);
   if (hour24 < 12) {
-    return 'a.m.';
+    return 'am';
   } else {
-    return 'p.m.';
+    return 'pm';
   }
 }

Modified: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl	2009-02-10 21:51:32 UTC (rev 2053)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl	2009-02-11 16:02:01 UTC (rev 2054)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output
-     method="html"
+     method="xml"
      indent="no"
      media-type="text/html"
      doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
@@ -2789,7 +2789,19 @@
         <td>
           <strong><xsl:value-of select="creator"/></strong>
         </td>
-      </tr>
+      </tr>
+
+      <!-- Submitter -->
+      <xsl:if test="xproperties/X-BEDEWORK-SUBMITTEDBY">
+        <tr>
+          <th>
+            Submitter:
+          </th>
+          <td>
+            <strong><xsl:value-of select="xproperties/X-BEDEWORK-SUBMITTEDBY/values/text"/></strong>
+          </td>
+        </tr>
+      </xsl:if>
 
       <!--  Categories  -->
       <tr>

Modified: trunk/deployment/webadmin/webapp/resources/resources/bwClock.js
===================================================================
--- trunk/deployment/webadmin/webapp/resources/resources/bwClock.js	2009-02-10 21:51:32 UTC (rev 2053)
+++ trunk/deployment/webadmin/webapp/resources/resources/bwClock.js	2009-02-11 16:02:01 UTC (rev 2054)
@@ -16,8 +16,8 @@
     // reset hours and minutes to null
     bwClockHour = null;
     bwClockMinute = null;
-    bwClockIndicator = document.getElementById("bwClockDateTypeIndicator");
-    bwClockSwitch = document.getElementById("bwClockSwitch");
+    var bwClockIndicator = document.getElementById("bwClockDateTypeIndicator");
+    var bwClockSwitch = document.getElementById("bwClockSwitch");
     document.getElementById("bwClockTime").innerHTML = "select time";
     if (type == 'eventStartDate') {
       bwClockIndicator.innerHTML = "Start Time";
@@ -36,7 +36,7 @@
 function bwClockUpdateDateTimeForm(valType,val,hour24) {
   // valType: "hour" or "minute"
   // val: hour or minute value as integer
-  // hour24: true (24hr clock) or false (12hr clock + am/pm) 
+  // hour24: true (24hr clock) or false (12hr clock + am/pm)
   if (bwClockRequestedType) {
     try {
       if (valType == 'minute') {

Modified: trunk/deployment/webconfig/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webconfig/webapp/resources/default/default/default.xsl	2009-02-10 21:51:32 UTC (rev 2053)
+++ trunk/deployment/webconfig/webapp/resources/default/default/default.xsl	2009-02-11 16:02:01 UTC (rev 2054)
@@ -5,7 +5,7 @@
   <!--                    BEDEWORK CONFIGURATION WEB APP                    -->
   <!-- ==================================================================== -->
   <!-- ==================================================================== -->
-  <xsl:output method="xhtml" indent="yes" media-type="text/html" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" standalone="yes" omit-xml-declaration="yes"/>
+  <xsl:output method="xml" indent="yes" media-type="text/html" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" standalone="yes" omit-xml-declaration="yes"/>
   <xsl:variable name="resourcesRoot" select="/bedework/appRoot"/>
   <xsl:variable name="urlPrefix" select="/bedework/urlPrefix"/>
 

Modified: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/PDA/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/PDA/default.xsl	2009-02-10 21:51:32 UTC (rev 2053)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/PDA/default.xsl	2009-02-11 16:02:01 UTC (rev 2054)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:output method="xhtml"
+<xsl:output method="xml"
     indent="yes"
     media-type="text/html"
     doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"

Modified: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl	2009-02-10 21:51:32 UTC (rev 2053)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl	2009-02-11 16:02:01 UTC (rev 2054)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output
-  method="xhtml"
+  method="xml"
   indent="no"
   media-type="text/html"
   doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"

Modified: trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl	2009-02-10 21:51:32 UTC (rev 2053)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl	2009-02-11 16:02:01 UTC (rev 2054)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output
-  method="xhtml"
+  method="xml"
   indent="no"
   media-type="text/html"
   doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"

Modified: trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl	2009-02-10 21:51:32 UTC (rev 2053)
+++ trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl	2009-02-11 16:02:01 UTC (rev 2054)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output
-  method="xhtml"
+  method="xml"
   indent="no"
   media-type="text/html"
   doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"

Modified: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2009-02-10 21:51:32 UTC (rev 2053)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2009-02-11 16:02:01 UTC (rev 2054)
@@ -5,7 +5,7 @@
   xmlns:url="http://whatever/java/java.net.URLEncoder"
   exclude-result-prefixes="url">
 <xsl:output
-  method="xhtml"
+  method="xml"
   indent="no"
   media-type="text/html"
   doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"

