Update nutups and js file into generated mix

json5/Nutups.json5

@@ -4,22 +4,22 @@
 {
     'PackageName': 'Nutups',
     'prefix': 'nut',
-    'MenuHeading': 'Network',
+    'MenuHeading': 'System',
     'MenuDescription': 'NutUPS configuration',
-    'MenuNavigation': '6000 6700',
+    'MenuNavigation': '4000 700',
     'firstPanel': 'STATUS',
     'signalEvent': 'smeserver-nutups-update',
     'html': [
         {
             'Name': 'Status',
             'route': 'STATUS',
-			'Group': 'class=inline-buttons',
+			'Group1': 'class=inline-buttons',
 			'Link1': {
 				'Type': 'Link',
 				'href': 'nutupsd?trt=CONFIG',
 				'title': 'Configure NutUPS'
 			},
-			'Endgroup': '',
+			'Endgroup1': '',
 			SubHeader1: 'Status of the controlled UPS ',
 			'Paragraph1': 'Descriptive paragraph',
 			'Input1': {
@@ -71,12 +71,13 @@
 
                 ]
             },
-            SubHeader3: 'if Net Client',
+			Group2: 'class=slaveups',
+            SubHeader3: 'if Net Server',
 			Input3: {
 				Name: 'SlaveUPS_Name',
 				Type: 'Text',
 				Label: 'SlaveUPS UPSNAME@IP',
-				Value: '")',
+				Value: '',
 			  },
 			Input4: {
 				Name: 'SlaveUPS_Password',
@@ -84,37 +85,65 @@
 				Label: 'SlaveUPS Password',
 				Value: '',
 			  },
+			Endgroup2: '',
+
+			Group3: 'class=masterups',
+            SubHeader4: 'if Net Master',
 			Input5: {
-				Name: 'UPS_Model',
+				Name: 'MasterUPS_Name',
 				Type: 'Text',
-				Label: 'UPS Model',
+				Label: 'MasterUPS UPSNAME@IP',
 				Value: '',
 			  },
 			Input6: {
+				Name: 'MasterUPS_Password',
+				Type: 'Password',
+				Label: 'MasterUPS Password',
+				Value: '',
+			  },
+			Endgroup3: '',
+			
+			Input7: {
+				Name: 'UPS_Model',
+				Type: 'Select',
+				Label: 'UPS Model',
+				Value: '',
+				Options: [],
+			  },
+			Input8: {
 				Name: 'UPS_Device',
 				Type: 'Text',
 				Label: 'UPS Device',
 				Value: '',
 			  },
-			SubHeader4: 'if genericups',
-			Input7: {
+			
+			Group4:'class=generics',
+			SubHeader5: 'if genericups',
+			Input9: {
 				Name: 'UPS_gen_Type',
 				Type: 'Text',
 				Label: 'UPS Generic Type',
 				Value: '',
 			  },
-			Input8: {
+			Input10: {
 				Name: 'UPS_gen_Mfr',
 				Type: 'Text',
 				Label: 'UPS Generic Manufacturer',
 				Value: '',
 			  },
-			Input9: {
+			Input11: {
 				Name: 'UPS_gen_Model',
 				Type: 'Text',
 				Label: 'UPS Generic Model',
 				Value: '',
 			  },
-			}          
+			'Input12': {
+				'Type': 'Submit',
+				'Value': 'Save',
+				'Name': 'Next',
+				'Label': null
+				},
+			Endgroup4:''
+			},
 	]
 }