Revert "WIP erp5_web_renderjs_ui: try to make the panel configurable"

This reverts commit ca0fe7b8.

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css

@@ -466,7 +466,7 @@ img {
 /**********************************************
 * Gadget: panel
 **********************************************/
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] {
+div[data-gadget-scope='panel'] {
   background-color: #393939;
   color: #FFFFFF;
   width: 180pt;
@@ -482,29 +482,29 @@ div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] {
   transform: translate3d(0, 0, 0);
 }
 @media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 85em) {
-  div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] {
+  div[data-gadget-scope='panel'] {
     box-shadow: 5px 0 5px rgba(0, 0, 0, 0.15);
   }
 }
 @media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 85em) {
-  div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] {
+  div[data-gadget-scope='panel'] {
     left: -186pt;
   }
-  div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"].visible {
+  div[data-gadget-scope='panel'].visible {
     transform: translate3d(186pt, 0, 0);
   }
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-role="header"] {
+div[data-gadget-scope='panel'] div[data-role="header"] {
   display: flex;
   justify-content: flex-start;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-role="header"] .panel_img {
+div[data-gadget-scope='panel'] div[data-role="header"] .panel_img {
   text-align: center;
   flex: 1;
   height: 30pt;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-role="header"] button,
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-role="header"] a {
+div[data-gadget-scope='panel'] div[data-role="header"] button,
+div[data-gadget-scope='panel'] div[data-role="header"] a {
   width: 3em;
   overflow: hidden;
   text-indent: -9999px;
@@ -514,49 +514,49 @@ div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[d
   line-height: 30pt;
   color: #FFFFFF;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-role="header"] button::before,
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-role="header"] a::before {
+div[data-gadget-scope='panel'] div[data-role="header"] button::before,
+div[data-gadget-scope='panel'] div[data-role="header"] a::before {
   float: left;
   text-indent: 0;
   margin-left: 12pt;
 }
 @media not screen and (max-width: 85em) {
-  div[data-role='page']:not(.desktop-panel-hidden) div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-role="header"] button[data-i18n="Close"],
-  div[data-role='page']:not(.desktop-panel-hidden) div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-role="header"] a[data-i18n="Close"] {
+  div[data-role='page']:not(.desktop-panel-hidden) div[data-gadget-scope='panel'] div[data-role="header"] button[data-i18n="Close"],
+  div[data-role='page']:not(.desktop-panel-hidden) div[data-gadget-scope='panel'] div[data-role="header"] a[data-i18n="Close"] {
     display: none;
   }
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-gadget-scope='erp5_searchfield'] {
+div[data-gadget-scope='panel'] div[data-gadget-scope='erp5_searchfield'] {
   padding: 3pt 12pt;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-gadget-scope='erp5_searchfield'] button {
+div[data-gadget-scope='panel'] div[data-gadget-scope='erp5_searchfield'] button {
   color: #FFFFFF;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-gadget-scope='erp5_searchfield'] input[type="search"] {
+div[data-gadget-scope='panel'] div[data-gadget-scope='erp5_searchfield'] input[type="search"] {
   color: #FFFFFF !important;
   background-color: #767676 !important;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] img {
+div[data-gadget-scope='panel'] img {
   text-align: left;
   height: 100%;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-gadget-scope="erp5_checkbox"] {
+div[data-gadget-scope='panel'] div[data-gadget-scope="erp5_checkbox"] {
   padding: 3pt;
   padding-left: 12pt;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-gadget-scope="erp5_checkbox"] label,
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-gadget-scope="erp5_checkbox"] span,
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-gadget-scope="erp5_checkbox"] input {
+div[data-gadget-scope='panel'] div[data-gadget-scope="erp5_checkbox"] label,
+div[data-gadget-scope='panel'] div[data-gadget-scope="erp5_checkbox"] span,
+div[data-gadget-scope='panel'] div[data-gadget-scope="erp5_checkbox"] input {
   cursor: pointer;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] div[data-gadget-scope="erp5_checkbox"] span {
+div[data-gadget-scope='panel'] div[data-gadget-scope="erp5_checkbox"] span {
   width: 24pt;
   display: inline-block;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] ul:first-child {
+div[data-gadget-scope='panel'] ul:first-child {
   margin-top: 30pt;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] ul li a {
+div[data-gadget-scope='panel'] ul li a {
   color: #FFFFFF;
   display: block;
   padding: 1.5pt;
@@ -565,29 +565,29 @@ div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] ul li
   overflow: hidden;
   white-space: nowrap;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] ul li a.active {
+div[data-gadget-scope='panel'] ul li a.active {
   color: #1F1F1F;
   background-color: #FFFFFF;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] ul li a:hover,
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] ul li a:active {
+div[data-gadget-scope='panel'] ul li a:hover,
+div[data-gadget-scope='panel'] ul li a:active {
   color: #FFFFFF;
   background-color: #1F1F1F;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] ul li a::before {
+div[data-gadget-scope='panel'] ul li a::before {
   width: 24pt;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] dl {
+div[data-gadget-scope='panel'] dl {
   background-color: #767676;
   color: #1F1F1F;
   transform-origin: 50% 0;
   transform: scaleY(0);
   transition: transform 0.2s ease-out;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] dl:not(:empty) {
+div[data-gadget-scope='panel'] dl:not(:empty) {
   transform: scaleY(1);
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] dl dt {
+div[data-gadget-scope='panel'] dl dt {
   padding: 1.5pt;
   padding-left: 12pt;
   text-overflow: ellipsis;
@@ -595,10 +595,10 @@ div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] dl dt
   white-space: nowrap;
   text-transform: uppercase;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] dl dt::before {
+div[data-gadget-scope='panel'] dl dt::before {
   width: 24pt;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] dl dd a {
+div[data-gadget-scope='panel'] dl dd a {
   color: #FFFFFF;
   display: block;
   padding: 1.5pt;
@@ -608,16 +608,16 @@ div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] dl dd
   white-space: nowrap;
   padding-left: 36pt;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] dl dd a.active {
+div[data-gadget-scope='panel'] dl dd a.active {
   color: #1F1F1F;
   background-color: #FFFFFF;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] dl dd a:hover,
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] dl dd a:active {
+div[data-gadget-scope='panel'] dl dd a:hover,
+div[data-gadget-scope='panel'] dl dd a:active {
   color: #1F1F1F;
   background-color: #FFFFFF;
 }
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] dl dd a::before {
+div[data-gadget-scope='panel'] dl dd a::before {
   width: 24pt;
 }
 /**********************************************

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml

@@ -75,9 +75,7 @@
         </item>
         <item>
             <key> <string>content_type</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string>text/css</string> </value>
         </item>
         <item>
             <key> <string>default_reference</string> </key>
@@ -246,7 +244,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>990.6665.21066.20684</string> </value>
+                      <value> <string>986.53918.32237.3225</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -264,7 +262,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1613669436.36</float>
+                              <float>1600941690.9</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.html

@@ -31,6 +31,32 @@
 
   </head>
   <body>
-    <div data-gadget-url="gadget_panel.html" data-gadget-scope="subpanel"></div>
+    <div>
+      <div data-role="header">
+        <div class="ui-btn-left">
+          <div class="ui-controlgroup-controls">
+            <button data-i18n="Close" class="ui-btn-icon-notext ui-icon-delete">Close</button>
+          </div>
+        </div>
+        <div class="panel_img">
+        <img alt="ERP5" src="gadget_erp5_panel.png"/>
+        </div>
+      </div>
+      <div>
+
+        <form>
+          <button type="submit" class="ui-icon-action ui-btn-icon-right ui-screen-hidden">Submit</button>
+          <div data-gadget-url="gadget_erp5_searchfield.html"
+               data-gadget-scope="erp5_searchfield"
+               data-gadget-sandbox="public"></div>
+        </form>
+
+        <ul></ul>
+        <div data-gadget-url="gadget_erp5_field_multicheckbox.html"
+             data-gadget-scope="erp5_checkbox"
+             data-gadget-sandbox="public"></div>
+        <dl></dl>
+      </div>
+    </div>
   </body>
 </html>
\ No newline at end of file

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml

@@ -238,7 +238,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>990.6759.2839.30344</string> </value>
+                      <value> <string>989.49479.12222.40430</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -256,7 +256,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1613666958.38</float>
+                              <float>1612876311.33</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml

@@ -234,7 +234,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>990.26894.15626.38126</string> </value>
+                      <value> <string>989.59257.5605.14267</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -252,7 +252,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1614615293.14</float>
+                              <float>1612884079.54</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_panel_html.html

-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <meta name="viewport" content="width=device-width" />
-    <title>Panel</title>
-    <link rel="http://www.renderjs.org/rel/interface" href="interface_panel.html">
-
-    <!-- renderjs -->
-    <script src="rsvp.js" type="text/javascript"></script>
-    <script src="renderjs.js" type="text/javascript"></script>
-    <script src="gadget_global.js" type="text/javascript"></script>
-
-    <!-- custom script -->
-    <script src="gadget_panel.js" type="text/javascript"></script>
-
-  </head>
-  <body>
-    <div>
-      <div data-role="header">
-        <div class="ui-btn-left">
-          <div class="ui-controlgroup-controls">
-            <button data-i18n="Close" class="ui-btn-icon-notext ui-icon-delete">Close</button>
-          </div>
-        </div>
-        <div class="panel_img">
-        <img alt="ERP5" src="gadget_erp5_panel.png"/>
-        </div>
-      </div>
-      <div>
-
-        <form>
-          <button type="submit" class="ui-icon-action ui-btn-icon-right ui-screen-hidden">Submit</button>
-          <div data-gadget-url="gadget_erp5_searchfield.html"
-               data-gadget-scope="erp5_searchfield"
-               data-gadget-sandbox="public"></div>
-        </form>
-
-        <ul></ul>
-        <div data-gadget-url="gadget_erp5_field_multicheckbox.html"
-             data-gadget-scope="erp5_checkbox"
-             data-gadget-sandbox="public"></div>
-        <dl></dl>
-      </div>
-    </div>
-  </body>
-</html>
\ No newline at end of file

bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSection_getPrecacheManifest.py

@@ -110,8 +110,6 @@ url_list = [
   'gadget_erp5_panel.html',
   'gadget_erp5_panel.js',
   'gadget_erp5_panel.png',
-  'gadget_panel.html',
-  'gadget_panel.js',
   'gadget_erp5_pt_embedded_form_render.html',
   'gadget_erp5_pt_embedded_form_render.js',
   'gadget_erp5_pt_form_dialog.html',

bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt

@@ -590,7 +590,7 @@ img {
 /**********************************************
 * Gadget: panel
 **********************************************/
-div[data-gadget-scope='panel'] > div[data-gadget-url$="gadget_panel.html"] {
+div[data-gadget-scope='panel'] {
 
   background-color: @panelbackgroundcolor;
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_interface_validator_zuite/testERP5Interface.zpt

@@ -13,7 +13,7 @@
 <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
 
 <tal:block tal:define="check_configuration python: {'precache_reference': '../renderjs_runner/WebSection_getPrecacheManifest',
-                                                    'gadget_count': 73}">
+                                                    'gadget_count': 72}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUiInterface/macros/run_app_interface_check" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test_core/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test_core/Zuite_CommonTemplateForRenderjsUi.zpt

@@ -1740,7 +1740,7 @@
     </tr>
     <tr>
       <td>waitForElementPresent</td>
-      <td>//div[@data-gadget-scope='panel']/div[contains(@class, 'visible')]</td>
+      <td>//div[@data-gadget-scope='panel' and contains(@class, 'visible')]</td>
       <td></td>
     </tr>
     <tr>