Commit c8291587 authored by Gabriel Monnerat's avatar Gabriel Monnerat

- clean up calendar box

- improve css to calendar
- remove not used javascript file

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42709 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 673930f8
...@@ -101,7 +101,6 @@ elif request_type == "remove":\n ...@@ -101,7 +101,6 @@ elif request_type == "remove":\n
event = context.restrictedTraverse(catalog_object.getPath())\n event = context.restrictedTraverse(catalog_object.getPath())\n
portal.event_module.deleteContent(event.getId())\n portal.event_module.deleteContent(event.getId())\n
elif request_type == "update":\n elif request_type == "update":\n
context.log(form)\n
title = form.get("title")\n title = form.get("title")\n
if not title:\n if not title:\n
return None\n return None\n
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
<link href="ung_css/ung_calendar.css" rel="stylesheet" type="text/css"/>\n <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/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/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.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/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 <script src="portal_skins/erp5_jquery/jquery/plugin/wdcalendar/wdCalendar_lang_US.js" type="text/javascript"></script>\n
......
...@@ -219,12 +219,7 @@ ...@@ -219,12 +219,7 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<div class="fshowdatep fbutton">\n <div id="datepicker"></div>
<div>\n
<input type="hidden" name="txtshow" id="hdtxtshow" />\n
<span id="txtdatetimeshow">Loading</span>\n
</div>\n
</div>
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -66,8 +66,60 @@ div.cHead div.ptogtitle {\n ...@@ -66,8 +66,60 @@ div.cHead div.ptogtitle {\n
a#BBIT_DP_CONTAINER {\n a#BBIT_DP_CONTAINER {\n
left: 0px !important;\n left: 0px !important;\n
}\n }\n
\n
input[type="text"] {\n input[type="text"] {\n
border: 0px;\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> }</string> </value>
</item> </item>
<item> <item>
......
...@@ -64,7 +64,7 @@ function Edit(data){\n ...@@ -64,7 +64,7 @@ function Edit(data){\n
var editUrl="WebSection_newEvent?id={0}&start={2}&end={3}&isallday={4}&title={1}";\n var editUrl="WebSection_newEvent?id={0}&start={2}&end={3}&isallday={4}&title={1}";\n
if(data){\n if(data){\n
var url = StrFormat(editUrl, 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 $("#gridcontainer").reload();\n
}});\n }});\n
}\n }\n
...@@ -96,7 +96,7 @@ function wtd(p){\n ...@@ -96,7 +96,7 @@ function wtd(p){\n
$(document).ready(function() { \n $(document).ready(function() { \n
var DATA_FEED_URL = "Base_updateCalendarEventList";\n var DATA_FEED_URL = "Base_updateCalendarEventList";\n
var op = {\n var op = {\n
view: "day",\n view: "week",\n
showday: new Date(),\n showday: new Date(),\n
EditCmdhandler:Edit,\n EditCmdhandler:Edit,\n
DeleteCmdhandler:Delete,\n DeleteCmdhandler:Delete,\n
...@@ -122,14 +122,15 @@ $(document).ready(function() { \n ...@@ -122,14 +122,15 @@ $(document).ready(function() { \n
$("#txtdatetimeshow").text(p.datestrshow);\n $("#txtdatetimeshow").text(p.datestrshow);\n
}\n }\n
$("#caltoolbar").noSelect();\n $("#caltoolbar").noSelect();\n
$("#hdtxtshow").datepicker({ picker: "#txtdatetimeshow", showtarget: $("#txtdatetimeshow"),\n /*$("#hdtxtshow").datepicker({picker:"#txtdatetimeshow", showtarget: $("#txtdatetimeshow"),\n
onReturn:function(r){ \n onReturn:function(r){\n
console.log(r);\n
var p = $("#gridcontainer").gotoDate(r).BcalGetOp();\n var p = $("#gridcontainer").gotoDate(r).BcalGetOp();\n
if (p && p.datestrshow) {\n if (p && p.datestrshow) {\n
$("#txtdatetimeshow").text(p.datestrshow);\n $("#txtdatetimeshow").text(p.datestrshow);\n
}\n }\n
} \n } \n
});\n });*/\n
//to show day view\n //to show day view\n
$("#showdaybtn").click(function(e) {\n $("#showdaybtn").click(function(e) {\n
//document.location.href="#day";\n //document.location.href="#day";\n
...@@ -213,6 +214,8 @@ $(document).ready(function() { \n ...@@ -213,6 +214,8 @@ $(document).ready(function() { \n
}\n }\n
},\n },\n
});\n });\n
$( "#datepicker" ).datepicker();\n
\n
}); });
]]></string> </value> ]]></string> </value>
......
190 191
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment