diff --git a/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_getConnectionParameterList.xml b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_getConnectionParameterList.xml index b5ebedc126a998c4a72e664d128a3c1e883b4d7e..3de1911ac9340d5727623d883430828d93755b95 100644 --- a/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_getConnectionParameterList.xml +++ b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_getConnectionParameterList.xml @@ -59,14 +59,14 @@ for instance in context.getPredecessorValueList():\n break\n \n if found:\n - result = instance.SoftwareInstance_getConnectionParameterList()\n + result = instance.SoftwareInstance_getConnectionParameterList(type)\n \n return result\n </string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>*args, **kwargs</string> </value> + <value> <string>type=None, **kwargs</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb.xml b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb.xml index 98427f95a6f42a4f5c6b6926940c50b6ffca4a53..ff3eb860b820dc2e8cb09fce00075c93cc4050b9 100644 --- a/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb.xml +++ b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb.xml @@ -104,13 +104,13 @@ <string>your_ad</string> <string>my_url_string</string> <string>my_source_reference</string> - <string>info</string> <string>last_event_listbox</string> <string>your_status</string> <string>your_instance_xml</string> <string>my_update_button</string> <string>my_start_button</string> <string>my_stop_button</string> + <string>info</string> <string>your_connection_listbox</string> <string>your_monitoring_status</string> </list> diff --git a/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/info.xml b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/info.xml index fd081e825acb04aef7c0f5947efa11872daf3bca..8352a59f5d78e77ad74de73ceba5faa05d8c8194 100644 --- a/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/info.xml +++ b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb/info.xml @@ -233,7 +233,7 @@ </item> <item> <key> <string>extra</string> </key> - <value> <string>style=\'background:white; margin:6px; color:red\'</string> </value> + <value> <string>style=\'background-color: #E1FFF5; padding: 6px; color: #4F9073; border: 1px solid #D5E5FB; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); line-height: 25px; margin: 10px 0;\'</string> </value> </item> <item> <key> <string>height</string> </key> @@ -289,7 +289,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: "\\n".join([i.connection_value for i in here.HostingSubscription_getConnectionParameterList() if i.connection_key.endswith("_info")])</string> </value> + <value> <string>python: "\\n".join([i.connection_value for i in here.HostingSubscription_getConnectionParameterList(type=\'info\') if i.connection_key.endswith("_info")])</string> </value> </item> </dictionary> </pickle> @@ -302,7 +302,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: len(here.HostingSubscription_getConnectionParameterList())</string> </value> + <value> <string>python: len(here.HostingSubscription_getConnectionParameterList(type=\'info\'))</string> </value> </item> </dictionary> </pickle> diff --git a/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_getConnectionParameterList.xml b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_getConnectionParameterList.xml index 7defd7248b412a51772e44259e2b6b6830bc940a..c9d2413bd8d5f6844c1a324ee40fb1c30e505cbe 100644 --- a/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_getConnectionParameterList.xml +++ b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_getConnectionParameterList.xml @@ -62,16 +62,20 @@ if connection_dict is None:\n return return_list\n \n portal = context.getPortalObject()\n -for k, v in connection_dict.iteritems():\n +for k in sorted(connection_dict):\n + if type == \'info\' and not k.endswith(\'_info\'):\n + continue\n + elif not type and k.endswith(\'_info\'):\n + continue\n d = newTempDocument(portal, \'temp\')\n - d.edit(connection_key=k, connection_value=v)\n + d.edit(connection_key=k, connection_value=connection_dict[k])\n return_list.append(d)\n return return_list\n </string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>*args, **kwargs</string> </value> + <value> <string>type=None, **kwargs</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb.xml b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb.xml index c287a90590ea35f390e89c1901470a7ba6b69568..6bb03210b6d0141ce65939e83b7ea23d6b99509e 100644 --- a/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb.xml +++ b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb.xml @@ -103,6 +103,7 @@ <key> <string>normal bis</string> </key> <value> <list> + <string>info</string> <string>your_connection_listbox</string> <string>my_text_content</string> </list> diff --git a/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb/info.xml b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb/info.xml new file mode 100644 index 0000000000000000000000000000000000000000..b3a0b98260d71f0dbac529b26313f8c05b7bd7d6 --- /dev/null +++ b/master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb/info.xml @@ -0,0 +1,310 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="TextAreaField" module="Products.Formulator.StandardFields"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>info</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> + <item> + <key> <string>line_too_long</string> </key> + <value> <string>A line was too long.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + <item> + <key> <string>too_long</string> </key> + <value> <string>You entered too many characters.</string> </value> + </item> + <item> + <key> <string>too_many_lines</string> </key> + <value> <string>You entered too many lines.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <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>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string>hosting_information</string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string>style=\'background-color: #E1FFF5; padding: 6px; color: #4F9073; border: 1px solid #D5E5FB; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); line-height: 25px; margin: 10px 0;\'</string> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <int>5</int> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Information</string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <int>40</int> </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>python: "\\n".join([i.connection_value for i in here.SoftwareInstance_getConnectionParameterList(type=\'info\') if i.connection_key.endswith("_info")])</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: len(here.SoftwareInstance_getConnectionParameterList(type=\'info\'))</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData>