Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D8B3C9537 for ; Tue, 3 Jan 2012 09:39:47 +0000 (UTC) Received: (qmail 60024 invoked by uid 500); 3 Jan 2012 09:39:45 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 59387 invoked by uid 500); 3 Jan 2012 09:39:43 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 59378 invoked by uid 99); 3 Jan 2012 09:39:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jan 2012 09:39:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jan 2012 09:39:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 006FD23889EB for ; Tue, 3 Jan 2012 09:39:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1226716 - in /deltacloud/trunk/server/views/instances: show.html.haml show.xml.haml Date: Tue, 03 Jan 2012 09:39:18 -0000 To: commits@deltacloud.apache.org From: marios@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120103093919.006FD23889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: marios Date: Tue Jan 3 09:39:18 2012 New Revision: 1226716 URL: http://svn.apache.org/viewvc?rev=1226716&view=rev Log: Adds display of storage volumes to deltacloud show instance Modified: deltacloud/trunk/server/views/instances/show.html.haml deltacloud/trunk/server/views/instances/show.xml.haml Modified: deltacloud/trunk/server/views/instances/show.html.haml URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/views/instances/show.html.haml?rev=1226716&r1=1226715&r2=1226716&view=diff ============================================================================== --- deltacloud/trunk/server/views/instances/show.html.haml (original) +++ deltacloud/trunk/server/views/instances/show.html.haml Tue Jan 3 09:39:18 2012 @@ -46,6 +46,11 @@ - if @instance.firewalls %li{ :'data-role' => 'list-divider'} Firewalls %li=@instance.firewalls.join(", ") + - if @instance.storage_volumes + %li{ :'data-role' => 'list-divider'} Attached Storage Volumes + -@instance.storage_volumes.each do |vol| + %li + %p{ :'data-role' => 'fieldcontain'}="#{vol.keys.first} <---> #{vol.values.first}" %li{ :'data-role' => 'list-divider'} Actions %li %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" } Modified: deltacloud/trunk/server/views/instances/show.xml.haml URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/views/instances/show.xml.haml?rev=1226716&r1=1226715&r2=1226716&view=diff ============================================================================== --- deltacloud/trunk/server/views/instances/show.xml.haml (original) +++ deltacloud/trunk/server/views/instances/show.xml.haml Tue Jan 3 09:39:18 2012 @@ -41,6 +41,10 @@ %firewalls< - @instance.firewalls.each do |firewall| %firewall{:href => firewall_url(firewall), :id => firewall } + - if @instance.storage_volumes + %storage_volumes< + - @instance.storage_volumes.each do |volume| + %storage_volume{:href=> storage_volume_url(volume.keys.first), :id => volume.keys.first, :device => volume.values.first} - if driver_has_auth_features? %authentication{ :type => driver_auth_feature_name } - if @instance.authn_feature_failed?