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

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Jan 31 18:40:44 CET 2011


Author: gabriel
Date: Mon Jan 31 18:40:44 2011
New Revision: 42841

URL: http://svn.erp5.org?rev=42841&view=rev
Log:
refactor to load and edit the text_content of event

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/EventModule_createNewEvent.xml
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.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=42841&r1=42840&r2=42841&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] Mon Jan 31 18:40:44 2011
@@ -97,7 +97,10 @@ if request_type == "list":\n
                                  start,\n
                                  end,\n
                                  0, display_minimized, 0,\n
-                                 random.randrange(-1,13), 1, event.getId(), event.getPortalType()])\n
+                                 random.randrange(-1,13), 1,\n
+                                 event.getId(),\n
+                                 event.getPortalType(),\n
+                                 event.getTextContent()])\n
   return dumps(event_dict)\n
 \n
 elif request_type == "remove":\n

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/EventModule_createNewEvent.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/EventModule_createNewEvent.xml?rev=42841&r1=42840&r2=42841&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/EventModule_createNewEvent.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/EventModule_createNewEvent.xml [utf8] Mon Jan 31 18:40:44 2011
@@ -55,12 +55,14 @@
 form = context.REQUEST.form\n
 portal_type = form.get("portal_type")\n
 event_title = form.get("title")\n
+text_content = form.get("event_text_content")\n
 start_date = DateTime("%(start_date_year)s/%(start_date_month)s/%(start_date_day)s %(start_date_hour)s:%(start_date_minute)s" % form)\n
 stop_date = DateTime("%(stop_date_year)s/%(stop_date_month)s/%(stop_date_day)s %(stop_date_hour)s:%(stop_date_minute)s" % form)\n
 portal = context.getPortalObject()\n
 event = portal.event_module.newContent(portal_type=portal_type, title=event_title)\n
 event.setStartDate(start_date)\n
 event.setStopDate(stop_date)\n
+event.setTextContent(text_content)\n
 </string> </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml?rev=42841&r1=42840&r2=42841&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml [utf8] Mon Jan 31 18:40:44 2011
@@ -55,20 +55,23 @@
   <input name="title" value="" type="text" size="30">\n
   <p>\n
   <label>Start Date: </label>\n
-  <input class="start_date_field" name="start_date_year" value="2011" maxlength="4" type="text" size="4">/\n
   <input class="start_date_field" name="start_date_month" value="" maxlength="2" type="text" size="2">/\n
-  <input class="start_date_field" name="start_date_day" value="" maxlength="2" type="text" size="2">\n
+  <input class="start_date_field" name="start_date_day" value="" maxlength="2" type="text" size="2">/\n
+  <input class="start_date_field" name="start_date_year" value="2011" maxlength="4" type="text" size="4">\n
   &nbsp;&nbsp;&nbsp;\n
   <input class="start_date_field" name="start_date_hour" value="" maxlength="2" type="text" size="2">:\n
   <input class="start_date_field" name="start_date_minute" value="" maxlength="2" type="text" size="2">\n
   <p>\n
   <label>Stop Date: </label>\n
-  <input class="stop_date_field" name="stop_date_year" value="2011" maxlength="4" type="text" size="4">/\n
   <input class="stop_date_field" name="stop_date_month" value="" maxlength="2" type="text" size="2">/\n
-  <input class="stop_date_field" name="stop_date_day" value="" maxlength="2" type="text" size="2">\n
+  <input class="stop_date_field" name="stop_date_day" value="" maxlength="2" type="text" size="2">/\n
+  <input class="stop_date_field" name="stop_date_year" value="2011" maxlength="4" type="text" size="4">\n
   &nbsp;&nbsp;&nbsp;\n
   <input class="stop_date_field" name="stop_date_hour" value="" maxlength="2" type="text" size="2">:\n
   <input class="stop_date_field" name="stop_date_minute" value="" maxlength="2" type="text" size="2">\n
+  <p>\n
+  <label>Text: </label>\n
+  <textarea name="event_text_content" rows="2" cols="30"></textarea>\n
 </form>
 
 ]]></unicode> </value>

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=42841&r1=42840&r2=42841&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] Mon Jan 31 18:40:44 2011
@@ -100,6 +100,7 @@ function Edit(data){\n
     $("form#create_new_event").append("<input type=\'hidden\' id=\'event_id\'/>");\n
     $("input#event_id").attr("value", data[9]);\n
     $("form#create_new_event select").val(data[10]);\n
+    $("textarea[name=\'event_text_content\']").val(data[11]);\n
     $("input[name=\'title\']").attr("value", data[1]);\n
     $("input.start_date_field[name=\'start_date_year\']").attr("value", data[2].getFullYear());\n
     $("input.start_date_field[name=\'start_date_month\']").attr("value", (parseInt(data[2].getMonth()) + 1));\n
@@ -259,7 +260,7 @@ $(document).ready(function() {     \n
   });\n
   $("div#new_event_dialog").dialog({\n
     autoOpen: false,\n
-    height: 192,\n
+    height: 255,\n
     width: 410,\n
     modal: true,\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=42841&r1=42840&r2=42841&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Mon Jan 31 18:40:44 2011
@@ -1 +1 @@
-206
\ No newline at end of file
+207
\ No newline at end of file



More information about the Erp5-report mailing list