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

[nobody at svn.erp5.org]

Author: gabriel
Date: Fri Jan 28 13:19:27 2011
New Revision: 42737

URL: http://svn.erp5.org?rev=42737&view=rev
Log:
- clean up the code
- add response to each calendar request

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/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=42737&r1=42736&r2=42737&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] Fri Jan 28 13:19:27 2011
@@ -100,6 +100,7 @@ elif request_type == "remove":\n
   catalog_object = portal.portal_catalog.getResultValue(portal_type=portal_type_list, title=title)\n
   event = context.restrictedTraverse(catalog_object.getPath())\n
   portal.event_module.deleteContent(event.getId())\n
+  return dumps({"IsSuccess": True})\n
 elif request_type == "update":\n
   title = form.get("title")\n
   if not title:\n
@@ -110,6 +111,7 @@ elif request_type == "update":\n
   event = context.restrictedTraverse(catalog_object.getPath())\n
   event.setStartDate(start_date)\n
   event.setStopDate(end_date)\n
+  return dumps({"IsSuccess": True})\n
 elif request_type == "add":\n
   end_date = convertToERP5DateTime(form.get("CalendarEndTime"))\n
   start_date = convertToERP5DateTime(form.get("CalendarStartTime"))\n
@@ -117,6 +119,7 @@ elif request_type == "add":\n
   event = portal.event_module.newContent(portal_type="Web Message", title=event_title)\n
   event.setStartDate(start_date)\n
   event.setStopDate(end_date)\n
+  return dumps({"IsSuccess": True, "Data": {"title": event_title}})\n
 </string> </value>
         </item>
         <item>

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=42737&r1=42736&r2=42737&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] Fri Jan 28 13:19:27 2011
@@ -46,7 +46,6 @@
   <link href="portal_skins/erp5_jquery/jquery/plugin/wdcalendar/main.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/datepicker_lang_US.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/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=42737&r1=42736&r2=42737&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] Fri Jan 28 13:19:27 2011
@@ -31,10 +31,15 @@
             <value> <string encoding="cdata"><![CDATA[
 
 function callBeforeRequest(type){\n
-  var message = "Loading data...";\n
   switch(type){\n
     case 1:\n
-      message = "Loading data...";\n
+      message = "Loading Events...";\n
+      break;\n
+    case 2:\n
+      message = "Adding Event...";\n
+      break;\n
+    case 3:\n
+      message = "Removing Event...";\n
       break;\n
     case 4:\n
       message = "The request is being processed ...";\n
@@ -46,13 +51,9 @@ function callBeforeRequest(type){\n
 \n
 function callAfterRequest(type){\n
   switch(type){\n
-    case 1:\n
+    default:\n
       $("#loadingpannel").hide();\n
       break;\n
-    case 4:\n
-      $("#loadingpannel").html("Success!");\n
-      window.setTimeout(function(){$("#loadingpannel").hide();},2000);\n
-      break;\n
   }\n
 }\n
 \n

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=42737&r1=42736&r2=42737&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Fri Jan 28 13:19:27 2011
@@ -1 +1 @@
-193
\ No newline at end of file
+194
\ No newline at end of file