supplemental-web / xymon: Add restart MBE to web interface.

  Tweaks to css for call log

2 files changed, 20 insertions, 16 deletions

diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 69507d4..3f25614 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
 pkgbase=xymon
 pkgname=('xymonserver' 'xymonclient')
 pkgver=4.3.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Xymon is a system for monitoring of hosts and networks"
 license="GPL"
 arch=('i686' 'x86_64')
@@ -138,7 +138,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312'
          '758cdd9f1ba5ae3e1b42e811172806f3'
          'ee608dcafc050d790e28647a670f6b60'
          'b2f98ac0df013332deedc1efae0a270d'
-         '9610356bd8c1f0b6d9f4a7a33b385e16'
+         '07c8312b7eb0dd943f80f81a81d6de2c'
          '526c169e020b570b5b02661a831aa4e6'
          '166279c006c3ef7bf0c21537cf89fc83'
          '80d9cfac86c6d96836e6f406e35e7cf5'
diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py
index 6967aa4..3171cb0 100644
--- a/abs/core/xymon/hbnotes.py
+++ b/abs/core/xymon/hbnotes.py
@@ -167,7 +167,7 @@ def create_dot_file():
 
     results=os.popen(cmd,'r')
     return frontonly,masterbackend,masterbacked_w_fe,slave_w_fe,slave,stand_alone
-    
+
 
 
 
@@ -205,7 +205,7 @@ def createdropdown(currenthostype):
     #This is for the d/l backup option
     dropdown+='''
 
-
+    </br>
     <input name="param2" type="radio"  value="Dbackup" />Download Backup: </>
     <select name="param7">\n\n </br>'''
 
@@ -216,18 +216,16 @@ def createdropdown(currenthostype):
     dropdown+='''
     </select>
 
-    <br>
+    </br>
+    </br>
     <input name="param2" type="radio" value="Optimize"  />Optimize Database<br />
     '''
+
     if currenthostype == "Master_backend":
-        dropdown+='<input name="param2" type="radio" value="ShutdownAll"  />Shutdown All Systems (except master backend)<br /> \n'
-    #dropdown+='''<input name="param2" type="radio"  value="UpdateAll" />Update All Systems </>           <select name="param5">
-                   #<option value="Myth_only">Myth only</option>
-                   #<option value="All"> Full System</option>
-           #</select>
-       #</br>
-       #</br>
-           #</br>'''
+        dropdown+='</br><input name="param2" type="radio" value="ShutdownAll"  />Shutdown All Systems (except master backend)<br /> \n'
+
+    #Add option to restart MBE
+    dropdown+='</br> <input name="param2" type="radio" value="RestartMBE"  />Restart MBE service<br /> \n'
 
     dropdown+='''    </br></br>\n'''
     return dropdown
@@ -403,24 +401,29 @@ function Do_it ()
 
 
        buttonform_bottom='''
+       </br>
         <input name="param2" type="radio"  value="Update" />Update System: </>
             <select name="param3">
                 <option value="Myth_only">Myth only</option>
                 <option value="All"> Full System</option>
             </select>
         </br>
-
+        </br>
         <input name="param2" type="radio"  value="Kill" />Restart Interface: </>
             <select name="param6">
                 <option value="killX">Full UI</option>
                 <option value="killmyth">MythFrontend</option>
             </select>
         </br>
-
+        </br>
         <input name="param2" type="radio"  value="Shutdown" />Shutdown System<br />
+        </br>
         <input name="param2" type="radio"  value="Reboot" />Reboot System<br />
+        </br>
         <input name="param2" type="radio"  value="WOL" />Wake on LAN<br />
+        </br>
         <input name="hiddenparam" type="hidden" value="
+        </br>
     '''
 
        oldurlform=''' "/>
@@ -441,6 +444,7 @@ function Do_it ()
 
        if currenthostype == "Master_backend" or currenthostype == "Standalone":
             mbeoptions=createdropdown(currenthostype)
+
        else:
             mbeoptions=''
        returnurl="/xymon/notes/"
@@ -525,7 +529,7 @@ def main(argv):
                            slave_w_fe,
                            slave,
                            stand_alone)
-    
+
 
 if __name__ == "__main__":
     main(sys.argv[1:])