[Erp5-report] r41789 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Dec 27 10:21:28 CET 2010
Author: gabriel
Date: Mon Dec 27 10:21:28 2010
New Revision: 41789
URL: http://svn.erp5.org?rev=41789&view=rev
Log:
2010-12-27 gabriel
* Fix issue with search
* Add tag to display the document's key shared in the view page.
* Refactor javascript code to checkall and uncheckall actions do not reload the page
Modified:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_renderer.xml
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml
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/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.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/WebSection_renderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_renderer.xml?rev=41789&r1=41788&r2=41789&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_renderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_renderer.xml [utf8] Mon Dec 27 10:21:28 2010
@@ -55,28 +55,29 @@
"""\n
portal = context.getPortalObject()\n
\n
-if context.REQUEST.form.has_key("key"):\n
+request = context.REQUEST\n
+\n
+if request.form.has_key("key"):\n
webpage = context.WebSection_userFollowUpWebPage(reference=context.REQUEST.form.get("key"))\n
webpage_id = webpage.getId()\n
editor_name = context.Base_getEditorViewName(webpage.getPortalType())\n
return context.Base_redirect("/web_page_module/%s/%s" % (webpage_id, editor_name),\n
keep_items=dict(editable_mode=1))\n
+\n
else:\n
+ portal_type_list = request.form.get("portal_type")\n
+ searchable_text = request.form.get("SearchableText")\n
return context.Base_redirect("unfoldDomain", \n
keep_items = dict(domain_url="ung_domain/all_document_list",\n
form_id="erp5_web_ung_layout",\n
list_selection_name="ung_document_list_selection",\n
domain_depth=0,\n
+ SearchableText=searchable_text,\n
+ portal_type=portal_type_list,\n
reset=1))\n
</string> </value>
</item>
<item>
- <key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
@@ -91,60 +92,9 @@ else:\n
</value>
</item>
<item>
- <key> <string>errors</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>func_code</string> </key>
- <value>
- <object>
- <klass>
- <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>co_argcount</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>co_varnames</string> </key>
- <value>
- <tuple>
- <string>_getattr_</string>
- <string>context</string>
- <string>portal</string>
- <string>webpage</string>
- <string>webpage_id</string>
- <string>editor_name</string>
- <string>dict</string>
- </tuple>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>func_defaults</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>id</string> </key>
<value> <string>WebSection_renderer</string> </value>
</item>
- <item>
- <key> <string>warnings</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
</dictionary>
</pickle>
</record>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml?rev=41789&r1=41788&r2=41789&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml [utf8] Mon Dec 27 10:21:28 2010
@@ -60,6 +60,7 @@
</li>\n
</tal:block>\n
</div>\n
+ <a id=\'sharing_url\'></a>\n
</tal:block>
]]></unicode> </value>
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=41789&r1=41788&r2=41789&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] Mon Dec 27 10:21:28 2010
@@ -103,6 +103,12 @@ function update(){\n
$("a#loading_message").append(".");\n
}\n
\n
+function changeCheckBoxValue(value){\n
+ $("table.listbox tbody tr td.listbox-table-select-cell input").each(function(){\n
+ this.checked = 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
@@ -130,11 +136,13 @@ $(document).ready(function(){\n
}\n
switch (getWebEditorName()) {\n
case "WebPage_viewEditor":\n
- $("div.content").css({"position":"fixed", "bottom": "0px", "left": "0px", "right": "0px"});\n
+ $("div.content").css({"position":"fixed", "bottom": "0px",\n
+ "left": "0px", "right": "0px"});\n
$("div.content").css({"top": "5em"});\n
break;\n
case "WebTable_viewEditor":\n
- $("div.content").css({"position":"fixed", "bottom": "0px", "left": "0px", "right": "0px"});\n
+ $("div.content").css({"position":"fixed", "bottom": "0px",\n
+ "left": "0px", "right": "0px"});\n
$("div.content").css({"top": "6em"});\n
break;\n
}\n
@@ -192,17 +200,26 @@ $(document).ready(function(){\n
if ($("a[name=\'document_state\']").text() == "Draft") {\n
$("div.action_menu li ul").append("<li><a id=\'share_document\' href=\'#\'>" + \n
"<h6>Share this Document</h6></a></li>");\n
- $("div.action_menu li ul").css("height", 101);\n
$("div.action_menu ul li a#share_document").click(function(event){\n
event.preventDefault();\n
- reference = $.ajax({\n
- url: \'WebSection_shareDocument\',\n
- async: false,\n
- }).responseText;\n
- alert(reference);\n
- });\n
- }\n
- }\n
+ $.ajax({\n
+ url: \'WebSection_shareDocument\',\n
+ async: false,\n
+ });\n
+ location.reload();\n
+ });\n
+ };\n
+ $("div.action_menu li ul").css("height",\n
+ $("div.action_menu li ul li").length * 25.3 + "px");\n
+ if ($("a[name=\'document_state\']").text() == "Shared"){\n
+ reference = $.ajax({\n
+ url: \'getReference\',\n
+ async: false,\n
+ }).responseText;\n
+ keyUrl = location.href.split("web_page_module")[0] + "?key=" + reference;\n
+ $("div.header-right fieldset.widget a#sharing_url").text(keyUrl);\n
+ };\n
+ };\n
$("#edit_document").dialog({\n
autoOpen: false,\n
height: 146,\n
@@ -307,6 +324,14 @@ $(document).ready(function(){\n
});\n
}\n
});\n
+ $("input.listbox-check-all").click(function(event){\n
+ event.preventDefault();\n
+ changeCheckBoxValue(true);\n
+ });\n
+ $("input.listbox-uncheck-all").click(function(event){\n
+ event.preventDefault();\n
+ changeCheckBoxValue(false);\n
+ });\n
return false;\n
});
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml?rev=41789&r1=41788&r2=41789&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml [utf8] Mon Dec 27 10:21:28 2010
@@ -912,8 +912,17 @@ span#ui-dialog-title-preference_dialog {
}\n
\n
div#preference_dialog div.field {\n
- padding-bottom: 1px;\n
- padding-top: 1px;\n
+ padding-bottom: 1px;\n
+ padding-top: 1px;\n
+}\n
+\n
+div.header-right fieldset.widget {\n
+ height: 29px;\n
+}\n
+\n
+div.header-right fieldset.widget a#sharing_url {\n
+ padding-top: 2px;\n
+ font-size: 11px;\n
}
]]></string> </value>
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=41789&r1=41788&r2=41789&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] Mon Dec 27 10:21:28 2010
@@ -1,3 +1,8 @@
+2010-12-27 gabriel
+* Fix issue with search
+* Add tag to display the document's key shared in the view page.
+* Refactor javascript code to checkall and uncheckall actions do not reload the page
+
2010-12-22 gabriel
* Initial commit to load part of user and system preferences
* Implemented code to allow which the user edit the document using the reference of the document shared.
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=41789&r1=41788&r2=41789&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Mon Dec 27 10:21:28 2010
@@ -1 +1 @@
-142
\ No newline at end of file
+143
\ No newline at end of file
More information about the Erp5-report
mailing list