diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleCalendarGadget.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleCalendarGadget.xml index b007ceb18be100e938f213dca3ae0bd0041bc025..47a3191aa5aaa43184698a2b1e8dcfdc7fc9aff0 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleCalendarGadget.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleCalendarGadget.xml @@ -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&up_showCalendar2=1&up_showAgenda=1&up_calendarFeeds=(%7B%7D)&up_firstDay=Sunday&up_syndicatable=true&up_stylesheet=&up_sub=1&up_c0u=&up_c0c=&up_c1u=&up_c1c=&up_c2u=&up_c2c=&up_c3u=&up_c3c=&up_min=&up_start=&up_timeFormat=1%3A00pm&up_calendarFeedsImported=0&synd=open&w=""" + w + """&h=""" + h + """&title=Google+Calendar&border=%23ffffff%7C3px%2C1px+solid+%23999999&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&up_showCalendar2=1&up_showAgenda=1&up_calendarFeeds=(%7B%7D)&up_firstDay=Sunday&up_syndicatable=true&up_stylesheet=&up_sub=1&up_c0u=&up_c0c=&up_c1u=&up_c1c=&up_c2u=&up_c2c=&up_c3u=&up_c3c=&up_min=&up_start=&up_timeFormat=1%3A00pm&up_calendarFeedsImported=0&synd=open&w=""" + w + """&h=""" + h + """&title=Google+Calendar&border=%23ffffff%7C3px%2C1px+solid+%23999999&output=js"></script>"""\n \n return s\n diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleClockGadget.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleClockGadget.xml index 67365ce3f8b5df80c6a28143091132d982e9fd58..75d1c33adc7ab12790fb50c822e920cc6307c275 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleClockGadget.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleClockGadget.xml @@ -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&up_color=blue&up_firstDay=1&synd=open&w=""" + w + """&h=""" + h + """&title=""" + t + """&lang=fr&country=ALL&border=%23ffffff%7C3px%2C1px+solid+%23999999&output=js"></script>"""\n +s = """<script type="text/javascript" src="http://gmodules.com/ig/ifr?url=http://www.google.com/ig/modules/datetime.xml&up_color=blue&up_firstDay=1&synd=open&w=""" + w + """&h=""" + h + """&title=""" + t + """&lang=fr&country=ALL&border=%23ffffff%7C3px%2C1px+solid+%23999999&output=js"></script>"""\n \n return s\n diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml index 037bd4c0e42f4495a8f4f216b49ab6f4746edbaf..5824eaa9c966714a4504065b4b4ed3b5994b49ff 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml @@ -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 diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml index 9c2cadd8a99e0abe86cc858fb480ab8f7ee9310a..8bcebede20745c802f930bc6f0e560ff9fa68fd8 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml @@ -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> diff --git a/bt5/erp5_knowledge_pad/bt/revision b/bt5/erp5_knowledge_pad/bt/revision index 1c34b96390b67bd8f62c2758c2563682ba06d5b8..eb8f2fa1aeb162439e4756fc55642cad6c193cff 100644 --- a/bt5/erp5_knowledge_pad/bt/revision +++ b/bt5/erp5_knowledge_pad/bt/revision @@ -1 +1 @@ -377 \ No newline at end of file +379 \ No newline at end of file