[Erp5-report] r42709 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jan 27 16:41:53 CET 2011
Author: gabriel
Date: Thu Jan 27 16:41:53 2011
New Revision: 42709
URL: http://svn.erp5.org?rev=42709&view=rev
Log:
- clean up calendar box
- improve css to calendar
- remove not used javascript file
Modified:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewCalendarWidget.xml
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_calendar_layout/date_selector_box.xml
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml
erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml?rev=42709&r1=42708&r2=42709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml [utf8] Thu Jan 27 16:41:53 2011
@@ -101,7 +101,6 @@ elif request_type == "remove":\n
event = context.restrictedTraverse(catalog_object.getPath())\n
portal.event_module.deleteContent(event.getId())\n
elif request_type == "update":\n
- context.log(form)\n
title = form.get("title")\n
if not title:\n
return None\n
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewCalendarWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewCalendarWidget.xml?rev=42709&r1=42708&r2=42709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewCalendarWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewCalendarWidget.xml [utf8] Thu Jan 27 16:41:53 2011
@@ -47,7 +47,6 @@
<link href="ung_css/ung_calendar.css" rel="stylesheet" type="text/css"/>\n
<script src="portal_skins/erp5_jquery/jquery/plugin/wdcalendar/Common.js" type="text/javascript"></script>\n
<script src="portal_skins/erp5_jquery/jquery/plugin/wdcalendar/datepicker_lang_US.js" type="text/javascript"></script>\n
- <script src="portal_skins/erp5_jquery/jquery/plugin/wdcalendar/jquery.datepicker.js" type="text/javascript"></script>\n
<script src="portal_skins/erp5_jquery/jquery/plugin/wdcalendar/jquery.alert.js" type="text/javascript"></script>\n
<script src="portal_skins/erp5_jquery/jquery/plugin/wdcalendar/jquery.ifrmdailog.js" defer="defer" type="text/javascript"></script>\n
<script src="portal_skins/erp5_jquery/jquery/plugin/wdcalendar/wdCalendar_lang_US.js" type="text/javascript"></script>\n
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_calendar_layout/date_selector_box.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_calendar_layout/date_selector_box.xml?rev=42709&r1=42708&r2=42709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_calendar_layout/date_selector_box.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_calendar_layout/date_selector_box.xml [utf8] Thu Jan 27 16:41:53 2011
@@ -219,12 +219,7 @@
<key> <string>default</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<div class="fshowdatep fbutton">\n
-<div>\n
-<input type="hidden" name="txtshow" id="hdtxtshow" />\n
-<span id="txtdatetimeshow">Loading</span>\n
-</div>\n
-</div>
+<div id="datepicker"></div>
]]></string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml?rev=42709&r1=42708&r2=42709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml [utf8] Thu Jan 27 16:41:53 2011
@@ -66,8 +66,60 @@ div.cHead div.ptogtitle {\n
a#BBIT_DP_CONTAINER {\n
left: 0px !important;\n
}\n
+\n
input[type="text"] {\n
border: 0px;\n
+}\n
+\n
+div.main-left div#datepicker.hasDatepicker {\n
+ margin: -3px;\n
+}\n
+\n
+.ui-datepicker {\n
+ padding: 0;\n
+ width: 13.5em;\n
+}\n
+\n
+.ui-widget-content {\n
+ background: none !important;\n
+ border: 0;\n
+}\n
+\n
+.ui-datepicker th {\n
+ padding: 0px !important;\n
+ font-size: 12px;\n
+}\n
+\n
+.ui-datepicker .ui-datepicker-header {\n
+ padding: 0px !important;\n
+}\n
+\n
+.ui-datepicker table {\n
+ width: 101% !important;\n
+}\n
+\n
+.ui-datepicker .ui-datepicker-header {\n
+ width: 100% !imporant;\n
+}\n
+\n
+.ui-datepicker .ui-datepicker-prev,\n
+ .ui-datepicker .ui-datepicker-next {\n
+ top: 0px;\n
+}\n
+\n
+.ui-state-default, \n
+ .ui-widget-content .ui-state-default,\n
+ .ui-widget-header .ui-state-default {\n
+ background: none !important;\n
+ border: 1px solid #FFF !important;\n
+}\n
+\n
+.ui-widget-header {\n
+ border: 1px solid #DAE6F6 !important;\n
+}\n
+\n
+.ui-datepicker td:hover {\n
+ background: #DAE6F6 !important;\n
}</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml?rev=42709&r1=42708&r2=42709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml [utf8] Thu Jan 27 16:41:53 2011
@@ -64,7 +64,7 @@ function Edit(data){\n
var editUrl="WebSection_newEvent?id={0}&start={2}&end={3}&isallday={4}&title={1}";\n
if(data){\n
var url = StrFormat(editUrl, data);\n
- OpenModelWindow(url,{width: 400, height: 200, caption:"Manage The Event",onclose:function(){\n
+ OpenModelWindow(url,{width: 400, height: 200, caption:"Manage The Event", onclose:function(){\n
$("#gridcontainer").reload();\n
}});\n
}\n
@@ -96,7 +96,7 @@ function wtd(p){\n
$(document).ready(function() { \n
var DATA_FEED_URL = "Base_updateCalendarEventList";\n
var op = {\n
- view: "day",\n
+ view: "week",\n
showday: new Date(),\n
EditCmdhandler:Edit,\n
DeleteCmdhandler:Delete,\n
@@ -122,14 +122,15 @@ $(document).ready(function() { \n
$("#txtdatetimeshow").text(p.datestrshow);\n
}\n
$("#caltoolbar").noSelect();\n
- $("#hdtxtshow").datepicker({ picker: "#txtdatetimeshow", showtarget: $("#txtdatetimeshow"),\n
- onReturn:function(r){ \n
+ /*$("#hdtxtshow").datepicker({picker:"#txtdatetimeshow", showtarget: $("#txtdatetimeshow"),\n
+ onReturn:function(r){\n
+ console.log(r);\n
var p = $("#gridcontainer").gotoDate(r).BcalGetOp();\n
if (p && p.datestrshow) {\n
$("#txtdatetimeshow").text(p.datestrshow);\n
}\n
} \n
- });\n
+ });*/\n
//to show day view\n
$("#showdaybtn").click(function(e) {\n
//document.location.href="#day";\n
@@ -213,6 +214,8 @@ $(document).ready(function() { \n
}\n
},\n
});\n
+ $( "#datepicker" ).datepicker();\n
+\n
});
]]></string> </value>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=42709&r1=42708&r2=42709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Thu Jan 27 16:41:53 2011
@@ -1 +1 @@
-190
\ No newline at end of file
+191
\ No newline at end of file
More information about the Erp5-report
mailing list