Merge branch 'feature/robust-template-selection'

CenturyLinkLabs · Feb 10, 2015 · 8b78425 · 8b78425
2 parents 0183097 + 244daeb
commit 8b78425
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 14 deletions.
diff --git a/...uster_with_panamax_remote_agent_small.png → ...ges/providers/logo_amazon_cloud_small.png b/...uster_with_panamax_remote_agent_small.png → ...ges/providers/logo_amazon_cloud_small.png
diff --git a/...uster_with_panamax_remote_agent_small.png → ...roviders/logo_centurylink_cloud_small.png b/...uster_with_panamax_remote_agent_small.png → ...roviders/logo_centurylink_cloud_small.png
diff --git a/app/assets/stylesheets/panamax.css.scss b/app/assets/stylesheets/panamax.css.scss
@@ -1015,3 +1015,7 @@ pre.prettyprint {
 :-ms-input-placeholder {
   font-style: italic;
 }
+
+.plain-contents a:focus {
+  outline: none;
+}
diff --git a/app/assets/stylesheets/panamax/deployments.css.scss b/app/assets/stylesheets/panamax/deployments.css.scss
@@ -433,7 +433,12 @@
 
   .add-target {
     margin-top: 30px;
-    overflow: auto;
+    &:after {
+      display: block;
+      content: " ";
+      clear: both;
+      height: 0;
+    }
 
     h2 {
       margin-bottom: 0;
@@ -458,18 +463,50 @@
     .provider {
       float: left;
       margin: 0 10px 10px 0;
-      max-width: 200px;
-      overflow: hidden;
+      width: 200px;
+      text-align: center;
+      position: relative;
 
-      a {
+      span {
         display: block;
         padding: 0 10px;
         background-color: $light_grey;
         height: 60px;
         line-height: 50px;
+      }
 
-        &:hover {
-          background-color: $white;
+      .job-templates {
+        display: none;
+        position: absolute;
+        padding: 20px;
+        text-align: left;
+        background-color: $dark_grey;
+
+        h6, a {
+          color: $white;
+        }
+
+        h6 {
+          font-size: 14px;
+          font-weight: bold;
+          margin-bottom: 10px;
+        }
+
+        a {
+          display: block;
+          line-height: 30px;
+          font-size: 14px;
+          text-decoration: none;
+
+          &:hover {
+            text-decoration: underline;
+          }
+        }
+      }
+
+      &:hover {
+        .job-templates {
+          display: block;
         }
       }
     }

diff --git a/app/controllers/deployment_targets_controller.rb b/app/controllers/deployment_targets_controller.rb
@@ -33,7 +33,7 @@ def destroy
 
   def hydrate_index_view
     @deployment_targets = DeploymentTarget.all
-    @job_templates = JobTemplate.all
+    @job_templates_by_vendor = JobTemplate.all.group_by(&:vendor)
     @jobs = Job.all
       .map(&:with_template!)
       .map(&:with_log!)

diff --git a/app/views/deployment_targets/index.html.haml b/app/views/deployment_targets/index.html.haml
@@ -54,9 +54,14 @@
       = link_to 'Dray.', 'https://registry.hub.docker.com/u/centurylink/dray/', target: '_blank'
 
     %ul
-      - @job_templates.each do |job_template|
+      - @job_templates_by_vendor.each do |vendor, templates|
         %li.provider
-          = link_to provider_label(job_template.name), new_job_path(template_id: job_template.id), title: job_template.name
+          %span= provider_label(vendor)
+          .job-templates
+            %h6 Select Orchestrator
+            - templates.each do |job_template|
+              = link_to job_template.adapter, new_job_path(template_id: job_template.id), title: job_template.name
+
     %p.alternative-provider
       Don't see your favorite provider listed?
       %br/

diff --git a/app/views/jobs/new.html.haml b/app/views/jobs/new.html.haml
@@ -1,5 +1,5 @@
 - content_for(:body_id, 'jobs_flow')
-- content_for(:title, "New #{@template.name} Remote Deployment Target")
+- content_for(:title, "New #{@template.name}")
 
 %h1 create a new job
 %p!= markdown_to_html(@template.description)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -92,4 +92,4 @@
               .clear
   %section.copyright
     #logo
-    %small &copy; 2014 CenturyLink &mdash; The Panamax project is provided under the Apache 2.0 license. All Rights Reserved.
+    %small!= "&copy; #{Time.now.year} CenturyLink &mdash; The Panamax project is provided under the Apache 2.0 license. All Rights Reserved."
diff --git a/spec/controllers/deployment_targets_controller_spec.rb b/spec/controllers/deployment_targets_controller_spec.rb
@@ -2,7 +2,7 @@
 
 describe DeploymentTargetsController do
   let(:deployment_targets) { [double(:target1), double(:target2)] }
-  let(:job_templates) { [double(:template1), double(:template2)] }
+  let(:job_templates) { [double(:template1, vendor: 'CTL'), double(:template2, vendor: 'CTL')] }
   let(:job1) { double(:job1) }
   let(:job2) { double(:job2) }
 
@@ -32,7 +32,7 @@
     end
 
     it 'assigns the job templates' do
-      expect(assigns(:job_templates)).to eq job_templates
+      expect(assigns(:job_templates_by_vendor)).to eq('CTL' => job_templates)
     end
 
     it 'renders the view' do
@@ -120,7 +120,7 @@
       end
 
       it 'assigns the job templates' do
-        expect(assigns(:job_templates)).to eq job_templates
+        expect(assigns(:job_templates_by_vendor)).to eq('CTL' => job_templates)
       end
 
       it 'renders the index view' do

diff --git a/spec/support/fixtures/job_templates_representation.json b/spec/support/fixtures/job_templates_representation.json
@@ -2,6 +2,8 @@
   {
   "id": 1,
   "name": "Amazon Web Services",
+  "vendor": "Amazon Cloud",
+  "adapter": "Kubernetes",
   "description": "Short-description",
   "documentation": "[![image](http://brightbox.com/images/misc/logo.png)[BrightBox](http://brightbox.com/) - **Serious Cloud Hosting.**\nCreate a CoreOS cluster on BrightBox, deployment ready from Panamax. Visit your BrightBox dashboard and create an API\nID and make note of your Secret ID. You will need these to launch your cluster.\n",
   "environment": [