[Erp5-report] r44535 ivan - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Mar 23 14:27:21 CET 2011
Author: ivan
Date: Wed Mar 23 14:27:21 2011
New Revision: 44535
URL: http://svn.erp5.org?rev=44535&view=rev
Log:
Fix PT.
Modified:
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewDashboardWidget.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml
erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml?rev=44535&r1=44534&r2=44535&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml [utf8] Wed Mar 23 14:27:21 2011
@@ -39,7 +39,14 @@
<tal:block tal:define="layout python: options[\'section_layout\'];\n
real_context python: options.get(\'real_context\', None);\n
cancel_url python: options.get(\'cancel_url\', None);\n
- isAnon python: here.portal_membership.isAnonymousUser();\n
+ is_anonymous_user python: here.portal_membership.isAnonymousUser();\n
+ dummy python: request.set(\'is_gadget_mode\', \'1\');\n
+ current_web_section python: context.REQUEST.get(\'current_web_section\', here);\n
+ current_web_section python: test(current_web_section.getPortalType()==\'Web Site\', real_context, current_web_section);\n
+ current_web_section python: test(real_context.getPortalType() in (\'ERP5 Site\', \'Web Site\',), real_context, current_web_section); \n
+ context_url current_web_section/absolute_url;\n
+ is_knowledge_pad_template_used python: request.get(\'is_knowledge_pad_template_used\', 0);\n
+ is_anonymous_knowledge_pad_used python: request.get(\'is_anonymous_knowledge_pad_used\', 0);\n
visibility_css_dict python: {\'visible\': \'block\',\n
\'invisible\': \'none\'};">\n
\n
@@ -53,42 +60,27 @@
gadget_title_dom_id python: \'%s_gadget_title\' %box_dom_id;\n
gadget python: box.getSpecialiseValue();\n
gadget_state python: gadget.getValidationState();\n
- dummy python: request.set(\'is_gadget_mode\', \'1\');\n
dummy python: request.set(\'box_relative_url\', box.getRelativeUrl());\n
dummy python: request.form.update(dict(box_relative_url=box.getRelativeUrl()));\n
edit_form_id gadget/getEditFormId;\n
view_form_id gadget/getViewFormId;\n
render_type gadget/getRenderType;\n
is_asynchronous_gadget python: render_type == \'asynchronous\';\n
- current_web_section python: context.REQUEST.get(\'current_web_section\',\n
- here);\n
- current_web_section python: \n
- test(current_web_section.getPortalType()==\'Web Site\',\n
- real_context, current_web_section);\n
- current_web_section python: \n
- test(real_context.getPortalType() in (\'ERP5 Site\', \'Web Site\',),\n
- real_context, current_web_section); \n
- isKnowledgePadTemplateUsed python:\n
- request.get(\'is_knowledge_pad_template_used\', 0);\n
- isAnonymousKnowledgePadUsed python:\n
- request.get(\'is_anonymous_knowledge_pad_used\', 0);">\n
-\n
-\n
-\n
- <div class="block" \n
- tal:condition="python: gadget is not None and gadget_state==\'invisible\'"\n
- tal:attributes="id box_dom_id"\n
- style="display:none;"></div>\n
+ is_gadget_visible python: gadget is not None and gadget_state!=\'invisible\';">\n
\n
+ <!-- Render gadget as hidden one -->\n
+ <div tal:condition="not: is_gadget_visible"\n
+ tal:attributes="id box_dom_id"\n
+ class="block invisible"></div>\n
\n
<!-- Show only public gadgets -->\n
<div class="block" \n
- tal:condition="python: gadget is not None and gadget_state!=\'invisible\'"\n
- tal:attributes="id box_dom_id">\n
+ tal:condition="is_gadget_visible"\n
+ tal:attributes="id box_dom_id">\n
\n
<h3 class="handle">\n
<span class="handle">\n
- <tal:block tal:condition="python: not (isAnon or isAnonymousKnowledgePadUsed)">\n
+ <tal:block tal:condition="python: not (is_anonymous_user or is_anonymous_knowledge_pad_used)">\n
<a class="clickable-block block-remove" \n
i18n:translate="" \n
i18n:domain="ui"\n
@@ -113,13 +105,12 @@
</h3>\n
\n
<div class="minimize_wrapper"\n
- tal:attributes="style python: \'display: %s\'\n
- %visibility_css_dict.get(box.getValidationState(), \'block\')">\n
+ tal:attributes="style python: \'display: %s\' %visibility_css_dict.get(box.getValidationState(), \'block\')">\n
\n
<!-- Edit form -->\n
<div class="edit-form" \n
- tal:condition="python: not isAnon and edit_form_id is not None and box is not None and\n
- not isAnonymousKnowledgePadUsed and not isKnowledgePadTemplateUsed"\n
+ tal:condition="python: not is_anonymous_user and edit_form_id is not None and box is not None and\n
+ not is_anonymous_knowledge_pad_used and not is_knowledge_pad_template_used"\n
tal:attributes="id edit_form_dom_id"\n
style="display: none;">\n
\n
@@ -140,17 +131,16 @@
\n
<tal:block tal:condition="not: is_asynchronous_gadget">\n
\n
- <input type="hidden" \n
- name="cancel_url" \n
- tal:attributes="value cancel_url;\n
- name python: \'%s_cancel_url\' %form_fields_main_prefix"/>\n
- <button type="submit"\n
- i18n:translate="" \n
- i18n:domain="ui"\n
- tal:attributes="onclick python: \n
- \'submitSynchronousGadgetPreferenceForm(\\\'%s\\\',\\\'%s\\\')\' \n
- %(form_fields_main_prefix, box_relative_url);\n
- id string: submit_button_${box_dom_id};">Save</button>\n
+ <input type="hidden" \n
+ name="cancel_url" \n
+ tal:attributes="value cancel_url;\n
+ name string: \'${form_fields_main_prefix}_cancel_url\'"/>\n
+\n
+ <button type="submit"\n
+ i18n:translate="" \n
+ i18n:domain="ui"\n
+ tal:attributes="onclick string:submitSynchronousGadgetPreferenceForm(\'${form_fields_main_prefix}\',\'${box_relative_url}\');\n
+ id string: submit_button_${box_dom_id};">Save</button>\n
\n
</tal:block>\n
\n
@@ -159,15 +149,14 @@
<button type="button" \n
i18n:translate="" \n
i18n:domain="ui"\n
- tal:attributes="onclick python: \n
- \'submitAsynchronousGadgetPreferenceForm(\n
- \\\'%s\\\', \\\'%s\\\', \\\'%s\\\', \\\'%s\\\', \\\'%s\\\')\'\n
- %(edit_form_dom_id, \n
- view_form_id, \n
- box_relative_url, \n
- view_form_dom_id,\n
- form_fields_main_prefix);\n
- id string: submit_button_${box_dom_id};">Save</button>\n
+ tal:attributes="onclick string:submitAsynchronousGadgetPreferenceForm(\n
+ \'${edit_form_dom_id}\', \n
+ \'${view_form_id}\', \n
+ \'${box_relative_url}\', \n
+ \'${view_form_dom_id}\', \n
+ \'${form_fields_main_prefix}\');\n
+ id string:submit_button_${box_dom_id};">Save</button>\n
+\n
\n
</tal:block>\n
</tal:block>\n
@@ -192,23 +181,22 @@
tal:define="view_form_object python: getattr(real_context, view_form_id);">\n
\n
<!-- Synchronous Gadget -->\n
- <div tal:condition="python: not is_asynchronous_gadget"\n
+ <div tal:condition="not: is_asynchronous_gadget"\n
tal:attributes="id view_form_dom_id"\n
class="box_inner_content" \n
tal:content="structure python: view_form_object(box=box)"/>\n
\n
<!-- Asynchronous Gadget -->\n
- <tal:block tal:condition="python: is_asynchronous_gadget">\n
+ <tal:block tal:condition="is_asynchronous_gadget">\n
<div tal:attributes="id view_form_dom_id" \n
class="box_inner_content"\n
i18n:translate="" \n
i18n:domain="ui">Loading ...</div>\n
<script type="text/javascript"\n
tal:content="structure python:\n
- here.KnowledgePad_generateAjaxCall(\'%s/%s\' %(current_web_section.absolute_url(),view_form_id),\n
+ here.KnowledgePad_generateAjaxCall(\'%s/%s\' %(context_url, view_form_id),\n
box,\n
- view_form_dom_id,\n
- ignore_security_check=1)"/>\n
+ view_form_dom_id)"/>\n
</tal:block>\n
</div>\n
\n
@@ -218,8 +206,7 @@
</div>\n
</tal:block>\n
</tal:block>\n
-</tal:block>\n
-
+</tal:block>
]]></unicode> </value>
</item>
@@ -237,7 +224,7 @@
</item>
<item>
<key> <string>output_encoding</string> </key>
- <value> <string>utf-8</string> </value>
+ <value> <string>iso-8859-15</string> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewDashboardWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewDashboardWidget.xml?rev=44535&r1=44534&r2=44535&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewDashboardWidget.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewDashboardWidget.xml [utf8] Wed Mar 23 14:27:21 2011
@@ -40,10 +40,10 @@
tal:define="layout here/KnowledgePad_getBoxColumnLayout;\n
real_context python: options.get(\'real_context\', None);\n
cancel_url python: options.get(\'cancel_url\', None);\n
- isAnon python: here.portal_membership.isAnonymousUser();\n
+ is_anonymous_user python: here.portal_membership.isAnonymousUser();\n
is_tab_empty here/KnowledgePad_isEmpty;\n
columns python: options.get(\'columns\', 3);\n
- column_css_class python: test(isAnon, \n
+ column_css_class python: test(is_anonymous_user, \n
\'portal-column portal-column-undraggable\', \n
\'portal-column\');">\n
\n
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml?rev=44535&r1=44534&r2=44535&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml [utf8] Wed Mar 23 14:27:21 2011
@@ -12,7 +12,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
- <value> <string>ts95442223.79</string> </value>
+ <value> <string>ts00882107.52</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
@@ -55,7 +55,9 @@
font-weight: bold;\n
font-size: 90%;\n
}\n
-\n
+.invisible{\n
+ display:none;\n
+}\n
/* 3 columng gadget layout */\n
div.portal-column {\n
float: left;\n
@@ -495,7 +497,7 @@ div.gadget-rss-reader .body {\n
</item>
<item>
<key> <string>size</string> </key>
- <value> <int>8226</int> </value>
+ <value> <int>8255</int> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=44535&r1=44534&r2=44535&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Wed Mar 23 14:27:21 2011
@@ -1 +1 @@
-712
\ No newline at end of file
+713
\ No newline at end of file
More information about the Erp5-report
mailing list