slapos_monitoring: minor changes

master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_appcache.xml

@@ -107,7 +107,7 @@
             <value> <string encoding="cdata"><![CDATA[
 
 CACHE MANIFEST\n
-# generated on Fri, 30 Mars 2016 11:45:33 +0000\n
+# generated on Fri, 11 April 2016 11:45:33 +0000\n
 # XXX + fonts\n
 # images/ajax-loader.gif\n
 CACHE:\n
@@ -326,7 +326,7 @@ NETWORK:\n
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>950.11734.46994.47240</string> </value>
+                <value> <string>950.28768.11607.28996</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -344,7 +344,7 @@ NETWORK:\n
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1459356896.12</float>
+                        <float>1460450834.81</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_header_js.js

@@ -135,9 +135,7 @@
           ['edit_url', 'Edit', 'pencil'],
           ['add_url', 'Add', 'plus'],
           ['new_url', 'New', 'plus'],
-          ['refresh_url', 'Refresh', 'refresh'],
-          ['display_grid', 'Change View', 'grid'],
-          ['display_list', 'Change View', 'bullets']
+          ['refresh_url', 'Refresh', 'refresh']
         ],
         possible_right_button_list = [
           ['save_action', 'Save', 'check', 'submit'],

master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_header_js.xml

@@ -235,7 +235,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>948.30482.37472.6331</string> </value>
+                <value> <string>950.28768.11607.28996</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -253,7 +253,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1452873280.01</float>
+                        <float>1460450584.75</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_overview_js.html

@@ -14,21 +14,6 @@
       return gadget.getDeclaredGadget("listview")
         .push(function (listbox_gadget) {
           gadget.property_dict.listview = listbox_gadget;
-          return gadget.getSetting('monitoring_display_filter');
-        })
-        .push(function (display_filter) {
-          gadget.property_dict.display_filter = display_filter || '';
-        });
-    })
-    .ready(function (gadget) {
-      return gadget.getSetting('jio_storage_description')
-        .push(function (jio_storage) {
-          if (! jio_storage) {
-            return gadget.redirect({
-              page: 'settings_configurator'
-            });
-          }
-          gadget.property_dict.listview_data_url = jio_storage.sub_storage.sub_storage.url;
         });
     })
     .declareMethod('render', function (options) {
@@ -45,7 +30,6 @@
             title: 'Title'
           },
           data_id: 'monitor.global',
-          data_url: gadget.property_dict.listview_data_url,
           search_column_list: [
             {select: 'status', title: 'Status'},
             {select: 'hosting-title', title: 'Date'}

master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_overview_js.xml

@@ -239,7 +239,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>949.23937.2972.5563</string> </value>
+                <value> <string>950.28768.11607.28996</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -257,7 +257,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1458226729.62</float>
+                        <float>1460450670.49</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_status_list_js.html

@@ -71,11 +71,6 @@
           }
         };
 
-      if (gadget.property_dict.display_option == 'list') {
-        header.display_grid = '#page=main&display=grid';
-      } else {
-        header.display_list = '#page=main&display=list';
-      }
       return gadget.updateHeader(header)
         .push(function () {
           if (options.opml_url) {

master/bt5/slapos_monitoring/PathTemplateItem/web_page_module/gadget_monitoring_status_list_js.xml

@@ -239,7 +239,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>949.58584.63587.19677</string> </value>
+                <value> <string>950.28768.11607.28996</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -257,7 +257,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1458314108.86</float>
+                        <float>1460450783.19</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

master/bt5/slapos_monitoring/PathTemplateItem/web_site_module/monitoring_render_js/hateoas.xml

@@ -261,11 +261,11 @@
         </item>
         <item>
             <key> <string>skin_selection_name</string> </key>
-            <value> <string>HalRestricted</string> </value>
+            <value> <string>Hal</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Restricted Hateoas</string> </value>
+            <value> <string>Hateoas</string> </value>
         </item>
         <item>
             <key> <string>view_action_category</string> </key>
@@ -434,7 +434,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>949.6675.61849.23210</string> </value>
+                <value> <string>950.29945.27881.11383</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -452,7 +452,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1459762739.09</float>
+                        <float>1460450799.56</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

master/bt5/slapos_monitoring/bt/template_keep_last_workflow_history_only_path_list

 web_page_module/gadget_monitoring_*
 web_site_module/monitoring_render_js
-web_site_module/monitoring_render_js/**
+web_site_module/monitoring_render_js/hateoas
 web_page_module/gadget_erp5_graph_*
 web_page_module/jio_dev_rssfeed_storage_js
 web_page_module/chart_min_js

master/bt5/slapos_monitoring/bt/template_keep_workflow_path_list

 web_page_module/gadget_monitoring_*
 web_site_module/monitoring_render_js
-web_site_module/monitoring_render_js/**
+web_site_module/monitoring_render_js/hateoas
 web_page_module/gadget_erp5_graph_*
 web_page_module/jio_dev_rssfeed_storage_js
 web_page_module/chart_min_js

master/bt5/slapos_monitoring/bt/template_path_list

@@ -7,4 +7,4 @@ web_page_module/jsen_json_validator_js
 web_page_module/magnific-popup.css
 web_page_module/rjs_dygraph_js
 web_site_module/monitoring_render_js
-web_site_module/monitoring_render_js/**
+web_site_module/monitoring_render_js/hateoas
\ No newline at end of file