Return-Path: X-Original-To: apmail-deltacloud-dev-archive@www.apache.org Delivered-To: apmail-deltacloud-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B51BE7C5A for ; Wed, 7 Dec 2011 15:26:15 +0000 (UTC) Received: (qmail 67352 invoked by uid 500); 7 Dec 2011 15:26:15 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 67333 invoked by uid 500); 7 Dec 2011 15:26:15 -0000 Mailing-List: contact dev-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 dev@deltacloud.apache.org Received: (qmail 67325 invoked by uid 99); 7 Dec 2011 15:26:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 15:26:15 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of mfojtik@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 15:26:11 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pB7FPomR014540 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Dec 2011 10:25:50 -0500 Received: from dhcp-29-121.brq.redhat.com (dhcp-29-121.brq.redhat.com [10.34.29.121]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pB7FPmqi025242 for ; Wed, 7 Dec 2011 10:25:49 -0500 From: mfojtik@redhat.com To: dev@deltacloud.apache.org Subject: [PATCH core 1/8] CIMI: Added links to JSON and XML in CIMI UI Date: Wed, 7 Dec 2011 16:26:45 +0100 Message-Id: <1323271612-15649-1-git-send-email-mfojtik@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 From: Michal Fojtik Signed-off-by: Michal fojtik --- clients/cimi/public/app.css | 4 ++++ clients/cimi/views/cloud_entry_point/index.haml | 5 +++++ clients/cimi/views/layout.haml | 6 ++---- .../cimi/views/machine_configurations/index.haml | 4 ++++ .../cimi/views/machine_configurations/show.haml | 5 +++++ clients/cimi/views/machine_images/index.haml | 4 ++++ clients/cimi/views/machine_images/show.haml | 5 +++++ clients/cimi/views/machines/index.haml | 4 ++++ clients/cimi/views/machines/show.haml | 3 +++ .../cimi/views/volume_configurations/index.haml | 5 ++++- clients/cimi/views/volume_configurations/show.haml | 7 ++++++- clients/cimi/views/volume_images/index.haml | 5 +++++ clients/cimi/views/volume_images/show.haml | 7 ++++++- clients/cimi/views/volumes/index.haml | 4 ++++ clients/cimi/views/volumes/show.haml | 7 ++++++- 15 files changed, 67 insertions(+), 8 deletions(-) diff --git a/clients/cimi/public/app.css b/clients/cimi/public/app.css index 1cabc0f..45580d6 100644 --- a/clients/cimi/public/app.css +++ b/clients/cimi/public/app.css @@ -58,3 +58,7 @@ body { .content .row .span10 div.alert-message { margin-right : 30px; } + +#toolbar p:first-child { + text-align : right; +} diff --git a/clients/cimi/views/cloud_entry_point/index.haml b/clients/cimi/views/cloud_entry_point/index.haml index 0867d31..33321fc 100644 --- a/clients/cimi/views/cloud_entry_point/index.haml +++ b/clients/cimi/views/cloud_entry_point/index.haml @@ -5,6 +5,11 @@ %li.active CloudEntryPoint +- content_for :actions do + %p + %a{ :href => "#{@entry_point.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@entry_point.uri}?format=json", :class => 'label warning' } JSON + %blockquote %p The Cloud Entry Point represents the entry point into the cloud defined by diff --git a/clients/cimi/views/layout.haml b/clients/cimi/views/layout.haml index 1978f83..87cdd3a 100644 --- a/clients/cimi/views/layout.haml +++ b/clients/cimi/views/layout.haml @@ -21,13 +21,11 @@ %h1=@title || 'no-title-fix-me' = yield_content :breadcrumb .row - .span10 + .span10#main - [ :info, :error, :success ].map do |message| = flash_block_for message =yield - .span4 - %h3 Operations - =yield_content :actions + .span4#toolbar=yield_content :actions %footer %p © 2009-2011 The Apache Software Foundation and individual contributors. diff --git a/clients/cimi/views/machine_configurations/index.haml b/clients/cimi/views/machine_configurations/index.haml index 6b3452e..d24bd75 100644 --- a/clients/cimi/views/machine_configurations/index.haml +++ b/clients/cimi/views/machine_configurations/index.haml @@ -8,6 +8,10 @@ %li.active MachineConfigurationCollection +- content_for :actions do + %p + %a{ :href => "#{@machine_configurations.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@machine_configurations.uri}?format=json", :class => 'label warning' } JSON %blockquote %p diff --git a/clients/cimi/views/machine_configurations/show.haml b/clients/cimi/views/machine_configurations/show.haml index 06663cf..387de62 100644 --- a/clients/cimi/views/machine_configurations/show.haml +++ b/clients/cimi/views/machine_configurations/show.haml @@ -11,6 +11,11 @@ %li.active = @machine_configuration.name +- content_for :actions do + %p + %a{ :href => "#{@machine_configuration.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@machine_configuration.uri}?format=json", :class => 'label warning' } JSON + %blockquote %p The Machine Configuration entity represents the set of configuration values diff --git a/clients/cimi/views/machine_images/index.haml b/clients/cimi/views/machine_images/index.haml index 6bfb7fa..54f3711 100644 --- a/clients/cimi/views/machine_images/index.haml +++ b/clients/cimi/views/machine_images/index.haml @@ -8,6 +8,10 @@ %li.active MachineImageCollection +- content_for :actions do + %p + %a{ :href => "#{@machine_images.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@machine_images.uri}?format=json", :class => 'label warning' } JSON %blockquote %p diff --git a/clients/cimi/views/machine_images/show.haml b/clients/cimi/views/machine_images/show.haml index 3a6a75d..b3c4120 100644 --- a/clients/cimi/views/machine_images/show.haml +++ b/clients/cimi/views/machine_images/show.haml @@ -11,6 +11,11 @@ %li.active = @machine_image.name +- content_for :actions do + %p + %a{ :href => "#{@machine_image.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@machine_image.uri}?format=json", :class => 'label warning' } JSON + %blockquote %p This entity represents the information (e.g. an Open Virtualization Format diff --git a/clients/cimi/views/machines/index.haml b/clients/cimi/views/machines/index.haml index be18e65..08205bd 100644 --- a/clients/cimi/views/machines/index.haml +++ b/clients/cimi/views/machines/index.haml @@ -10,8 +10,12 @@ - content_for :actions do %p + %a{ :href => "#{@machines.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@machines.uri}?format=json", :class => 'label warning' } JSON + %p %a{ :href => '/cimi/machines/new', :class => 'btn info'} New machine + %blockquote %p A Machine Collection entity represents the collection of Machine diff --git a/clients/cimi/views/machines/show.haml b/clients/cimi/views/machines/show.haml index 620da17..fa637e5 100644 --- a/clients/cimi/views/machines/show.haml +++ b/clients/cimi/views/machines/show.haml @@ -13,6 +13,9 @@ - content_for :actions do %p + %a{ :href => "#{@machine.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@machine.uri}?format=json", :class => 'label warning' } JSON + %p - if @machine.state == 'STARTED' %form{ :action => "/cimi/machines/#{@machine.name}/stop", :method => :post, :style => 'display:inline'} %button{ :class => 'btn'} Stop diff --git a/clients/cimi/views/volume_configurations/index.haml b/clients/cimi/views/volume_configurations/index.haml index 602d230..88ed9c8 100644 --- a/clients/cimi/views/volume_configurations/index.haml +++ b/clients/cimi/views/volume_configurations/index.haml @@ -7,7 +7,10 @@ %span.divider="/" %li.active VolumeConfigurationCollection - +- content_for :actions do + %p + %a{ :href => "#{@volume_configurations.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@volume_configurations.uri}?format=json", :class => 'label warning' } JSON %blockquote %p diff --git a/clients/cimi/views/volume_configurations/show.haml b/clients/cimi/views/volume_configurations/show.haml index 373486c..6378ee7 100644 --- a/clients/cimi/views/volume_configurations/show.haml +++ b/clients/cimi/views/volume_configurations/show.haml @@ -11,6 +11,11 @@ %li.active = @volume_configuration.name +- content_for :actions do + %p + %a{ :href => "#{@volume_configuration.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@volume_configuration.uri}?format=json", :class => 'label warning' } JSON + %blockquote %p The Volume Configuration entity represents the set of configuration values @@ -27,4 +32,4 @@ %dt Created %dd #{@volume_configuration.created}  %dt Details - %dd=@volume_configuration.inspect \ No newline at end of file + %dd=@volume_configuration.inspect diff --git a/clients/cimi/views/volume_images/index.haml b/clients/cimi/views/volume_images/index.haml index e7ab56f..26be6c8 100644 --- a/clients/cimi/views/volume_images/index.haml +++ b/clients/cimi/views/volume_images/index.haml @@ -8,6 +8,11 @@ %li.active VolumeImageCollection +- content_for :actions do + %p + %a{ :href => "#{@volume_images.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@volume_images.uri}?format=json", :class => 'label warning' } JSON + %blockquote %p A Volume Image Collection entity represents the collection of Volume Image diff --git a/clients/cimi/views/volume_images/show.haml b/clients/cimi/views/volume_images/show.haml index ef396dc..20b3ef4 100644 --- a/clients/cimi/views/volume_images/show.haml +++ b/clients/cimi/views/volume_images/show.haml @@ -11,6 +11,11 @@ %li.active = @volume_image.name +- content_for :actions do + %p + %a{ :href => "#{@volume_image.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@volume_image.uri}?format=json", :class => 'label warning' } JSON + %blockquote %p This entity represents the information necessary for hardware virtualized @@ -25,4 +30,4 @@ %dt Created %dd=@volume_image.created %dt Details - %dd=@volume_image.inspect \ No newline at end of file + %dd=@volume_image.inspect diff --git a/clients/cimi/views/volumes/index.haml b/clients/cimi/views/volumes/index.haml index e9bd529..eedb125 100644 --- a/clients/cimi/views/volumes/index.haml +++ b/clients/cimi/views/volumes/index.haml @@ -8,6 +8,10 @@ %li.active VolumeCollection +- content_for :actions do + %p + %a{ :href => "#{@volumes.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@volumes.uri}?format=json", :class => 'label warning' } JSON %blockquote %p diff --git a/clients/cimi/views/volumes/show.haml b/clients/cimi/views/volumes/show.haml index 85a73f7..f08006b 100644 --- a/clients/cimi/views/volumes/show.haml +++ b/clients/cimi/views/volumes/show.haml @@ -11,6 +11,11 @@ %li.active = @volume.name +- content_for :actions do + %p + %a{ :href => "#{@volume.uri}?format=xml", :class => 'label warning' } XML + %a{ :href => "#{@volume.uri}?format=json", :class => 'label warning' } JSON + %blockquote %p This entity represents a @@ -25,4 +30,4 @@ %dt Created %dd #{@volume.created}  %dt Details - %dd=@volume.inspect \ No newline at end of file + %dd=@volume.inspect -- 1.7.4.4