]> git.proxmox.com Git - pve-manager.git/commitdiff
use TimeView and TimeEdit from widget toolkit
authorDominik Csapak <d.csapak@proxmox.com>
Mon, 15 Jan 2018 14:17:53 +0000 (15:17 +0100)
committerDominik Csapak <d.csapak@proxmox.com>
Thu, 25 Jan 2018 12:36:37 +0000 (13:36 +0100)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Reviewed-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
www/manager6/Makefile
www/manager6/node/Config.js
www/manager6/node/TimeEdit.js [deleted file]
www/manager6/node/TimeView.js [deleted file]

index f9b6deb4675786f4b1d78b6bc5b75c5af991d936..da01f71cc2fb318f2d4fc14dee13c71f119a0791 100644 (file)
@@ -120,8 +120,6 @@ JSSRC=                                                      \
        node/Disks.js                                   \
        node/DNSEdit.js                                 \
        node/DNSView.js                                 \
-       node/TimeView.js                                \
-       node/TimeEdit.js                                \
        node/StatusView.js                              \
        node/Summary.js                                 \
        node/ServiceView.js                             \
index 1b1cc8018a715d2677cfbd7403de514b12989c2a..5ead4878ea97a2b97793736a658fc12acb86e4e3 100644 (file)
@@ -178,7 +178,8 @@ Ext.define('PVE.node.Config', {
                    title: gettext('Time'),
                    itemId: 'time',
                    groups: ['services'],
-                   xtype: 'pveNodeTimeView',
+                   nodename: nodename,
+                   xtype: 'proxmoxNodeTimeView',
                    iconCls: 'fa fa-clock-o'
                });
        }
diff --git a/www/manager6/node/TimeEdit.js b/www/manager6/node/TimeEdit.js
deleted file mode 100644 (file)
index 62d3c21..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-Ext.define('PVE.node.TimeEdit', {
-    extend: 'PVE.window.Edit',
-    alias: ['widget.pveNodeTimeEdit'],
-
-    initComponent : function() {
-       var me = this;
-
-       var nodename = me.pveSelNode.data.node;
-       if (!nodename) {
-           throw "no node name specified";
-       }
-
-       Ext.applyIf(me, {
-           subject: gettext('Time zone'),
-           url: "/api2/extjs/nodes/" + nodename + "/time",
-           fieldDefaults: {
-               labelWidth: 70
-            },
-           width: 400,
-           items: {
-               xtype: 'combo',
-               fieldLabel: gettext('Time zone'),
-               name: 'timezone',
-               queryMode: 'local',
-               store: Ext.create('PVE.data.TimezoneStore'),
-               valueField: 'zone',
-               displayField: 'zone',
-               triggerAction: 'all',
-               forceSelection: true,
-               editable: false,
-               allowBlank: false
-           }
-       });
-
-       me.callParent();
-
-       me.load();
-    }
-});
diff --git a/www/manager6/node/TimeView.js b/www/manager6/node/TimeView.js
deleted file mode 100644 (file)
index 20c8310..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-Ext.define('PVE.node.TimeView', {
-    extend: 'PVE.grid.ObjectGrid',
-    alias: ['widget.pveNodeTimeView'],
-
-    initComponent : function() {
-       var me = this;
-
-       var nodename = me.pveSelNode.data.node;
-       if (!nodename) {
-           throw "no node name specified";
-       }
-
-       var tzoffset = (new Date()).getTimezoneOffset()*60000;
-       var renderlocaltime = function(value) {
-           var servertime = new Date((value * 1000) + tzoffset);
-           return Ext.Date.format(servertime, 'Y-m-d H:i:s');
-       };
-
-       var run_editor = function() {
-           var win = Ext.create('PVE.node.TimeEdit', {
-               pveSelNode: me.pveSelNode
-           });
-           win.show();
-       };
-
-       Ext.apply(me, {
-           url: "/api2/json/nodes/" + nodename + "/time",
-           cwidth1: 150,
-           interval: 1000,
-           rows: {
-               timezone: { 
-                   header: gettext('Time zone'), 
-                   required: true
-               },
-               localtime: { 
-                   header: gettext('Server time'), 
-                   required: true, 
-                   renderer: renderlocaltime 
-               }
-           },
-           tbar: [ 
-               {
-                   text: gettext("Edit"),
-                   handler: run_editor
-               }
-           ],
-           listeners: {
-               itemdblclick: run_editor
-           }
-       });
-
-       me.callParent();
-
-       me.on('activate', me.rstore.startUpdate);
-       me.on('destroy', me.rstore.stopUpdate); 
-    }
-});