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 2012/05/22 22:19:38 UTC
[50/50] [abbrv] git commit: Core: Renamed @profiles to
@hardware_profiles to make standard operation helpers work
Core: Renamed @profiles to @hardware_profiles to make standard operation helpers work
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/1decd7de
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/1decd7de
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/1decd7de
Branch: refs/heads/master
Commit: 1decd7de3725d5cf2c916d1fa44d53c20047c4ee
Parents: 1f5a3f1
Author: Michal Fojtik <mf...@redhat.com>
Authored: Tue Apr 17 15:23:14 2012 +0200
Committer: Michal fojtik <mf...@redhat.com>
Committed: Tue May 22 22:17:34 2012 +0200
----------------------------------------------------------------------
server/views/hardware_profiles/index.html.haml | 2 +-
server/views/hardware_profiles/index.xml.haml | 4 ++--
server/views/hardware_profiles/show.html.haml | 6 +++---
server/views/hardware_profiles/show.xml.haml | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/1decd7de/server/views/hardware_profiles/index.html.haml
----------------------------------------------------------------------
diff --git a/server/views/hardware_profiles/index.html.haml b/server/views/hardware_profiles/index.html.haml
index 64e3455..59d43eb 100644
--- a/server/views/hardware_profiles/index.html.haml
+++ b/server/views/hardware_profiles/index.html.haml
@@ -3,7 +3,7 @@
%div{ :'data-role' => :content, :'data-theme' => 'c'}
%ul{ :'data-role' => :listview, :'data-inset' => :true }
- - for profile in @profiles
+ - for profile in @hardware_profiles
%li{ :'data-theme' => 'c'}
%a{ :href => hardware_profile_url(profile.name)}
%img{ :class => 'ui-link-thumb', :src => '/images/profile.png'}
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/1decd7de/server/views/hardware_profiles/index.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/hardware_profiles/index.xml.haml b/server/views/hardware_profiles/index.xml.haml
index cf0a69f..25e0496 100644
--- a/server/views/hardware_profiles/index.xml.haml
+++ b/server/views/hardware_profiles/index.xml.haml
@@ -1,4 +1,4 @@
!!! XML
%hardware_profiles
- - @profiles.each do |prof|
- = haml :'hardware_profiles/show', :locals => { :@profile => prof, :partial => true }
+ - @hardware_profiles.each do |prof|
+ = haml :'hardware_profiles/show', :locals => { :@hardware_profile => prof, :partial => true }
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/1decd7de/server/views/hardware_profiles/show.html.haml
----------------------------------------------------------------------
diff --git a/server/views/hardware_profiles/show.html.haml b/server/views/hardware_profiles/show.html.haml
index c27690e..033e94d 100644
--- a/server/views/hardware_profiles/show.html.haml
+++ b/server/views/hardware_profiles/show.html.haml
@@ -1,12 +1,12 @@
=header "Hardware profiles"
-=subheader @profile.name
+=subheader @hardware_profile.name
%div{ :'data-role' => :content, :'data-theme' => 'c'}
%ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
%li{ :'data-role' => 'list-divider'} Name
%li
- %p{ :'data-role' => 'fieldcontain'}=@profile.name
- - @profile.each_property do |p|
+ %p{ :'data-role' => 'fieldcontain'}=@hardware_profile.name
+ - @hardware_profile.each_property do |p|
%li{ :'data-role' => 'list-divider'} #{p.name.to_s.titlecase}
%li
%p{ :'data-role' => 'fieldcontain'}
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/1decd7de/server/views/hardware_profiles/show.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/hardware_profiles/show.xml.haml b/server/views/hardware_profiles/show.xml.haml
index 094ffd5..21e488c 100644
--- a/server/views/hardware_profiles/show.xml.haml
+++ b/server/views/hardware_profiles/show.xml.haml
@@ -1,9 +1,9 @@
- unless defined?(partial)
!!! XML
-%hardware_profile{ :href => hardware_profile_url(@profile.name), :id => @profile.name }
+%hardware_profile{ :href => hardware_profile_url(@hardware_profile.name), :id => @hardware_profile.name }
%name<
- =@profile.name
- - @profile.each_property do |prop|
+ = @hardware_profile.name
+ - @hardware_profile.each_property do |prop|
- attr = { :name => prop.name, :kind => prop.kind, :unit => prop.unit }
- if prop.kind == :fixed
%property{ attr, :value => prop.value }/