Skip to content

erp5
erp5
Commit 7521764b authored by Tatuya Kamada's avatar Tatuya Kamada
Browse files
Options

Gadget: Fix label duplication in Person Gadget.

parent f11656c0
Hide whitespace changes
Inline Side-by-side
Showing with 203 additions and 20 deletions
bt5/erp5_knowledge_pad_ui_test/PathTemplateItem/portal_tests/gadgets_zuite/testPersonGadget.xml 0 → 100644
View file @ 7521764b
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_text</string> </key>
<value> <unicode encoding="cdata"><![CDATA[
<html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal">\n
<head>\n
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n
<title tal:content="template/getId"/>\n
</head>\n
<body >\n
<table cellpadding="1" cellspacing="1" border="1">\n
<thead>\n
<tr><td rowspan="1" colspan="3" tal:content="template/getId"/></tr>\n
</thead><tbody>\n
\n
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
<tr>\n
\t<td>openAndWait</td>\n
\t<td>${base_url}/view</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>verifyTextPresent</td>\n
\t<td>Add tab</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>click</td>\n
\t<td>add_new_tab_dialog_link</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>type</td>\n
\t<td>new_pad_title</td>\n
\t<td>test tab person</td>\n
</tr>\n
<tr>\n
\t<td>keyPressAndWait</td>\n
\t<td>new_pad_title</td>\n
\t<td>\\13</td>\n
</tr>\n
<tr>\n
\t<td>verifyTextPresent</td>\n
\t<td>test tab person</td>\n
\t<td></td>\n
</tr>\n
<!-- check adding gadgets By clicking -->\n
<tr>\n
\t<td>verifyTextPresent</td>\n
\t<td>Add gadgets</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>waitForTextPresent</td>\n
\t<td>Your tab is empty.</td>\n
\t<td></td>\n
</tr>\n
<!-- add "Persons" gadget to front-->\n
<span metal:use-macro="container/Zuite_CommonTemplate/macros/wait_for_activities">Wait for activities</span>\n
\n
<tr>\n
\t<td>openAndWait</td>\n
\t<td>${base_url}/Zuite_AddGadgetToActivePad?gadget_relative_url=portal_gadgets/erp5_persons</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>waitForText</td>\n
\t<td>transition_message</td>\n
\t<td>regexp:knowledge_pad_module/.*</td>\n
</tr>\n
<tr>\n
\t<td>storeText</td>\n
\t<td>transition_message</td>\n
\t<td>erp5_persons_url</td>\n
</tr>\n
<tr>\n
\t<td>openAndWait</td>\n
\t<td>${base_url}/Zuite_getGadgetIdByRelativeUrl?knowledge_box_url=${erp5_persons_url}</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>storeText</td>\n
\t<td>transition_message</td>\n
\t<td>erp5_persons_id</td>\n
</tr>\n
<tr>\n
\t<td>waitForElementPresent</td>\n
\t<td>//th[@class="listbox-table-header-cell"][1]</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>verifyText</td>\n
\t<td>//th[@class="listbox-table-header-cell"][1]</td>\n
\t<td>Name</td>\n
</tr>\n
<tr>\n
\t<td>assertElementPresent</td>\n
\t<td>//th[@class="listbox-table-header-cell"][1]</td>\n
\t<td></td>\n
</tr>\n
<tr>\n
\t<td>verifyText</td>\n
\t<td>//th[@class="listbox-table-header-cell"][2]</td>\n
\t<td>Email</td>\n
</tr>\n
\n
</tbody></table>\n
</body>\n
</html>
]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>expand</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>testPersonGadget</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_knowledge_pad_ui_test/bt/revision
View file @ 7521764b
31 32
\ No newline at end of file \ No newline at end of file
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml
View file @ 7521764b
...@@ -297,7 +297,6 @@ ...@@ -297,7 +297,6 @@
or \'Sort\';\n or \'Sort\';\n
listbox_field_id string:${field_id}.${sql};"> \n listbox_field_id string:${field_id}.${sql};"> \n
<!-- Button in normal view -->\n <!-- Button in normal view -->\n
<span tal:condition="is_gadget_mode" i18n:translate="" i18n:domain="ui" tal:content="title"/>\n
<span tal:condition="not:is_gadget_mode" class="listbox-table-header-column-title" i18n:translate="" i18n:domain="ui" tal:content="title"/>\n <span tal:condition="not:is_gadget_mode" class="listbox-table-header-column-title" i18n:translate="" i18n:domain="ui" tal:content="title"/>\n
<button tal:condition="not:is_gadget_mode"\n <button tal:condition="not:is_gadget_mode"\n
type="submit"\n type="submit"\n
...@@ -329,24 +328,37 @@ ...@@ -329,24 +328,37 @@
</button>\n </button>\n
\n \n
<!-- Button in gadget mode -->\n <!-- Button in gadget mode -->\n
<button tal:condition="is_gadget_mode" \n <span tal:condition="is_gadget_mode" class="listbox-table-header-column-title" i18n:translate="" i18n:domain="ui" tal:content="title"/>\n
tal:define ="params python: {\'setSelectionQuickSortOrder:method\':listbox_field_id};"\n <button tal:condition="is_gadget_mode"\n
type="button" \n type="button"\n
tal:attributes="title title; \n title="Ascending Display"\n
onclick python: real_context.KnowledgePad_generateAjaxCall(context_url+\'/\'+form_id,box,dom_id,params);\n class="sort-button sort-button-asc"\n
class bt_class;"\n tal:define ="value python:test(sort_order==\'ascending\', listbox_field_id+\':none\', listbox_field_id+\':asc\');\n
i18n:domain="ui" i18n:attributes="title">\n params python: {\'setSelectionQuickSortOrder:method\':value};"\n
<span i18n:translate="" i18n:domain="ui" tal:content="title"/>\n tal:attributes="onclick python: real_context.KnowledgePad_generateAjaxCall(context_url+\'/\'+form_id,box,dom_id,params);"\n
i18n:domain="ui" i18n:attributes="title">\n
<img src="images/transparent-image.gif"\n
alt="Ascending Display"\n
title="Ascending Display"\n
tal:attributes="src string:${portal_url_string}/images/transparent-image.gif;\n
class python:test(sort_order==\'ascending\', \'sort-button sort-button-arrow sort-button-asc-selected\', \'sort-button sort-button-arrow sort-button-asc-not-selected\');"\n
i18n:domain="ui" i18n:attributes="title;alt" />\n
</button>\n
<button tal:condition="is_gadget_mode"\n
type="button"\n
title="Descending Display"\n
class="sort-button sort-button-desc"\n
tal:define ="value python:test(sort_order==\'descending\', listbox_field_id+\':none\', listbox_field_id+\':desc\');\n
params python: {\'setSelectionQuickSortOrder:method\':value};"\n
tal:attributes="onclick python: real_context.KnowledgePad_generateAjaxCall(context_url+\'/\'+form_id,box,dom_id,params);"\n
i18n:domain="ui" i18n:attributes="title">\n
<img src="images/transparent-image.gif"\n
alt="Descending Display"\n
title="Descending Display"\n
tal:attributes="src string:${portal_url_string}/images/transparent-image.gif;\n
class python:test(sort_order==\'descending\', \'sort-button sort-button-arrow sort-button-desc-selected\', \'sort-button sort-button-arrow sort-button-desc-not-selected\');"\n
i18n:domain="ui" i18n:attributes="title;alt" />\n
</button>\n </button>\n
\n
<!-- Icon showing sort order -->\n
<img tal:condition="is_gadget_mode"\n
src="images/transparent-image.gif"\n
tal:attributes="alt bt_title;\n
title bt_title;\n
class bt_class;\n
src string:${portal_url_string}/images/transparent-image.gif"\n
i18n:domain="ui" i18n:attributes="title;alt" />\n
\n \n
</th>\n </th>\n
\n \n
......
product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
View file @ 7521764b
1109 1110
\ 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