Skip to content

erp5
erp5
Commit 6cc4c01e authored by Ivan Tyagov's avatar Ivan Tyagov
Browse files
Options

Fix PT. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44535 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2586ef88
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 62 deletions
bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml
View file @ 6cc4c01e
...@@ -39,7 +39,14 @@ ...@@ -39,7 +39,14 @@
<tal:block tal:define="layout python: options[\'section_layout\'];\n <tal:block tal:define="layout python: options[\'section_layout\'];\n
real_context python: options.get(\'real_context\', None);\n real_context python: options.get(\'real_context\', None);\n
cancel_url python: options.get(\'cancel_url\', 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 visibility_css_dict python: {\'visible\': \'block\',\n
\'invisible\': \'none\'};">\n \'invisible\': \'none\'};">\n
\n \n
...@@ -53,42 +60,27 @@ ...@@ -53,42 +60,27 @@
gadget_title_dom_id python: \'%s_gadget_title\' %box_dom_id;\n gadget_title_dom_id python: \'%s_gadget_title\' %box_dom_id;\n
gadget python: box.getSpecialiseValue();\n gadget python: box.getSpecialiseValue();\n
gadget_state python: gadget.getValidationState();\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.set(\'box_relative_url\', box.getRelativeUrl());\n
dummy python: request.form.update(dict(box_relative_url=box.getRelativeUrl()));\n dummy python: request.form.update(dict(box_relative_url=box.getRelativeUrl()));\n
edit_form_id gadget/getEditFormId;\n edit_form_id gadget/getEditFormId;\n
view_form_id gadget/getViewFormId;\n view_form_id gadget/getViewFormId;\n
render_type gadget/getRenderType;\n render_type gadget/getRenderType;\n
is_asynchronous_gadget python: render_type == \'asynchronous\';\n is_asynchronous_gadget python: render_type == \'asynchronous\';\n
current_web_section python: context.REQUEST.get(\'current_web_section\',\n is_gadget_visible python: gadget is not None and gadget_state!=\'invisible\';">\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
\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 \n
<!-- Show only public gadgets -->\n <!-- Show only public gadgets -->\n
<div class="block" \n <div class="block" \n
tal:condition="python: gadget is not None and gadget_state!=\'invisible\'"\n tal:condition="is_gadget_visible"\n
tal:attributes="id box_dom_id">\n tal:attributes="id box_dom_id">\n
\n \n
<h3 class="handle">\n <h3 class="handle">\n
<span 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 <a class="clickable-block block-remove" \n
i18n:translate="" \n i18n:translate="" \n
i18n:domain="ui"\n i18n:domain="ui"\n
...@@ -113,13 +105,12 @@ ...@@ -113,13 +105,12 @@
</h3>\n </h3>\n
\n \n
<div class="minimize_wrapper"\n <div class="minimize_wrapper"\n
tal:attributes="style python: \'display: %s\'\n tal:attributes="style python: \'display: %s\' %visibility_css_dict.get(box.getValidationState(), \'block\')">\n
%visibility_css_dict.get(box.getValidationState(), \'block\')">\n
\n \n
<!-- Edit form -->\n <!-- Edit form -->\n
<div class="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 tal:condition="python: not is_anonymous_user and edit_form_id is not None and box is not None and\n
not isAnonymousKnowledgePadUsed and not isKnowledgePadTemplateUsed"\n not is_anonymous_knowledge_pad_used and not is_knowledge_pad_template_used"\n
tal:attributes="id edit_form_dom_id"\n tal:attributes="id edit_form_dom_id"\n
style="display: none;">\n style="display: none;">\n
\n \n
...@@ -140,17 +131,16 @@ ...@@ -140,17 +131,16 @@
\n \n
<tal:block tal:condition="not: is_asynchronous_gadget">\n <tal:block tal:condition="not: is_asynchronous_gadget">\n
\n \n
<input type="hidden" \n <input type="hidden" \n
name="cancel_url" \n name="cancel_url" \n
tal:attributes="value cancel_url;\n tal:attributes="value cancel_url;\n
name python: \'%s_cancel_url\' %form_fields_main_prefix"/>\n name string: \'${form_fields_main_prefix}_cancel_url\'"/>\n
<button type="submit"\n \n
i18n:translate="" \n <button type="submit"\n
i18n:domain="ui"\n i18n:translate="" \n
tal:attributes="onclick python: \n i18n:domain="ui"\n
\'submitSynchronousGadgetPreferenceForm(\\\'%s\\\',\\\'%s\\\')\' \n tal:attributes="onclick string:submitSynchronousGadgetPreferenceForm(\'${form_fields_main_prefix}\',\'${box_relative_url}\');\n
%(form_fields_main_prefix, box_relative_url);\n id string: submit_button_${box_dom_id};">Save</button>\n
id string: submit_button_${box_dom_id};">Save</button>\n
\n \n
</tal:block>\n </tal:block>\n
\n \n
...@@ -159,15 +149,14 @@ ...@@ -159,15 +149,14 @@
<button type="button" \n <button type="button" \n
i18n:translate="" \n i18n:translate="" \n
i18n:domain="ui"\n i18n:domain="ui"\n
tal:attributes="onclick python: \n tal:attributes="onclick string:submitAsynchronousGadgetPreferenceForm(\n
\'submitAsynchronousGadgetPreferenceForm(\n \'${edit_form_dom_id}\', \n
\\\'%s\\\', \\\'%s\\\', \\\'%s\\\', \\\'%s\\\', \\\'%s\\\')\'\n \'${view_form_id}\', \n
%(edit_form_dom_id, \n \'${box_relative_url}\', \n
view_form_id, \n \'${view_form_dom_id}\', \n
box_relative_url, \n \'${form_fields_main_prefix}\');\n
view_form_dom_id,\n id string:submit_button_${box_dom_id};">Save</button>\n
form_fields_main_prefix);\n \n
id string: submit_button_${box_dom_id};">Save</button>\n
\n \n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
...@@ -192,23 +181,22 @@ ...@@ -192,23 +181,22 @@
tal:define="view_form_object python: getattr(real_context, view_form_id);">\n tal:define="view_form_object python: getattr(real_context, view_form_id);">\n
\n \n
<!-- Synchronous Gadget -->\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 tal:attributes="id view_form_dom_id"\n
class="box_inner_content" \n class="box_inner_content" \n
tal:content="structure python: view_form_object(box=box)"/>\n tal:content="structure python: view_form_object(box=box)"/>\n
\n \n
<!-- Asynchronous Gadget -->\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 <div tal:attributes="id view_form_dom_id" \n
class="box_inner_content"\n class="box_inner_content"\n
i18n:translate="" \n i18n:translate="" \n
i18n:domain="ui">Loading ...</div>\n i18n:domain="ui">Loading ...</div>\n
<script type="text/javascript"\n <script type="text/javascript"\n
tal:content="structure python:\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 box,\n
view_form_dom_id,\n view_form_dom_id)"/>\n
ignore_security_check=1)"/>\n
</tal:block>\n </tal:block>\n
</div>\n </div>\n
\n \n
...@@ -218,8 +206,7 @@ ...@@ -218,8 +206,7 @@
</div>\n </div>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>
]]></unicode> </value> ]]></unicode> </value>
</item> </item>
...@@ -237,7 +224,7 @@ ...@@ -237,7 +224,7 @@
</item> </item>
<item> <item>
<key> <string>output_encoding</string> </key> <key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value> <value> <string>iso-8859-15</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewDashboardWidget.xml
View file @ 6cc4c01e
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
tal:define="layout here/KnowledgePad_getBoxColumnLayout;\n tal:define="layout here/KnowledgePad_getBoxColumnLayout;\n
real_context python: options.get(\'real_context\', None);\n real_context python: options.get(\'real_context\', None);\n
cancel_url python: options.get(\'cancel_url\', 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 is_tab_empty here/KnowledgePad_isEmpty;\n
columns python: options.get(\'columns\', 3);\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 portal-column-undraggable\', \n
\'portal-column\');">\n \'portal-column\');">\n
\n \n
......
bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml
View file @ 6cc4c01e
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts95442223.79</string> </value> <value> <string>ts00882107.52</string> </value>
</item> </item>
<item> <item>
<key> <string>__name__</string> </key> <key> <string>__name__</string> </key>
...@@ -55,7 +55,9 @@ ...@@ -55,7 +55,9 @@
font-weight: bold;\n font-weight: bold;\n
font-size: 90%;\n font-size: 90%;\n
}\n }\n
\n .invisible{\n
display:none;\n
}\n
/* 3 columng gadget layout */\n /* 3 columng gadget layout */\n
div.portal-column {\n div.portal-column {\n
float: left;\n float: left;\n
...@@ -495,7 +497,7 @@ div.gadget-rss-reader .body {\n ...@@ -495,7 +497,7 @@ div.gadget-rss-reader .body {\n
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>8226</int> </value> <value> <int>8255</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_knowledge_pad/bt/revision
View file @ 6cc4c01e
712 713
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7