Changeset 12435 for trunk/sources/HeuristicLab.Services.WebApp/3.3

Timestamp:

06/12/15 14:59:54 (9 years ago)

Author:

dglaser

Message:

#2394: Improved PluginManager and updated hive status monitor.

Location:

trunk/sources/HeuristicLab.Services.WebApp/3.3

Files:

• Configs/BundleConfig.cs (modified) (2 diffs)
• Configs/FilterConfig.cs (modified) (1 diff)
• Configs/RouteConfig.cs (modified) (1 diff)
• Configs/WebApiConfig.cs (modified) (1 diff)
• Controllers/AppController.cs (modified) (2 diffs)
• Controllers/AuthenticationController.cs (modified) (1 diff)
• Controllers/DataTransfer/Plugin.cs (modified) (1 diff)
• Controllers/DataTransfer/User.cs (modified) (1 diff)
• Controllers/PluginController.cs (modified) (2 diffs)
• Controllers/WebAppControllerSelector.cs (modified) (2 diffs)
• Global.asax.cs (modified) (1 diff)
• Plugin.cs (modified) (3 diffs)
• PluginManager.cs (modified) (5 diffs)
• WebApp/app.css (modified) (6 diffs)
• WebApp/shared/directives/flot.js (modified) (1 diff)
• WebApp/shared/layout/layout.cshtml (modified) (3 diffs)
• WebApp/shared/menu/menu.cshtml (modified) (1 diff)
• WebApp/shared/menu/menuCtrl.js (modified) (1 diff)

trunk/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs

@@ -1 @@
-using System.Collections.Generic;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Web;
 using System.Web.Optimization;
 
 namespace HeuristicLab.Services.WebApp.Configs {
   public class BundleConfig {
+
     public static void RegisterBundles(BundleCollection bundles) {
       bundles.IgnoreList.Clear();
@@ -61 +81 @@
         "~/WebApp/app.css"
       ));
-      AddOrUpdateWebAppBundle();
+
+      bundles.Add(new ScriptBundle("~/Bundles/WebApp/Main").Include(
+        "~/WebApp/main.js"
+      ));
+
+      bundles.Add(new ScriptBundle("~/Bundles/WebApp/Shared")
+        .IncludeDirectory("~/WebApp/shared/services", "*.js", true)
+        .IncludeDirectory("~/WebApp/shared/directives", "*.js", true)
+        .IncludeDirectory("~/WebApp/shared/menu", "*.js", true)
+      );
     }
 
-    public static void AddOrUpdateWebAppBundle() {
-      var jsBundle = BundleTable.Bundles.GetBundleFor("~/Bundles/WebApp/js");
-      if (jsBundle != null) {
-        BundleTable.Bundles.Remove(jsBundle);
+    public static IEnumerable<string> GetWebAppScripts() {
+      var jsFiles = new List<string> {
+        "WebApp/helper.js",
+        "WebApp/app.js"
+      };
+      PluginManager pluginManager = PluginManager.Instance;
+      foreach (var plugin in pluginManager.GetPlugins()) {
+        if (File.Exists(string.Format(@"{0}\{1}\{1}.js", PluginManager.PluginsDirectory, plugin.Name))) {
+          jsFiles.Add(string.Format("WebApp/plugins/{0}/{0}.js", plugin.Name));
+        }
       }
-      var jsFiles = new List<string> {
-        "~/WebApp/helper.js",
-        "~/WebApp/app.js"
-      };
-      var directories = Directory.GetDirectories(string.Format(@"{0}WebApp\plugins", HttpRuntime.AppDomainAppPath));
-      jsFiles.AddRange(directories.Select(Path.GetFileName).Select(directory => string.Format("~/WebApp/plugins/{0}/{0}.js", directory)));
-      jsFiles.Add("~/WebApp/main.js");
-      jsBundle = new ScriptBundle("~/Bundles/WebApp/js");
-      jsBundle.Include(jsFiles.ToArray());
-      jsBundle.IncludeDirectory("~/WebApp/shared/", "*.js", true);
-      BundleTable.Bundles.Add(jsBundle);
+      jsFiles.Add("WebApp/main.js");
+      return jsFiles;
     }
   }

trunk/sources/HeuristicLab.Services.WebApp/3.3/Configs/FilterConfig.cs

@@ -1 @@
-using System.Web.Mvc;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Web.Mvc;
 
 namespace HeuristicLab.Services.WebApp.Configs {

trunk/sources/HeuristicLab.Services.WebApp/3.3/Configs/RouteConfig.cs

@@ -1 @@
-using System.Web.Mvc;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Web.Mvc;
 using System.Web.Routing;
 

trunk/sources/HeuristicLab.Services.WebApp/3.3/Configs/WebApiConfig.cs

@@ -1 @@
-
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using System.Net.Http.Formatting;
 using System.Web.Http;

trunk/sources/HeuristicLab.Services.WebApp/3.3/Controllers/AppController.cs

@@ -21 +21 @@
 
 using System.Web.Mvc;
-using HeuristicLab.Services.WebApp.Configs;
 
 namespace HeuristicLab.Services.WebApp.Controllers {
@@ -31 +30 @@
         return RedirectPermanent(Request.Url + "/");
       }
-      BundleConfig.AddOrUpdateWebAppBundle();
       return View("~/WebApp/shared/layout/layout.cshtml");
     }

trunk/sources/HeuristicLab.Services.WebApp/3.3/Controllers/AuthenticationController.cs

@@ -1 @@
-using System.Web.Http;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Web.Http;
 using System.Web.Security;
 using HeuristicLab.Services.WebApp.Controllers.DataTransfer;

trunk/sources/HeuristicLab.Services.WebApp/3.3/Controllers/DataTransfer/Plugin.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 
 namespace HeuristicLab.Services.WebApp.Controllers.DataTransfer {

trunk/sources/HeuristicLab.Services.WebApp/3.3/Controllers/DataTransfer/User.cs

@@ -1 @@
-namespace HeuristicLab.Services.WebApp.Controllers.DataTransfer {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace HeuristicLab.Services.WebApp.Controllers.DataTransfer {
   public class User {
     public string Username { get; set; }

trunk/sources/HeuristicLab.Services.WebApp/3.3/Controllers/PluginController.cs

@@ -1 @@
-using System.Collections.Generic;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
 using System.Linq;
 using System.Web.Http;
+using HeuristicLab.Services.Hive;
 using DTO = HeuristicLab.Services.WebApp.Controllers.DataTransfer;
 
 namespace HeuristicLab.Services.WebApp.Controllers {
 
-  [Authorize(Roles = "Hive Administrator")]
+  [Authorize(Roles = HiveRoles.Administrator)]
   public class PluginController : ApiController {
 
@@ -21 +43 @@
 
     public bool ReloadPlugin(string name) {
-      var plugin = PluginManager.Instance.GetPlugin(name);
+      var plugin = pluginManager.GetPlugin(name);
+      if (plugin == null)
+        return false;
       plugin.ReloadControllers();
       return true;

trunk/sources/HeuristicLab.Services.WebApp/3.3/Controllers/WebAppControllerSelector.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -18 +39 @@
       : base(configuration) {
       this.configuration = configuration;
-      pluginManager.Configuration = configuration;
       controllers = new ConcurrentDictionary<string, HttpControllerDescriptor>();
       LoadAppControllers();

trunk/sources/HeuristicLab.Services.WebApp/3.3/Global.asax.cs

@@ -8 +8 @@
   public class MvcApplication : System.Web.HttpApplication {
     protected void Application_Start() {
+      var pluginManager = PluginManager.Instance;
+      pluginManager.Configuration = GlobalConfiguration.Configuration;
+      pluginManager.DiscoverPlugins();
       AreaRegistration.RegisterAllAreas();
       GlobalConfiguration.Configure(WebApiConfig.Register);

trunk/sources/HeuristicLab.Services.WebApp/3.3/Plugin.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -5 +26 @@
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using System.Web.Http;
 using System.Web.Http.Controllers;
@@ -56 +76 @@
         AssemblyName = Path.GetFileName(assemblyPath);
       }
-      catch (ReflectionTypeLoadException ex) {
-        StringBuilder sb = new StringBuilder();
-        foreach (Exception exSub in ex.LoaderExceptions) {
-          sb.AppendLine(exSub.Message);
-          FileNotFoundException exFileNotFound = exSub as FileNotFoundException;
-          if (exFileNotFound != null) {
-            if (!string.IsNullOrEmpty(exFileNotFound.FusionLog)) {
-              sb.AppendLine("Fusion Log:");
-              sb.AppendLine(exFileNotFound.FusionLog);
-            }
-          }
-          sb.AppendLine();
-        }
-        AssemblyName = "Error loading assembly: " + sb.ToString();
+      catch (Exception) {
+        AssemblyName = "Error loading assembly";
         Controllers.Clear();
       }

trunk/sources/HeuristicLab.Services.WebApp/3.3/PluginManager.cs

@@ -1 @@
-using System.Collections.Concurrent;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
@@ -17 +38 @@
     public HttpConfiguration Configuration { get; set; }
 
-    private string PluginsDirectory {
+    public static string PluginsDirectory {
       get { return string.Format(@"{0}WebApp\plugins", HttpRuntime.AppDomainAppPath); }
     }
@@ -23 +44 @@
     public PluginManager() {
       plugins = new ConcurrentDictionary<string, Plugin>();
+      var fileWatcher = new FileSystemWatcher(PluginsDirectory, "*") {
+        IncludeSubdirectories = true,
+        EnableRaisingEvents = true
+      };
+      fileWatcher.Created += OnFilesChanged;
+      fileWatcher.Changed += OnFilesChanged;
+      fileWatcher.Deleted += OnFilesChanged;
+      fileWatcher.Renamed += OnFilesChanged;
+    }
+
+    private void OnFilesChanged(object sender, FileSystemEventArgs args) {
+      string path = args.FullPath.Remove(0, PluginsDirectory.Length + 1);
+      var pathParts = path.Split('\\');
+      string pluginName = pathParts[0];
+      if (pathParts.Length == 1) {
+        switch (args.ChangeType) {
+          case WatcherChangeTypes.Created:
+            GetPlugin(pluginName);
+            break;
+
+          case WatcherChangeTypes.Deleted:
+            plugins.Remove(pluginName);
+            break;
+
+          case WatcherChangeTypes.Renamed:
+            RenamedEventArgs renamedArgs = (RenamedEventArgs)args;
+            string oldPath = renamedArgs.OldFullPath.Remove(0, PluginsDirectory.Length + 1);
+            var oldPathParts = oldPath.Split('\\');
+            string oldPluginName = oldPathParts[0];
+            plugins.Remove(oldPluginName);
+            GetPlugin(pluginName);
+            break;
+
+          case WatcherChangeTypes.Changed:
+            Plugin plugin = LookupPlugin(pluginName);
+            if (plugin != null) {
+              plugin.ReloadControllers();
+            }
+            break;
+        }
+      }
     }
 
     public Plugin GetPlugin(string name) {
-      Plugin plugin;
-      plugins.TryGetValue(name, out plugin);
+      Plugin plugin = LookupPlugin(name);
       if (plugin == null) {
         string directory = string.Format(@"{0}\{1}", PluginsDirectory, name);
@@ -43 +104 @@
 
     public IEnumerable<Plugin> GetPlugins() {
-      DiscoverPlugins();
       return plugins.Values;
     }
 
-    private void DiscoverPlugins() {
+    public void DiscoverPlugins() {
       var pluginDirectories = Directory.GetDirectories(PluginsDirectory);
       foreach (var directory in pluginDirectories) {
         string pluginName = Path.GetFileName(directory);
-        Plugin plugin;
-        plugins.TryGetValue(pluginName, out plugin);
+        Plugin plugin = LookupPlugin(pluginName);
         if (plugin == null) {
           plugin = new Plugin {
@@ -63 +122 @@
       }
     }
+
+    private Plugin LookupPlugin(string name) {
+      Plugin plugin;
+      plugins.TryGetValue(name, out plugin);
+      return plugin;
+    }
   }
 }

trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/app.css

@@ -79 +79 @@
 
 #menu {
-  position: absolute;
-  min-height: inherit;
-  width: 250px;
+  position: relative;
   background: #FAFAFA;
   display: block;
   overflow: hidden;
-  border-right: 1px solid #D3D3D3;
+  z-index: 10000;
+  width: 100%;
 }
 
@@ -101 +100 @@
 #view {
   position: relative;
-  left: 0px;
-  margin-left: 250px;
+  left: 0;
+  margin-left: 0px;
   display: block;
   overflow: hidden;
 }
+
 
 .view-header {
@@ -124 +124 @@
 }
 
-.navbar-header{
-  width: 250px;
+.navbar-header {
+  width: 100%;
   background: #3c3a39;
   color: #FFFFFF;
+  float: left;
+}
+
+
+@media (min-width: 768px) {
+  #view {
+    margin-left: 250px;
+  }
+
+  #menu {
+    visibility: visible;
+    position: absolute;
+    width: 250px;
+    min-height: inherit;
+    border-right: 1px solid #D3D3D3;
+    z-index: 0;
+  }
+
+  .navbar-header {
+    width: 250px;
+  }
+}
+.container-fluid .navbar-header {
+  margin: 0;
+  padding: 0;
+}
+
+.navbar-nav {
+  margin: 0;
+  padding: 0;
+}
+
+.navbar-right {
+  float: right!important
+}
+
+.navbar-nav>li>a {
+  padding-top: 15px;
+  padding-bottom: 15px;
+}
+
+.navbar-content {
+  padding-right: 15px;
+}
+
+.navbar-nav > li {
+  float: left;
 }
 
@@ -140 +187 @@
 .nav-sidebar {
   font-size: 12px;
+  padding-bottom: 30px;
 }
 
@@ -279 +327 @@
 }
 
+.table-no-border>thead>tr>th, 
+.table-no-border>tbody>tr>th, 
+.table-no-border>tfoot>tr>th, 
+.table-no-border>thead>tr>td, 
+.table-no-border>tbody>tr>td, 
+.table-no-border>tfoot>tr>td,
+.table-no-border>tbody,
+.table-no-border>thead,
+.table-no-border>tfoot{
+  border-top: none !important; 
+  border-bottom: none !important; 
+}
+
+.table-auto-width {
+  width: auto !important;
+}
+
+.center-element {
+  margin: 0 auto;
+}
+
+.table-content {
+  margin-bottom: 0;
+}
 
 #top-navbar {
@@ -311 +383 @@
 
 .navbar-default .navbar-text {
+  display: block;
   color: #ffffff;
   text-shadow: none !important;
-}
-
+  margin: 0;
+  padding: 15px;
+}
+
+.navbar-nav {
+  float:left;
+  margin:0
+}
+
+.navbar-nav>li {
+  float:left
+}
+
+.navbar-nav>li>a {
+  padding-top:15px;
+  padding-bottom:15px
+}
+
+.navbar-toggle {
+  border: none !important;
+}
+
+.navbar-toggle:focus {
+  background-color: transparent !important;
+}
+
+.navbar-toggle:hover {
+  background-color: #D3D3D3 !important;
+}
+
+#menu .navbar-collapse {
+  padding: 0;
+  margin: 0;
+}
 
 .default-view-container {
   padding: 30px;
 }
+
+.panel-heading a:after {
+    font-family:'Glyphicons Halflings';
+    content:"\e114";
+    float: right;
+    color: grey;
+}
+.panel-heading a.collapsed:after {
+    content:"\e080";
+}
+
+.panel-heading a:focus, a:hover {
+  text-decoration: none;
+}

trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/shared/directives/flot.js

@@ -6 +6 @@
             link: function (scope, element, attrs) {
                 var chart = null, opts = scope[attrs.options];
+                var div = null;
 
                 scope.$watchCollection(attrs.dataset, function (newData, oldData) {
                     if (!chart) {
-                        var div = element.append("<div>");
+                        div = element.append("<div>");
                         div.bind("plotselected", function (event, ranges) {
                             $.each(chart.getXAxes(), function (_, axis) {

trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/shared/layout/layout.cshtml

@@ -1 @@
-@using HeuristicLab.Services.WebApp.Configs
+@* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+*@
+
+@using HeuristicLab.Services.WebApp.Configs
 <!DOCTYPE html>
 <html lang="en" ng-app="app">
@@ -15 +34 @@
     <![endif]-->
     @Scripts.Render("~/Bundles/Vendors/js")
-    @{
-        BundleTable.EnableOptimizations = false;
+    @foreach (var script in BundleConfig.GetWebAppScripts()) {
+        <script src="@script"></script>
     }
-    @Scripts.Render("~/Bundles/WebApp/js") 
-    @{
-        BundleTable.EnableOptimizations = true;
-    }
+
+    @Scripts.Render("~/Bundles/WebApp/Shared")
 </head>
-<body>
-    <div id="app">
-        <header id="toolbar" class="navbar navbar-default navbar-static-top no-border no-padding-margin"
-                ng-controller="app.menu.ctrl">
-            <nav>
-                <div class="container-fluid">
-                    <div class="navbar-header">
-                        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-navbar">
+<body ngcloak>
+<div id="app">
+    <header id="toolbar" class="navbar navbar-default navbar-static-top no-border no-padding-margin"
+            ng-controller="app.menu.ctrl">
+        <nav>
+            <div class="container-fluid">
+                <div class="navbar-header">
+                    <div class="center-block">
+                        <a class="navbar-brand" href="#">
+                            <img src="~/WebApp/shared/images/HeuristicLab-Logo.png" style="float: left; height: 100%; margin-right: 5px;"/>
+                            <span style="color: #f7921d">HeuristicLab</span>
+                        </a>
+                        <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#menu .navbar-collapse">
                             <span class="sr-only">Toggle navigation</span>
                             <span class="icon-bar"></span>
@@ -36 +58 @@
                             <span class="icon-bar"></span>
                         </button>
-                        <a class="navbar-brand" href="#">
-                            <img src="~/WebApp/shared/images/HeuristicLab-Logo.png" style="float: left; height: 100%; margin-left: 25px; margin-right: 5px;" />
-                            Heuristic<span style="color: #f7921d">Lab</span>
-                        </a>
-                    </div>
-
-                    <div class="collapse navbar-collapse" id="top-navbar">
-                        <ul class="nav navbar-nav navbar-right">
-                            @if (Request.IsAuthenticated) {
-                                <li>
-                                    <p class="navbar-text">Hello @User.Identity.Name!</p>
-                                </li>
-                                <li>
-                                    <a ng-href="" data-ng-click="logout()">Logout</a>
-                                </li>
-                            } else {
-                                <li>
-                                    <a ng-href="#/login">Login</a>
-                                </li>
-                            }
-                        </ul>
                     </div>
                 </div>
-            </nav>
-        </header>
 
-        <aside id="menu" ng-controller="app.menu.ctrl">
+                <div class="navbar-content">
+                    <ul class="nav navbar-nav navbar-right">
+                        @if (Request.IsAuthenticated)
+                        {
+                            <li>
+                                <span class="navbar-text">Hello @User.Identity.Name!</span>
+                            </li>
+                            <li>
+                                <a ng-href="" data-ng-click="logout()">Logout</a>
+                            </li>
+                        }
+                        else
+                        {
+                            <li>
+                                <a ng-href="#/login" data-ng-click="hideMenu()">Login</a>
+                            </li>
+                        }
+                    </ul>
+                </div>
+            </div>
+        </nav>
+    </header>
+
+    <aside id="menu" ng-controller="app.menu.ctrl">
+        <div class="navbar-collapse collapse">
             <ul class="nav nav-sidebar"
                 ng-include="'App/LoadSharedView?directory=menu&view=menu.cshtml&dateTime=@DateTime.Now'"
                 ng-init="entries = menuEntries;"></ul>
-        </aside>
+        </div>
+    </aside>
 
-        <section id="view">
-            <ui-view/>
-        </section>
-    </div>
+    <section id="view">
+        <ui-view/>
+    </section>
+</div>
 </body>
 </html>

trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/shared/menu/menu.cshtml

@@ -1 +1 @@
 <li ng-repeat="section in entries" ng-class="{'category':section.isCategory === true, 'active': isActive(section.route)}">
-    <a ng-href="{{section.route}}" ng-if="!section.isCategory">
+    <a ng-href="{{section.route}}" ng-if="!section.isCategory"
+       data-toggle="collapse" data-target="#menu .navbar-collapse">
         <span ng-if="section.icon != ''" ng-class="section.icon" style="padding-right: 10px;"></span>
         <span>{{section.name}}</span>

trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/shared/menu/menuCtrl.js

@@ -27 +27 @@
                 });
             };
+
+            $scope.hideMenu = function() {
+                $(".navbar-collapse").collapse('hide');
+            };
         }]
     );