[Erp5-report] r42939 gabriel - /erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: gabriel
Date: Wed Feb  2 16:24:35 2011
New Revision: 42939

URL: http://svn.erp5.org?rev=42939&view=rev
Log:
- Add condition to don't display the search view if SearchableText is blank
- improve view of search results

Modified:
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_calendar.js.xml

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=42939&r1=42938&r2=42939&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 16:24:35 2011
@@ -296,6 +296,8 @@ $(document).ready(function() {     \n
   });\n
   $("input#submit-search").click(function(event){\n
     event.preventDefault();\n
+    if ($("input[name=\'searchable-text\']").val() == "")\n
+      return false;\n
     $("div#dvCalMain.calmain div#gridcontainer").css("background", "none repeat scroll 0 0 #FFFFFF");\n
     $("div#dvwkcontaienr.wktopcontainer").hide();\n
     $("div#gridcontainer div#dvtec.scolltimeevent").hide();\n
@@ -324,16 +326,23 @@ $(document).ready(function() {     \n
              var currentDate = new Date();\n
              for (var i = 0; i < eventList.length; i++){\n
                var eventDate = new Date(eventList[i][2]);\n
+               var hourSymbol = "am";\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
+               var dateSplitted = eventList[i][2].split(" ");\n
+               if (eventDate.getHours() >= 12)\n
+                 hourSymbol = "pm";\n
+               eventTableList.push("<td id=\'event-date\'>");\n
+               eventTableList.push(dateSplitted[0]);\n
+               eventTableList.push("</td>");\n
+               eventTableList.push("<td id=\'time-range\'>", \n
+                                   dateSplitted[1] + hourSymbol,\n
+                                   "</td>");\n
+               eventTableList.push("<td>", eventList[i][1]);\n
                eventTableList.push("</td></tr>");\n
              }\n
              $("div.event-listview tbody").append(eventTableList.join(""));\n