Fix URL stuff

extension.js

@@ -39,7 +39,7 @@ const PopupMenu = imports.ui.popupMenu;
 const Gettext = imports.gettext.domain(GETTEXT_DOMAIN);
 const _ = Gettext.gettext;
 
-const { GObject, St, Clutter, Gio, GLib } = imports.gi;
+const { GObject, St, Clutter, Gio, GLib, Pango } = imports.gi;
 
 const SETTINGS_SCHEMA = "org.gnome.shell.extensions.monito";
 const SETTINGS_SCHEMA_ACCOUNT = "org.gnome.shell.extensions.monito.account";
@@ -341,7 +341,7 @@ class Indicator extends PanelMenu.Button {
                                       style: ( col.style ? col.style : '' ) } );
             _child.original_text = text.toString();
             _child.connect('button-press-event', Lang.bind(this, this._onExpandLabel ) );
-            _child.connect('notify::hover', Lang.bind(this, this._onEnterEvent ) );
+//            _child.connect('notify::hover', Lang.bind(this, this._onEnterEvent ) );
         }
         else if ( col.special == 'actions' )
         {
@@ -594,10 +594,10 @@ class Indicator extends PanelMenu.Button {
         
     }
 
-    _onEnterEvent ( e )
-    {
-        log ( "Monito: enter");
-    }
+//    _onEnterEvent ( e )
+//    {
+//        log ( "Monito: enter");
+//    }
 
     _onOpenInBrowser ( e )
     {
@@ -616,24 +616,20 @@ class Indicator extends PanelMenu.Button {
             proc.wait_async(cancellable, (proc, result) => {
                 try {
                     proc.wait_finish(result);
-
-                    if (proc.get_successful()) {
-                        log ( 'Monito: the process succeeded');
-                    } else {
+                    if ( ! proc.get_successful()) {
                         log ( 'Monito: the process failed' );
                     }
-                    this.stopChildSpin ( e.service.button );
-
                 } catch (e) {
                     logError(e);
                 } finally {
                     loop.quit();
                 }
             });
-            log ( 'Monito: ' + proc );
         } catch ( e ) {
-            log ( 'Monito: ' + e );
+            log ( 'Monito err: ' + e.message );
+            Main.notifyError ( _('Unable to execute command: %s').format ( e.message ) );
         }
+        this.stopChildSpin ( e.service.button );
     }
 
     _createButton ( sizeName, icon, data, callback ) {

prefs.js

@@ -24,6 +24,7 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const Gdk = imports.gi.Gdk;
+const GObject = imports.gi.GObject;
 
 // It's common practice to keep GNOME API and JS imports in separate blocks
 const Lang = imports.lang;
@@ -245,9 +246,12 @@ function createAccountWidgets ( isActive )
     this._accountsWidget = new Gtk.Notebook( { } );
     this._accountsWidgetContainer.pack_start(this._accountsWidget, true, true, 0);
 
-    for ( var _tab of [ 'Settings', 'Colors', 'Filters', 'Replacements' ] )
+    for ( var _tab of [ 'Settings', 'Columns', 'Colors', 'Filters', 'Replacements' ] )
     {
-        this.createPrefWidgets ( _accountsWidget, _tab, isActive );
+        if ( _tab != 'Columns' )
+            this.createPrefWidgets ( _accountsWidget, _tab, isActive );
+        else
+            this.createColumnsPrefTab ( _accountsWidget, _tab, isActive );
     }
 
     // Settings
@@ -324,6 +328,56 @@ function createPrefWidgets ( noteBook, type, isActive )
     }
 }
 
+
+function createColumnsPrefTab ( noteBook, type, isActive )
+{
+    let grid = new Gtk.Grid ( {
+	halign: Gtk.Align.FILL,
+	margin: 18,
+        column_spacing: 12,
+        row_spacing: 12,
+        visible: true,
+	column_homogeneous: false,
+    });
+    noteBook.append_page ( grid, new Gtk.Label ( { label: _(type), } ) );
+
+    let _store = new Gtk.TreeStore();
+    _store.set_column_types([GObject.TYPE_STRING, GObject.TYPE_INT]);
+    _store.filter_new(null);	
+
+    let _treeView = new Gtk.TreeView ( { model: _store,
+                                         headers_visible: true,
+                                         reorderable: true,
+                                         hexpand: true,
+                                         vexpand: true });
+
+    let columnNumbers = new Gtk.TreeViewColumn ( { title: _("Column") } );
+    let rendererNumbers = new Gtk.CellRendererText ( { editable: true } );
+    columnNumbers.pack_start(rendererNumbers, true);
+    columnNumbers.add_attribute(rendererNumbers, 'text', 0);
+    _treeView.append_column(columnNumbers);
+
+    let _colSize = new Gtk.TreeViewColumn ( { title: _("Size") } );
+    let _colRenderer = new Gtk.CellRendererText ( { editable: true } );
+    _colSize.pack_start(_colRenderer, true);
+    _colSize.add_attribute(_colRenderer, 'text', 1);
+    _treeView.append_column(_colSize);
+
+    let _item = _store.append(null);
+    _store.set_value(_item, 0, 'prout' );
+    _store.set_value(_item, 1, 2 );
+
+    _item = _store.append(null);
+    _store.set_value(_item, 0, 'bar' );
+    _store.set_value(_item, 1, 1 );
+
+//    _treeView.connect('row-activated', this._editPath.bind(this));
+    
+    grid.attach ( _treeView, 0, 1, 1, 1 );
+
+}
+
+
 function activateAccountRow ( ) {
 
     if ( this._accountsWidget )

servers/icinga.js

@@ -106,4 +106,11 @@ class Icinga extends GenericServer {
         }
     }
     
+    getUrlForService ( service )
+    {
+        return '%s/?type=2&host=%s&service=%s'.format ( this._settings.get_string ( 'urlcgi' ).replace ( /status.cgi/, 'extinfo.cgi' ),
+                                                        encodeURI ( service.real_host_name ),
+                                                        encodeURI ( service.service_display_name ) );
+    }
+
 }

servers/icinga2.js

@@ -82,7 +82,11 @@ class Icinga2 extends GenericServer {
 
     getUrlForService ( service )
     {
-        return this._settings.get_string ( 'url' ) ; // + monitoring/service/show?host=XXX&service=XXX
-    }   
+        log ( service );
+        return '%s/monitoring/service/show?host=%s&service=%s'.format ( this._settings.get_string ( 'url' ),
+                                                                        service.host_name,
+                                                                        service.service_display_name );
+    }
+
 }
 

servers/icinga2api.js

@@ -102,6 +102,7 @@ class Icinga2API extends GenericServer {
 //                    log ( JSON.stringify(entry) );
                     this.status.service_status.push ( {
                         status: _statuses[entry.attrs.state],
+                        real_host_name: entry.attrs.host_name,
                         host_name: entry.attrs.host_name,
                         service_display_name: entry.attrs.display_name,
                         has_been_acknowledged: parseInt(entry.attrs.acknowledgement),
@@ -124,8 +125,9 @@ class Icinga2API extends GenericServer {
 
     getUrlForService ( service )
     {
-        return this._settings.get_string ( 'url' ) ;
-    }   
-
+        return '%s/monitoring/service/show?host=%s&service=%s'.format ( this._settings.get_string ( 'url' ),
+                                                                        encodeURI ( service.real_host_name ),
+                                                                        encodeURI ( service.service_display_name ) );
+    }
 }
 

stylesheet.css

@@ -109,5 +109,3 @@
 .small-button {
     padding: 3px !important;
 }
-
-