Merge branch 'develop' into standalone_develop

app/controllers/settings_controller.rb

@@ -1,6 +1,7 @@
 class SettingsController < ApplicationController
   def show
     @old_projects_url = nil
+    get_navbar
     get_add_menu
     get_common_menu
     get_personal_menu
@@ -9,6 +10,17 @@ class SettingsController < ApplicationController
   end
 
   private
+    def get_navbar 
+      @navbar = []
+      default_laboratory.navbar.each do |site|
+        hash = {}
+        site.each {|k, v|
+          hash.merge!("#{k}":  get_site_url(k, v))
+        }
+        @navbar << hash
+      end
+    end
+    
     def get_add_menu
       @add = []
       Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|