You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2011/12/07 17:18:06 UTC
svn commit: r1211498 - in /deltacloud/trunk/clients/cimi: public/ views/
views/cloud_entry_point/ views/machine_configurations/
views/machine_images/ views/machines/ views/volume_configurations/
views/volume_images/ views/volumes/
Author: mfojtik
Date: Wed Dec 7 16:18:05 2011
New Revision: 1211498
URL: http://svn.apache.org/viewvc?rev=1211498&view=rev
Log:
CIMI: Added links to JSON and XML in CIMI UI
Modified:
deltacloud/trunk/clients/cimi/public/app.css
deltacloud/trunk/clients/cimi/views/cloud_entry_point/index.haml
deltacloud/trunk/clients/cimi/views/layout.haml
deltacloud/trunk/clients/cimi/views/machine_configurations/index.haml
deltacloud/trunk/clients/cimi/views/machine_configurations/show.haml
deltacloud/trunk/clients/cimi/views/machine_images/index.haml
deltacloud/trunk/clients/cimi/views/machine_images/show.haml
deltacloud/trunk/clients/cimi/views/machines/index.haml
deltacloud/trunk/clients/cimi/views/machines/show.haml
deltacloud/trunk/clients/cimi/views/volume_configurations/index.haml
deltacloud/trunk/clients/cimi/views/volume_configurations/show.haml
deltacloud/trunk/clients/cimi/views/volume_images/index.haml
deltacloud/trunk/clients/cimi/views/volume_images/show.haml
deltacloud/trunk/clients/cimi/views/volumes/index.haml
deltacloud/trunk/clients/cimi/views/volumes/show.haml
Modified: deltacloud/trunk/clients/cimi/public/app.css
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/public/app.css?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/public/app.css (original)
+++ deltacloud/trunk/clients/cimi/public/app.css Wed Dec 7 16:18:05 2011
@@ -58,3 +58,7 @@ body {
.content .row .span10 div.alert-message {
margin-right : 30px;
}
+
+#toolbar p:first-child {
+ text-align : right;
+}
Modified: deltacloud/trunk/clients/cimi/views/cloud_entry_point/index.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/cloud_entry_point/index.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/cloud_entry_point/index.haml (original)
+++ deltacloud/trunk/clients/cimi/views/cloud_entry_point/index.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/layout.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/layout.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/layout.haml (original)
+++ deltacloud/trunk/clients/cimi/views/layout.haml Wed Dec 7 16:18:05 2011
@@ -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.
Modified: deltacloud/trunk/clients/cimi/views/machine_configurations/index.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/machine_configurations/index.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/machine_configurations/index.haml (original)
+++ deltacloud/trunk/clients/cimi/views/machine_configurations/index.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/machine_configurations/show.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/machine_configurations/show.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/machine_configurations/show.haml (original)
+++ deltacloud/trunk/clients/cimi/views/machine_configurations/show.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/machine_images/index.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/machine_images/index.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/machine_images/index.haml (original)
+++ deltacloud/trunk/clients/cimi/views/machine_images/index.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/machine_images/show.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/machine_images/show.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/machine_images/show.haml (original)
+++ deltacloud/trunk/clients/cimi/views/machine_images/show.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/machines/index.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/machines/index.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/machines/index.haml (original)
+++ deltacloud/trunk/clients/cimi/views/machines/index.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/machines/show.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/machines/show.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/machines/show.haml (original)
+++ deltacloud/trunk/clients/cimi/views/machines/show.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/volume_configurations/index.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/volume_configurations/index.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/volume_configurations/index.haml (original)
+++ deltacloud/trunk/clients/cimi/views/volume_configurations/index.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/volume_configurations/show.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/volume_configurations/show.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/volume_configurations/show.haml (original)
+++ deltacloud/trunk/clients/cimi/views/volume_configurations/show.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/volume_images/index.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/volume_images/index.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/volume_images/index.haml (original)
+++ deltacloud/trunk/clients/cimi/views/volume_images/index.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/volume_images/show.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/volume_images/show.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/volume_images/show.haml (original)
+++ deltacloud/trunk/clients/cimi/views/volume_images/show.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/volumes/index.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/volumes/index.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/volumes/index.haml (original)
+++ deltacloud/trunk/clients/cimi/views/volumes/index.haml Wed Dec 7 16:18:05 2011
@@ -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
Modified: deltacloud/trunk/clients/cimi/views/volumes/show.haml
URL: http://svn.apache.org/viewvc/deltacloud/trunk/clients/cimi/views/volumes/show.haml?rev=1211498&r1=1211497&r2=1211498&view=diff
==============================================================================
--- deltacloud/trunk/clients/cimi/views/volumes/show.haml (original)
+++ deltacloud/trunk/clients/cimi/views/volumes/show.haml Wed Dec 7 16:18:05 2011
@@ -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