On 09/01/14 15:40, Duncan Mac-Vicar P. wrote:
Attached patch with all mentioned issues corrected.
Now attached for real.
diff --git a/branding/templates/header.pxt b/branding/templates/header.pxt
index d90e605..c567b3a 100644
--- a/branding/templates/header.pxt
+++ b/branding/templates/header.pxt
@@ -21,6 +21,10 @@
script src=/javascript/bootstrap.js/script
script src=/javascript/spacewalk-essentials.js/script
script src=/javascript/spacewalk-checkall.js/script
+
+script src=/rhn/dwr/engine.js/script
+script src=/rhn/dwr/util.js/script
+script src=/rhn/dwr/interface/DWRItemSelector.js/script
/head
/pxt-passthrough
diff --git a/web/modules/pxt/PXT/HTML.pm b/web/modules/pxt/PXT/HTML.pm
index 7064042..dde1c7a 100644
--- a/web/modules/pxt/PXT/HTML.pm
+++ b/web/modules/pxt/PXT/HTML.pm
@@ -119,6 +119,7 @@ sub hidden {
#text(
# -name = foo,
# -value = foo,
+# -placeholder = foo,
# -maxlength = 30,
# -size = 15);
sub text{
@@ -129,7 +130,7 @@ sub text{
$class-_spew(-text no name given, defaulting to . $e{-name});
}
- return $class-_format(\%e,input type=\text\);
+ return $class-_format(\%e,input class=\form-control\ type=\text\);
}
#file(
@@ -451,6 +452,26 @@ sub link {
return sprintf qq{a href=%s$css_class$target%s/a}, $url, $label;
}
+sub button {
+ my $class = shift;
+ my $text = shift;
+ my %params = @_;
+
+ if (not exists $params{-name}) {
+die nameless button;
+ }
+
+ my @inner;
+ for my $attr (qw/value type name class/) {
+next unless exists $params{-$attr};
+push @inner, sprintf(qq{$attr=$params{-$attr}});
+ }
+
+ my $inner_str = join( , @inner);
+
+ return qq{button $inner_str$text/button};
+}
+
sub link2 {
my $class = shift;
my %params = validate(@_, { url = 1, text = 0, css = 0, target = 0, params = 0 });
@@ -527,6 +548,7 @@ my %rhn_icons = (
header-errata-set = fa spacewalk-icon-patch-set,
header-errata-set-add = fa pacewalk-icon-patchset-install,
header-event-history = fa fa-suitcase,
+header-filter = fa fa-eye,
header-help = fa fa-question-circle,
header-info = fa fa-info-circle text-primary,
header-package= fa spacewalk-icon-packages,
diff --git a/web/modules/sniglets/Sniglets/ListView/List.pm b/web/modules/sniglets/Sniglets/ListView/List.pm
index 47030ce..f5cada4 100644
--- a/web/modules/sniglets/Sniglets/ListView/List.pm
+++ b/web/modules/sniglets/Sniglets/ListView/List.pm
@@ -492,6 +492,17 @@ sub render_formvars {
sub render_alphabar {
my $self = shift;
+ my $pxt = shift;
+ my $content = shift;
+
+ # if there is no alphabar we still need the div there
+ my $template = $self-style-alphabar();
+ $template =~ s/\{alphabar_content\}/$content/;
+ return $template;
+}
+
+sub render_alphabar_content {
+ my $self = shift;
my $alphabar = shift;
my $pagesize = shift;
my $url = shift;
@@ -511,19 +522,15 @@ sub render_alphabar {
my $varstring = join('amp;', map { $_= . PXT::Utils-escapeURI($vars-{$_}) } keys %{$vars});
- push @ret, qq{A HREF=$url?$varstring class=list-alphabar-enabled$alpha/A};
+ push @ret, qq{lia href=$url?$varstring$alpha/a/li\n};
}
else {
- push @ret, qq {span class=list-alphabar-disabled$alpha/span};
+ push @ret, qq {li class=disableda href=#$alpha/a/li\n};
}
}
- my $bar = qq(div align=centerstrong\n) . join(, @ret) . qq(\n/strong/div\nbr /\n);
-
- my $html = $self-style-alphabar;
- $html =~ s/\{alphabar\}/$bar/;
-
- return $html;
+ my $bar = qq(ul class=spacewalk-alphabar pagination pagination-sm\n) . join(, @ret) . qq(\n/ul\n);
+ return $bar;
}
sub render_filterbox {
@@ -536,10 +543,12 @@ sub render_filterbox {
throw No 'sort_by' column for mode ' . $self-mode-{__name__} . '\n unless defined $filter_by;
- $ret .= q{div class=filter-input};
- $ret .= sprintf('Filter by %s: ', $filter_by-name);
+ $ret .= q{div class=spacewalk-list-filter};
+ $ret .= q{div class=input-group input-group-sm};
+
if ($self-filter_type eq 'text') {
-$ret .= PXT::HTML-text(-name = 'filter_value', -value = PXT::Utils-escapeHTML($self-filter_string || ''), -size = 12);
+$ret .= PXT::HTML-text(-name = 'filter_value', -value = PXT::Utils-escapeHTML($self-filter_string || ''),
+-placeholder = sprintf('Filter by %s: ', $filter_by-name));
$ret .= PXT::HTML-hidden(-name = 'prev_filter_value', -value = PXT::Utils-escapeHTML($self-filter_string || ''));
}
elsif ($self-filter_type eq 'select') {
@@ -554,8 +563,12 @@ sub render_filterbox {
throw Unknown filter type: ' . $self-filter_type . ';
}
- $ret .= ;
- $ret .= PXT::HTML-submit_image(-src = '/img/button-go.gif', -alt = Filter, -name = filter_list);
+ $ret .= q{div class=input-group-btn};
+ $ret .= PXT::HTML-button(PXT::HTML-icon(-type = 'header-filter') , -type = 'submit', -name = filter_list,
+-class = btn btn-default
