deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From <di...@fast.au.fujitsu.com>
Subject [PATCH] GUI: made capitalization in titles and buttons consistent
Date Sat, 23 Feb 2013 01:22:47 GMT
From: Dies Koper <diesk@fast.au.fujitsu.com>

---
 server/views/addresses/show.html.haml          | 2 +-
 server/views/buckets/show.html.haml            | 2 +-
 server/views/firewalls/new.html.haml           | 4 ++--
 server/views/images/show.html.haml             | 2 +-
 server/views/instances/run_command.html.haml   | 2 +-
 server/views/instances/show.html.haml          | 6 +++---
 server/views/load_balancers/new.html.haml      | 2 +-
 server/views/load_balancers/show.html.haml     | 4 ++--
 server/views/metrics/show.html.haml            | 2 +-
 server/views/storage_snapshots/index.html.haml | 2 +-
 server/views/storage_snapshots/new.html.haml   | 2 +-
 server/views/storage_volumes/new.html.haml     | 4 ++--
 server/views/storage_volumes/show.html.haml    | 4 ++--
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/server/views/addresses/show.html.haml b/server/views/addresses/show.html.haml
index 86eb546..d4d146c 100644
--- a/server/views/addresses/show.html.haml
+++ b/server/views/addresses/show.html.haml
@@ -16,5 +16,5 @@
           =link_to_action 'Disassociate', "#{address_url(@address.id)}/disassociate", :post
         - else
           - if driver.respond_to?(:associate_address)
-            =link_to_action 'Associate',"#{address_url(@address.id)}/associate", :get
+            =link_to_action 'Associate...',"#{address_url(@address.id)}/associate", :get
         =link_to_action "Destroy", destroy_address_url(@address.id), :delete
diff --git a/server/views/buckets/show.html.haml b/server/views/buckets/show.html.haml
index a1e1bbc..0ea89dc 100644
--- a/server/views/buckets/show.html.haml
+++ b/server/views/buckets/show.html.haml
@@ -19,5 +19,5 @@
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        %a{ :href => new_blob_form_url(@bucket), :'data-role' => "button", :'data-ajax'
=> 'false'} Create a new blob
+        %a{ :href => new_blob_form_url(@bucket), :'data-role' => "button", :'data-ajax'
=> 'false'} Create new blob...
         =link_to_action 'Delete bucket', destroy_bucket_url(@bucket.name), :delete
diff --git a/server/views/firewalls/new.html.haml b/server/views/firewalls/new.html.haml
index e570353..7fec9e2 100644
--- a/server/views/firewalls/new.html.haml
+++ b/server/views/firewalls/new.html.haml
@@ -1,4 +1,4 @@
-%h1 New Firewall
+%h1 New firewall
 
 %form{:action => firewalls_url, :method => :post, :'data-ajax' => 'false'}
   %label
@@ -8,4 +8,4 @@
   %label
     Firewall Description
     %input{:name => 'description', :size => 100}/
-  %input{:type => :submit, :name => "commit", :value=>"create"}
+  %input{:type => :submit, :name => "commit", :value=>"Create"}
diff --git a/server/views/images/show.html.haml b/server/views/images/show.html.haml
index 4ee622d..d33b3e7 100644
--- a/server/views/images/show.html.haml
+++ b/server/views/images/show.html.haml
@@ -36,5 +36,5 @@
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        %a{ :href => url_for("instances/new?image_id=#{@image.id}"), :'data-role' =>
"button", :'data-ajax' => 'false'} Launch
+        %a{ :href => url_for("instances/new?image_id=#{@image.id}"), :'data-role' =>
"button", :'data-ajax' => 'false'} Launch...
         = link_to_action 'Destroy', destroy_image_url(@image.id), :delete
diff --git a/server/views/instances/run_command.html.haml b/server/views/instances/run_command.html.haml
index 75c7534..a9d9bf9 100644
--- a/server/views/instances/run_command.html.haml
+++ b/server/views/instances/run_command.html.haml
@@ -1,4 +1,4 @@
-=header "Run a command on #{@instance.name}"
+=header "Run command on #{@instance.name}"
 =subheader "#{@instance.id}"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
diff --git a/server/views/instances/show.html.haml b/server/views/instances/show.html.haml
index bbe2e56..ae193aa 100644
--- a/server/views/instances/show.html.haml
+++ b/server/views/instances/show.html.haml
@@ -60,8 +60,8 @@
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
         - @instance.actions.each do |action|
-          =link_to_action action, self.send(:"#{action}_instance_url", @instance.id), instance_action_method(action)
+          =link_to_action action.to_s.capitalize, self.send(:"#{action}_instance_url", @instance.id),
instance_action_method(action)
         - if @instance.state=="RUNNING" and driver.respond_to?(:run_on_instance)
-          =link_to_action 'run command', url_for('instances/%s/run' % @instance.id), :get
+          =link_to_action 'Run command...', url_for('instances/%s/run' % @instance.id), :get
         - if @instance.can_create_image?
-          =link_to_action 'Create Image', url_for("images/new?instance_id=#{@instance.id}"),
:get
+          =link_to_action 'Create image...', url_for("images/new?instance_id=#{@instance.id}"),
:get
diff --git a/server/views/load_balancers/new.html.haml b/server/views/load_balancers/new.html.haml
index 1dffd61..6dffedd 100644
--- a/server/views/load_balancers/new.html.haml
+++ b/server/views/load_balancers/new.html.haml
@@ -35,5 +35,5 @@
         Instances port:
       %input{ :name => "listener_instance_port", :size => 30}
     %p
-      %input{ :type => :submit, :name => "commit", :value => "create" }/
+      %input{ :type => :submit, :name => "commit", :value => "Create" }/
 
diff --git a/server/views/load_balancers/show.html.haml b/server/views/load_balancers/show.html.haml
index 3725f81..7123319 100644
--- a/server/views/load_balancers/show.html.haml
+++ b/server/views/load_balancers/show.html.haml
@@ -1,4 +1,4 @@
-=header "Loadbalancer"
+=header "Load balancer"
 =subheader @load_balancer.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
@@ -20,7 +20,7 @@
       %li
         %a{ :href => instance_url(instance[:id]), :'data-ajax' => 'false'}
           %h3=instance[:name]
-          =link_to_action "UnRegister", url_for("load_balancers/#{@load_balancer.id}/unregister?instance_id=#{instance[:id]}"),
:post
+          =link_to_action "Unregister", url_for("load_balancers/#{@load_balancer.id}/unregister?instance_id=#{instance[:id]}"),
:post
     %li{ :'data-role' => 'list-divider'} Unregistered Instances
     - @unregistered_instances.each do |instance|
       %li
diff --git a/server/views/metrics/show.html.haml b/server/views/metrics/show.html.haml
index fc56238..648ba33 100644
--- a/server/views/metrics/show.html.haml
+++ b/server/views/metrics/show.html.haml
@@ -7,7 +7,7 @@
       %div{ :'data-role' => :'collapsible', :'data-collapse' => 'true'}
         %h3=p.name
         %table{ :summary => "#{p.name} values"}
-          %caption Statistics for last 60 minutes
+          %caption Statistics for the last 60 minutes
           %tr
             %th Time
             %th Minimum
diff --git a/server/views/storage_snapshots/index.html.haml b/server/views/storage_snapshots/index.html.haml
index abab276..4443141 100644
--- a/server/views/storage_snapshots/index.html.haml
+++ b/server/views/storage_snapshots/index.html.haml
@@ -1,4 +1,4 @@
-=header "Storage Snapshots"
+=header "Storage snapshots"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' =>
'a'}
diff --git a/server/views/storage_snapshots/new.html.haml b/server/views/storage_snapshots/new.html.haml
index c211672..1141209 100644
--- a/server/views/storage_snapshots/new.html.haml
+++ b/server/views/storage_snapshots/new.html.haml
@@ -6,4 +6,4 @@
       Volume ID:
     %input{ :name => 'volume_id', :size => 30, :value => params[:volume_id] }
   %p
-    %input{ :type => :submit, :name => "commit", :value => "create" }/
+    %input{ :type => :submit, :name => "commit", :value => "Create" }/
diff --git a/server/views/storage_volumes/new.html.haml b/server/views/storage_volumes/new.html.haml
index 115721f..f0923cb 100644
--- a/server/views/storage_volumes/new.html.haml
+++ b/server/views/storage_volumes/new.html.haml
@@ -1,4 +1,4 @@
-=header "Create new Storage Volume"
+=header "Create new storage volume"
 
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
@@ -20,4 +20,4 @@
         Realm ID:
       %input{ :name => "realm_id", :size => 10, :value => driver.realms(credentials).first.id}
     %p
-      %input{ :type => :submit, :name => "commit", :value => "create" }/
+      %input{ :type => :submit, :name => "commit", :value => "Create" }/
diff --git a/server/views/storage_volumes/show.html.haml b/server/views/storage_volumes/show.html.haml
index eddf5a9..9818334 100644
--- a/server/views/storage_volumes/show.html.haml
+++ b/server/views/storage_volumes/show.html.haml
@@ -35,9 +35,9 @@
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
         - if ["AVAILABLE", "IN-USE"].include?(@storage_volume.state)
-          =link_to_action "Snapshot", url_for("storage_snapshots/new?volume_id=#{@storage_volume.id}"),
:get
+          =link_to_action "Snapshot...", url_for("storage_snapshots/new?volume_id=#{@storage_volume.id}"),
:get
           - unless @storage_volume.instance_id
             =link_to_action "Delete", url_for("storage_volumes/#{@storage_volume.id}"), :delete
-            =link_to_action "Attach", url_for("storage_volumes/#{@storage_volume.id}/attach_instance"),
:get
+            =link_to_action "Attach...", url_for("storage_volumes/#{@storage_volume.id}/attach_instance"),
:get
           - if @storage_volume.instance_id
             =link_to_action "Detach", url_for("storage_volumes/#{@storage_volume.id}/detach"),
:post
-- 
1.8.0.msysgit.0



Mime
View raw message