[Erp5-report] r42932 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...

[nobody at svn.erp5.org]

Author: gabriel
Date: Wed Feb  2 14:46:18 2011
New Revision: 42932

URL: http://svn.erp5.org?rev=42932&view=rev
Log:
- filter event list to select only events with date equal current day or more
- improve css
- add id for tr tag that the your date is the current day

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/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=42932&r1=42931&r2=42932&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] Wed Feb  2 14:46:18 2011
@@ -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

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=42932&r1=42931&r2=42932&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] Wed Feb  2 14:46:18 2011
@@ -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>

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=42932&r1=42931&r2=42932&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] Wed Feb  2 14:46:18 2011
@@ -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>

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=42932&r1=42931&r2=42932&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Wed Feb  2 14:46:18 2011
@@ -1 +1 @@
-217
\ No newline at end of file
+218
\ No newline at end of file