[Rt-commit] r2689 - in rt/branches/PLATANO-EXPERIMENTAL-CSS: . etc
html/Elements html/NoAuth html/Prefs html/Widgets lib/t/regression
jesse at bestpractical.com
jesse at bestpractical.com
Sat Apr 16 04:14:20 EDT 2005
Author: jesse
Date: Sat Apr 16 04:14:17 2005
New Revision: 2689
Modified:
rt/branches/PLATANO-EXPERIMENTAL-CSS/ (props changed)
rt/branches/PLATANO-EXPERIMENTAL-CSS/etc/RT_Config.pm.in
rt/branches/PLATANO-EXPERIMENTAL-CSS/etc/initialdata
rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/ShowSearch
rt/branches/PLATANO-EXPERIMENTAL-CSS/html/NoAuth/list.js
rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/MyRT.html
rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/Quicksearch.html
rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/Search.html
rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Widgets/SelectionBox
rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/t/regression/18custom_frontpage.t
Log:
r13078 at hualien: jesse | 2005-04-16 03:01:09 -0400
r12972 at hualien: jesse | 2005-04-16 02:16:27 -0400
r6648 at hualien: jesse | 2005-03-09 13:32:18 -0500
r6638 at hualien (orig r2321): clkao | 2005-03-08 23:44:47 -0500
Kill all referers and "go back"s.
r6639 at hualien (orig r2322): clkao | 2005-03-09 00:15:21 -0500
Move selectAll to form onSubmit.
r6640 at hualien (orig r2323): clkao | 2005-03-09 00:20:13 -0500
Oops.
r6641 at hualien (orig r2324): clkao | 2005-03-09 00:44:38 -0500
More SelectionBox UI tweaks.
r6646 at hualien (orig r2329): clkao | 2005-03-09 13:04:48 -0500
Make SummaryRow a user preference.
r6647 at hualien (orig r2330): clkao | 2005-03-09 13:30:32 -0500
MyRT SubTabs.
Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/etc/RT_Config.pm.in
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/etc/RT_Config.pm.in (original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/etc/RT_Config.pm.in Sat Apr 16 04:14:17 2005
@@ -366,6 +366,11 @@
Set($MaxInlineBody, 13456);
+# $DefaultSummaryRows is default number of rows displayed in for search
+# results on the frontpage.
+
+Set($DefaultSummaryRows, 10);
+
# @MasonParameters is the list of parameters for the constructor of
# HTML::Mason's Apache or CGI Handler. This is normally only useful
# for debugging, eg. profiling individual components with:
Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/etc/initialdata
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/etc/initialdata (original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/etc/initialdata Sat Apr 16 04:14:17 2005
@@ -595,8 +595,7 @@
{ Format => "'<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__id__</a>/TITLE:#', '<a href=\"$RT::WebPath/Ticket/Display.html?id=__id__\">__Subject__</a>/TITLE:Subject', Priority, QueueName, ExtendedStatus",
Query => " Owner = '__CurrentUser__' AND ( Status = 'new' OR Status = 'open')",
OrderBy => 'Priority',
- Order => 'DESC',
- SummaryRows => 10, },
+ Order => 'DESC' },
},
{ Name => 'Search - My Requests',
Description => '[_1] newest unowned tickets', # loc
@@ -606,8 +605,7 @@
Query => " Owner = 'Nobody' AND ( Status = 'new' OR Status = 'open')",
OrderBy => 'Created',
- Order => 'DESC',
- SummaryRows => 10, },
+ Order => 'DESC' },
},
{ Name => 'HomepageSettings',
Description => 'HomepageSettings',
Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/ShowSearch
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/ShowSearch (original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/ShowSearch Sat Apr 16 04:14:17 2005
@@ -80,7 +80,7 @@
$customize = $RT::WebPath.'/Prefs/Search.html?'.$m->comp('/Elements/QueryString', name => ref($search).'-'.$search->Id)
}
-my $rows = $SearchArg->{SummaryRows} || 10;
+my $rows = $user->Preferences('SummaryRows', $RT::DefaultSummaryRows);
$SearchArg->{'Query'} =~ s/__CurrentUser__/$session{'CurrentUser'}->Id/ge;
$SearchArg->{'Format'} =~ s/__WebPath__/$RT::WebPath/g;
my $QueryString = '?' . $m->comp('/Elements/QueryString',
Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/NoAuth/list.js
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/NoAuth/list.js (original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/NoAuth/list.js Sat Apr 16 04:14:17 2005
@@ -43,7 +43,7 @@
if((src.childNodes[i].nodeName=="input" || src.childNodes[i].nodeName=="INPUT")
&& (src.childNodes[i].type=="submit" || src.childNodes[i].type=="SUBMIT")) {
- if(src.childNodes[i].name != "submit")
+ if (src.childNodes[i].name.indexOf("Save") < 0)
src.childNodes[i].type = "button";
if(src.childNodes[i].name=="add")
@@ -54,10 +54,6 @@
src.childNodes[i].onclick = new Function(this.name+".moveup();");
if(src.childNodes[i].name=="movedown")
src.childNodes[i].onclick = new Function(this.name+".movedown();");
- if(src.childNodes[i].type=="submit") {
- src.childNodes[i].onclick = new Function(this.name+".selectAll();");
- }
-
}
}
if (esrc) {
Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/MyRT.html
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/MyRT.html (original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/MyRT.html Sat Apr 16 04:14:17 2005
@@ -44,25 +44,22 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, Title => $title &>
-<& /User/Elements/Tabs,
+<& /Prefs/Elements/Tabs,
current_tab => 'Prefs/MyRT.html',
- Title => $title
+ Title => $title,
+ Searches => \@sys_searches
&>
<& /Widgets/SelectionBox:header &>
<& /Elements/ListActions, actions => \@actions &>
-<a href="<% $ARGS{'referer'} %>"><&|/l&>Go back</&></a><br>
<p>
-<&|/Elements/TitleBox, title => loc('Predefined searches'), bodyclass => "" &>
-<ul>
-<li><a href="<% $RT::WebPath %>/Prefs/Quicksearch.html"><&|/l&>Quick search</&></a></li>
-% for my $search (@sys_searches) {
-<li><a href="<% $RT::WebPath.'/Prefs/Search.html?'.$m->comp('/Elements/QueryString', name => ref($search->[1]).'-'.$search->[1]->Id) %>"><% $search->[0] %></a></li>
-% }
-</ul>
+<&|/Elements/TitleBox, title => loc('Options'), bodyclass => "" &>
+<form method="POST" action="MyRT.html">
+<&|/l&>Summary rows</&>:<input name="SummaryRows" value="<% $ARGS{SummaryRows} %>">
+<& /Elements/Submit, Caption => loc("Save"), Label => loc('Save'), Name => 'Save' &>
+</form>
</&>
-
% for my $pane (@panes) {
<&|/Elements/TitleBox, title => loc('RT at a glance').': '.loc($pane->{Name}), bodyclass => "" &>
<& /Widgets/SelectionBox:show, self => $pane &>
@@ -73,13 +70,21 @@
my $title = loc("Customize").' '.loc("RT at a glance");
my $user = $session{'CurrentUser'}->UserObj;
-$ARGS{'referer'} ||= $ENV{'HTTP_REFERER'};
unless (exists $session{'my_rt_portlets'}) {
my ($d_portlets) = RT::System->new($session{'CurrentUser'})->Attributes->Named('HomepageSettings');
$session{'my_rt_portlets'} = $user->Preferences('HomepageSettings', $d_portlets->Content);
}
+if ($ARGS{SummaryRows}) {
+ $user->SetPreferences('SummaryRows', $ARGS{SummaryRows});
+ push @actions, loc ('Preferences saved for [_1].', loc('summary rows'));
+}
+else {
+ $ARGS{SummaryRows} = $user->Preferences('SummaryRows', $RT::DefaultSummaryRows);
+}
+
+
my $portlets = $session{'my_rt_portlets'};
my %allowed_components = map {$_ => 1}
@@ -89,18 +94,19 @@
push @items, map {["component-$_", $_]} sort keys %allowed_components;
my $sys = RT::System->new($session{'CurrentUser'});
+my @objs = ($sys);
-unless ($session{'CurrentUser'}->HasRight( Right => 'LoadSavedSearch',
- Object=> $RT::System )) {
- return;
+if ($session{'CurrentUser'}->HasRight( Right => 'LoadSavedSearch',
+ Object=> $RT::System )) {
+ my $groups = RT::Groups->new($session{'CurrentUser'});
+ $groups->LimitToUserDefinedGroups;
+ $groups->WithMember(PrincipalId => $session{'CurrentUser'}->Id,
+ Recursively => 1);
+ push @objs, ($user, @{$groups->ItemsArrayRef()});
}
-my $groups = RT::Groups->new($session{'CurrentUser'});
-$groups->LimitToUserDefinedGroups;
-$groups->WithMember(PrincipalId => $session{'CurrentUser'}->Id,
- Recursively => 1);
my @sys_searches;
-for my $object ($sys, $user, @{$groups->ItemsArrayRef()}) {
+for my $object (@objs) {
for ($m->comp("/Search/Elements/SearchesForObject", Object => $object)) {
my ($desc, $search) = @$_;
if ($object eq $sys) {
Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/Quicksearch.html
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/Quicksearch.html (original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/Quicksearch.html Sat Apr 16 04:14:17 2005
@@ -44,15 +44,14 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, Title => $title &>
-<& /User/Elements/Tabs,
+<& /Prefs/Elements/Tabs,
current_tab => 'Prefs/MyRT.html',
+ current_subtab => 'Prefs/Quicksearch.html',
Title => $title
&>
<& /Elements/ListActions, actions => \@actions &>
-<a href="<% $ARGS{'referer'} %>"><&|/l&>Go back</&></a><br>
<FORM METHOD="POST" ACTION="Quicksearch.html" NAME="Preferences">
-<input type="hidden" name="referer" value="<%$ARGS{'referer'}%>">
% for my $queue (@queues) {
<input type=checkbox name="Want-<%$queue->Name%>" value="1"
@@ -69,7 +68,6 @@
<%INIT>
my @actions;
-$ARGS{'referer'} ||= $ENV{'HTTP_REFERER'};
my $title = loc("Customize").' '.loc("Quick search");
# The queue list is not loaded from cache, so it might be a bit inconsistent
my $user = $session{'CurrentUser'}->UserObj;
Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/Search.html
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/Search.html (original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Prefs/Search.html Sat Apr 16 04:14:17 2005
@@ -44,12 +44,13 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, Title => $title &>
-<& /User/Elements/Tabs,
+<& /Prefs/Elements/Tabs,
current_tab => 'Prefs/MyRT.html',
+# current_subtab => 'Prefs/Search.html?name='.$m->comp('/Elements/QueryString', name => $ARGS{name}),
+ current_subtab => 'Prefs/Search.html?name='.$ARGS{name},
Title => $title
&>
<& /Elements/ListActions, actions => \@actions &>
-<a href="<% $ARGS{'referer'} %>"><&|/l&>Go back</&></a><br>
% if ($session{'CurrentUser'}->HasRight( Object=> $RT::System, Right => 'SuperUser')) {
<&|/l&>You can also edit the predefined search itself</&>:
<a href="<% $RT::WebPath.'/Search/Build.html?'.
@@ -59,7 +60,6 @@
<br>
<FORM METHOD="POST" ACTION="Search.html" NAME="BuildQuery">
<input type=hidden name=name value="<%$ARGS{name}%>">
-<input type=hidden name=referer value="<%$ARGS{referer}%>">
<input type=hidden name=Format value="<%$ARGS{Format}%>">
<& /Search/Elements/DisplayOptions, %$SearchArg, %ARGS,
@@ -70,7 +70,6 @@
<%INIT>
my @actions;
-$ARGS{'referer'} ||= $ENV{'HTTP_REFERER'};
my $title = loc("Customize").' ';
my @fields = qw(Format Order OrderBy RowsPerPage);
Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Widgets/SelectionBox
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Widgets/SelectionBox (original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Widgets/SelectionBox Sat Apr 16 04:14:17 2005
@@ -91,7 +91,9 @@
}
$self->{Selected} = $ARGS{$self->{Name}.'-Selected'};
-$self->{Selected} = [$self->{Selected}] unless ref ($self->{Selected});
+if ($self->{Selected} && !ref($self->{Selected})) {
+ $self->{Selected} = [$self->{Selected}];
+}
if ($ARGS{fromjs}) {
$self->{Current} = $self->{Selected};
@@ -141,7 +143,7 @@
# XXX: Verify Current are within $self->{Available} here
-if ($ARGS{submit}) {
+if ($ARGS{$self->{Name}.'-Save'}) {
$self->{OnSubmit}->($self);
delete $self->{Modified};
}
@@ -166,23 +168,22 @@
</%method>
<%method show>
-<FORM METHOD="POST" ACTION="<%$self->{Action}%>" name="SelectionBox-<% $name %>" id="SelectionBox-<% $name %>">
+<FORM METHOD="POST" ACTION="<%$self->{Action}%>" name="SelectionBox-<% $name %>" id="SelectionBox-<% $name %>" onSubmit="list_<% $name %>.selectAll();">
<input type="hidden" name="<% $self->{Name} %>-Submit" value="1">
<& SelectionBox:current, self => $self &>
-<input type="hidden" name="referer" value="<%$ARGS{'referer'}%>">
<input type="hidden" name="fromjs" value="0">
<&|/l&>Available</&>:
% if ($self->{Modified}) {
<b><&|/l&>(Modified, Please save)</&></b>
% }
<br>
-<select name="<%$name%>-Available" multiple >
+<select name="<%$name%>-Available" id="<%$name%>-Available" size="<%$size%>" multiple="multiple">
% for (@{$self->{Available}}) {
<option value="<% $_->[0] %>"><% $_->[1] %></option>
% }
</select>
<input name="add" type="submit" value="->"/>
-<select name="<%$name%>-Selected" multiple>
+<select name="<%$name%>-Selected" id="<%$name%>-Selected" size="<%$size%>" multiple="multiple">
% for (@{$self->{Current}}) {
<option value="<% $_ %>"
% if (exists $selected{$_}) {
@@ -193,11 +194,9 @@
</select>
<input name="moveup" type="submit" value="^"/>
<input name="movedown" type="submit" value="v"/>
- <input name="remove" type="submit" value="X"/>
- <input name="submit" type="submit" value="<&|/l&>Save</&>"/>
+ <input name="remove" type="submit" value="<&|/l&>Delete</&>"/>
-%# the save button does not work because it's not direct child of the form element
-%#<& /Elements/Submit, Caption => loc("Save"), Label => loc('Save'), Name => $name.'-Save' &>
+<& /Elements/Submit, Caption => loc("Save"), Label => loc('Save'), Name => $name.'-Save' &>
</form>
@@ -206,12 +205,12 @@
</script>
<%ARGS>
$self => undef
+$size => 10
</%ARGS>
<%INIT>
my $name = $self->{Name};
my %selected = map {$_ => 1} @{$self->{Selected}};
my %item_map = map {$_->[0] => $_->[1]} @{$self->{Available}};
-$ARGS{'referer'} ||= $ENV{'HTTP_REFERER'};
</%INIT>
</%method>
Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/t/regression/18custom_frontpage.t
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/t/regression/18custom_frontpage.t (original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/t/regression/18custom_frontpage.t Sat Apr 16 04:14:17 2005
@@ -26,7 +26,7 @@
$m->field ('body-Selected' => ['component-QuickCreate', 'system-My Requests', 'system-My Tickets']);
$m->click_button (name => 'remove');
$m->form_name ('SelectionBox-body');
-$m->click_button (name => 'submit');
+$m->click_button (name => 'body-Save');
$m->get ( BaseURL );
$m->content_lacks ('highest priority tickets', 'remove everything from body pane');
@@ -43,6 +43,6 @@
$m->click_button (name => 'movedown');
$m->form_name ('SelectionBox-body');
-$m->click_button (name => 'submit');
+$m->click_button (name => 'body-Save');
$m->get ( BaseURL );
$m->content_like (qr'highest priority tickets', 'adds them back');
More information about the Rt-commit
mailing list