---
server/views/hardware_profiles/index.xml.haml | 2 +-
server/views/hardware_profiles/show.xml.haml | 2 +-
server/views/images/index.xml.haml | 2 +-
server/views/instances/index.xml.haml | 6 +++---
server/views/instances/show.xml.haml | 6 +++---
server/views/storage_snapshots/index.xml.haml | 6 +++---
server/views/storage_snapshots/show.xml.haml | 4 ++--
server/views/storage_volumes/index.xml.haml | 4 ++--
server/views/storage_volumes/show.xml.haml | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/server/views/hardware_profiles/index.xml.haml
b/server/views/hardware_profiles/index.xml.haml
index 52f91a4..cf0a69f 100644
--- a/server/views/hardware_profiles/index.xml.haml
+++ b/server/views/hardware_profiles/index.xml.haml
@@ -1,4 +1,4 @@
!!! XML
-%hardware-profiles
+%hardware_profiles
- @profiles.each do |prof|
= haml :'hardware_profiles/show', :locals => { :@profile => prof, :partial
=> true }
diff --git a/server/views/hardware_profiles/show.xml.haml
b/server/views/hardware_profiles/show.xml.haml
index 4a289a1..b39d6f0 100644
--- a/server/views/hardware_profiles/show.xml.haml
+++ b/server/views/hardware_profiles/show.xml.haml
@@ -1,6 +1,6 @@
- unless defined?(partial)
!!! XML
-%hardware-profile{ :href => hardware_profile_url(@profile.name) }
+%hardware_profile{ :href => hardware_profile_url(@profile.name) }
%id= @profile.name
- @profile.each_property do |prop|
- attr = { :name => prop.name, :kind => prop.kind, :unit => prop.unit }
diff --git a/server/views/images/index.xml.haml
b/server/views/images/index.xml.haml
index a86cc5b..9236d02 100644
--- a/server/views/images/index.xml.haml
+++ b/server/views/images/index.xml.haml
@@ -4,7 +4,7 @@
- if full_listing_mode?(:images)
%image{:href => image_url(image.id)}
- image.attributes.each do |attribute|
- - haml_tag(attribute, :<) do
+ - haml_tag("#{attribute}".tr('-', '_'), :<) do
- haml_concat image.send(attribute)
- else
%image{ :href => image_url(image.id), :id => image.id }
diff --git a/server/views/instances/index.xml.haml
b/server/views/instances/index.xml.haml
index 176d706..c6a208a 100644
--- a/server/views/instances/index.xml.haml
+++ b/server/views/instances/index.xml.haml
@@ -9,17 +9,17 @@
%image{:href => image_url(instance.image_id)}
%realm{:href => realm_url(instance.realm_id)}
%state #{instance.state}
- - haml_tag :"hardware-profile", { :href =>
hardware_profile_url(instance.instance_profile.id)} do
+ - haml_tag :"hardware_profile", { :href =>
hardware_profile_url(instance.instance_profile.id)} do
%id #{instance.instance_profile.id}
- instance.instance_profile.overrides.each do |p, v|
%property{:kind => 'fixed', :name => p, :value => v, :unit =>
Deltacloud::HardwareProfile::unit(p)}
%actions
- instance.actions.compact.each do |action|
%link{:rel => action, :href => self.send("#{action}_instance_url",
instance.id), :method => instance_action_method(action)}
- %public-addresses
+ %public_addresses
- instance.public_addresses.each do |address|
%address #{address}
- %private-addresses
+ %private_addresses
- instance.private_addresses.each do |address|
%address #{address}
- else
diff --git a/server/views/instances/show.xml.haml
b/server/views/instances/show.xml.haml
index cfe5e80..2881100 100644
--- a/server/views/instances/show.xml.haml
+++ b/server/views/instances/show.xml.haml
@@ -10,7 +10,7 @@
%realm{:href => realm_url(@instance.realm_id)}
%state<
[email protected]
- - haml_tag :"hardware-profile", {:href =>
hardware_profile_url(@instance.instance_profile.id)} do
+ - haml_tag :"hardware_profile", {:href =>
hardware_profile_url(@instance.instance_profile.id)} do
%id<
[email protected]_profile.id
- @instance.instance_profile.overrides.each do |p, v|
@@ -18,11 +18,11 @@
%actions
- @instance.actions.compact.each do |instance_action|
%link{:rel => instance_action, :method =>
instance_action_method(instance_action), :href =>
self.send("#{instance_action}_instance_url", @instance.id)}
- %public-addresses
+ %public_addresses
- @instance.public_addresses.each do |address|
%address<
=address
- %private-addresses
+ %private_addresses
- @instance.private_addresses.each do |address|
%address<
=address
diff --git a/server/views/storage_snapshots/index.xml.haml
b/server/views/storage_snapshots/index.xml.haml
index 734e00f..46b362f 100644
--- a/server/views/storage_snapshots/index.xml.haml
+++ b/server/views/storage_snapshots/index.xml.haml
@@ -1,11 +1,11 @@
!!!XML
-%storage-snapshots
+%storage_snapshots
- @elements.each do |snapshot|
- %storage-snapshot{ :href => storage_snapshot_url(snapshot.id)}
+ %storage_snapshot{ :href => storage_snapshot_url(snapshot.id)}
%id<
=snapshot.id
%created<
=snapshot.created
%state<
=snapshot.state
- %storage-volume{ :href => storage_volume_url(snapshot.storage_volume_id)}
+ %storage_volume{ :href => storage_volume_url(snapshot.storage_volume_id)}
diff --git a/server/views/storage_snapshots/show.xml.haml
b/server/views/storage_snapshots/show.xml.haml
index 49e3f00..912f97a 100644
--- a/server/views/storage_snapshots/show.xml.haml
+++ b/server/views/storage_snapshots/show.xml.haml
@@ -1,9 +1,9 @@
!!!XML
-%storage-snapshot{:href => storage_snapshot_url(@storage_snapshot.id)}
+%storage_snapshot{:href => storage_snapshot_url(@storage_snapshot.id)}
%id<
=...@storage_snapshot.id
%created<
=...@storage_snapshot.created
%state<
=...@storage_snapshot.state
- %storage-volume{:href =>
storage_volume_url(@storage_snapshot.storage_volume_id)}
+ %storage_volume{:href =>
storage_volume_url(@storage_snapshot.storage_volume_id)}
diff --git a/server/views/storage_volumes/index.xml.haml
b/server/views/storage_volumes/index.xml.haml
index e07596f..bc55ff4 100644
--- a/server/views/storage_volumes/index.xml.haml
+++ b/server/views/storage_volumes/index.xml.haml
@@ -1,7 +1,7 @@
!!!XML
-%storage-volumes
+%storage_volumes
- @elements.each do |volume|
- %storage-volume{ :href => storage_volume_url(volume.id)}
+ %storage_volume{ :href => storage_volume_url(volume.id)}
%id<
=volume.id
%created<
diff --git a/server/views/storage_volumes/show.xml.haml
b/server/views/storage_volumes/show.xml.haml
index 18f2e42..b6b1088 100644
--- a/server/views/storage_volumes/show.xml.haml
+++ b/server/views/storage_volumes/show.xml.haml
@@ -1,5 +1,5 @@
!!!XML
-%storage-volume{ :href => storage_volume_url(@storage_volume.id)}
+%storage_volume{ :href => storage_volume_url(@storage_volume.id)}
%id<
=...@storage_volume.id
%created<
--
1.7.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
