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

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Dec 28 16:08:04 CET 2010


Author: gabriel
Date: Tue Dec 28 16:08:03 2010
New Revision: 41836

URL: http://svn.erp5.org?rev=41836&view=rev
Log:
2010-12-28 gabriel
* Added javascript code to be possible choose the theme to Spreadsheet editor and save it

Modified:
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
    erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log
    erp5/trunk/bt5/erp5_web_ung_theme/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml?rev=41836&r1=41835&r2=41836&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] Tue Dec 28 16:08:03 2010
@@ -122,6 +122,15 @@ $(document).ready(function(){\n
         $("div.content").css({"position":"fixed", "bottom": "0px",\n
                               "left": "0px", "right": "0px"});\n
         $("div.content").css({"top": "6em"});\n
+        $.getJSON("Base_getPreferencePathList", function(data){\n
+          var ungPreferencePath = data.preference;\n
+          $.get(ungPreferencePath + \'/getPreferredThemeSheetEditor\', function(data){\n
+            link = $("<link>");\n
+            link.attr("id", "dynamic_css");\n
+            link.attr({type: \'text/css\', rel:\'stylesheet\', href:data});\n
+            $("head").append(link);\n
+          });\n
+        });     \n
         break;\n
     }\n
   }\n
@@ -234,20 +243,25 @@ $(document).ready(function(){\n
  });\n
  $("div#preference_dialog").dialog({\n
     autoOpen: false,\n
-    height: 436,\n
+    height: 487,\n
     width: 330,\n
     buttons: {\n
       "Save": function(){\n
-         var ungPreferenceArgument = $("form#ung_preference").serialize();\n
+         var erp5PreferenceArgument = $("form#erp5_preference").serialize();\n
          $.ajax({\n
                 url: ungPreferencePath + "/Base_edit",\n
-                data: ungPreferenceArgument + "&form_id=Preference_viewHtmlStyle",\n
+                data: erp5PreferenceArgument + "&form_id=Preference_viewHtmlStyle",\n
          });\n
          var systemPreferenceArgument = $("form#system_preference").serialize();\n
          $.ajax({\n
                 url: systemPreferencePath + "/Base_edit",\n
                 data: systemPreferenceArgument + "&form_id=SystemPreference_view",\n
          });\n
+         var ungPreferenceArgument = $("form#ung_preference").serialize();\n
+         $.ajax({\n
+                url: ungPreferencePath + "/Base_edit",\n
+                data: ungPreferenceArgument + "&form_id=UNGPreference_view",\n
+         });\n
         location.reload();\n
        },\n
        Cancel: function() {\n
@@ -332,7 +346,7 @@ $(document).ready(function(){\n
    systemPreferencePath = data.system_preference;\n
    if ($("div#preference_dialog").html() == "") {\n
      $.get(ungPreferencePath + \'/Preference_viewHtmlStyle?editable_mode:int=1\', function(data){\n
-       $("div#preference_dialog").append("<form id=\'ung_preference\'>" + \n
+       $("div#preference_dialog").append("<form id=\'erp5_preference\'>" + \n
                                          "<fieldset class=\'center editable\'>" + \n
                                          $(data).find(\'fieldset.center.editable\').html() +\n
                                          "</fieldset></form>");\n
@@ -343,6 +357,12 @@ $(document).ready(function(){\n
                                          $(data).find(\'fieldset.right.editable\').html() +\n
                                          "</fieldset></form>");\n
      });\n
+     $.get(ungPreferencePath + \'/UNGPreference_view?editable_mode:int=1\', function(data){\n
+       $("div#preference_dialog").append("<form id=\'ung_preference\'>" + \n
+                                         "<fieldset class=\'center editable\'>" + \n
+                                         $(data).find(\'fieldset.center.editable\').html() +\n
+                                         "</fieldset></form>");\n
+     });\n
   }\n
  });\n
  return false;\n

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log?rev=41836&r1=41835&r2=41836&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log [utf8] Tue Dec 28 16:08:03 2010
@@ -1,3 +1,6 @@
+2010-12-28 gabriel
+* Added javascript code to be possible choose the theme to Spreadsheet editor and save it
+
 2010-12-27 gabriel
 * Implemented javascript code to be possible save all changes on enabled preferences.
 * Clean up the code to remove some global variables

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=41836&r1=41835&r2=41836&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Tue Dec 28 16:08:03 2010
@@ -1 +1 @@
-146
\ No newline at end of file
+147
\ No newline at end of file



More information about the Erp5-report mailing list