[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-150-gaeeba39
Jesse Vincent
jesse at bestpractical.com
Wed Oct 13 06:47:19 EDT 2010
The branch, 3.9-trunk has been updated
via aeeba39931584c93817d9e885de3dda1888c824c (commit)
via a748bbd641688c676a5fd1ccad726e514c600cfb (commit)
via b3c7e07d145e2aa9ace09a61aaba48f2af05af57 (commit)
via b7036028741eebd61d0a4b4cbaab91ef9fe7f941 (commit)
via 428ba92f1e6a9daa31a844b88324a4df74bb41b3 (commit)
via 0647b130ca9c3630d1f9ca0a45dbc52cc674087e (commit)
via 96268ef6d9cecebf75f2401c936e82ab92ca6bed (commit)
via 12305a7f80ac9a81592b5cb3659178d83d6458d9 (commit)
via 6aba38f4a7494bdd70aff1995906bdb7b4e3accd (commit)
via 0bc3fa25bad986882a1b796e0dacdafafa12b326 (commit)
via 15dc572d2f7af380584252a8ca1fe36d9de4518b (commit)
via e3bb3c9dea59d69200f7b40885b0df847710839d (commit)
via 93497091766f1dade43e55651114b09bc70d9c9a (commit)
via d896a83f30c64caae9b3d2940d37179409deb27a (commit)
via bba107fdf0ef32522c1b9ec6659eef5a9548e9b1 (commit)
via 2daf924e85cf9b9557ae6f31e9eaf93a52c4f982 (commit)
via 77e2dc15a44a6208f501f139883657d74b68792b (commit)
from a489db10ecd430c0bdabd07883ebc585b9773f02 (commit)
Summary of changes:
Makefile.in | 6 +--
lib/RT.pm.in | 6 +-
share/html/Dashboards/Elements/Tabs | 26 ++------
share/html/Dashboards/Modify.html | 10 ++--
share/html/NoAuth/css/web2/boxes.css | 4 -
share/html/NoAuth/css/web2/layout.css | 9 ++-
share/html/NoAuth/css/web2/nav.css | 2 +-
share/html/NoAuth/css/web2/ticket-lists.css | 62 +++++++++++++++++
share/html/NoAuth/css/web2/ticket-search.css | 55 ++++++++++++++-
share/html/Prefs/MyRT.html | 11 ++-
share/html/Search/Build.html | 4 +-
share/html/Search/Chart.html | 11 ++-
share/html/Search/Elements/Chart | 77 +++++++++++----------
share/html/Search/Elements/DisplayOptions | 94 +-------------------------
share/html/Search/Elements/EditFormat | 29 ++++++--
share/html/Search/Elements/EditSearches | 9 ++-
share/html/Search/Elements/EditSort | 93 +++++++++++++++++++++++++
share/html/Ticket/Create.html | 6 +-
18 files changed, 314 insertions(+), 200 deletions(-)
create mode 100644 share/html/Search/Elements/EditSort
- Log -----------------------------------------------------------------
commit 77e2dc15a44a6208f501f139883657d74b68792b
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 21:14:38 2010 -0400
Actually install the message catalogs on install, not just on upgrade.
diff --git a/Makefile.in b/Makefile.in
index 3b9ec8c..bbd1cc3 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -358,7 +358,7 @@ dirs:
install: testdeps config-install dirs files-install fixperms instruct
-files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install font-install
+files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install font-install po-install
config-install:
@COMMENT_INPLACE_LAYOUT@ $(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)
commit 2daf924e85cf9b9557ae6f31e9eaf93a52c4f982
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 21:29:35 2010 -0400
absolutify the global lexicon path
diff --git a/lib/RT.pm.in b/lib/RT.pm.in
index 6825f05..06b3a67 100755
--- a/lib/RT.pm.in
+++ b/lib/RT.pm.in
@@ -110,9 +110,9 @@ unless ( File::Spec->file_name_is_absolute($EtcPath) ) {
$BasePath = Cwd::realpath( $BasePath );
for my $path ( qw/EtcPath BinPath SbinPath VarPath LocalPath LocalEtcPath
- LocalLibPath LocalLexiconPath PluginPath LocalPluginPath
- MasonComponentRoot MasonLocalComponentRoot MasonDataDir
- MasonSessionDir/ ) {
+ LocalLibPath LexiconPath LocalLexiconPath PluginPath
+ LocalPluginPath MasonComponentRoot MasonLocalComponentRoot
+ MasonDataDir MasonSessionDir/ ) {
no strict 'refs';
# just change relative ones
$$path = File::Spec->catfile( $BasePath, $$path )
commit bba107fdf0ef32522c1b9ec6659eef5a9548e9b1
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 21:30:43 2010 -0400
remove outdated upgrade-noclobber Makefile target
diff --git a/Makefile.in b/Makefile.in
index bbd1cc3..bf84331 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -275,10 +275,6 @@ upgrade-instruct:
upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
-upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install po-install font-install fixperms
-
-
-
my_with_web_handlers= $(shell $(PERL) -e 'print join " ", map "--with-$$_", grep defined && length, split /,/, "$(WEB_HANDLER)"')
testdeps:
$(PERL) ./sbin/rt-test-dependencies --verbose --with-$(DB_TYPE) $(my_with_web_handlers)
commit d896a83f30c64caae9b3d2940d37179409deb27a
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 21:48:53 2010 -0400
visited titlebox titles shouldn't be white
diff --git a/share/html/NoAuth/css/web2/boxes.css b/share/html/NoAuth/css/web2/boxes.css
index b36087b..87066b2 100644
--- a/share/html/NoAuth/css/web2/boxes.css
+++ b/share/html/NoAuth/css/web2/boxes.css
@@ -105,10 +105,6 @@
}
-.titlebox .titlebox-title a:visited {
- color: #fff;
-}
-
.titlebox .titlebox-title .left {
font-weight: bold;
background: #ccc;
commit 93497091766f1dade43e55651114b09bc70d9c9a
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 21:49:14 2010 -0400
put "Reset RT at a glance" into a box
diff --git a/share/html/Prefs/MyRT.html b/share/html/Prefs/MyRT.html
index ab164d2..a870cdf 100644
--- a/share/html/Prefs/MyRT.html
+++ b/share/html/Prefs/MyRT.html
@@ -55,10 +55,6 @@
<& /Widgets/SelectionBox:header, nojs => 1 &>
-<form method="post" action="MyRT.html">
-<input type="hidden" name="Reset" value="1" />
-<input type="submit" class="button" value="<% loc('Reset to default') %>">
-</form>
<br />
@@ -78,6 +74,13 @@
<input type="submit" class="button" name="UpdateSummaryRows" value="<% loc('Save') %>" />
</form>
</&>
+<&|/Widgets/TitleBox, title => loc("Reset RT at a glance") &>
+<form method="post" action="MyRT.html">
+<input type="hidden" name="Reset" value="1" />
+<input type="submit" class="button" value="<% loc('Reset to default') %>">
+</form>
+</&>
+
<%INIT>
my @results;
commit e3bb3c9dea59d69200f7b40885b0df847710839d
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 22:03:42 2010 -0400
Add a link to "show" for our current dashboard
diff --git a/share/html/Dashboards/Elements/Tabs b/share/html/Dashboards/Elements/Tabs
index eb2dc3c..884f290 100755
--- a/share/html/Dashboards/Elements/Tabs
+++ b/share/html/Dashboards/Elements/Tabs
@@ -69,30 +69,16 @@ if ( $DashboardObj and $DashboardObj->Id ) {
$current_subtab = $render;
$actions = {
- a_Basics => {
- title => loc('Basics'),
- path => $modify,
- },
-
- b_Queries => {
- title => loc('Queries'),
- path => $queries,
- },
-
- c_Subscription => {
- title => loc('Subscription'),
- path => $subscribe,
- },
+ a_Show => { title => loc('Show'), path => $render, },
+ b_Basics => { title => loc('Basics'), path => $modify, },
+ c_Queries => { title => loc('Queries'), path => $queries, },
+ d_Subscription => { title => loc('Subscription'), path => $subscribe, },
};
- delete $actions->{"c_Subscription"}
- unless $DashboardObj->CurrentUserCanSubscribe;
+ delete $actions->{"d_Subscription"} unless $DashboardObj->CurrentUserCanSubscribe;
}
else {
- $subtabs->{"a_Select"} = {
- title => loc('Select'),
- path => "Dashboards/index.html",
- };
+ $subtabs->{"a_Select"} = { title => loc('Select'), path => "Dashboards/index.html", };
my $dashboard = RT::Dashboard->new($session{'CurrentUser'});
my @objects = $dashboard->ObjectsForCreating;
commit 15dc572d2f7af380584252a8ca1fe36d9de4518b
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 22:04:02 2010 -0400
small cleanup to the basic dashboard modify page
diff --git a/share/html/Dashboards/Modify.html b/share/html/Dashboards/Modify.html
index 0dd2e4c..cb90aa9 100755
--- a/share/html/Dashboards/Modify.html
+++ b/share/html/Dashboards/Modify.html
@@ -60,6 +60,8 @@
% } else {
<input type="hidden" class="hidden" name="id" value="<%$Dashboard->Id%>" />
% }
+
+<&|/Widgets/TitleBox, title => loc('Basics') &>
<table>
<tr><td align="right">
<&|/l&>Name</&>:
@@ -72,11 +74,9 @@
<& /Dashboards/Elements/SelectPrivacy, Name => "Privacy", Objects => \@privacies, Default => $Dashboard->Privacy &>
</td></tr>
</table>
-% if ( $Create ) {
-<& /Elements/Submit, Name => 'Save', Label => loc('Create') &>
-% } else {
-<& /Elements/Submit, Name => 'Save', Label => loc('Save Changes') &>
-% }
+</&>
+<& /Elements/Submit, Name => 'Save', Label =>( $Create ? loc('Create') : loc('Save Changes') ) &>
+
% if ($Dashboard->Id && $can_delete) {
<& /Elements/Submit, Name => 'Delete', Label => loc('Delete') &>
% }
commit 0bc3fa25bad986882a1b796e0dacdafafa12b326
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 22:46:49 2010 -0400
style updates to chart
diff --git a/share/html/NoAuth/css/web2/ticket-lists.css b/share/html/NoAuth/css/web2/ticket-lists.css
index 7c2c27c..cc5ae98 100644
--- a/share/html/NoAuth/css/web2/ticket-lists.css
+++ b/share/html/NoAuth/css/web2/ticket-lists.css
@@ -171,4 +171,50 @@ padding-bottom: 1em;
}
+.chart.image {
+ margin-top: -1em;
+ padding-right: 2em;
+ float: left;
+ clear: both;
+}
+
+.chart-wrapper {
+ display: block;
+ width: auto;
+}
+
+.chart-wrapper .collection-as-table {
+ width: auto;
+ font-size: 1em;
+}
+
+.chart-wrapper .collection-as-table th.collection-as-table {
+ text-align: center;
+ padding: 0.5em;
+ padding-right: 1em;
+ padding-left: 1em;
+}
+
+.chart-wrapper .collection-as-table tr.total td {
+ border-top: 1px solid #ccc;
+}
+.chart-wrapper .collection-as-table td.value {
+ padding-left: 0.5em;
+}
+
+.chart-wrapper .query {
+ clear: both;
+ text-align: center;
+ font-size: 1.2em;
+ padding: 1em;
+}
+
+.chart-wrapper .collection-as-table .label {
+ font-weight: bold;
+}
+
+
+.chart-wrapper .query .label {
+ font-weight: bold;
+}
diff --git a/share/html/Search/Chart.html b/share/html/Search/Chart.html
index 79981ad..daa30e5 100644
--- a/share/html/Search/Chart.html
+++ b/share/html/Search/Chart.html
@@ -85,7 +85,6 @@ my @actions = $m->comp( '/Widgets/SavedSearch:process', args => \%ARGS, self =>
<& /Elements/ListActions, actions => \@actions &>
<& /Search/Elements/Chart, %ARGS &>
-<br />
<&| /Widgets/TitleBox, title => loc('Graph Properties')&>
<form method="get" action="<%RT->Config->Get('WebPath')%>/Search/Chart.html">
<input type="hidden" class="hidden" name="Query" value="<% $ARGS{Query} %>" />
diff --git a/share/html/Search/Elements/Chart b/share/html/Search/Elements/Chart
index a718cbc..dd95466 100644
--- a/share/html/Search/Elements/Chart
+++ b/share/html/Search/Elements/Chart
@@ -87,65 +87,66 @@ my %loc_keys;
foreach my $key (@keys) { $data{$key} = shift @values; $loc_keys{$key} = loc($key); }
my @sorted_keys = map { $loc_keys{$_}} sort { $loc_keys{$a} cmp $loc_keys{$b} } keys %loc_keys;
my @sorted_values = map { $data{$_}} sort { $loc_keys{$a} cmp $loc_keys{$b} } keys %loc_keys;
-
-
my $query_string = $m->comp('/Elements/QueryString', %ARGS);
-</%init>
-
-<% loc('Query:') %> <% $Query %><br />
+my ($i,$total);
+</%init>
+<div class="chart-wrapper">
+<span class="chart image">
% if (RT->Config->Get('DisableGD')) {
<% loc('Graphical charts are not available.') %><br />
% } else {
-<img src="<%RT->Config->Get('WebPath')%>/Search/Chart?<%$query_string|n%>" /><br />
+<img src="<%RT->Config->Get('WebPath')%>/Search/Chart?<%$query_string|n%>" />
% }
-
-<table class="collection-as-table">
+</span>
+<table class="collection-as-table chart">
<tr>
<th class="collection-as-table"><% loc($tix->Label($PrimaryGroupBy)) %>
</th>
<th class="collection-as-table"><&|/l&>Tickets</&>
</th>
</tr>
-% my ($i,$total);
% while (my $key = shift @sorted_keys) {
-% $i++;
-% my $value = shift @sorted_values;
-% $total += $value;
<tr class="<%$i%2 ? 'evenline' : 'oddline' %>">
+<%perl>
+ $i++;
+ my $value = shift @sorted_values;
+ $total += $value;
+</%perl>
+<%perl>
+# TODO sadly we don't have "creator.city is null" or alike support yet
+# so no link if the key is undef for now
+ if ( $PrimaryGroupBy !~ /(Hourly|Daily|Monthly|Annually)$/
+ && $key ne loc('(no value)') ) {
+ my $group = $PrimaryGroupBy; $group =~ s! !.!;
+ my %orig_keys = reverse %loc_keys;
+ my $QueryString = $m->comp('/Elements/QueryString',
+ Query => "$Query and $group = '$orig_keys{$key}'",
+ Format => $ARGS{Format},
+ Rows => $ARGS{Rows},
+ OrderBy => $ARGS{OrderBy},
+ Order => $ARGS{Order},
+ );
+</%perl>
<td class="label collection-as-table">
-%# TODO sadly we don't have "creator.city is null" or alike support yet
-%# so no link if the key is undef for now
-% if ( $PrimaryGroupBy !~ /(Hourly|Daily|Monthly|Annually)$/
-% && $key ne loc('(no value)') ) {
-% my $group = $PrimaryGroupBy; $group =~ s! !.!;
-% my %orig_keys = reverse %loc_keys;
-% my $QueryString = $m->comp('/Elements/QueryString',
-% Query => "$Query and $group = '$orig_keys{$key}'",
-% Format => $ARGS{Format},
-% Rows => $ARGS{Rows},
-% OrderBy => $ARGS{OrderBy},
-% Order => $ARGS{Order},
-% );
<a href=<% RT->Config->Get('WebURL') %>Search/Results.html?<%$QueryString%>><%$key%></a>
-% } else {
-<% $key %>
-% }
</td>
<td class="value collection-as-table">
-<%$value%>
+<a href=<% RT->Config->Get('WebURL') %>Search/Results.html?<%$QueryString%>><%$value%></a>
</td>
+% } else {
+<td class="label collection-as-table"><% $key %></td>
+<td class="value collection-as-table"><% $value %></td>
+% }
</tr>
% }
%$i++;
-<tr class="<%$i%2 ? 'evenline' : 'oddline' %>">
-<td class="label collection-as-table">
-<%loc('Total')%>
-</td>
-<td class="value collection-as-table">
-<%$total||''%>
-</td>
+<tr class="<%$i%2 ? 'oddline' : 'evenline' %> total">
+<td class="label collection-as-table"><%loc('Total')%></td>
+<td class="value collection-as-table"><%$total||'0'%></td>
</tr>
</table>
+<div class="query"><span class="label"><% loc('Query') %>:</span><span class="value"><% $Query %></span></div>
+</div>
commit 6aba38f4a7494bdd70aff1995906bdb7b4e3accd
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 23:03:11 2010 -0400
tweaks to Chart.html's config pane
diff --git a/share/html/NoAuth/css/web2/ticket-lists.css b/share/html/NoAuth/css/web2/ticket-lists.css
index cc5ae98..055d8e9 100644
--- a/share/html/NoAuth/css/web2/ticket-lists.css
+++ b/share/html/NoAuth/css/web2/ticket-lists.css
@@ -218,3 +218,19 @@ padding-bottom: 1em;
.chart-wrapper .query .label {
font-weight: bold;
}
+
+.chart-meta {
+ padding-top: 2em;
+ border-top: 1px solid #ccc;
+}
+
+.chart-meta .chart-type {
+ display: inline-block;
+ float: left;
+ padding-right: 2em;
+ clear: both;
+}
+
+.chart-meta .saved-search {
+ display: inline-block;
+}
diff --git a/share/html/Search/Chart.html b/share/html/Search/Chart.html
index daa30e5..31e5b24 100644
--- a/share/html/Search/Chart.html
+++ b/share/html/Search/Chart.html
@@ -85,13 +85,19 @@ my @actions = $m->comp( '/Widgets/SavedSearch:process', args => \%ARGS, self =>
<& /Elements/ListActions, actions => \@actions &>
<& /Search/Elements/Chart, %ARGS &>
+<div class="chart-meta">
+<div class="chart-type">
<&| /Widgets/TitleBox, title => loc('Graph Properties')&>
<form method="get" action="<%RT->Config->Get('WebPath')%>/Search/Chart.html">
<input type="hidden" class="hidden" name="Query" value="<% $ARGS{Query} %>" />
<input type="hidden" class="hidden" name="SavedChartSearchId" value="<% $saved_search->{SearchId} || 'new' %>" />
+
<&|/l, $m->scomp('Elements/SelectChartType', Name => 'ChartStyle', Default => $ChartStyle), $m->scomp('Elements/SelectGroupBy', Name => 'PrimaryGroupBy', Query => $ARGS{Query}, Default => $PrimaryGroupBy)
&>[_1] chart by [_2]</&><input type="submit" class="button" value="<%loc('Update Graph')%>" />
</form>
</&>
-
-<& /Widgets/SavedSearch:show, %ARGS, Action => 'Chart.html', self => $saved_search, Title => loc('Saved charts') &>
+</div>
+<div class="saved-search">
+ <& /Widgets/SavedSearch:show, %ARGS, Action => 'Chart.html', self => $saved_search, Title => loc('Saved charts') &>
+</div>
+</div>
commit 12305a7f80ac9a81592b5cb3659178d83d6458d9
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 23:07:22 2010 -0400
formatting updates for the EditSavedSearches widget
diff --git a/share/html/NoAuth/css/web2/ticket-search.css b/share/html/NoAuth/css/web2/ticket-search.css
index 03b3148..f4e9b46 100644
--- a/share/html/NoAuth/css/web2/ticket-search.css
+++ b/share/html/NoAuth/css/web2/ticket-search.css
@@ -187,6 +187,11 @@
}
+.edit-saved-searches .label {
+ display: inline-block;
+ width: 7em;
+ font-weight: bold;
+}
.refresh {
float: left;
diff --git a/share/html/Search/Elements/EditSearches b/share/html/Search/Elements/EditSearches
index dc1c53a..347f29d 100644
--- a/share/html/Search/Elements/EditSearches
+++ b/share/html/Search/Elements/EditSearches
@@ -45,14 +45,15 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
+<div class="edit-saved-searches">
<&| /Widgets/TitleBox, title => loc($Title)&>
%# Hide all the save functionality if the user shouldn't see it.
% if ( $can_modify ) {
-<&|/l&>Privacy:</&>
+<span class="label"><&|/l&>Privacy</&>:</span>
<& SelectSearchObject, Name => 'SavedSearchOwner', Objects => \@Objects, Object => ( $Object && $Object->id ) ? $Object->Object : '' &>
<br />
-<&|/l&>Description</&>:
+<span class="label"><&|/l&>Description</&>:</span>
<input size="25" name="SavedSearchDescription" value="<% $Description || '' %>" />
% if ($Id ne 'new') {
@@ -74,12 +75,12 @@
% }
<br />
<hr />
-<&|/l&>Load saved search:</&>
+<span class="label"><&|/l&>Load search</&>:</span>
<& SelectSearchesForObjects, Name => 'SavedSearchLoad', Objects => \@Objects, SearchType => $Type &>
<input type="submit" value="<% loc('Load') %>" class="button" />
</&>
-
+</div>
<%INIT>
return unless $session{'CurrentUser'}->HasRight(
Right => 'LoadSavedSearch',
commit 96268ef6d9cecebf75f2401c936e82ab92ca6bed
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 23:09:20 2010 -0400
fix a bug in our iterator initializaiton
diff --git a/share/html/Search/Elements/Chart b/share/html/Search/Elements/Chart
index dd95466..47d8648 100644
--- a/share/html/Search/Elements/Chart
+++ b/share/html/Search/Elements/Chart
@@ -106,13 +106,13 @@ my ($i,$total);
<th class="collection-as-table"><&|/l&>Tickets</&>
</th>
</tr>
-% while (my $key = shift @sorted_keys) {
-<tr class="<%$i%2 ? 'evenline' : 'oddline' %>">
<%perl>
+ while (my $key = shift @sorted_keys) {
$i++;
my $value = shift @sorted_values;
$total += $value;
</%perl>
+<tr class="<% $i%2 ? 'evenline' : 'oddline' %>">
<%perl>
# TODO sadly we don't have "creator.city is null" or alike support yet
# so no link if the key is undef for now
@@ -142,7 +142,7 @@ my ($i,$total);
% }
%$i++;
-<tr class="<%$i%2 ? 'oddline' : 'evenline' %> total">
+<tr class="<%$i%2 ? 'evenline' : 'oddline' %> total">
<td class="label collection-as-table"><%loc('Total')%></td>
<td class="value collection-as-table"><%$total||'0'%></td>
</tr>
commit 0647b130ca9c3630d1f9ca0a45dbc52cc674087e
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 23:16:26 2010 -0400
slight normalization to the ticket creation page
diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index fda7a1a..d624e74 100755
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -68,7 +68,7 @@
<a name="basics"></a>
<div id="ticket-create-metadata">
- <&| /Widgets/TitleBox, title => loc("Ticket") &>
+ <&| /Widgets/TitleBox, title => loc("Basics"), class=>'ticket-info-basics' &>
<input type="hidden" class="hidden" name="Queue" value="<% $QueueObj->Id %>" />
<table width="100%" border="0">
<& /Ticket/Elements/EditBasics,
@@ -452,10 +452,10 @@ if ((!exists $ARGS{'AddMoreAttach'}) and (defined($ARGS{'id'}) and $ARGS{'id'} e
my $actions = {
A => {
- html => q[<a href="#basics" onclick="return switchVisibility('Ticket-Create-basics','Ticket-Create-details');">] . loc('Show basics') . q[</a>],
+ html => q[<a href="#basics" onclick="return switchVisibility('Ticket-Create-basics','Ticket-Create-details');">] . loc('Basics') . q[</a>],
},
B => {
- html => q[<a href="#details" onclick="return switchVisibility('Ticket-Create-details','Ticket-Create-basics');">] . loc('Show details') . q[</a>],
+ html => q[<a href="#details" onclick="return switchVisibility('Ticket-Create-details','Ticket-Create-basics');">] . loc('Details') . q[</a>],
},
};
</%INIT>
commit 428ba92f1e6a9daa31a844b88324a4df74bb41b3
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Oct 12 23:37:20 2010 -0400
Cleanup to Search build page
diff --git a/share/html/NoAuth/css/web2/ticket-search.css b/share/html/NoAuth/css/web2/ticket-search.css
index f4e9b46..3f6d126 100644
--- a/share/html/NoAuth/css/web2/ticket-search.css
+++ b/share/html/NoAuth/css/web2/ticket-search.css
@@ -136,7 +136,7 @@
overflow-x: auto;
}
-#comp-Search-Build .submit {
+#BuildQuery .submit {
width: 58%;
}
@@ -146,9 +146,6 @@
padding-right: 1em;
}
-#comp-Search-Build #columns {
-}
-
#display-options .submit {
width: 100%;
}
@@ -193,6 +190,29 @@
font-weight: bold;
}
+span#display-options {
+ display: block;
+ padding-top: 2em;
+ margin-top: 2em;
+ border-top: 1px solid #ccc;
+ clear: both;
+}
+
+span#display-options .titlebox#sorting {
+ float: left;
+ width: auto;
+ margin-right: 2em;
+ min-width: 40%;
+}
+
+span#display-options .titlebox#columns {
+ float: left;
+}
+
+#BuildQuery #formatbuttons.submit{
+ width: 85%;
+}
+
.refresh {
float: left;
}
diff --git a/share/html/Search/Build.html b/share/html/Search/Build.html
index cb23aa7..a6031cc 100644
--- a/share/html/Search/Build.html
+++ b/share/html/Search/Build.html
@@ -74,7 +74,7 @@
SavedChartSearchId => $ARGS{SavedChartSearchId},
&>
-<form method="post" action="Build.html" name="BuildQuery">
+<form method="post" action="Build.html" name="BuildQuery" id="BuildQuery">
<input type="hidden" class="hidden" name="SavedSearchId" value="<% $saved_search{'Id'} %>" />
<input type="hidden" class="hidden" name="SavedChartSearchId" value="<% $ARGS{'SavedChartSearchId'} %>" />
<input type="hidden" class="hidden" name="Query" value="<% $query{'Query'} %>" />
@@ -108,8 +108,8 @@
AvailableColumns => $AvailableColumns,
CurrentFormat => $CurrentFormat,
&>
-<& /Elements/Submit, Label => loc('Update format and Search'), Name => 'DoSearch', id=>"formatbuttons"&>
</span>
+<& /Elements/Submit, Label => loc('Update format and Search'), Name => 'DoSearch', id=>"formatbuttons"&>
</form>
<%INIT>
diff --git a/share/html/Search/Elements/DisplayOptions b/share/html/Search/Elements/DisplayOptions
index 4b85b2b..fad6e0c 100644
--- a/share/html/Search/Elements/DisplayOptions
+++ b/share/html/Search/Elements/DisplayOptions
@@ -46,100 +46,8 @@
%#
%# END BPS TAGGED BLOCK }}}
<&| /Widgets/TitleBox, title => loc("Sorting"), id => 'sorting' &>
-<table valign="top">
-
-% for my $o (0..3) {
-% $Order[$o] ||= ''; $OrderBy[$o] ||= '';
-<tr>
-<td class="label">
-% if ($o == 0) {
-<&|/l&>Order by</&>:
-% }
-</td>
-<td class="value">
-<select name="OrderBy">
-% if ($o > 0) {
-<option value=""><&|/l&>~[none~]</&></option>
-% }
-% # %fields maps display name to SQL column/function
-% foreach my $field (sort keys %fields) {
-% next unless $field;
-% my $fieldval = $fields{$field};
-<option value="<%$fieldval%>"
-% if (defined $OrderBy[$o] and $fieldval eq $OrderBy[$o]) {
-selected="selected"
-% }
-><% loc($field) %></option>
-% }
-</select>
-<select name="Order">
-<option value="ASC"
-% unless ( ($Order[$o]||'') eq "DESC" ) {
-selected="selected"
-% }
-><&|/l&>Asc</&></option>
-<option value="DESC"
-% if ( ($Order[$o]||'') eq "DESC" ) {
-selected="selected"
-% }
-><&|/l&>Desc</&></option>
-</select>
-</td>
-</tr>
-% }
-<tr>
-<td class="label">
-<&|/l&>Rows per page</&>:
-</td><td class="value">
-<& /Elements/SelectResultsPerPage,
- Name => "RowsPerPage",
- Default => $RowsPerPage &>
-</td>
-</tr>
-</table>
+<& EditSort, %ARGS &>
</&>
<&| /Widgets/TitleBox, title => loc("Display Columns"), id => 'columns' &>
<& EditFormat, %ARGS &>
</&>
-
-<%INIT>
-my $tickets = RT::Tickets->new($session{'CurrentUser'});
-my %FieldDescriptions = %{$tickets->FIELDS};
-my %fields;
-
-for my $field (keys %FieldDescriptions) {
- next if $field eq 'EffectiveId';
- next unless $FieldDescriptions{$field}->[0] =~ /^(?:ENUM|INT|DATE|STRING|ID)$/;
- $fields{$field} = $field;
-}
-
-$fields{'Owner'} = 'Owner';
-$fields{ $_ . '.EmailAddress' } = $_ . '.EmailAddress'
- for qw(Requestor Cc AdminCc);
-
-# Add all available CustomFields to the list of sortable columns.
-my @cfs = grep /^CustomField/, @{$ARGS{AvailableColumns}};
-$fields{$_} = $_ for @cfs;
-
-# Add PAW sort
-$fields{'Custom.Ownership'} = 'Custom.Ownership';
-
-$m->callback(CallbackName => 'MassageSortFields', Fields => \%fields );
-
-my @Order = split /\|/, $Order;
-my @OrderBy = split /\|/, $OrderBy;
-if ($Order =~ /\|/) {
- @Order = split /\|/, $Order;
-} else {
- @Order = ( $Order );
-}
-
-</%INIT>
-
-<%ARGS>
-$Order => undef
-$OrderBy => undef
-$RowsPerPage => undef
-$Format => undef
-$GroupBy => 'id'
-</%ARGS>
diff --git a/share/html/Search/Elements/EditSort b/share/html/Search/Elements/EditSort
new file mode 100644
index 0000000..6433d92
--- /dev/null
+++ b/share/html/Search/Elements/EditSort
@@ -0,0 +1,93 @@
+<table valign="top">
+
+% for my $o (0..3) {
+% $Order[$o] ||= ''; $OrderBy[$o] ||= '';
+<tr>
+<td class="label">
+% if ($o == 0) {
+<&|/l&>Order by</&>:
+% }
+</td>
+<td class="value">
+<select name="OrderBy">
+% if ($o > 0) {
+<option value=""><&|/l&>~[none~]</&></option>
+% }
+% # %fields maps display name to SQL column/function
+% foreach my $field (sort keys %fields) {
+% next unless $field;
+% my $fieldval = $fields{$field};
+<option value="<%$fieldval%>"
+% if (defined $OrderBy[$o] and $fieldval eq $OrderBy[$o]) {
+selected="selected"
+% }
+><% loc($field) %></option>
+% }
+</select>
+<select name="Order">
+<option value="ASC"
+% unless ( ($Order[$o]||'') eq "DESC" ) {
+selected="selected"
+% }
+><&|/l&>Asc</&></option>
+<option value="DESC"
+% if ( ($Order[$o]||'') eq "DESC" ) {
+selected="selected"
+% }
+><&|/l&>Desc</&></option>
+</select>
+</td>
+</tr>
+% }
+<tr>
+<td class="label">
+<&|/l&>Rows per page</&>:
+</td><td class="value">
+<& /Elements/SelectResultsPerPage,
+ Name => "RowsPerPage",
+ Default => $RowsPerPage &>
+</td>
+</tr>
+</table>
+
+<%INIT>
+my $tickets = RT::Tickets->new($session{'CurrentUser'});
+my %FieldDescriptions = %{$tickets->FIELDS};
+my %fields;
+
+for my $field (keys %FieldDescriptions) {
+ next if $field eq 'EffectiveId';
+ next unless $FieldDescriptions{$field}->[0] =~ /^(?:ENUM|INT|DATE|STRING|ID)$/;
+ $fields{$field} = $field;
+}
+
+$fields{'Owner'} = 'Owner';
+$fields{ $_ . '.EmailAddress' } = $_ . '.EmailAddress'
+ for qw(Requestor Cc AdminCc);
+
+# Add all available CustomFields to the list of sortable columns.
+my @cfs = grep /^CustomField/, @{$ARGS{AvailableColumns}};
+$fields{$_} = $_ for @cfs;
+
+# Add PAW sort
+$fields{'Custom.Ownership'} = 'Custom.Ownership';
+
+$m->callback(CallbackName => 'MassageSortFields', Fields => \%fields );
+
+my @Order = split /\|/, $Order;
+my @OrderBy = split /\|/, $OrderBy;
+if ($Order =~ /\|/) {
+ @Order = split /\|/, $Order;
+} else {
+ @Order = ( $Order );
+}
+
+</%INIT>
+
+<%ARGS>
+$Order => undef
+$OrderBy => undef
+$RowsPerPage => undef
+$Format => undef
+$GroupBy => 'id'
+</%ARGS>
commit b7036028741eebd61d0a4b4cbaab91ef9fe7f941
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Oct 13 00:12:01 2010 -0400
Tidy up search format box
diff --git a/share/html/NoAuth/css/web2/ticket-search.css b/share/html/NoAuth/css/web2/ticket-search.css
index 3f6d126..e20c766 100644
--- a/share/html/NoAuth/css/web2/ticket-search.css
+++ b/share/html/NoAuth/css/web2/ticket-search.css
@@ -202,13 +202,35 @@ span#display-options .titlebox#sorting {
float: left;
width: auto;
margin-right: 2em;
- min-width: 40%;
+ min-width: 35%;
}
span#display-options .titlebox#columns {
float: left;
}
+span#display-options .titlebox#columns table.edit-columns td {
+ padding: 0.5em;
+}
+
+span#display-options .titlebox#columns table.edit-columns div.row {
+ width: 9em;
+}
+span#display-options .titlebox#columns table.edit-columns span.label {
+ width: 2em;
+}
+
+span#display-options .titlebox#columns table.edit-columns span.value input,
+span#display-options .titlebox#columns table.edit-columns span.value select {
+ width: 7em;
+ padding: 0;
+}
+
+span#display-options .titlebox#columns table.edit-columns span.value {
+ display: inline-block;
+ width:7em;
+}
+
#BuildQuery #formatbuttons.submit{
width: 85%;
}
diff --git a/share/html/Search/Elements/EditFormat b/share/html/Search/Elements/EditFormat
index 7d4c04a..fa59981 100644
--- a/share/html/Search/Elements/EditFormat
+++ b/share/html/Search/Elements/EditFormat
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<table>
+<table class="edit-columns">
<tr>
<th><&|/l&>Add Columns</&>:</th>
@@ -62,8 +62,10 @@
<option value="<% $field %>"><% loc($field) %></option>
% }
</select></td>
-
-<td><&|/l&>Link</&>:
+<td>
+<div class="row">
+<span class="label"><&|/l&>Link</&>:</span>
+<span class="value">
<select name="Link">
<option value="None">-</option>
<option value="Display"><&|/l&>Display</&></option>
@@ -72,19 +74,30 @@
<option value="Comment"><&|/l&>Comment</&></option>
<option value="Resolve"><&|/l&>Resolve</&></option>
</select>
-<br /><&|/l&>Title</&>: <input name="Title" size="10" />
-<br /><&|/l&>Size</&>:
-<select name="Size">
+</span>
+</div>
+<div class="row">
+<span class="label"><&|/l&>Title</&>:</span>
+<span class="value"><input name="Title" size="10" /></span>
+</div>
+<div class="row">
+<span class="label"><&|/l&>Size</&>:</span>
+<span class="value"><select name="Size">
<option value="">-</option>
<option value="Small"><&|/l&>Small</&></option>
<option value="Large"><&|/l&>Large</&></option>
</select>
-<br /><&|/l&>Style</&>:
-<select name="Face">
+</span>
+</div>
+<div class="row">
+<span class="label"><&|/l&>Style</&>:</span>
+<span class="value"><select name="Face">
<option value="">-</option>
<option value="Bold"><&|/l&>Bold</&></option>
<option value="Italic"><&|/l&>Italic</&></option>
</select>
+</span>
+</div>
</td>
<td><input type="submit" class="button" name="AddCol" value=" → " /></td>
commit b3c7e07d145e2aa9ace09a61aaba48f2af05af57
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Oct 13 00:12:17 2010 -0400
eliminate a couple undef warnings
diff --git a/share/html/NoAuth/css/web2/ticket-search.css b/share/html/NoAuth/css/web2/ticket-search.css
index e20c766..7ed384f 100644
--- a/share/html/NoAuth/css/web2/ticket-search.css
+++ b/share/html/NoAuth/css/web2/ticket-search.css
@@ -214,7 +214,7 @@ span#display-options .titlebox#columns table.edit-columns td {
}
span#display-options .titlebox#columns table.edit-columns div.row {
- width: 9em;
+ width: 9em;
}
span#display-options .titlebox#columns table.edit-columns span.label {
width: 2em;
diff --git a/share/html/Search/Elements/EditSort b/share/html/Search/Elements/EditSort
index 6433d92..c71cdb0 100644
--- a/share/html/Search/Elements/EditSort
+++ b/share/html/Search/Elements/EditSort
@@ -85,8 +85,8 @@ if ($Order =~ /\|/) {
</%INIT>
<%ARGS>
-$Order => undef
-$OrderBy => undef
+$Order => ''
+$OrderBy => ''
$RowsPerPage => undef
$Format => undef
$GroupBy => 'id'
commit a748bbd641688c676a5fd1ccad726e514c600cfb
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Oct 13 00:20:21 2010 -0400
open-up the right side of the page in the web2 theme to better deal with overflowing layouts
diff --git a/share/html/NoAuth/css/web2/layout.css b/share/html/NoAuth/css/web2/layout.css
index cf19d71..c1f2eb3 100644
--- a/share/html/NoAuth/css/web2/layout.css
+++ b/share/html/NoAuth/css/web2/layout.css
@@ -62,12 +62,15 @@ body {
div#body {
position: relative;
padding: 1em;
+ padding-right: 0.5em;
padding-top: 1.8em;
- -moz-border-radius: 0.5em;
- -webkit-border-radius: 0.5em;
+ -moz-border-radius-topleft: 0.5em;
+ -webkit-border-top-left-radius: 0.5em;
+ -moz-border-radius-bottomleft: 0.5em;
+ -webkit-border-bottom-left-radius: 0.5em;
margin-left: 10.5em;
margin-top: 5.6em;
- margin-right: 1em;
+ margin-right: 0;
margin-bottom: 0em;
min-height: 10%;
background: #fff;
diff --git a/share/html/NoAuth/css/web2/nav.css b/share/html/NoAuth/css/web2/nav.css
index f68f481..eb71cdb 100644
--- a/share/html/NoAuth/css/web2/nav.css
+++ b/share/html/NoAuth/css/web2/nav.css
@@ -170,7 +170,7 @@ div#page-navigation ul#page-menu {
div#page-navigation ul#actions-menu {
position: absolute;
- right: 1em;
+ right: 0em;
top: 5.6em;
margin-top: 0em;
padding: 0.25em;
commit aeeba39931584c93817d9e885de3dda1888c824c
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Oct 13 00:25:26 2010 -0400
revert "Load Saved Search" -> "Load Search" for now, since it impacts
localizations.
diff --git a/share/html/NoAuth/css/web2/ticket-search.css b/share/html/NoAuth/css/web2/ticket-search.css
index 7ed384f..fe25af1 100644
--- a/share/html/NoAuth/css/web2/ticket-search.css
+++ b/share/html/NoAuth/css/web2/ticket-search.css
@@ -186,7 +186,7 @@
.edit-saved-searches .label {
display: inline-block;
- width: 7em;
+ width: 10em;
font-weight: bold;
}
diff --git a/share/html/Search/Elements/EditSearches b/share/html/Search/Elements/EditSearches
index 347f29d..3764d02 100644
--- a/share/html/Search/Elements/EditSearches
+++ b/share/html/Search/Elements/EditSearches
@@ -75,7 +75,7 @@
% }
<br />
<hr />
-<span class="label"><&|/l&>Load search</&>:</span>
+<span class="label"><&|/l&>Load saved search</&>:</span>
<& SelectSearchesForObjects, Name => 'SavedSearchLoad', Objects => \@Objects, SearchType => $Type &>
<input type="submit" value="<% loc('Load') %>" class="button" />
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list