Skip to content

S
slapos.core
Commit b6f47e51 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

Improve instance/hosting subscription display. 

Show more informations (url, software type).
Show connection parameters on hosting subscription.
Hide useless informations.
parent aab87e2e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1958 additions and 19 deletions
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/Base_getNonEditableAbsoluteUrl.xml 0 → 100644
View file @ b6f47e51
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<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_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<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>_body</string> </key>
<value> <string>return "%s?editable_mode:int=0" % context.absolute_url()\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>**kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getNonEditableAbsoluteUrl</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_getConnectionParameterList.xml 0 → 100644
View file @ b6f47e51
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<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_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<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>_body</string> </key>
<value> <string>title = context.getTitle()\n
result = []\n
found = False\n
for instance in context.getPredecessorValueList():\n
if (instance.getTitle() == title) and (instance.getSlapState() != \'destroy_requested\'):\n
found = True\n
break\n
\n
if found:\n
result = instance.SoftwareInstance_getConnectionParameterList()\n
\n
return result\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kwargs</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>HostingSubscription_getConnectionParameterList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb.xml
View file @ b6f47e51
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>listbox</string>
<string>my_destroy_button</string> <string>my_destroy_button</string>
</list> </list>
</value> </value>
...@@ -82,10 +83,7 @@ ...@@ -82,10 +83,7 @@
<item> <item>
<key> <string>center</string> </key> <key> <string>center</string> </key>
<value> <value>
<list> <list/>
<string>your_instance_xml</string>
<string>my_update_button</string>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -102,19 +100,22 @@ ...@@ -102,19 +100,22 @@
<value> <value>
<list> <list>
<string>my_title</string> <string>my_title</string>
<string>listbox</string> <string>my_root_software_release_url</string>
<string>my_source_reference</string>
<string>last_event_listbox</string> <string>last_event_listbox</string>
<string>my_translated_slap_state_title</string> <string>my_translated_slap_state_title</string>
<string>your_instance_xml</string>
<string>my_update_button</string>
<string>my_start_button</string>
<string>my_stop_button</string>
<string>your_connection_listbox</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>right</string> </key> <key> <string>right</string> </key>
<value> <value>
<list> <list/>
<string>my_start_button</string>
<string>my_stop_button</string>
</list>
</value> </value>
</item> </item>
</dictionary> </dictionary>
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/listbox.xml
View file @ b6f47e51
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<string>select</string> <string>select</string>
<string>selection_name</string> <string>selection_name</string>
<string>title</string> <string>title</string>
<string>url_columns</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -153,6 +154,21 @@ ...@@ -153,6 +154,21 @@
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>My Software Instances</string> </value> <value> <string>My Software Instances</string> </value>
</item> </item>
<item>
<key> <string>url_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Base_getNonEditableAbsoluteUrl</string>
</tuple>
<tuple>
<string>status</string>
<string>Base_getNonEditableAbsoluteUrl</string>
</tuple>
</list>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/my_destroy_button.xml
View file @ b6f47e51
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string>nolabel cancel widthAuto</string> </value> <value> <string>alignr nolabel cancel widthAuto</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/my_start_button.xml
View file @ b6f47e51
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string>nolabel validate widthAuto</string> </value> <value> <string>alignr nolabel validate widthAuto</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getSlapState() != \'destroy_requested\'</string> </value> <value> <string>python: here.getSlapState() == \'stop_requested\'</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/my_stop_button.xml
View file @ b6f47e51
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string>nolabel cancel widthAuto</string> </value> <value> <string>alignr nolabel cancel widthAuto</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getSlapState() != \'destroy_requested\'</string> </value> <value> <string>python: here.getSlapState() == \'start_requested\'</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/my_update_button.xml
View file @ b6f47e51
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string>nolabel validate</string> </value> <value> <string>alignr nolabel validate</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb.xml
View file @ b6f47e51
...@@ -90,9 +90,11 @@ ...@@ -90,9 +90,11 @@
<string>my_section_title</string> <string>my_section_title</string>
<string>my_reference</string> <string>my_reference</string>
<string>my_title</string> <string>my_title</string>
<string>your_status</string>
<string>your_new_title</string> <string>your_new_title</string>
<string>my_update_button</string> <string>my_update_button</string>
<string>my_root_software_release_url</string>
<string>my_source_reference</string>
<string>your_status</string>
</list> </list>
</value> </value>
</item> </item>
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb/my_title.xml
View file @ b6f47e51
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<list> <list>
<string>css_class</string> <string>css_class</string>
<string>editable</string> <string>editable</string>
<string>enabled</string>
<string>title</string> <string>title</string>
</list> </list>
</value> </value>
...@@ -81,6 +82,10 @@ ...@@ -81,6 +82,10 @@
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value> <value> <string>my_string_field</string> </value>
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb/my_update_button.xml
View file @ b6f47e51
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string>nolabel validate</string> </value> <value> <string>nolabel validate alignr</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb/your_new_title.xml
View file @ b6f47e51
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<list> <list>
<string>css_class</string> <string>css_class</string>
<string>default</string> <string>default</string>
<string>display_width</string>
<string>title</string> <string>title</string>
</list> </list>
</value> </value>
...@@ -95,6 +96,10 @@ ...@@ -95,6 +96,10 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>display_width</string> </key>
<value> <int>30</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value> <value> <string>my_string_field</string> </value>
...@@ -109,7 +114,7 @@ ...@@ -109,7 +114,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>New Name</string> </value> <value> <string>Name</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
master/bt5/vifib_web/bt/revision
View file @ b6f47e51
382 383
\ 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