deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@redhat.com
Subject [PATCH core 4/8] CIMI: Collections now display details in UI
Date Wed, 07 Dec 2011 15:26:48 GMT
From: Michal Fojtik <mfojtik@redhat.com>


Signed-off-by: Michal fojtik <mfojtik@redhat.com>
---
 .../cimi/views/machine_configurations/index.haml   |   12 +++++++++++-
 clients/cimi/views/machine_images/index.haml       |   12 +++++++++++-
 clients/cimi/views/machine_templates/index.haml    |   10 ++++++++++
 clients/cimi/views/machines/index.haml             |   19 ++++++++++++++++++-
 clients/cimi/views/volume_images/index.haml        |   12 +++++++++++-
 clients/cimi/views/volumes/index.haml              |   10 ++++++++++
 6 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/clients/cimi/views/machine_configurations/index.haml b/clients/cimi/views/machine_configurations/index.haml
index d24bd75..cd9bb4d 100644
--- a/clients/cimi/views/machine_configurations/index.haml
+++ b/clients/cimi/views/machine_configurations/index.haml
@@ -1,4 +1,4 @@
-- @title=@machine_configurations.description
+- @title=@machine_configurations.name
 
 - content_for :breadcrumb do
   %ul.breadcrumb
@@ -23,3 +23,13 @@
   - @machine_configurations.machine_configurations.each do |conf|
     %li
       %a{ :href => "/cimi/machine_configurations/#{conf.href.split('/').last}"}=conf.href.split('/').last
+
+%h3 Collection details
+
+%dl
+  %dt URI
+  %dd=@machine_configurations.uri
+  %dt Description
+  %dd=@machine_configurations.description
+  %dt Created
+  %dd=@machine_configurations.created
diff --git a/clients/cimi/views/machine_images/index.haml b/clients/cimi/views/machine_images/index.haml
index 54f3711..c8d9c86 100644
--- a/clients/cimi/views/machine_images/index.haml
+++ b/clients/cimi/views/machine_images/index.haml
@@ -1,4 +1,4 @@
-- @title=@machine_images.description
+- @title=@machine_images.name
 
 - content_for :breadcrumb do
   %ul.breadcrumb
@@ -23,3 +23,13 @@
   - @machine_images.machine_images.each do |image|
     %li
       %a{ :href => "/cimi/machine_images/#{image.href.split('/').last}"}=image.href.split('/').last
+
+%h3 Collection details
+
+%dl
+  %dt URI
+  %dd=@machine_images.uri
+  %dt Description
+  %dd=@machine_images.description
+  %dt Created
+  %dd=@machine_images.created
diff --git a/clients/cimi/views/machine_templates/index.haml b/clients/cimi/views/machine_templates/index.haml
index f61126d..2a285f1 100644
--- a/clients/cimi/views/machine_templates/index.haml
+++ b/clients/cimi/views/machine_templates/index.haml
@@ -19,3 +19,13 @@
   - @machine_templates.machine_templates.each do |temp|
     %li
       %a{ :href => "/cimi/machine_templates/#{temp.href.split('/').last}"}=temp.href.split('/').last
+
+%h3 Collection details
+
+%dl
+  %dt URI
+  %dd=@machine_templates.uri
+  %dt Description
+  %dd=@machine_templates.description
+  %dt Created
+  %dd=@machine_templates.created
diff --git a/clients/cimi/views/machines/index.haml b/clients/cimi/views/machines/index.haml
index 08205bd..3f436ac 100644
--- a/clients/cimi/views/machines/index.haml
+++ b/clients/cimi/views/machines/index.haml
@@ -1,4 +1,4 @@
-- @title=@machines.description
+- @title=@machines.name
 
 - content_for :breadcrumb do
   %ul.breadcrumb
@@ -26,3 +26,20 @@
   - @machines.machines.each do |machine|
     %li
       %a{ :href => "/cimi/machines/#{machine.href.split('/').last}"}=machine.href.split('/').last
+
+- if @machines.machines.empty?
+  .alert-message.block-message.warning
+    %p
+      There are no Machine entities defined for this collection.
+    .alert_actions
+      %a{ :href => '/cimi/machine/new', :class => 'btn'} Create new
+
+%h3 Collection details
+
+%dl
+  %dt URI
+  %dd=@machines.uri
+  %dt Description
+  %dd=@machines.description
+  %dt Created
+  %dd=@machines.created
diff --git a/clients/cimi/views/volume_images/index.haml b/clients/cimi/views/volume_images/index.haml
index 26be6c8..2fb5826 100644
--- a/clients/cimi/views/volume_images/index.haml
+++ b/clients/cimi/views/volume_images/index.haml
@@ -1,4 +1,4 @@
-- @title=@volume_images.description
+- @title=@volume_images.name
 
 - content_for :breadcrumb do
   %ul.breadcrumb
@@ -23,3 +23,13 @@
   - @volume_images.volume_images.each do |image|
     %li
       %a{ :href => "/cimi/volume_images/#{image.href.split('/').last}"}=image.href.split('/').last
+
+%h3 Collection details
+
+%dl
+  %dt URI
+  %dd=@volume_images.uri
+  %dt Description
+  %dd=@volume_images.description
+  %dt Created
+  %dd=@volume_images.created
diff --git a/clients/cimi/views/volumes/index.haml b/clients/cimi/views/volumes/index.haml
index eedb125..de37597 100644
--- a/clients/cimi/views/volumes/index.haml
+++ b/clients/cimi/views/volumes/index.haml
@@ -23,3 +23,13 @@
   - @volumes.volumes.each do |volume|
     %li
       %a{ :href => "/cimi/volumes/#{volume.href.split('/').last}"}=volume.href.split('/').last
+
+%h3 Collection details
+
+%dl
+  %dt URI
+  %dd=@volumes.uri
+  %dt Description
+  %dd=@volumes.description
+  %dt Created
+  %dd=@volumes.created
-- 
1.7.4.4


Mime
View raw message