slapos_ui_jio_ui_test: Simplify using macro

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt

@@ -16,63 +16,8 @@
 
 <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_front_page" />
 
-<tal:block define="menu_item python: 'Servers'; header menu_item">
-  <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item" />
-</tal:block>
-
-<tal:block tal:define="pagination_configuration python: {'header': '(0)', 'footer': 'No records'}">
-  <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/check_listbox_pagination_text" />
-</tal:block>
-
-<tal:block define="menu_action python: 'Add'">
-  <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_submenu_action" />
-</tal:block>
-
-<tal:block define="header python: 'New Computer'; ">
-  <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/assert_page_header" />
-</tal:block>
-
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//input[@id="title"]</td>
-  <td></td>
-</tr>
-<tr>
-  <td>type</td>
-  <td>//input[@id="title"]</td>
-  <td>TEST-SLAPOSJS-COMPUTER 0</td>
-</tr>
-
-<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
-
-<tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'New Computer created.'}">
-  <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/wait_for_notification" />
-</tal:block>
-
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//a[text()=" Click here to access your computer "]</td>
-  <td></td>
-</tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//textarea[@name="certificate"]</td>
-  <td></td>
-</tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//textarea[@name="key"]</td>
-  <td></td>
-</tr>
-<tr>
-  <td>click</td>
-  <td>//a[text()=" Click here to access your computer "]</td>
-  <td></td>
-</tr>
-
-<tal:block define="header python: 'Computer: TEST-SLAPOSJS-COMPUTER 0'; ">
-  <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/assert_page_header" />
+<tal:block define="document_title python: 'TEST-SLAPOSJS-COMPUTER 0';">
+  <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/create_simple_computer" />
 </tal:block>
 
 <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />

master/bt5/slapos_jio_ui_test/SkinTemplateItem/portal_skins/slapos_ui_test/Zuite_SlapOSCommonTemplate.zpt

@@ -740,4 +740,69 @@
     </tr>
   </tal:block>
 
+  <tal:block metal:define-macro="create_simple_computer">
+    <tr>
+      <td colspan="3"><p>Create Simple Computer</p></td>
+    </tr>
+
+    <tal:block define="menu_item python: 'Servers'; header menu_item">
+      <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item" />
+    </tal:block>
+
+    <tal:block tal:define="pagination_configuration python: {'header': '(0)', 'footer': 'No records'}">
+      <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/check_listbox_pagination_text" />
+    </tal:block>
+
+    <tal:block define="menu_action python: 'Add'">
+      <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_submenu_action" />
+    </tal:block>
+
+    <tal:block define="header python: 'New Computer'; ">
+      <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/assert_page_header" />
+    </tal:block>
+
+    <tr>
+      <td>waitForElementPresent</td>
+      <td>//input[@id="title"]</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>type</td>
+      <td>//input[@id="title"]</td>
+      <td tal:content="python: '%s' % document_title">TEST-SLAPOSJS-COMPUTER 0</td>
+    </tr>
+
+    <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
+
+    <tal:block tal:define="notification_configuration python: {'class': 'success',
+                                                           'text': 'New Computer created.'}">
+      <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/wait_for_notification" />
+    </tal:block>
+
+    <tr>
+      <td>waitForElementPresent</td>
+      <td>//a[text()=" Click here to access your computer "]</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>waitForElementPresent</td>
+      <td>//textarea[@name="certificate"]</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>waitForElementPresent</td>
+      <td>//textarea[@name="key"]</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>click</td>
+      <td>//a[text()=" Click here to access your computer "]</td>
+      <td></td>
+    </tr>
+
+    <tal:block define="header python: 'Computer: %s' % document_title; ">
+      <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/assert_page_header" />
+    </tal:block>
+  </tal:block>
+
 </tal:block>
\ No newline at end of file