Commit cf44df86 authored by Fabien Morin's avatar Fabien Morin

make erp5_knowledge_pad bt a bit more xhtml valid :

- add script type (wich is required)
- add div markup (a block is required inside a form to enter data)
- remove id on block because it was not used and it was made with invalid
caracters ("/")

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26348 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f23ca8d8
......@@ -59,7 +59,7 @@ preferences = box.KnowledgeBox_getDefaultPreferencesDict()\n
h = str(preferences.get(\'preferred_height\'))\n
w = str(preferences.get(\'preferred_width\'))\n
\n
s = """<script src="http://gmodules.com/ig/ifr?url=http://www.google.com/ig/modules/calendar-for-your-site.xml&amp;up_showCalendar2=1&amp;up_showAgenda=1&amp;up_calendarFeeds=(%7B%7D)&amp;up_firstDay=Sunday&amp;up_syndicatable=true&amp;up_stylesheet=&amp;up_sub=1&amp;up_c0u=&amp;up_c0c=&amp;up_c1u=&amp;up_c1c=&amp;up_c2u=&amp;up_c2c=&amp;up_c3u=&amp;up_c3c=&amp;up_min=&amp;up_start=&amp;up_timeFormat=1%3A00pm&amp;up_calendarFeedsImported=0&amp;synd=open&amp;w=""" + w + """&amp;h=""" + h + """&amp;title=Google+Calendar&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>"""\n
s = """<script type="text/javascript" src="http://gmodules.com/ig/ifr?url=http://www.google.com/ig/modules/calendar-for-your-site.xml&amp;up_showCalendar2=1&amp;up_showAgenda=1&amp;up_calendarFeeds=(%7B%7D)&amp;up_firstDay=Sunday&amp;up_syndicatable=true&amp;up_stylesheet=&amp;up_sub=1&amp;up_c0u=&amp;up_c0c=&amp;up_c1u=&amp;up_c1c=&amp;up_c2u=&amp;up_c2c=&amp;up_c3u=&amp;up_c3c=&amp;up_min=&amp;up_start=&amp;up_timeFormat=1%3A00pm&amp;up_calendarFeedsImported=0&amp;synd=open&amp;w=""" + w + """&amp;h=""" + h + """&amp;title=Google+Calendar&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>"""\n
\n
return s\n
......
......@@ -60,7 +60,7 @@ h = str(preferences.get(\'preferred_height\'))\n
w = str(preferences.get(\'preferred_width\'))\n
t = str(preferences.get(\'preferred_title\'))\n
\n
s = """<script src="http://gmodules.com/ig/ifr?url=http://www.google.com/ig/modules/datetime.xml&amp;up_color=blue&amp;up_firstDay=1&amp;synd=open&amp;w=""" + w + """&amp;h=""" + h + """&amp;title=""" + t + """&amp;lang=fr&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>"""\n
s = """<script type="text/javascript" src="http://gmodules.com/ig/ifr?url=http://www.google.com/ig/modules/datetime.xml&amp;up_color=blue&amp;up_firstDay=1&amp;synd=open&amp;w=""" + w + """&amp;h=""" + h + """&amp;title=""" + t + """&amp;lang=fr&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>"""\n
\n
return s\n
......
......@@ -144,25 +144,27 @@
class="toggable_dialog">\n
<h3 i18n:translate="" i18n:domain="ui"> Rename tab </h3>\n
<form action="">\n
<span i18n:translate="" i18n:domain="ui">Tab name</span>:\n
<input type="text"\n
id="new_knowledge_pad_title"\n
name="knowledge_pad_title"\n
tal:attributes="value active_knowledge_pad/getTitle"/><br/><br/>\n
<button type="button"\n
i18n:translate="" \n
i18n:domain="ui"\n
onclick="toggleElement(\'rename_tab_dialog\');">Cancel</button>\n
<button type="button"\n
i18n:translate="" \n
i18n:domain="ui"\n
tal:attributes="onclick python: \'renameKnowledgePadToServer(\n
\\\'rename_tab_dialog\\\',\n
\\\'active_knowledge_pad_title\\\',\n
\\\'new_knowledge_pad_title\\\',\n
\\\'%s\\\')\' %active_knowledge_pad.getRelativeUrl()">\n
Rename \n
</button>\n
<div>\n
<span i18n:translate="" i18n:domain="ui">Tab name</span>:\n
<input type="text"\n
id="new_knowledge_pad_title"\n
name="knowledge_pad_title"\n
tal:attributes="value active_knowledge_pad/getTitle"/><br/><br/>\n
<button type="button"\n
i18n:translate="" \n
i18n:domain="ui"\n
onclick="toggleElement(\'rename_tab_dialog\');">Cancel</button>\n
<button type="button"\n
i18n:translate="" \n
i18n:domain="ui"\n
tal:attributes="onclick python: \'renameKnowledgePadToServer(\n
\\\'rename_tab_dialog\\\',\n
\\\'active_knowledge_pad_title\\\',\n
\\\'new_knowledge_pad_title\\\',\n
\\\'%s\\\')\' %active_knowledge_pad.getRelativeUrl()">\n
Rename \n
</button>\n
</div>\n
</form>\n
</div>\n
</tal:block>\n
......
......@@ -70,8 +70,7 @@
request.get(\'is_knowledge_pad_template_used\', 0);">\n
\n
<div class="block" \n
tal:condition="python: gadget is not None"\n
tal:attributes="id python: \'%s/%s\' %(here.getRelativeUrl(), box_id)">\n
tal:condition="python: gadget is not None">\n
\n
<h3 class="handle">\n
<span class="handle">\n
......@@ -111,19 +110,21 @@
<form action="KnowledgeBox_baseEdit"\n
tal:condition="not: is_asynchronous_gadget"\n
tal:define="box_relative_url python: box.getRelativeUrl();">\n
<span tal:replace="structure python: getattr(box, edit_form_id)()"/>\n
<input type="hidden" \n
name="box_relative_url" \n
tal:attributes="value box_relative_url"/>\n
<input type="hidden" \n
name="cancel_url" \n
tal:attributes="value cancel_url;\n
name python: \'%s_cancel_url\' \n
%box_relative_url.replace(\'/\', \'_\')"/> \n
<button type="submit"\n
i18n:translate="" \n
i18n:domain="ui" \n
name="KnowledgeBox_baseEdit:method">Save</button>\n
<div>\n
<span tal:replace="structure python: getattr(box, edit_form_id)()"/>\n
<input type="hidden" \n
name="box_relative_url" \n
tal:attributes="value box_relative_url"/>\n
<input type="hidden" \n
name="cancel_url" \n
tal:attributes="value cancel_url;\n
name python: \'%s_cancel_url\' \n
%box_relative_url.replace(\'/\', \'_\')"/> \n
<button type="submit"\n
i18n:translate="" \n
i18n:domain="ui" \n
name="KnowledgeBox_baseEdit:method">Save</button>\n
</div>\n
</form>\n
\n
<tal:block tal:condition="is_asynchronous_gadget">\n
......@@ -172,7 +173,8 @@
\n
</div>\n
</tal:block>\n
</tal:block>
</tal:block>\n
]]></string> </value>
</item>
......
377
\ No newline at end of file
379
\ 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