diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml index 3d4df86cd8212c6e885387ac19a41c0a275d95c5..2f7c80b3e43915e9d2b6bdb4ffbb3b09a1529a76 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_updateCalendarEventList.xml @@ -81,6 +81,7 @@ if request_type == "list":\n if form.has_key("SearchableText"):\n kw["SearchableText"] = form.get("SearchableText")\n kw["sort_on"] = (("delivery.start_date", "ASC"))\n + kw["delivery.start_date"] = {"range": "min", "query": DateTime()}\n event_list = portal.event_module.searchFolder(**kw)\n now = DateTime()\n event_dict = {}\n diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml index 7481e40a7fb026245a45cd86df9d203e3c39d65d..d53cdedc8172b845f7099c170c26334c8d45b967 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_css/ung_calendar.css.xml @@ -184,7 +184,7 @@ div.header-left {\n \n div#gridcontainer div.event-listview tr td {\n border-bottom: 1px solid #CCC;\n - padding: 9px;\n + padding: 11px;\n }\n \n div#gridcontainer div.toolbar-listview {\n @@ -198,8 +198,19 @@ a#back-calendar {\n }\n \n td#resultview {\n - text-align: center;\n + text-align: right;\n font-size: 10pt;\n +}\n +\n +tr#today-event td:first-child{\n + background: none repeat scroll 0 0 #FFF7D7;\n + border-color: #FAD163 #FAD163 #CCCCCC;\n + border-style: solid;\n + border-width: 0 1px 1px 0;\n +}\n +\n +div.event-listview table tbody tr td:first-child {\n + width: 12%;\n }</string> </value> </item> <item> diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml index 687772bf5cf0fc49adb048e7bd51c8a9be88e1a1..d00afae65bee96f8a12a8c61cceb7742d822ead4 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml @@ -320,9 +320,17 @@ $(document).ready(function() { \n data : paramList,\n success: function(data){\n var eventTableList = Array();\n - var eventList = data.events; \n + var eventList = data.events;\n + var currentDate = new Date();\n for (var i = 0; i < eventList.length; i++){\n - eventTableList.push("<tr><td>");\n + var eventDate = new Date(eventList[i][2]);\n + if (eventDate.getMonth() == currentDate.getMonth() && eventDate.getDate() == currentDate.getDate()){\n + eventTableList.push("<tr id=\'today-event\'>");\n + }\n + else {\n + eventTableList.push("<tr>");\n + }\n + eventTableList.push("<td>");\n eventTableList.push(eventList[i][2]);\n eventTableList.push("</td><td>");\n eventTableList.push(eventList[i][1]);\n @@ -338,7 +346,11 @@ $(document).ready(function() { \n tableList.push("</tbody></table></div>");\n $("div#gridcontainer").append(tableList.join(""));\n });\n -}); +});\n +\n +window.onload = function(){\n + $("div#dvCalMain.calmain").parent().css("padding", "0 0 0 1px");\n +} ]]></string> </value> </item> diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index e99fdcc524490dab1572edae62443278a789b5e9..cc4f7f3feba9cb8765296f4ce390a79adf482e95 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -217 \ No newline at end of file +218 \ No newline at end of file