rundeck · gschueler · Sep 30, 2016 · Sep 30, 2016
diff --git a/rundeckapp/grails-app/assets/javascripts/menu/home.js b/rundeckapp/grails-app/assets/javascripts/menu/home.js
@@ -20,55 +20,8 @@
 //= require ko/binding-url-path-param
 //= require ko/binding-message-template
 //= require jquery.waypoints.min
-function ProjectAuth(data) {
-    "use strict";
-    var self = this;
-    self.jobCreate = ko.observable(false);
-    self.admin = ko.observable(false);
-    self.mapping = {};
-    if (data) {
-        ko.mapping.fromJS(data, self.mapping, self);
-    }
-}
-function ProjectReadme(data) {
-    "use strict";
-    var self = this;
-    self.readmeHTML = ko.observable(null);
-    self.motdHTML = ko.observable(null);
+//= require menu/project-model
 
-    self.mapping = {};
-    if (data) {
-        ko.mapping.fromJS(data, self.mapping, self);
-    }
-}
-function Project(data) {
-    var self = this;
-    self.name = ko.observable(data.name);
-    self.execCount = ko.observable(data.execCount || 0);
-    self.failedCount = ko.observable(data.failedCount || 0);
-    self.userCount = ko.observable(data.userCount || 0);
-    self.description = ko.observable(data.description);
-    self.auth = ko.observable(new ProjectAuth());
-    self.readme = ko.observable(new ProjectReadme());
-    self.loaded = ko.observable(false);
-    self.mapping = {
-        auth: {
-            create: function (options) {
-                "use strict";
-                return new ProjectAuth(options.data);
-            }
-        },
-        readme: {
-            create: function (options) {
-                "use strict";
-                return new ProjectReadme(options.data);
-            }
-        }
-    };
-    if (data) {
-        ko.mapping.fromJS(data, self.mapping, self);
-    }
-}
 function HomeData(data) {
     var self = this;
     self.baseUrl = data.baseUrl;

diff --git a/rundeckapp/grails-app/assets/javascripts/menu/project-model.js b/rundeckapp/grails-app/assets/javascripts/menu/project-model.js
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2016 SimplifyOps, Inc. (http://simplifyops.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+function ProjectAuth(data) {
+    "use strict";
+    var self = this;
+    self.jobCreate = ko.observable(false);
+    self.admin = ko.observable(false);
+    self.mapping = {};
+    if (data) {
+        ko.mapping.fromJS(data, self.mapping, self);
+    }
+}
+function ProjectReadme(data) {
+    "use strict";
+    var self = this;
+    self.readmeHTML = ko.observable(null);
+    self.motdHTML = ko.observable(null);
+
+    self.mapping = {};
+    if (data) {
+        ko.mapping.fromJS(data, self.mapping, self);
+    }
+}
+function Project(data) {
+    var self = this;
+    self.name = ko.observable(data.name);
+    self.execCount = ko.observable(data.execCount || 0);
+    self.failedCount = ko.observable(data.failedCount || 0);
+    self.userCount = ko.observable(data.userCount || 0);
+    self.description = ko.observable(data.description);
+    self.auth = ko.observable(new ProjectAuth());
+    self.readme = ko.observable(new ProjectReadme());
+    self.loaded = ko.observable(false);
+    self.mapping = {
+        auth: {
+            create: function (options) {
+                "use strict";
+                return new ProjectAuth(options.data);
+            }
+        },
+        readme: {
+            create: function (options) {
+                "use strict";
+                return new ProjectReadme(options.data);
+            }
+        }
+    };
+    if (data) {
+        ko.mapping.fromJS(data, self.mapping, self);
+    }
+}
diff --git a/rundeckapp/grails-app/assets/javascripts/menu/projectHome.js b/rundeckapp/grails-app/assets/javascripts/menu/projectHome.js
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 SimplifyOps, Inc. (http://simplifyops.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//= require knockout.min
+//= require knockout-mapping
+//= require knockout-onenter
+//= require ko/binding-url-path-param
+//= require ko/binding-message-template
+//= require menu/project-model
+
+function ProjectHome(name, data) {
+    "use strict";
+    var self = this;
+    self.name = ko.observable(name);
+    self.baseUrl = data.baseUrl;
+    self.project = ko.observable();
+    self.load = function () {
+        var params = {projects: self.name()};
+        return jQuery.ajax({
+            type: 'GET',
+            contentType: 'json',
+            headers: {'x-rundeck-ajax': 'true'},
+            url: _genUrl(self.baseUrl, params),
+            success: function (data, status, jqxhr) {
+                if (data.projects && data.projects.length == 1) {
+                    ko.mapping.fromJS(jQuery.extend(data.projects[0], {loaded: true}), null, self.project);
+                }
+            }
+        });
+    };
+}
+
+/**
+ * START page init
+ */
+function init() {
+    // ko.options.deferUpdates = true;
+    var data = loadJsonData('projectData');
+    var projectHome = new ProjectHome(data.project, {baseUrl: appLinks.menuHomeAjax});
+    projectHome.project(
+        new Project({name: data.project})
+    );
+    projectHome.load();
+    ko.applyBindings(projectHome);
+    window.projectHome = projectHome;
+}
+jQuery(init);
diff --git a/rundeckapp/grails-app/assets/stylesheets/rundeck.less b/rundeckapp/grails-app/assets/stylesheets/rundeck.less
@@ -1726,3 +1726,11 @@ a {
     color: @link-hover-color;
   }
 }
+
+.autohide {
+  visibility: hidden;
+}
+
+.autoshow:hover .autohide {
+  visibility: visible;
+}
diff --git a/rundeckapp/grails-app/conf/UrlMappings.groovy b/rundeckapp/grails-app/conf/UrlMappings.groovy
@@ -198,6 +198,7 @@ class UrlMappings {
         "/api/$api_version/$action?"(controller: 'api', action: 'invalid')
 
         //simplified url mappings for link generation
+        "/project/$project/home"(controller: 'menu', action: 'projectHome')
         "/project/$project/nodes/"(controller: 'framework', action: 'nodes')
         "/project/$project/run/"(controller: 'framework', action: 'nodes')
         "/project/$project/scm/$integration?/$action?"(controller: 'scm')

diff --git a/rundeckapp/grails-app/controllers/rundeck/controllers/ControllerBase.groovy b/rundeckapp/grails-app/controllers/rundeck/controllers/ControllerBase.groovy
@@ -39,6 +39,7 @@ class ControllerBase {
     public static final ArrayList<String> UIPLUGIN_PAGES = [
             'menu/jobs',
             'menu/home',
+            'menu/projectHome',
             'menu/executionMode',
             'menu/admin',
             "menu/logStorage",

diff --git a/rundeckapp/grails-app/controllers/rundeck/controllers/MenuController.groovy b/rundeckapp/grails-app/controllers/rundeck/controllers/MenuController.groovy
@@ -1424,6 +1424,13 @@ class MenuController extends ControllerBase implements ApplicationContextAware{
         ])
     }
 
+    def projectHome() {
+        if (!params.project) {
+            return redirect(controller: 'menu', action: 'home')
+        }
+        [project: params.project]
+    }
+
     def welcome(){
     }
 

diff --git a/rundeckapp/grails-app/i18n/messages.properties b/rundeckapp/grails-app/i18n/messages.properties
@@ -1336,3 +1336,5 @@ system.access.control.title=System
 project.access.control.title=Project: {0}
 project.access.control.description=Project ACLPolicy files can be modified via the API
 project.access.control.prompt=ACL Policy Files for project {0}
+select.project=Select Project...
+project.configuration.prompt=Project Configuration:
diff --git a/rundeckapp/grails-app/i18n/messages_es_419.properties b/rundeckapp/grails-app/i18n/messages_es_419.properties
@@ -1336,3 +1336,5 @@ system.access.control.title=System
 project.access.control.title=Project: {0}
 project.access.control.description=Project ACLPolicy files can be modified via the API
 project.access.control.prompt=ACL Policy Files for project {0}
+select.project=Select Project...
+project.configuration.prompt=Project Configuration:
diff --git a/rundeckapp/grails-app/views/common/_topbar.gsp b/rundeckapp/grails-app/views/common/_topbar.gsp
@@ -84,12 +84,20 @@
         <g:else>
             <li id="projectSelect" class="dropdown disabled">
                 <a data-toggle="dropdown" href="#" class="disabled">
-                    <i class="glyphicon glyphicon-tasks"></i>
-                    <g:enc>${ params.project ?: request.project}</g:enc>
                     <i class="caret"></i>
                 </a>
             </li>
         </g:else>
+        <li id="projectHomeLink">
+            <a href="${createLink(
+                    controller: 'menu',
+                    action: 'projectHome',
+                    params: [project: project ?: params.project ?: request.project]
+            )}">
+                <i class="glyphicon glyphicon-tasks"></i>
+                <g:enc>${project ?: params.project ?: request.project ?: 'Choose ...'}</g:enc>
+            </a>
+        </li>
     </g:if>
 
         <g:set var="selectedclass" value="active"/>

diff --git a/rundeckapp/grails-app/views/framework/_projectSelect.gsp b/rundeckapp/grails-app/views/framework/_projectSelect.gsp
@@ -16,17 +16,18 @@
 
 <g:set var="projectSet" value="${projects.sort()}"/>
 <g:set var="selectParams" value="${selectParams?:[:]}"/>
-    <a data-toggle="dropdown" href="#">
-        <i class="glyphicon glyphicon-tasks"></i>
-        <g:enc>${ selectItemTitle}${project?:params.project?:request.project?: 'Choose ...'}</g:enc>
-        <i class="caret"></i>
+    <a class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        ${project && selectItemTitle ? selectItemTitle : emptyTitle}
+        <span class="caret"></span>
+        <span class="sr-only">Toggle Dropdown</span>
     </a>
-    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+
+    <ul class="dropdown-menu " role="menu" aria-labelledby="dLabel">
 <auth:resourceAllowed action="create" kind="project" context="application">
         <g:if test="${!params.nocreate}">
             <li>
                 <g:link controller="framework" action="createProject">
-                    New Project
+                    <g:message code="page.home.new.project.button.label"/>
                     <b class="glyphicon glyphicon-plus"></b>
                 </g:link>
             </li>

diff --git a/rundeckapp/grails-app/views/menu/_configNav.gsp b/rundeckapp/grails-app/views/menu/_configNav.gsp
@@ -34,17 +34,17 @@
     <g:if test="${session.frameworkProjects}">
         <li class="${selected == 'project' ? 'active' : ''} dropdown" id="projectSelect">
             <g:render template="/framework/projectSelect"
-                      model="${[projects: session.frameworkProjects, project: params.project ?:
-                          request.project,
-                              selectParams: [page:'configure'],selectItemTitle:'Project Configuration: ']}"/>
+                      model="${[projects    : session.frameworkProjects, project: params.project ?: request.project,
+                                selectParams: [page: 'configure'], selectItemTitle: message(code:"project.configuration.prompt") + params.project,
+                                emptyTitle  : message(code:"select.project")]}"/>
         </li>
     </g:if>
     <g:else>
         <li id="projectSelect" class="${selected == 'project' ? 'active' : ''} dropdown">
             <span class="action textbtn" onclick="loadProjectSelect({page:'configure'});"
-                  title="Select project...">
+                  title="${message(code:"select.project")}">
                     <g:message code="project.configuration" />
-                <g:enc>${params.project ?: request.project ?: 'Select project...'}</g:enc>
+                <g:enc>${params.project ?: request.project ?: message(code:"select.project")}</g:enc>
             </span>
         </li>
     </g:else>