You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by ma...@apache.org on 2013/04/26 17:47:07 UTC
[10/14] git commit: Network API rev 3 - Updated Instance Views (haml)
Network API rev 3 - Updated Instance Views (haml)
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/1cef953d
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/1cef953d
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/1cef953d
Branch: refs/heads/master
Commit: 1cef953d697f20bf322df1700b5b1d61680142ee
Parents: a2d52f7
Author: marios <ma...@redhat.com>
Authored: Fri Apr 12 12:19:01 2013 +0300
Committer: marios <ma...@redhat.com>
Committed: Fri Apr 26 18:01:55 2013 +0300
----------------------------------------------------------------------
server/views/instances/show.html.haml | 5 +++++
server/views/instances/show.xml.haml | 5 ++++-
2 files changed, 9 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/1cef953d/server/views/instances/show.html.haml
----------------------------------------------------------------------
diff --git a/server/views/instances/show.html.haml b/server/views/instances/show.html.haml
index 58e912e..3fabc57 100644
--- a/server/views/instances/show.html.haml
+++ b/server/views/instances/show.html.haml
@@ -56,6 +56,11 @@
-instance.storage_volumes.each do |vol|
%li
%a{ :href => storage_volume_url("#{vol.keys.first}"), :'data-ajax' => 'false'}=["#{vol.keys.first}", "#{vol.values.first}"].compact.reject{ |e| e.empty? }.join(' <---> ')
+ - if instance.network_interfaces
+ %li{ :'data-role' => 'list-divider'} Network Interfaces
+ -instance.network_interfaces.each do |nic|
+ %li
+ %a{ :href => network_interface_url("#{nic}"), :'data-ajax' => 'false'}="#{nic}"
%li{ :'data-role' => 'list-divider'} Actions
%li
%div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/1cef953d/server/views/instances/show.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/instances/show.xml.haml b/server/views/instances/show.xml.haml
index 654037b..220a0a8 100644
--- a/server/views/instances/show.xml.haml
+++ b/server/views/instances/show.xml.haml
@@ -57,4 +57,7 @@
- if instance.keyname
%login
%keyname #{instance.keyname}
-
+ - if instance.network_interfaces
+ %network_interfaces<
+ - instance.network_interfaces.each do |nic|
+ %network_interface{:href => network_interface_url(nic), :id => nic}