From 963f0f6b01a2fc07f7351a6433fd6f70661e2bd8 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Wed, 1 Jun 2011 15:54:07 +0300 Subject: [PATCH] Include needed .js / .css only once not for every post. --- .../DiscussionPost_getSummaryAsHTML.xml | 7 +- .../DiscussionThread_viewAsWeb.xml | 1 + .../DiscussionThread_viewAsWeb/my_include.xml | 124 ++++++++++++++++++ .../erp5_discussion/erp5_discussion.css.xml | 6 +- bt5/erp5_discussion/bt/revision | 2 +- 5 files changed, 131 insertions(+), 9 deletions(-) create mode 100644 bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAsWeb/my_include.xml diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_getSummaryAsHTML.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_getSummaryAsHTML.xml index e344ff8cbc..7a7df4cfc6 100644 --- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_getSummaryAsHTML.xml +++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_getSummaryAsHTML.xml @@ -36,11 +36,6 @@ <key> <string>_text</string> </key> <value> <unicode encoding="cdata"><![CDATA[ -<!-- XXX: include only once not for every post item -->\n -\n -<script src="erp5_discussion.js" type="text/javascript"></script>\n -<link href="erp5_discussion.css" rel="stylesheet" type="text/css">\n -\n <tal:block tal:define="discussion_post_object here/getObject;\n author_dict discussion_post_object/DiscussionPost_getAuthorDict;\n author_url author_dict/author_url;\n @@ -58,7 +53,7 @@ isUserAllowedToPost python: discussion_post_object.getParentValue().DiscussionThread_isUserAllowedToPost()">\n \n <div class="discussion-post-header"\n - tal:attributes="style python: test(is_author_thumbnai_available, \'height:96px\',\'\')">\n + tal:attributes="style python: test(is_author_thumbnai_available, \'height:104px\',\'\')">\n \n <div class="thumbnail"\n tal:condition="is_author_thumbnai_available">\n diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAsWeb.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAsWeb.xml index a10d21a276..5eacc75281 100644 --- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAsWeb.xml +++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAsWeb.xml @@ -98,6 +98,7 @@ <value> <list> <string>my_title</string> + <string>my_include</string> </list> </value> </item> diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAsWeb/my_include.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAsWeb/my_include.xml new file mode 100644 index 0000000000..6a94f427e2 --- /dev/null +++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAsWeb/my_include.xml @@ -0,0 +1,124 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>css_class</string> + <string>default</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_include</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>default</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>css_class</string> </key> + <value> <string>hidden_label</string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_editor_field</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +string:<script src="erp5_discussion.js" type="text/javascript"></script> <link href="erp5_discussion.css" rel="stylesheet" type="text/css"> + +]]></string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml index e5895e3660..65762798c7 100644 --- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml +++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/erp5_discussion.css.xml @@ -12,7 +12,7 @@ </item> <item> <key> <string>_EtagSupport__etag</string> </key> - <value> <string>ts06927933.02</string> </value> + <value> <string>ts06928671.63</string> </value> </item> <item> <key> <string>__name__</string> </key> @@ -43,10 +43,12 @@ \n .discussion-post-header .thumbnail{\n width:14%;\n + margin:4px;\n }\n \n .discussion-post-header .title{\n width:85%;\n + margin-top:4px;\n }\n \n a.discussion-post-title{\n @@ -93,7 +95,7 @@ blockquote {\n </item> <item> <key> <string>size</string> </key> - <value> <int>913</int> </value> + <value> <int>945</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_discussion/bt/revision b/bt5/erp5_discussion/bt/revision index c4fbb1cfac..d7f3668a68 100644 --- a/bt5/erp5_discussion/bt/revision +++ b/bt5/erp5_discussion/bt/revision @@ -1 +1 @@ -97 \ No newline at end of file +98 \ No newline at end of file -- 2.30.9