From 4db92d7524ae8bb8ee5572726b216e071e9e584c Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Mon, 27 Dec 2010 10:04:00 +0000 Subject: [PATCH] fix issue to load the preference. It should be loaded after load the page git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41791 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_web_ung_layout/listbox.xml | 2 +- .../erp5_web_ung_theme/ung_js/ung.js.xml | 33 +++++++++---------- bt5/erp5_web_ung_theme/bt/revision | 2 +- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout/listbox.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout/listbox.xml index a3d9d9cada..9c0c3607ab 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout/listbox.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout/listbox.xml @@ -167,7 +167,7 @@ </item> <item> <key> <string>lines</string> </key> - <value> <int>20</int> </value> + <value> <int>17</int> </value> </item> <item> <key> <string>list_method</string> </key> diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml index ab0027a068..de9cb6c81f 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml @@ -109,23 +109,6 @@ function changeCheckBoxValue(value){\n });\n }\n \n -$.getJSON("Base_getPreferencePathList", function(data){\n - preference = data.preference + \'/Preference_viewHtmlStyle?editable_mode:int=1\';\n - system_preference = data.system_preference + \'/SystemPreference_view?editable_mode:int=1\';\n - if ($("div#preference_dialog").html() == "") {\n - $.get(preference, function(data){\n - $("div#preference_dialog").append("<fieldset class=\'center editable\'>" + \n - $(data).find(\'fieldset.center.editable\').html() +\n - "</fieldset>");\n - });\n - $.get(system_preference, function(data){\n - $("div#preference_dialog").append("<fieldset class=\'right editable\'>" + \n - $(data).find(\'fieldset.right.editable\').html() +\n - "</fieldset>");\n - });\n - }\n -});\n -\n $(document).ready(function(){\n if ($("div.gadget-column").length == 0 && window.location.href.split("?").length > 1) {\n parameterList = getUrlParameterList();\n @@ -332,6 +315,22 @@ $(document).ready(function(){\n event.preventDefault();\n changeCheckBoxValue(false);\n });\n + $.getJSON("Base_getPreferencePathList", function(data){\n + preference = data.preference + \'/Preference_viewHtmlStyle?editable_mode:int=1\';\n + system_preference = data.system_preference + \'/SystemPreference_view?editable_mode:int=1\';\n + if ($("div#preference_dialog").html() == "") {\n + $.get(preference, function(data){\n + $("div#preference_dialog").append("<fieldset class=\'center editable\'>" + \n + $(data).find(\'fieldset.center.editable\').html() +\n + "</fieldset>");\n + });\n + $.get(system_preference, function(data){\n + $("div#preference_dialog").append("<fieldset class=\'right editable\'>" + \n + $(data).find(\'fieldset.right.editable\').html() +\n + "</fieldset>");\n + });\n + }\n + });\n return false;\n }); diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index aa59885c83..70e1a64c23 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -143 \ No newline at end of file +144 \ No newline at end of file -- 2.30.9