[Bedework-commit] bedework r1967 - in trunk/deployment:
resources/javascript/jquery
webadmin/webapp/resources/default/default
webpublic/webapp/resources/demoskins/MainCampus/default/default
websubmit/webapp/resources/demoskins/default/default
websubmit/webapp/resources/demoskins/resources
webuser/webapp/resources/demoskins/default/default
webuser/webapp/resources/demoskins/resources
svnadmin at bedework.org
svnadmin at bedework.org
Thu Nov 13 16:19:01 EST 2008
Author: johnsa
Date: 2008-11-13 16:19:00 -0500 (Thu, 13 Nov 2008)
New Revision: 1967
Added:
trunk/deployment/resources/javascript/jquery/bedeworkJqueryThemes.css
Removed:
trunk/deployment/webadmin/webapp/resources/default/default/jquery.css
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/jquery.css
trunk/deployment/webuser/webapp/resources/demoskins/default/default/jquery.css
Modified:
trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js
trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js
Log:
some final jquery cleanup
Added: trunk/deployment/resources/javascript/jquery/bedeworkJqueryThemes.css
===================================================================
--- trunk/deployment/resources/javascript/jquery/bedeworkJqueryThemes.css (rev 0)
+++ trunk/deployment/resources/javascript/jquery/bedeworkJqueryThemes.css 2008-11-13 21:19:00 UTC (rev 1967)
@@ -0,0 +1,217 @@
+/********************************************/
+/* jquery styles for this Bedework calsuite */
+/********************************************/
+
+/* Main Style Sheet for jQuery UI date picker */
+#ui-datepicker-div, .ui-datepicker-inline {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 14px;
+ padding: 0;
+ margin: 0;
+ background: #ddd;
+ width: 185px;
+}
+#ui-datepicker-div {
+ display: none;
+ border: 1px solid #777;
+ z-index: 9999; /*must have*/
+}
+.ui-datepicker-inline {
+ float: left;
+ display: block;
+ border: 0;
+}
+.ui-datepicker-rtl {
+ direction: rtl;
+}
+.ui-datepicker-dialog {
+ padding: 5px !important;
+ border: 4px ridge #ddd !important;
+}
+button.ui-datepicker-trigger {
+ width: 25px;
+}
+img.ui-datepicker-trigger {
+ margin: 2px;
+ vertical-align: middle;
+}
+.ui-datepicker-prompt {
+ float: left;
+ padding: 2px;
+ background: #ddd;
+ color: #000;
+}
+* html .ui-datepicker-prompt {
+ width: 185px;
+}
+.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {
+ clear: both;
+ float: left;
+ width: 100%;
+ color: #fff;
+ background-color: inherit;
+}
+.ui-datepicker-control {
+ background-color: #000;
+ color: #fff;
+ padding: 2px 0px;
+}
+.ui-datepicker-links {
+ background-color: #333;
+ color: white;
+ padding: 2px 0px;
+}
+.ui-datepicker-control, .ui-datepicker-links {
+ font-weight: bold;
+ font-size: 80%;
+}
+.ui-datepicker-links label { /* disabled links */
+ padding: 2px 5px;
+ color: #888;
+}
+.ui-datepicker-clear, .ui-datepicker-prev {
+ float: left;
+ width: 34%;
+}
+.ui-datepicker-rtl .ui-datepicker-clear, .ui-datepicker-rtl .ui-datepicker-prev {
+ float: right;
+ text-align: right;
+}
+.ui-datepicker-current {
+ float: left;
+ width: 30%;
+ text-align: center;
+}
+.ui-datepicker-close, .ui-datepicker-next {
+ float: right;
+ width: 34%;
+ text-align: right;
+}
+.ui-datepicker-rtl .ui-datepicker-close, .ui-datepicker-rtl .ui-datepicker-next {
+ float: left;
+ text-align: left;
+}
+.ui-datepicker-header {
+ padding: 1px 0 3px;
+ background: #777;
+ text-align: center;
+ height: 1.3em;
+}
+.ui-datepicker-header select {
+ background: #777;
+ color: #fff;
+ border: 0px;
+}
+.ui-datepicker {
+ background: #ccc;
+ text-align: center;
+ font-size: 100%;
+}
+.ui-datepicker a {
+ display: block;
+ width: 100%;
+}
+.ui-datepicker-title-row {
+ background-color: #4164AE;
+ color: white;
+}
+.ui-datepicker-days-row {
+ background-color: #eee;
+ color: #666;
+}
+.ui-datepicker-week-col {
+ background-color: #777;
+ color: #fff;
+}
+.ui-datepicker-days-cell {
+ color: #000;
+ border: 1px solid #ddd;
+}
+.ui-datepicker-days-cell a{
+ display: block;
+}
+.ui-datepicker-week-end-cell {
+ background-color: #ddd;
+ color: black;
+}
+.ui-datepicker-title-row .ui-datepicker-week-end-cell {
+ background-color: #4164AE;
+ color: white;
+}
+.ui-datepicker-days-cell-over {
+ background: #fff;
+ border: 1px solid #777;
+}
+.ui-datepicker-unselectable {
+ color: #888;
+}
+.ui-datepicker-today {
+ background: #fcc !important;
+}
+.ui-datepicker-current-day {
+ background: #999 !important;
+}
+.ui-datepicker-status {
+ background: #ddd;
+ width: 100%;
+ font-size: 80%;
+ text-align: center;
+}
+
+/* ________ Datepicker Links _______
+
+** Reset link properties and then override them with !important */
+#ui-datepicker-div a, .ui-datepicker-inline a {
+ cursor: pointer;
+ margin: 0;
+ padding: 0;
+ background: none;
+ color: #000;
+}
+.ui-datepicker-inline .ui-datepicker-links a {
+ padding: 0 5px !important;
+}
+.ui-datepicker-control a, .ui-datepicker-links a {
+ padding: 2px 5px !important;
+ color: #eee !important;
+}
+.ui-datepicker-title-row a {
+ color: #eee !important;
+}
+.ui-datepicker-control a:hover {
+ background: #fdd !important;
+ color: #4164AE !important;
+}
+.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover {
+ background: #ddd !important;
+ color: #4164AE !important;
+}
+
+/* ___________ MULTIPLE MONTHS _________*/
+
+.ui-datepicker-multi .ui-datepicker {
+ border: 1px solid #777;
+}
+.ui-datepicker-one-month {
+ float: left;
+ width: 185px;
+}
+.ui-datepicker-new-row {
+ clear: left;
+}
+
+/* ___________ IE6 IFRAME FIX ________ */
+
+.ui-datepicker-cover {
+ display: none; /*sorry for IE5*/
+ display/**/: block; /*sorry for IE5*/
+ position: absolute; /*must have*/
+ z-index: -1; /*must have*/
+ filter: mask(); /*must have*/
+ top: -4px; /*must have*/
+ left: -4px; /*must have*/
+ width: 200px; /*must have*/
+ height: 200px; /*must have*/
+}
+
+
Modified: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2008-11-13 16:09:59 UTC (rev 1966)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2008-11-13 21:19:00 UTC (rev 1967)
@@ -234,7 +234,7 @@
<xsl:otherwise>
<script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js"> </script>
<script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js"> </script>
- <link rel="stylesheet" href="{$resourcesRoot}/default/default/jquery.css"/>
+ <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/>
<script type="text/javascript">
<xsl:comment>
$.datepicker.setDefaults({
Deleted: trunk/deployment/webadmin/webapp/resources/default/default/jquery.css
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/jquery.css 2008-11-13 16:09:59 UTC (rev 1966)
+++ trunk/deployment/webadmin/webapp/resources/default/default/jquery.css 2008-11-13 21:19:00 UTC (rev 1967)
@@ -1,217 +0,0 @@
-/********************************************/
-/* jquery styles for this Bedework calsuite */
-/********************************************/
-
-/* Main Style Sheet for jQuery UI date picker */
-#ui-datepicker-div, .ui-datepicker-inline {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 14px;
- padding: 0;
- margin: 0;
- background: #ddd;
- width: 185px;
-}
-#ui-datepicker-div {
- display: none;
- border: 1px solid #777;
- z-index: 9999; /*must have*/
-}
-.ui-datepicker-inline {
- float: left;
- display: block;
- border: 0;
-}
-.ui-datepicker-rtl {
- direction: rtl;
-}
-.ui-datepicker-dialog {
- padding: 5px !important;
- border: 4px ridge #ddd !important;
-}
-button.ui-datepicker-trigger {
- width: 25px;
-}
-img.ui-datepicker-trigger {
- margin: 2px;
- vertical-align: middle;
-}
-.ui-datepicker-prompt {
- float: left;
- padding: 2px;
- background: #ddd;
- color: #000;
-}
-* html .ui-datepicker-prompt {
- width: 185px;
-}
-.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {
- clear: both;
- float: left;
- width: 100%;
- color: #fff;
- background-color: inherit;
-}
-.ui-datepicker-control {
- background-color: #000;
- color: #fff;
- padding: 2px 0px;
-}
-.ui-datepicker-links {
- background-color: #333;
- color: white;
- padding: 2px 0px;
-}
-.ui-datepicker-control, .ui-datepicker-links {
- font-weight: bold;
- font-size: 80%;
-}
-.ui-datepicker-links label { /* disabled links */
- padding: 2px 5px;
- color: #888;
-}
-.ui-datepicker-clear, .ui-datepicker-prev {
- float: left;
- width: 34%;
-}
-.ui-datepicker-rtl .ui-datepicker-clear, .ui-datepicker-rtl .ui-datepicker-prev {
- float: right;
- text-align: right;
-}
-.ui-datepicker-current {
- float: left;
- width: 30%;
- text-align: center;
-}
-.ui-datepicker-close, .ui-datepicker-next {
- float: right;
- width: 34%;
- text-align: right;
-}
-.ui-datepicker-rtl .ui-datepicker-close, .ui-datepicker-rtl .ui-datepicker-next {
- float: left;
- text-align: left;
-}
-.ui-datepicker-header {
- padding: 1px 0 3px;
- background: #777;
- text-align: center;
- height: 1.3em;
-}
-.ui-datepicker-header select {
- background: #777;
- color: #fff;
- border: 0px;
-}
-.ui-datepicker {
- background: #ccc;
- text-align: center;
- font-size: 100%;
-}
-.ui-datepicker a {
- display: block;
- width: 100%;
-}
-.ui-datepicker-title-row {
- background-color: #4164AE;
- color: white;
-}
-.ui-datepicker-days-row {
- background-color: #eee;
- color: #666;
-}
-.ui-datepicker-week-col {
- background-color: #777;
- color: #fff;
-}
-.ui-datepicker-days-cell {
- color: #000;
- border: 1px solid #ddd;
-}
-.ui-datepicker-days-cell a{
- display: block;
-}
-.ui-datepicker-week-end-cell {
- background-color: #ddd;
- color: black;
-}
-.ui-datepicker-title-row .ui-datepicker-week-end-cell {
- background-color: #4164AE;
- color: white;
-}
-.ui-datepicker-days-cell-over {
- background: #fff;
- border: 1px solid #777;
-}
-.ui-datepicker-unselectable {
- color: #888;
-}
-.ui-datepicker-today {
- background: #fcc !important;
-}
-.ui-datepicker-current-day {
- background: #999 !important;
-}
-.ui-datepicker-status {
- background: #ddd;
- width: 100%;
- font-size: 80%;
- text-align: center;
-}
-
-/* ________ Datepicker Links _______
-
-** Reset link properties and then override them with !important */
-#ui-datepicker-div a, .ui-datepicker-inline a {
- cursor: pointer;
- margin: 0;
- padding: 0;
- background: none;
- color: #000;
-}
-.ui-datepicker-inline .ui-datepicker-links a {
- padding: 0 5px !important;
-}
-.ui-datepicker-control a, .ui-datepicker-links a {
- padding: 2px 5px !important;
- color: #eee !important;
-}
-.ui-datepicker-title-row a {
- color: #eee !important;
-}
-.ui-datepicker-control a:hover {
- background: #fdd !important;
- color: #4164AE !important;
-}
-.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover {
- background: #ddd !important;
- color: #4164AE !important;
-}
-
-/* ___________ MULTIPLE MONTHS _________*/
-
-.ui-datepicker-multi .ui-datepicker {
- border: 1px solid #777;
-}
-.ui-datepicker-one-month {
- float: left;
- width: 185px;
-}
-.ui-datepicker-new-row {
- clear: left;
-}
-
-/* ___________ IE6 IFRAME FIX ________ */
-
-.ui-datepicker-cover {
- display: none; /*sorry for IE5*/
- display/**/: block; /*sorry for IE5*/
- position: absolute; /*must have*/
- z-index: -1; /*must have*/
- filter: mask(); /*must have*/
- top: -4px; /*must have*/
- left: -4px; /*must have*/
- width: 200px; /*must have*/
- height: 200px; /*must have*/
-}
-
-
Modified: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl 2008-11-13 16:09:59 UTC (rev 1966)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl 2008-11-13 21:19:00 UTC (rev 1967)
@@ -133,7 +133,7 @@
<xsl:if test="/bedework/page='event' or /bedework/page='calendarList' or /bedework/page='displayCalendarForExport'">
<script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js"> </script>
<script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js"> </script>
- <link rel="stylesheet" href="{$resourcesRoot}/default/default/jquery.css"/>
+ <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/>
<script type="text/javascript">
<xsl:comment>
$.datepicker.setDefaults({
Deleted: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/jquery.css
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/jquery.css 2008-11-13 16:09:59 UTC (rev 1966)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/jquery.css 2008-11-13 21:19:00 UTC (rev 1967)
@@ -1,217 +0,0 @@
-/********************************************/
-/* jquery styles for this Bedework calsuite */
-/********************************************/
-
-/* Main Style Sheet for jQuery UI date picker */
-#ui-datepicker-div, .ui-datepicker-inline {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 14px;
- padding: 0;
- margin: 0;
- background: #ddd;
- width: 185px;
-}
-#ui-datepicker-div {
- display: none;
- border: 1px solid #777;
- z-index: 9999; /*must have*/
-}
-.ui-datepicker-inline {
- float: left;
- display: block;
- border: 0;
-}
-.ui-datepicker-rtl {
- direction: rtl;
-}
-.ui-datepicker-dialog {
- padding: 5px !important;
- border: 4px ridge #ddd !important;
-}
-button.ui-datepicker-trigger {
- width: 25px;
-}
-img.ui-datepicker-trigger {
- margin: 2px;
- vertical-align: middle;
-}
-.ui-datepicker-prompt {
- float: left;
- padding: 2px;
- background: #ddd;
- color: #000;
-}
-* html .ui-datepicker-prompt {
- width: 185px;
-}
-.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {
- clear: both;
- float: left;
- width: 100%;
- color: #fff;
- background-color: inherit;
-}
-.ui-datepicker-control {
- background-color: #000;
- color: #fff;
- padding: 2px 0px;
-}
-.ui-datepicker-links {
- background-color: #333;
- color: white;
- padding: 2px 0px;
-}
-.ui-datepicker-control, .ui-datepicker-links {
- font-weight: bold;
- font-size: 80%;
-}
-.ui-datepicker-links label { /* disabled links */
- padding: 2px 5px;
- color: #888;
-}
-.ui-datepicker-clear, .ui-datepicker-prev {
- float: left;
- width: 34%;
-}
-.ui-datepicker-rtl .ui-datepicker-clear, .ui-datepicker-rtl .ui-datepicker-prev {
- float: right;
- text-align: right;
-}
-.ui-datepicker-current {
- float: left;
- width: 30%;
- text-align: center;
-}
-.ui-datepicker-close, .ui-datepicker-next {
- float: right;
- width: 34%;
- text-align: right;
-}
-.ui-datepicker-rtl .ui-datepicker-close, .ui-datepicker-rtl .ui-datepicker-next {
- float: left;
- text-align: left;
-}
-.ui-datepicker-header {
- padding: 1px 0 3px;
- background: #777;
- text-align: center;
- height: 1.3em;
-}
-.ui-datepicker-header select {
- background: #777;
- color: #fff;
- border: 0px;
-}
-.ui-datepicker {
- background: #ccc;
- text-align: center;
- font-size: 100%;
-}
-.ui-datepicker a {
- display: block;
- width: 100%;
-}
-.ui-datepicker-title-row {
- background-color: #4164AE;
- color: white;
-}
-.ui-datepicker-days-row {
- background-color: #eee;
- color: #666;
-}
-.ui-datepicker-week-col {
- background-color: #777;
- color: #fff;
-}
-.ui-datepicker-days-cell {
- color: #000;
- border: 1px solid #ddd;
-}
-.ui-datepicker-days-cell a{
- display: block;
-}
-.ui-datepicker-week-end-cell {
- background-color: #ddd;
- color: black;
-}
-.ui-datepicker-title-row .ui-datepicker-week-end-cell {
- background-color: #4164AE;
- color: white;
-}
-.ui-datepicker-days-cell-over {
- background: #fff;
- border: 1px solid #777;
-}
-.ui-datepicker-unselectable {
- color: #888;
-}
-.ui-datepicker-today {
- background: #fcc !important;
-}
-.ui-datepicker-current-day {
- background: #999 !important;
-}
-.ui-datepicker-status {
- background: #ddd;
- width: 100%;
- font-size: 80%;
- text-align: center;
-}
-
-/* ________ Datepicker Links _______
-
-** Reset link properties and then override them with !important */
-#ui-datepicker-div a, .ui-datepicker-inline a {
- cursor: pointer;
- margin: 0;
- padding: 0;
- background: none;
- color: #000;
-}
-.ui-datepicker-inline .ui-datepicker-links a {
- padding: 0 5px !important;
-}
-.ui-datepicker-control a, .ui-datepicker-links a {
- padding: 2px 5px !important;
- color: #eee !important;
-}
-.ui-datepicker-title-row a {
- color: #eee !important;
-}
-.ui-datepicker-control a:hover {
- background: #fdd !important;
- color: #4164AE !important;
-}
-.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover {
- background: #ddd !important;
- color: #4164AE !important;
-}
-
-/* ___________ MULTIPLE MONTHS _________*/
-
-.ui-datepicker-multi .ui-datepicker {
- border: 1px solid #777;
-}
-.ui-datepicker-one-month {
- float: left;
- width: 185px;
-}
-.ui-datepicker-new-row {
- clear: left;
-}
-
-/* ___________ IE6 IFRAME FIX ________ */
-
-.ui-datepicker-cover {
- display: none; /*sorry for IE5*/
- display/**/: block; /*sorry for IE5*/
- position: absolute; /*must have*/
- z-index: -1; /*must have*/
- filter: mask(); /*must have*/
- top: -4px; /*must have*/
- left: -4px; /*must have*/
- width: 200px; /*must have*/
- height: 200px; /*must have*/
-}
-
-
Modified: trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl 2008-11-13 16:09:59 UTC (rev 1966)
+++ trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl 2008-11-13 21:19:00 UTC (rev 1967)
@@ -93,8 +93,8 @@
<xsl:variable name="publicCal">/cal</xsl:variable>
<!-- the following variable can be set to "true" or "false";
- to use dojo widgets and fancier UI features, set to false - these are
- not guaranteed to work in portals -->
+ to use jQuery widgets and fancier UI features, set to false - these are
+ not guaranteed to work in portals. -->
<xsl:variable name="portalFriendly">false</xsl:variable>
<!-- BEGIN MAIN TEMPLATE -->
@@ -156,15 +156,33 @@
<xsl:if test="/bedework/page='addEvent' or /bedework/page='editEvent'">
<script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script>
<link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
- <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script>
+ <xsl:choose>
+ <xsl:when test="$portalFriendly = 'true'">
+ <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script>
+ <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js"> </script>
+ <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js"> </script>
+ <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/>
+ <script type="text/javascript">
+ <xsl:comment>
+ $.datepicker.setDefaults({
+ constrainInput: true,
+ dateFormat: "yy-mm-dd",
+ showOn: "both",
+ buttonImage: "<xsl:value-of select='$resourcesRoot'/>/resources/calIcon.gif",
+ buttonImageOnly: true,
+ gotoCurrent: true,
+ duration: ""
+ });
+ </xsl:comment>
+ </script>
+ </xsl:otherwise>
+ </xsl:choose>
<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js"> </script>
<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js"> </script>
</xsl:if>
- <!-- <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js"> </script> -->
- <xsl:if test="$portalFriendly = 'true'">
- <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script>
- <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/>
- </xsl:if>
<script type="text/javascript">
<xsl:comment>
function focusElement(id) {
@@ -632,10 +650,20 @@
</script>
</xsl:when>
<xsl:otherwise>
- <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif">
- <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute>
- <xsl:text> </xsl:text>
- </span>
+ <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif">
+ <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute>
+ <xsl:text> </xsl:text>
+ </span -->
+ <input type="text" name="bwEventWidgetStartDate" id="bwEventWidgetStartDate" size="10"/>
+ <script language="JavaScript" type="text/javascript">
+ <xsl:comment>
+ $("#bwEventWidgetStartDate").datepicker({
+ defaultDate: new Date(<xsl:value-of select="form/start/yearText/input/@value"/>, <xsl:value-of select="number(form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="form/start/day/select/option[@selected = 'selected']/@value"/>)
+ }).attr("readonly", "readonly");
+ $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>');
+ //alert($("#bwEventWidgetStartDate").datepicker("getDate"));
+ </xsl:comment>
+ </script>
<input type="hidden" name="eventStartDate.year">
<xsl:attribute name="value"><xsl:value-of select="form/start/yearText/input/@value"/></xsl:attribute>
</input>
@@ -716,10 +744,19 @@
</script>
</xsl:when>
<xsl:otherwise>
- <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif">
+ <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif">
<xsl:attribute name="value"><xsl:value-of select="form/end/rfc3339DateTime"/></xsl:attribute>
<xsl:text> </xsl:text>
- </span>
+ </span-->
+ <input type="text" name="bwEventWidgetEndDate" id="bwEventWidgetEndDate" size="10"/>
+ <script language="JavaScript" type="text/javascript">
+ <xsl:comment>
+ $("#bwEventWidgetEndDate").datepicker({
+ defaultDate: new Date(<xsl:value-of select="form/end/dateTime/yearText/input/@value"/>, <xsl:value-of select="number(form/end/dateTime/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="form/end/dateTime/day/select/option[@selected = 'selected']/@value"/>)
+ }).attr("readonly", "readonly");
+ $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(form/end/rfc3339DateTime,'T')"/>');
+ </xsl:comment>
+ </script>
<input type="hidden" name="eventEndDate.year">
<xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/yearText/input/@value"/></xsl:attribute>
</input>
Modified: trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js
===================================================================
--- trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-11-13 16:09:59 UTC (rev 1966)
+++ trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-11-13 21:19:00 UTC (rev 1967)
@@ -25,11 +25,6 @@
special, consequential, or incidental damages related to the software,
to the maximum extent the law permits. */
-dojo.require("dojo.event.*");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.DropdownDatePicker");
-dojo.require("dojo.widget.DropdownTimePicker");
-
// ========================================================================
// ========================================================================
// Language and customization
@@ -45,7 +40,7 @@
/* An rdate
* date: String: internal date
* time: String
- * tzid timezone id or null
+ * tzid: timezone id or null
*/
function BwREXdate(date, time, allDay, floating, utc, tzid) {
this.date = date;
@@ -244,20 +239,23 @@
setDates(formObj);
}
setComments(formObj);
- //setRecurrence(formObj);
+ //if(formObj.freq){
+ // setRecurrence(formObj);
+ //} else we are editing an instance of a recurrence
setBedeworkXProperties(formObj,submitter);
//setAccessHow(formObj,1);
//setAccessAcl(formObj);
}
+/* Set dates based on jQuery widgets */
function setDates(formObj) {
var startDate = new Date();
- startDate = dojo.widget.byId("bwEventWidgetStartDate").getDate();
+ startDate = $("#bwEventWidgetStartDate").datepicker("getDate");
formObj["eventStartDate.year"].value = startDate.getFullYear();
formObj["eventStartDate.month"].value = startDate.getMonth() + 1;
formObj["eventStartDate.day"].value = startDate.getDate();
var endDate = new Date();
- endDate = dojo.widget.byId("bwEventWidgetEndDate").getDate();
+ endDate = $("#bwEventWidgetEndDate").datepicker("getDate");
formObj["eventEndDate.year"].value = endDate.getFullYear();
formObj["eventEndDate.month"].value = endDate.getMonth() + 1;
formObj["eventEndDate.day"].value = endDate.getDate();
@@ -269,34 +267,10 @@
}
function setBedeworkXProperties(formObj,submitter) {
- // set up specific Bedework X-Properties on event form submission
+ // Set up specific Bedework X-Properties on event form submission
// Depends on bedeworkXProperties.js
- // Set application x-properties here.
+ // Set application local x-properties here.
- // Submission comments as x-properties
- // Only return those comments that contain non-empty values;
- // throw out the subfields if main field has no value.
-
- if (formObj["commentLocationAddress"].value != "") {
- bwXProps.update(bwXPropertyLocation,
- [[bwXParamSubAddress,formObj["commentLocationSubaddress"].value],
- [bwXParamURL,formObj["commentLocationURL"].value]],
- formObj["commentLocationAddress"].value,true);
- }
- if (formObj["commentContactName"].value != "") {
- bwXProps.update(bwXPropertyContact,
- [[bwXParamPhone,formObj["commentContactPhone"].value],
- [bwXParamURL,formObj["commentContactURL"].value],
- [bwXParamEmail,formObj["commentContactEmail"].value]],
- formObj["commentContactName"].value,true);
- }
- if (formObj["commentCategories"].value) {
- bwXProps.update(bwXPropertyCategories,[],formObj["commentCategories"].value,true);
- }
- if (formObj["commentNotes"].value) {
- bwXProps.update(bwXPropertySubmitComment,[],formObj["commentNotes"].value,true);
- }
-
// X-BEDEWORK-IMAGE and its parameters:
if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') {
bwXProps.update(bwXPropertyImage,
@@ -637,7 +611,7 @@
case "until":
// the following will not be adequate for recurrences smaller than a day;
// we will need to set the time properly at that point.
- formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000";
+ formObj.until.value = formObj.bwEventUntilDate.value + "T000000";
break;
}
}
@@ -653,20 +627,6 @@
return true;
}
-function setRdateDateTime(formObj) {
- var rdateTime = dojo.byId("bwEventWidgeRdateTime");
- alert (rdateTime.getValue());
- if (rdateTime.getValue() != "") {
- /*var rdateTimeObj = rdateTime.getTime();
- var timeString = rdateTimeObj.
- formOjb.datetime.value += "T" +*/
- }
-}
-
-function untilClickHandler(evt) {
- selectRecurCountUntil('recurUntil');
-}
-
// =======================================================
// Event submit validation by page
// =======================================================
@@ -706,6 +666,7 @@
}
return validity;
}
+
function validateStep3() {
var validity = true;
if (document.getElementById("bwContactUid").value == '' &&
@@ -722,17 +683,5 @@
return validity;
}
-// =======================================================
-// Dojo initialization
-// =======================================================
-//function init() {
-// if(dojo.byId("untilHolder")) {
-// var untilHolder = dojo.byId("untilHolder");
-// dojo.event.connect(untilHolder, "onclick", untilClickHandler);
-// } // else we are editing an instance of a recurrence
-//}
-//dojo.addOnLoad(init);
-
-
Modified: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2008-11-13 16:09:59 UTC (rev 1966)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2008-11-13 21:19:00 UTC (rev 1967)
@@ -167,8 +167,7 @@
<!-- the following variable can be set to "true" or "false";
to use jQuery widgets and fancier UI features, set to false - these are
- not guaranteed to work in portals. Setting to true will make the
- add/edit event form much faster, but will not support internationalization. -->
+ not guaranteed to work in portals. -->
<xsl:variable name="portalFriendly">false</xsl:variable>
<!-- BEGIN MAIN TEMPLATE -->
@@ -402,7 +401,7 @@
<xsl:otherwise>
<script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js"> </script>
<script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js"> </script>
- <link rel="stylesheet" href="{$resourcesRoot}/default/default/jquery.css"/>
+ <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/>
<script type="text/javascript">
<xsl:comment>
$.datepicker.setDefaults({
@@ -416,8 +415,6 @@
});
</xsl:comment>
</script>
- <!-- script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script>
- <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkDojo.js"> </script-->
</xsl:otherwise>
</xsl:choose>
<script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script>
Deleted: trunk/deployment/webuser/webapp/resources/demoskins/default/default/jquery.css
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/jquery.css 2008-11-13 16:09:59 UTC (rev 1966)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/jquery.css 2008-11-13 21:19:00 UTC (rev 1967)
@@ -1,217 +0,0 @@
-/********************************************/
-/* jquery styles for this Bedework calsuite */
-/********************************************/
-
-/* Main Style Sheet for jQuery UI date picker */
-#ui-datepicker-div, .ui-datepicker-inline {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 14px;
- padding: 0;
- margin: 0;
- background: #ddd;
- width: 185px;
-}
-#ui-datepicker-div {
- display: none;
- border: 1px solid #777;
- z-index: 9999; /*must have*/
-}
-.ui-datepicker-inline {
- float: left;
- display: block;
- border: 0;
-}
-.ui-datepicker-rtl {
- direction: rtl;
-}
-.ui-datepicker-dialog {
- padding: 5px !important;
- border: 4px ridge #ddd !important;
-}
-button.ui-datepicker-trigger {
- width: 25px;
-}
-img.ui-datepicker-trigger {
- margin: 2px;
- vertical-align: middle;
-}
-.ui-datepicker-prompt {
- float: left;
- padding: 2px;
- background: #ddd;
- color: #000;
-}
-* html .ui-datepicker-prompt {
- width: 185px;
-}
-.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {
- clear: both;
- float: left;
- width: 100%;
- color: #fff;
- background-color: inherit;
-}
-.ui-datepicker-control {
- background-color: #000;
- color: #fff;
- padding: 2px 0px;
-}
-.ui-datepicker-links {
- background-color: #333;
- color: white;
- padding: 2px 0px;
-}
-.ui-datepicker-control, .ui-datepicker-links {
- font-weight: bold;
- font-size: 80%;
-}
-.ui-datepicker-links label { /* disabled links */
- padding: 2px 5px;
- color: #888;
-}
-.ui-datepicker-clear, .ui-datepicker-prev {
- float: left;
- width: 34%;
-}
-.ui-datepicker-rtl .ui-datepicker-clear, .ui-datepicker-rtl .ui-datepicker-prev {
- float: right;
- text-align: right;
-}
-.ui-datepicker-current {
- float: left;
- width: 30%;
- text-align: center;
-}
-.ui-datepicker-close, .ui-datepicker-next {
- float: right;
- width: 34%;
- text-align: right;
-}
-.ui-datepicker-rtl .ui-datepicker-close, .ui-datepicker-rtl .ui-datepicker-next {
- float: left;
- text-align: left;
-}
-.ui-datepicker-header {
- padding: 1px 0 3px;
- background: #777;
- text-align: center;
- height: 1.3em;
-}
-.ui-datepicker-header select {
- background: #777;
- color: #fff;
- border: 0px;
-}
-.ui-datepicker {
- background: #ccc;
- text-align: center;
- font-size: 100%;
-}
-.ui-datepicker a {
- display: block;
- width: 100%;
-}
-.ui-datepicker-title-row {
- background-color: #4164AE;
- color: white;
-}
-.ui-datepicker-days-row {
- background-color: #eee;
- color: #666;
-}
-.ui-datepicker-week-col {
- background-color: #777;
- color: #fff;
-}
-.ui-datepicker-days-cell {
- color: #000;
- border: 1px solid #ddd;
-}
-.ui-datepicker-days-cell a{
- display: block;
-}
-.ui-datepicker-week-end-cell {
- background-color: #ddd;
- color: black;
-}
-.ui-datepicker-title-row .ui-datepicker-week-end-cell {
- background-color: #4164AE;
- color: white;
-}
-.ui-datepicker-days-cell-over {
- background: #fff;
- border: 1px solid #777;
-}
-.ui-datepicker-unselectable {
- color: #888;
-}
-.ui-datepicker-today {
- background: #fcc !important;
-}
-.ui-datepicker-current-day {
- background: #999 !important;
-}
-.ui-datepicker-status {
- background: #ddd;
- width: 100%;
- font-size: 80%;
- text-align: center;
-}
-
-/* ________ Datepicker Links _______
-
-** Reset link properties and then override them with !important */
-#ui-datepicker-div a, .ui-datepicker-inline a {
- cursor: pointer;
- margin: 0;
- padding: 0;
- background: none;
- color: #000;
-}
-.ui-datepicker-inline .ui-datepicker-links a {
- padding: 0 5px !important;
-}
-.ui-datepicker-control a, .ui-datepicker-links a {
- padding: 2px 5px !important;
- color: #eee !important;
-}
-.ui-datepicker-title-row a {
- color: #eee !important;
-}
-.ui-datepicker-control a:hover {
- background: #fdd !important;
- color: #4164AE !important;
-}
-.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover {
- background: #ddd !important;
- color: #4164AE !important;
-}
-
-/* ___________ MULTIPLE MONTHS _________*/
-
-.ui-datepicker-multi .ui-datepicker {
- border: 1px solid #777;
-}
-.ui-datepicker-one-month {
- float: left;
- width: 185px;
-}
-.ui-datepicker-new-row {
- clear: left;
-}
-
-/* ___________ IE6 IFRAME FIX ________ */
-
-.ui-datepicker-cover {
- display: none; /*sorry for IE5*/
- display/**/: block; /*sorry for IE5*/
- position: absolute; /*must have*/
- z-index: -1; /*must have*/
- filter: mask(); /*must have*/
- top: -4px; /*must have*/
- left: -4px; /*must have*/
- width: 200px; /*must have*/
- height: 200px; /*must have*/
-}
-
-
Modified: trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-11-13 16:09:59 UTC (rev 1966)
+++ trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-11-13 21:19:00 UTC (rev 1967)
@@ -231,6 +231,7 @@
}
// ========================================================================
+// Form Manipulation Functions
// ========================================================================
function setEventFields(formObj,portalFriendly,submitter) {
@@ -244,20 +245,6 @@
setAccessHow(formObj,1);
//setAccessAcl(formObj);
}
-/* Set dates based on Dojo widget: DEPRECATED - now using jQuery
-function setDates(formObj) {
- var startDate = new Date();
- startDate = dojo.widget.byId("bwEventWidgetStartDate").getDate();
- formObj["eventStartDate.year"].value = startDate.getFullYear();
- formObj["eventStartDate.month"].value = startDate.getMonth() + 1;
- formObj["eventStartDate.day"].value = startDate.getDate();
-
- var endDate = new Date();
- endDate = dojo.widget.byId("bwEventWidgetEndDate").getDate();
- formObj["eventEndDate.year"].value = endDate.getFullYear();
- formObj["eventEndDate.month"].value = endDate.getMonth() + 1;
- formObj["eventEndDate.day"].value = endDate.getDate();
-} */
/* Set dates based on jQuery widgets */
function setDates(formObj) {
var startDate = new Date();
@@ -590,8 +577,6 @@
case "until":
// the following will not be adequate for recurrences smaller than a day;
// we will need to set the time properly at that point.
- // Dojo is deprecated:
- //formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000";
formObj.until.value = formObj.bwEventUntilDate.value + "T000000";
break;
}
@@ -608,16 +593,6 @@
return true;
}
-function setRdateDateTime(formObj) {
- var rdateTime = dojo.byId("bwEventWidgeRdateTime");
- alert (rdateTime.getValue());
- if (rdateTime.getValue() != "") {
- /*var rdateTimeObj = rdateTime.getTime();
- var timeString = rdateTimeObj.
- formOjb.datetime.value += "T" +*/
- }
-}
-
More information about the Bedework-commit
mailing list