Skip to content

S
slapos.core
Commit c37968ae authored by Alain Takoudjou's avatar Alain Takoudjou
Browse files
Options

slapos_web: Improve the display of service list and hosting subscription... 

slapos_web: Improve the display of service list and hosting subscription (short title and description)
parent 2de59208
Hide whitespace changes
Inline Side-by-side
Showing with 300 additions and 14 deletions
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_renameAsWeb.xml → master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_editFieldsAsWeb.xml
View file @ c37968ae
...@@ -89,11 +89,12 @@ ...@@ -89,11 +89,12 @@
<list> <list>
<string>my_section_title</string> <string>my_section_title</string>
<string>my_url_string</string> <string>my_url_string</string>
<string>my_title</string>
<string>my_reference</string> <string>my_reference</string>
<string>my_source_reference</string> <string>my_source_reference</string>
<string>your_new_title</string> <string>your_new_title</string>
<string>your_description</string> <string>your_description</string>
<string>my_rename_button</string> <string>my_edit_button</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -114,7 +115,7 @@ ...@@ -114,7 +115,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>HostingSubscription_renameAsWeb</string> </value> <value> <string>HostingSubscription_editFieldsAsWeb</string> </value>
</item> </item>
<item> <item>
<key> <string>method</string> </key> <key> <string>method</string> </key>
......
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_renameAsWeb/my_rename_button.xml → master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_editFieldsAsWeb/my_edit_button.xml
View file @ c37968ae
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_rename_button</string> </value> <value> <string>my_edit_button</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string>Rename</string> </value> <value> <string>Edit</string> </value>
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Rename</string> </value> <value> <string>Edit</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_renameAsWeb/my_section_title.xml → master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_editFieldsAsWeb/my_section_title.xml
View file @ c37968ae
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
python:"<h1>Rename: %s</h1>" % (context.getTranslatedTitle()) python:"<h1>Edit: %s</h1>" % (context.getTranslatedTitle())
]]></string> </value> ]]></string> </value>
</item> </item>
......
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_editFieldsAsWeb/my_title.xml 0 → 100644
View file @ c37968ae
<?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>editable</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_title</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>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>inline</string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewWebFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Title</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_renameWebMode.xml
View file @ c37968ae
...@@ -58,7 +58,7 @@ if \'field_your_new_title\' in request:\n ...@@ -58,7 +58,7 @@ if \'field_your_new_title\' in request:\n
context.edit(short_title=request[\'field_your_new_title\'], description=request.get(\'field_your_description\', \'\'))\n context.edit(short_title=request[\'field_your_new_title\'], description=request.get(\'field_your_description\', \'\'))\n
return context.Base_redirect(\'view\', keep_items={\'portal_status_message\':context.Base_translateString(\'Hosting subscription edited.\')})\n return context.Base_redirect(\'view\', keep_items={\'portal_status_message\':context.Base_translateString(\'Hosting subscription edited.\')})\n
\n \n
return context.Base_redirect(\'HostingSubscription_renameAsWeb\', keep_items={})\n return context.Base_redirect(\'HostingSubscription_editFieldsAsWeb\', keep_items={})\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/my_rename_button.xml
View file @ c37968ae
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string>Rename Hosting Subscription</string> </value> <value> <string>Edit short title and description</string> </value>
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Rename Hosting Subscription</string> </value> <value> <string>Edit short title and description</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_getCurrentHostingSubscriptionList.xml
View file @ c37968ae
...@@ -58,7 +58,7 @@ if person is not None:\n ...@@ -58,7 +58,7 @@ if person is not None:\n
portal_type="Hosting Subscription",\n portal_type="Hosting Subscription",\n
default_destination_section_uid=person.getUid(),\n default_destination_section_uid=person.getUid(),\n
validation_state=\'validated\',\n validation_state=\'validated\',\n
sort_on=((\'title\', ),)\n **kw\n
)\n )\n
\n \n
return []\n return []\n
......
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewMyServicesRender.xml
View file @ c37968ae
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
<value> <value>
<list> <list>
<string>listbox_image</string> <string>listbox_image</string>
<string>listbox_title</string>
</list> </list>
</value> </value>
</item> </item>
......
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewMyServicesRender/listbox.xml
View file @ c37968ae
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<value> <value>
<list> <list>
<string>columns</string> <string>columns</string>
<string>default_params</string>
<string>editable_columns</string> <string>editable_columns</string>
<string>list_method</string> <string>list_method</string>
<string>search</string> <string>search</string>
...@@ -58,6 +59,14 @@ ...@@ -58,6 +59,14 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable_columns</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -70,6 +79,14 @@ ...@@ -70,6 +79,14 @@
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>search</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>select</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>selection_name</string> </key> <key> <string>selection_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -104,13 +121,28 @@ ...@@ -104,13 +121,28 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>default_params</string> </key>
<value>
<list>
<tuple>
<string>checked_permission</string>
<string>View</string>
</tuple>
<tuple>
<string>sort_on</string>
<string>((\'title\', ),)</string>
</tuple>
</list>
</value>
</item>
<item> <item>
<key> <string>editable_columns</string> </key> <key> <string>editable_columns</string> </key>
<value> <value>
<list> <list>
<tuple> <tuple>
<string>image</string> <string>title</string>
<string>image</string> <string>Title</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -131,7 +163,7 @@ ...@@ -131,7 +163,7 @@
</item> </item>
<item> <item>
<key> <string>search</string> </key> <key> <string>search</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>select</string> </key> <key> <string>select</string> </key>
......
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewMyServicesRender/listbox_title.xml 0 → 100644
View file @ c37968ae
<?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>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_title</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>css_class</string> </key>
<value> <string></string> </value>
</item>
<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>
<item>
<key> <string>title</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>nolabel</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>
<item>
<key> <string>title</string> </key>
<value> <string>Title</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[
python: "<h3 style=\'margin-bottom: 6px;\'>%s</h3><i class=\'hs-short-title\'>%s</i>" % (cell.getTitle(), cell.getShortTitle() if cell.getShortTitle() else "")
]]></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_jauks_theme/vifib_style/vifib.css.xml
View file @ c37968ae
...@@ -65,6 +65,7 @@ input{height:26px;}\n ...@@ -65,6 +65,7 @@ input{height:26px;}\n
/* textarea{height:77px;width:247px;} */\n /* textarea{height:77px;width:247px;} */\n
fieldset{border:none;}\n fieldset{border:none;}\n
a img{border : 0 none;cursor : pointer;}\n a img{border : 0 none;cursor : pointer;}\n
a {text-decoration: none}\n
\n \n
/**********************/\n /**********************/\n
/* Global Class */\n /* Global Class */\n
...@@ -91,7 +92,7 @@ a img{border : 0 none;cursor : pointer;}\n ...@@ -91,7 +92,7 @@ a img{border : 0 none;cursor : pointer;}\n
.sectionTitle {line-height:90px;}\n .sectionTitle {line-height:90px;}\n
.inline label {display: inline-block;width: 150px;float:left;}\n .inline label {display: inline-block;width: 150px;float:left;}\n
.inline div {display:inline;}\n .inline div {display:inline;}\n
.field {padding-bottom: 3px;}\n .field {padding-bottom: 7px;}\n
\n \n
\n \n
/**********************/\n /**********************/\n
...@@ -338,6 +339,14 @@ fieldset > .subfield > label { \n ...@@ -338,6 +339,14 @@ fieldset > .subfield > label { \n
text-decoration: none;\n text-decoration: none;\n
}\n }\n
\n \n
.hs-short-title{\n
margin-left:6px;\n
padding-bottom: 10px;\n
font-size:12px;\n
font-weight: normal;\n
display: inline-block;\n
}\n
\n
</tal:block> </tal:block>
]]></unicode> </value> ]]></unicode> </value>
......
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