applies on Jan's "Packages are now groupped by group." patch.
---
src/app/stylesheets/aggregator.scss | 116 +++++++++++++---------
src/app/views/templates/_addbuttons.haml | 3 +
src/app/views/templates/_collections.haml | 3 +-
src/app/views/templates/_metagroup_packages.haml | 6 +-
src/app/views/templates/_searched_packages.haml | 3 +-
src/app/views/templates/content_selection.haml | 15 +--
6 files changed, 85 insertions(+), 61 deletions(-)
create mode 100644 src/app/views/templates/_addbuttons.haml
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
index 399549e..69d81c0 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -340,6 +340,19 @@ table {
background: url(../../images/icons/action-icons.png) no-repeat 0 0;
}
}
+input[type='submit'].icon {
+ border: none;
+ background: transparent;
+ font-size: 100%;
+ padding: 0;
+ &:hover {
+ @include no-box-shadow;
+ color: $dcprimary;
+ &[disabled] {
+ color: #000;
+ }
+ }
+}
.actionsidebar {
border-right: 1px solid darken($footerbg, 10%);
@@ -387,19 +400,6 @@ table {
form.buttononly {
display: inline-block;
}
- input[type='submit'].icon {
- border: none;
- background: transparent;
- font-size: 100%;
- padding: 0;
- &:hover {
- @include no-box-shadow;
- color: $dcprimary;
- &[disabled] {
- color: #000;
- }
- }
- }
span {
display: block;
position: absolute;
@@ -429,6 +429,62 @@ table {
}
}
+.packagegroupsidebar {
+ display: block;
+ text-align: right;
+ font-size: 120%;
+ li {
+ display: block;
+ margin: 0;
+ }
+ .icon {
+ text-transform: capitalize;
+ }
+}
+ #collections {
+ margin: 0 0 1em;
+ font-weight: bold;
+ }
+
+.metagrouppackages {
+ display: block;
+ &>li {
+ display: block;
+ text-transform: uppercase;
+ margin: 0 2em 2em 0; padding: 0;
+ label {
+ cursor: pointer;
+ }
+ ul {
+ @include column-count(3);
+ display: block;
+ text-transform: none;
+ font-size: 95%;
+ li {
+ display: block;
+ margin: 0 0 0 4px;
+ text-transform: capitalize;
+ label {
+ font-weight: normal;
+ }
+ }
+ }
+ }
+}
+
+.searchedpackages, .collections {
+ display: block;
+ margin: 0 2em 2em 0;
+ @include column-count(3);
+ li {
+ display: block;
+ margin: 0;
+ label {
+ font-weight: normal;
+ }
+ }
+}
+
/* ICONS */
img.icon {
@@ -1122,40 +1178,6 @@ a.iconbutton {
}
}
-.softwaregroups {
- height: 600px;
- overflow: auto;
- display: block;
- &>li {
- display: block;
- text-transform: uppercase;
- margin: 0 0 2em 0; padding: 0 0 0 20px;
- background: url('../../images/icons/expander-collapsed.png') no-repeat 0 0;
- &.expanded {
- background: url('../../images/icons/expander-expanded.png') no-repeat 0
0;
- }
- label {
- cursor: pointer;
- }
- }
- .packages {
- @include column-count(4);
- display: block;
- margin: 1em 0 0 0;
- &:first-child {
- margin: 0;
- }
- li {
- text-transform: none;
- display: block;
- label {
- font-weight: normal;
- }
- }
- }
-}
-
-
/* IE and other horror browser workarounds */
/* basic image styling for buttons in older browsers */
diff --git a/src/app/views/templates/_addbuttons.haml
b/src/app/views/templates/_addbuttons.haml
new file mode 100644
index 0000000..44cc12a
--- /dev/null
+++ b/src/app/views/templates/_addbuttons.haml
@@ -0,0 +1,3 @@
+%fieldset.clear
+ = submit_tag "Add Selected", :name => "add_selected", :class => "grid_2
alpha", :id => "do_add_software"
+ = submit_tag "Cancel", :name => "cancel_add_software", :class => "grid_2",
:id => "cancel_add_software"
diff --git a/src/app/views/templates/_collections.haml
b/src/app/views/templates/_collections.haml
index 1b4604b..96ddcad 100644
--- a/src/app/views/templates/_collections.haml
+++ b/src/app/views/templates/_collections.haml
@@ -1,6 +1,7 @@
-%ul.metagrouppackages
+%ul.collections
- @collections.keys.sort.each do |id|
%li
- selected = @collections[id][:selected] ? true : false
= check_box_tag 'groups[]', id, selected, {:disabled => selected, :id =>
"group_#{id}"}
= label_tag "group_#{id}", @collections[id][:name]
+= render :partial => 'addbuttons'
diff --git a/src/app/views/templates/_metagroup_packages.haml
b/src/app/views/templates/_metagroup_packages.haml
index 1ba0820..07459dc 100644
--- a/src/app/views/templates/_metagroup_packages.haml
+++ b/src/app/views/templates/_metagroup_packages.haml
@@ -4,11 +4,13 @@
- @metagroup_packages.keys.sort.each do |group|
%li
- selected = !...@metagroup_packages[group][:selected].nil?
- = check_box_tag 'groups[]', group, selected, {:disabled => selected, :id
=> "group_#{group}", :class => 'softwaregroups'}
- = label_tag "group_#{group}", group
+ %h5
+ = check_box_tag 'groups[]', group, selected, {:disabled => selected,
:id => "group_#{group}", :class => 'softwaregroups'}
+ = label_tag "group_#{group}", group
%ul
- @metagroup_packages[group][:packages].each do |pkg|
%li
- selected = @packages.to_a.find {|p| p[:name] == pkg}
= check_box_tag 'packages[]', pkg, selected, {:disabled =>
selected, :id => "package_#{group}_#{pkg}"}
= label_tag "package_#{group}_#{pkg}", pkg
+= render :partial => 'addbuttons'
diff --git a/src/app/views/templates/_searched_packages.haml
b/src/app/views/templates/_searched_packages.haml
index 084bb01..4bf3898 100644
--- a/src/app/views/templates/_searched_packages.haml
+++ b/src/app/views/templates/_searched_packages.haml
@@ -1,8 +1,9 @@
%h4
= "Search Results for '#{params[:package_search]}'"
-%ul.metagrouppackages
+%ul.searchedpackages
- @searched_packages.sort.each do |pkg|
%li
- selected = @packages.to_a.find {|p| p[:name] == pkg}
= check_box_tag 'packages[]', pkg, selected, {:disabled => selected, :id
=> "package_#{pkg}"}
= label_tag "package_#{pkg}", pkg
+= render :partial => 'addbuttons'
diff --git a/src/app/views/templates/content_selection.haml
b/src/app/views/templates/content_selection.haml
index 43ae9be..7697486 100644
--- a/src/app/views/templates/content_selection.haml
+++ b/src/app/views/templates/content_selection.haml
@@ -1,7 +1,7 @@
:javascript
$(document).ready(function() {
var $metagrouppackages = $('#metagrouppackages');
- $('input[name="show_metagroup"]').click(function(e) {
+ $('.metagroups input[name="show_metagroup"]').click(function(e) {
e.preventDefault();
var data = {
'show_metagroup': e.currentTarget.value,
@@ -27,22 +27,17 @@
.grid_8
%a.grid_4.omega Advanced Search
- %ul.metagroups{:class => 'actionsidebar', :style => 'float:left'}
+ %ul.metagroups{:class => 'packagegroupsidebar grid_4 alpha'}
%li
- = submit_tag 'Collections', :name => 'show_metagroup', :class => 'icon'
- %hr
+ = submit_tag 'Collections', :name => 'show_metagroup', :id =>
'collections', :class => 'icon'
- @metagroups.keys.sort.each do |cat|
%li
= submit_tag cat, :name => "show_metagroup", :class => 'icon'
- #metagrouppackages
+ #metagrouppackages.grid_12.omega.gap
- if @collections
= render :partial => 'collections'
- else
- if @metagroup_packages.blank?
- No group selected
+ %span.disabled No group selected
- else
= render :partial => 'metagroup_packages'
-
- %fieldset.clearfix
- = submit_tag "Add Selected", :name => "add_selected", :class => "grid_2
alpha", :id => "do_add_software"
- = submit_tag "Cancel", :name => "cancel_add_software", :class =>
"grid_2", :id => "cancel_add_software"
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
