From: Jan Provaznik <[email protected]>
helpers were very simple, so they are now injected into haml
---
src/app/helpers/image_descriptor_helper.rb | 29 --------------------------
src/app/views/image_descriptor/_targets.haml | 4 ++-
src/app/views/image_descriptor/software.haml | 4 +-
3 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/src/app/helpers/image_descriptor_helper.rb
b/src/app/helpers/image_descriptor_helper.rb
index 73d2502..fc89001 100644
--- a/src/app/helpers/image_descriptor_helper.rb
+++ b/src/app/helpers/image_descriptor_helper.rb
@@ -1,31 +1,2 @@
module ImageDescriptorHelper
- def tree_list(domid, data, action_name, action_callback)
- list = data.map do |group, pkgs|
- package_list(pkgs, action_name, action_callback)
- end
- return "<ul id='#{domid}' class='filetree'><li>" + list.join("</li><li>")
+ "</li></ul>"
- end
-
- def package_list(pkgs, action_name, action_callback)
- list = pkgs.map do |pkg|
- "<span class='pkgname'>#{pkg[:name]}</span><span style='float:right'
onclick='#{action_callback}'>#{action_name}</span>"
- end
- return "<li>" + list.join("</li><li>") + "</li>"
- end
-
- def js_add_group_cmd(group, pkgs)
- "select_group({group: '#{group}', pkgs: ['#{pkgs.map {|p|
p[:name]}.join("','")}']});"
- end
-
- def select_repository_tag(repositories)
- select_tag("repository", ["<option value='all'
selected='selected'>All</option>"] + repositories.map{|repid, rep| "<option
value=\"#{repid}\">#{rep['name']}</option>"}, {:onchange =>
"get_repository(event)"})
- end
-
- def image_target_actions(descriptor, target)
- str = ' '
- if ImageDescriptorTarget::ACTIVE_STATES.include?(target.status)
- str = link_to 'Cancel', {:controller => 'image_descriptor_target',
:action => 'cancel', :id => target.id, :descriptor_id => descriptor.id}
- end
- return str
- end
end
diff --git a/src/app/views/image_descriptor/_targets.haml
b/src/app/views/image_descriptor/_targets.haml
index be66513..77406f7 100644
--- a/src/app/views/image_descriptor/_targets.haml
+++ b/src/app/views/image_descriptor/_targets.haml
@@ -6,7 +6,9 @@
- @image_descriptor.image_descriptor_targets.each do |target|
%li
%span{:class => 'actions'}
- = image_target_actions(@image_descriptor, target)
+
+ - if ImageDescriptorTarget::ACTIVE_STATES.include?(target.status)
+ = link_to 'Cancel', {:controller => 'image_descriptor_target',
:action => 'cancel', :id => target.id, :descriptor_id => @image_descriptor.id}
%span{:class => 'status'}
= target.status
= @all_targets[target.name]['name']
diff --git a/src/app/views/image_descriptor/software.haml
b/src/app/views/image_descriptor/software.haml
index 47f377f..9821af3 100644
--- a/src/app/views/image_descriptor/software.haml
+++ b/src/app/views/image_descriptor/software.haml
@@ -10,7 +10,7 @@
// when JS is enabled, hide the Dashboard content -- it'll be loaded
// by jquery UI tab using ajax
$("#dashboard-content").hide();
- #...@image_descriptor.xml.packages.map {|group, pkgs|
js_add_group_cmd(group, pkgs)}.join("\n")}
+ #...@image_descriptor.xml.packages.map {|group, pkgs|
"select_group({group: '#{group}', pkgs: ['#{pkgs.map {|p|
p[:name]}.join("','")}']});"}.join("\n")}
});
function remove_group(ev) {
$(ev.target).parent().remove();
@@ -66,7 +66,7 @@
%li{ :class => "#{selection_style} ui-state-default
ui-corner-top", :style => 'clear: none' }
= "<a href=\"#{url_for :controller => "image_descriptor",
:action => item[:action] }\"><span>#{item[:text]}</span></a>"
%li{ :class => "select_repository"}
- = select_repository_tag(@repositories)
+ = select_tag("repository", ["<option value='all'
selected='selected'>All</option>"] + @repositories.map{|repid, rep| "<option
value=\"#{repid}\">#{rep['name']}</option>"}, {:onchange =>
"get_repository(event)"})
.pkglist{:style => "margin-left: 30px", :class => "left-pkglist"}
%div{:class => "ui-tabs ui-widget ui-widget-content ui-corner-all
ui-helper-reset ui-helper-clearfix ui-widget-header"}
Selected packages
--
1.7.0.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
