Merge pull request #16 from seecloud/fix-page-names

Add full_title configuration option for infra page
seecloud · Oct 12, 2016 · 29e5c3f · 29e5c3f
2 parents d5f4c1f + 7e09a00
commit 29e5c3f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/ceagle/blueprints/infrastructure/templates/infrastructure.html b/ceagle/blueprints/infrastructure/templates/infrastructure.html
@@ -45,7 +45,7 @@ <h1> Infrastructure Management</h1>
     </ul>
 
     {% else %}
-        <h1> {{ active_page["title"] }} </h1>
+        <h1> {{ active_page["full_title"] }} </h1>
         <p> {{ active_page["description"] }}
         <a href="{{ active_page['iframe'] }}"> Open in new window </a>
         </p>

diff --git a/ceagle/templates/layout.html b/ceagle/templates/layout.html
@@ -53,7 +53,7 @@
                             <a href="/capacity"> Capacity Management </a>
                         </li>
                         <li {% if menu == "optimization" %} class="active"{% endif %}>
-                            <a href="/optimization"> Cloud Optimization</a>
+                            <a href="/optimization"> Resource Optimization</a>
                         </li>
                         <li {% if menu == "security" %} class="active"{% endif %}>
                             <a href="/security"> Security Monitoring </a>

diff --git a/etc/fuel_config.json b/etc/fuel_config.json
@@ -36,37 +36,43 @@
         "pages": [
             {
                 "title": "Horizon",
+                "full_title": "Horizon",
                 "menu": "horzion",
                 "description": "Web UI that manages OpenStack resources",
                 "iframe": "http://nan"
             },
             {
                 "title": "Baremetal",
+                "full_title": "Baremetal Provisioning",
                 "menu": "baremetal",
                 "description": "MaaS service that manages baremetal infrastructure",
                 "iframe": "http://nan"
             },
             {
                 "title": "Jenkins CI/CD",
+                "full_title": "Jenkins CI/CD",
                 "menu": "jenkins",
                 "description": "Cloud Continues Integration and Deployment.",
                 "iframe": "http://nan"
 
             },
             {
                 "title": "Source Control",
+                "full_title": "Git Source Control",
                 "menu": "git",
                 "description": "Gitlab with Git repositories with all projects source code",
                 "iframe": "http://nan"
             },
             {
                 "title": "Packages",
+                "full_title": "JFrog Artifactory Packages",
                 "menu": "packages",
                 "description": "JFrog Artifactory service that contains all cloud packages & images",
                 "iframe": "http://nan"
             },
             {
                 "title": "Stacklight",
+                "full_title": "Stacklight",
                 "menu": "stacklight",
                 "description": "Cloud Logging, Metering and Alerting services",
                 "iframe": "http://nan"