[Rt-commit] rt branch, 4.2/tighten-html-whitespace, created. rt-4.2.10-226-gf3bf152
Jesse Vincent
jesse at bestpractical.com
Tue Mar 24 22:40:15 EDT 2015
The branch, 4.2/tighten-html-whitespace has been created
at f3bf15280b20c1a279c17c4908e4a640c695a9df (commit)
- Log -----------------------------------------------------------------
commit cb43575ea74ded1ce6fa6cd8e4980d9c3cdce0f7
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Mar 24 19:31:26 2015 -0700
Compress whitespace in page headers
Reduce the amount of whitespace in RT's generated page layout HTML.
When debugging, the whitespace that's crept into RT's HTML makes it
harder than it needs to be to see what's going on.
This commit should not result in any functionality changes to RT
diff --git a/share/html/Elements/Framekiller b/share/html/Elements/Framekiller
index 0fac829..6ae2124 100644
--- a/share/html/Elements/Framekiller
+++ b/share/html/Elements/Framekiller
@@ -52,16 +52,9 @@
<script>
if (window.top !== window.self) {
document.write = "";
-
window.top.location = window.self.location;
-
- setTimeout(function(){
- document.body.innerHTML = "";
- }, 1);
-
- window.self.onload = function(){
- document.body.innerHTML = "";
- };
+ setTimeout(function(){ document.body.innerHTML = ""; }, 1);
+ window.self.onload = function(){ document.body.innerHTML = ""; };
}
</script>
% }
diff --git a/share/html/Elements/Header b/share/html/Elements/Header
index bf3e6f9..9e57526 100644
--- a/share/html/Elements/Header
+++ b/share/html/Elements/Header
@@ -60,27 +60,21 @@
% my $URL = $m->notes->{RefreshURL}; $URL = $URL ? ";URL=$URL" : "";
<meta http-equiv="refresh" content="<% "$1$URL" %>" />
% }
-
<& JavascriptConfig &>
-
% for my $cssfile ( @css_files ) {
<link rel="stylesheet" href="<%RT->Config->Get('WebPath')%><% $cssfile %>" type="text/css" media="all" />
% }
-
% for (keys %{$LinkRel || {}}) {
<link rel="<% $_ %>" href="<% RT->Config->Get('WebPath') . $LinkRel->{$_} %>" />
% }
<link rel="shortcut icon" href="<%RT->Config->Get('WebImagesURL')%>favicon.png" type="image/png" />
-
% if ( $RSSAutoDiscovery ) {
<link rel="alternate" href="<%$RSSAutoDiscovery%>" type="application/rss+xml" title="RSS RT Search" />
% }
-
% my $stylesheet_plugin = "/NoAuth/css/".$style."/InHeader";
% if ($m->comp_exists($stylesheet_plugin) ) {
<& $stylesheet_plugin &>
% }
-
<!-- Site CSS from theme editor -->
<style type="text/css" media="all" id="sitecss">
%# Header is used when there isn't a database (such as in the Installer) which means there is no
@@ -91,17 +85,12 @@
</style>
% # Leave %ARGS for backward compatibility
% $m->callback( %ARGS, CallbackName => 'Head', ARGSRef => \%ARGS );
-
<& HeaderJavascript, focus => $Focus, onload => $onload, RichText => $RichText &>
-
<& /Elements/Framekiller &>
-
</head>
<body class="<% join( ' ',@{$ARGS{'BodyClass'}}) %>" <% $id && qq[id="comp-$id"] |n %>>
-
% if ($ShowBar) {
<& /Elements/Logo, %ARGS &>
-
<div id="quickbar">
<& /Elements/PersonalQuickbar, %ARGS &>
</div>
@@ -142,7 +131,6 @@ if (RT->Config->Get("UseSideBySideLayout", $session{'CurrentUser'})) {
}
</%INIT>
-
<%ARGS>
#$Focus => 'focus'
$Focus => ''
diff --git a/share/html/Elements/HeaderJavascript b/share/html/Elements/HeaderJavascript
index 79ee74e..14dd90c 100644
--- a/share/html/Elements/HeaderJavascript
+++ b/share/html/Elements/HeaderJavascript
@@ -49,13 +49,11 @@
$focus => undef
$onload => undef
</%args>
-
% for my $jsfile ( @js_files ) {
<script type="text/javascript" src="<%RT->Config->Get('WebPath')%><% $jsfile %>"></script>
% }
-
<script type="text/javascript"><!--
-jQuery( loadTitleBoxStates );
+ jQuery( loadTitleBoxStates );
% if ( $focus ) {
jQuery(function () { jQuery(<% $focus |n,j%>).focus() });
% }
diff --git a/share/html/Elements/Logo b/share/html/Elements/Logo
index 80e8697..8ce277c 100644
--- a/share/html/Elements/Logo
+++ b/share/html/Elements/Logo
@@ -47,13 +47,13 @@
%# END BPS TAGGED BLOCK }}}
<div id="<% $id %>">
% if ($user_logo) {
-<a href="<%$ARGS{'LogoLinkURL'}||RT->Config->Get('LogoLinkURL')%>"><img
- src="<% RT->Config->Get('WebPath') %>/NoAuth/Helpers/CustomLogo/<% $user_logo->Content->{'hash'} %>"
- alt="<%loc($ARGS{'LogoAltText'}||RT->Config->Get('LogoAltText'))%>" /></a>
+<a href="<%$ARGS{'LogoLinkURL'}||RT->Config->Get('LogoLinkURL')%>"><img \
+ src="<% RT->Config->Get('WebPath') %>/NoAuth/Helpers/CustomLogo/<% $user_logo->Content->{'hash'} %>" \
+ alt="<%loc($ARGS{'LogoAltText'}||RT->Config->Get('LogoAltText'))%>" /></a>
% } else {
-<a href="<%$ARGS{'LogoLinkURL'}||RT->Config->Get('LogoLinkURL')%>"><img
- src="<%$ARGS{'LogoURL'}||RT->Config->Get('LogoURL')%>"
- alt="<%loc($ARGS{'LogoAltText'}||RT->Config->Get('LogoAltText'))%>" /></a>
+<a href="<%$ARGS{'LogoLinkURL'}||RT->Config->Get('LogoLinkURL')%>"><img \
+ src="<%$ARGS{'LogoURL'}||RT->Config->Get('LogoURL')%>" \
+ alt="<%loc($ARGS{'LogoAltText'}||RT->Config->Get('LogoAltText'))%>" /></a>
% }
% if ( $ShowName ) {
<span class="rtname"><% $Name || loc("RT for [_1]", RT->Config->Get('rtname')) %></span>
diff --git a/share/html/Elements/PageLayout b/share/html/Elements/PageLayout
index 8955d9c..4a5fd42 100644
--- a/share/html/Elements/PageLayout
+++ b/share/html/Elements/PageLayout
@@ -50,11 +50,9 @@
<div id="page-navigation"><& /Elements/Menu, menu => PageMenu(), id => 'page-menu', 'parent_id' => 'page' &></div>
% }
<div id="topactions"><& /Elements/WidgetBar, menu => PageWidgets() &></div>
-
% if ($m->comp_exists($stylesheet_plugin) ) {
<& $stylesheet_plugin &>
% }
-
<div id="body">
% $m->callback( %ARGS, CallbackName => 'BeforeBody' );
% $m->flush_buffer(); # we've got the page laid out, let's flush the buffer;
commit 060d2f2681955c15e72a49ea70c9bfa073e7e54c
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Mar 24 19:35:05 2015 -0700
Remove newlines inside HTML tags, mostly in the search UI
This commit removes newlines inside of HTML tags. Newlines were
there because mason makes it easy to do the wrong thing.
This commit should result in no functional changes to RT
diff --git a/share/html/Elements/SelectCustomFieldOperator b/share/html/Elements/SelectCustomFieldOperator
index 9292a67..be5780b 100644
--- a/share/html/Elements/SelectCustomFieldOperator
+++ b/share/html/Elements/SelectCustomFieldOperator
@@ -48,14 +48,13 @@
<select name="<% $Name %>">
% while (my $option = shift @Options) {
% my $value = shift @Values;
-<option value="<% $value %>"
+ <option value="<% $value %>" \
% if ($Default eq $value) {
-selected="selected"
+selected="selected" \
% }
><% $option %></option>
% }
</select>
-
<%ARGS>
$Name => undef
@Options => ( loc('matches'), loc("doesn't match"), loc('is'), loc("isn't"), loc('less than'), loc('greater than'))
diff --git a/share/html/Elements/SelectEqualityOperator b/share/html/Elements/SelectEqualityOperator
index 29e859f..6697814 100644
--- a/share/html/Elements/SelectEqualityOperator
+++ b/share/html/Elements/SelectEqualityOperator
@@ -48,14 +48,13 @@
<select name="<%$Name%>">
% while (my $option = shift @Options) {
% my $value = shift @Values;
-<option value="<%$value%>"
+ <option value="<%$value%>" \
% if ($Default eq $value) {
-selected="selected"
+selected="selected" \
% }
><%$option%></option>
% }
</select>
-
<%ARGS>
$Name => undef
@Options => (loc('less than'), loc('equal to'), loc('greater than'), loc('not equal to'))
diff --git a/share/html/Elements/Submit b/share/html/Elements/Submit
index a5dcdf7..bfc000b 100644
--- a/share/html/Elements/Submit
+++ b/share/html/Elements/Submit
@@ -45,9 +45,9 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<div class="submit"
-% if($id) {
-id="<%$id%>"
+<div class="submit" \
+% if ($id) {
+id="<%$id%>" \
% }
>
<div class="extra-buttons">
diff --git a/share/html/Search/Elements/EditSearches b/share/html/Search/Elements/EditSearches
index 0a55e0d..79f7b37 100644
--- a/share/html/Search/Elements/EditSearches
+++ b/share/html/Search/Elements/EditSearches
@@ -76,9 +76,8 @@
<br />
<hr />
<span class="label"><&|/l&>Load saved search</&>:</span>
-<& SelectSearchesForObjects, Name => 'SavedSearchLoad', Objects => \@Objects, SearchType => $Type &>
-<input type="submit" value="<% loc('Load') %>" id="SavedSearchLoadSubmit" name="SavedSearchLoadSubmit" class="button" />
-
+<& SelectSearchesForObjects, Name => 'SavedSearchLoad', Objects => \@Objects, SearchType => $Type &>\
+<input type="submit" value="<% loc('Load') %>" id="SavedSearchLoadSubmit" name="SavedSearchLoadSubmit" class="button" />\
</&>
</div>
<%INIT>
diff --git a/share/html/Search/Elements/EditSort b/share/html/Search/Elements/EditSort
index 2707bde..0130e9c 100644
--- a/share/html/Search/Elements/EditSort
+++ b/share/html/Search/Elements/EditSort
@@ -64,22 +64,22 @@
% foreach my $field (sort keys %fields) {
% next unless $field;
% my $fieldval = $fields{$field};
-<option value="<%$fieldval%>"
+<option value="<%$fieldval%>" \
% if (defined $OrderBy[$o] and $fieldval eq $OrderBy[$o]) {
-selected="selected"
+selected="selected" \
% }
><% $field =~ /^(?:CustomField|CF)\./ ? $field : loc($field) %></option>
% }
</select>
<select name="Order">
-<option value="ASC"
+<option value="ASC" \
% unless ( ($Order[$o]||'') eq "DESC" ) {
-selected="selected"
+selected="selected" \
% }
><&|/l&>Asc</&></option>
-<option value="DESC"
+<option value="DESC" \
% if ( ($Order[$o]||'') eq "DESC" ) {
-selected="selected"
+selected="selected" \
% }
><&|/l&>Desc</&></option>
</select>
@@ -96,7 +96,6 @@ selected="selected"
</td>
</tr>
</table>
-
<%INIT>
my $tickets = RT::Tickets->new($session{'CurrentUser'});
my %FieldDescriptions = %{$tickets->FIELDS};
diff --git a/share/html/Widgets/SelectionBox b/share/html/Widgets/SelectionBox
index 01ca668..154d43a 100644
--- a/share/html/Widgets/SelectionBox
+++ b/share/html/Widgets/SelectionBox
@@ -160,30 +160,26 @@ $self => undef
<%ARGS>
$self => undef
</%ARGS>
-
</%method>
<%method show>
<form method="post" action="<%$self->{Action}%>" name="SelectionBox-<% $name %>" id="SelectionBox-<% $name %>">
<input type="hidden" class="hidden" name="<% $self->{Name} %>-Submit" value="1" />
<& SelectionBox:current, self => $self &>
-<&|/l&>Available</&>:
-<br />
+<&|/l&>Available</&>:<br />
<select name="<%$name%>-Available" id="<%$name%>-Available" size="<%$size%>" multiple="multiple">
% for (@{$self->{Available}}) {
<option value="<% $_->[0] %>"><% $_->[1] %></option>
% }
</select>
-
% unless ($self->{ReadOnly}) {
<input aria-label="Add" name="add" type="submit" class="button" value=" → " />
% }
-
<select name="<%$name%>-Selected" id="<%$name%>-Selected" size="<%$size%>" multiple="multiple">
% for (@{$self->{Current}}) {
-<option value="<% $_ %>"
+<option value="<% $_ %>" \
% if (exists $selected{$_}) {
-selected="selected"
+selected="selected" \
% }
><% $self->{_item_map}{$_} ||'' %></option>
% }
commit f2f6c5370a683c7674827be264e1b0e22369d7fc
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Mar 24 19:38:00 2015 -0700
Remove newlines from mason source code that leak into rendered HTML
All this commit does is tighten up our generated HTML to make
debugging and reading the HTML easier
diff --git a/share/html/Elements/SelectBoolean b/share/html/Elements/SelectBoolean
index 02b49e7..a6b67ee 100644
--- a/share/html/Elements/SelectBoolean
+++ b/share/html/Elements/SelectBoolean
@@ -49,7 +49,6 @@
<option value="<%$TrueVal%>" <%$TrueDefault|n%>><%$True%></option>
<option value="<%$FalseVal%>" <%$FalseDefault|n%>><%$False%></option>
</select>
-
<%ARGS>
$Name => undef
$True => loc("is")
diff --git a/share/html/Elements/SelectMatch b/share/html/Elements/SelectMatch
index d76cfbb..f0a63c9 100644
--- a/share/html/Elements/SelectMatch
+++ b/share/html/Elements/SelectMatch
@@ -51,7 +51,6 @@
<option value="=" <%$TrueDefault|n%>><%$True%></option>
<option value="!=" <%$FalseDefault|n%>><%$False%></option>
</select>
-
<%ARGS>
$Name => undef
$Like => loc('matches')
diff --git a/share/html/Elements/SelectWatcherType b/share/html/Elements/SelectWatcherType
index 105d1f4..86bd298 100644
--- a/share/html/Elements/SelectWatcherType
+++ b/share/html/Elements/SelectWatcherType
@@ -53,7 +53,6 @@
<option value="<%$option%>"<%defined($Default) && $option eq $Default && qq[ selected="selected"] |n %>><%loc($option)%></option>
%}
</select>
-
<%INIT>
my @types;
if ($Scope =~ /queue/) {
diff --git a/share/html/Elements/Submit b/share/html/Elements/Submit
index bfc000b..a19d2a7 100644
--- a/share/html/Elements/Submit
+++ b/share/html/Elements/Submit
@@ -65,7 +65,6 @@ id="<%$id%>" \
% if ( $Back ) {
<div class="next">
% }
-
% if ($AlternateLabel) {
<span class="caption"><%$AlternateCaption%></span>
<input type="submit" <% $OnClick ? qq[ onclick="$OnClick"] : '' | n %> <% $Name ? qq[ name="$Name"] : '' | n %> <% $SubmitId ? qq[ id="$SubmitId"] : '' | n %> value="<%$AlternateLabel%>" class="button" />
@@ -73,12 +72,9 @@ id="<%$id%>" \
<span class="caption"><%$Caption%></span>
<input type="submit" <% $OnClick ? qq[ onclick="$OnClick"] : '' | n %> <% $Name ? qq[ name="$Name"] : '' | n %> <% $SubmitId ? qq[ id="$SubmitId"] : '' | n %> value="<%$Label%>" class="button" />
% }
-
% if ( $Back ) {
</div>
% }
-
-
% if ( $Back ) {
<div class="back">
<span class="caption"><%$BackCaption%></span>
@@ -86,11 +82,9 @@ id="<%$id%>" \
$BackName ? qq[ name="$BackName"] : '' | n %> value="<%$BackLabel%>" class="button" />
</div>
% }
-
</div>
<div class="submit-clear"></div>
</div>
-
<%ARGS>
$color => undef
$Caption => ''
diff --git a/share/html/Search/Build.html b/share/html/Search/Build.html
index e5ba586..273771d 100644
--- a/share/html/Search/Build.html
+++ b/share/html/Search/Build.html
@@ -67,23 +67,16 @@
%#
<& /Elements/Header, Title => $title &>
<& /Elements/Tabs, %TabArgs &>
-
<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'} %>" />
<input type="hidden" class="hidden" name="Format" value="<% $query{'Format'} %>" />
-
-
-
-
<div id="pick-criteria">
<& Elements/PickCriteria, query => $query{'Query'}, queues => $queues &>
</div>
<& /Elements/Submit, Label => loc('Add these terms'), SubmitId => 'AddClause', Name => 'AddClause'&>
<& /Elements/Submit, Label => loc('Add these terms and Search'), SubmitId => 'DoSearch', Name => 'DoSearch'&>
-
-
<div id="editquery">
<& Elements/EditQuery,
%ARGS,
@@ -95,7 +88,6 @@
<div id="editsearches">
<& Elements/EditSearches, %saved_search, CurrentSearch => \%query &>
</div>
-
<span id="display-options">
<& Elements/DisplayOptions,
%ARGS, %query,
@@ -105,7 +97,6 @@
</span>
<& /Elements/Submit, Label => loc('Update format and Search'), Name => 'DoSearch', id=>"formatbuttons"&>
</form>
-
<%INIT>
use RT::Interface::Web::QueryBuilder;
use RT::Interface::Web::QueryBuilder::Tree;
diff --git a/share/html/Search/Elements/EditFormat b/share/html/Search/Elements/EditFormat
index fffec5c..de93851 100644
--- a/share/html/Search/Elements/EditFormat
+++ b/share/html/Search/Elements/EditFormat
@@ -46,16 +46,13 @@
%#
%# END BPS TAGGED BLOCK }}}
<table class="edit-columns">
-
<tr>
<th><&|/l&>Add Columns</&>:</th>
<th><&|/l&>Format</&>:</th>
<th></th>
<th><&|/l&>Show Columns</&>:</th>
</tr>
-
<tr>
-
<td valign="top"><select size="6" name="SelectDisplayColumns" multiple="multiple">
% my %seen;
% foreach my $field ( grep !$seen{lc $_}++, @$AvailableColumns) {
@@ -100,9 +97,7 @@
</span>
</div>
</td>
-
<td><input type="submit" class="button" name="AddCol" value=" → " /></td>
-
<td valign="top">
<select size="4" name="CurrentDisplayColumns">
% my $i=0;
@@ -119,10 +114,8 @@
<input type="submit" class="button" name="RemoveCol" value="<%loc('Delete')%>" />
</center>
</td>
-
</tr>
</table>
-
<%init>
my $selected = $ARGS{SelectDisplayColumns};
$selected = [ $selected ] unless ref $selected;
diff --git a/share/html/Search/Elements/EditSearches b/share/html/Search/Elements/EditSearches
index 79f7b37..4d22ff7 100644
--- a/share/html/Search/Elements/EditSearches
+++ b/share/html/Search/Elements/EditSearches
@@ -47,7 +47,6 @@
%# 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 ) {
<span class="label"><&|/l&>Privacy</&>:</span>
@@ -55,7 +54,6 @@
<br />
<span class="label"><&|/l&>Description</&>:</span>
<input size="25" name="SavedSearchDescription" value="<% $Description || '' %>" />
-
% if ($Id ne 'new') {
<nobr>
% if ( $Dirty ) {
@@ -123,7 +121,6 @@ my $Dirty = $is_dirty->(
);
</%INIT>
-
<%ARGS>
$Id => 'new'
$Object => undef
@@ -134,7 +131,6 @@ $CurrentSearch => {}
$AllowCopy => 1
$Title => loc('Saved searches')
</%ARGS>
-
<%METHOD Init>
<%ARGS>
$Query => {}
@@ -218,7 +214,6 @@ return @results;
</%INIT>
</%METHOD>
-
<%METHOD Save>
<%ARGS>
$Query => {}
diff --git a/share/html/Search/Elements/EditSort b/share/html/Search/Elements/EditSort
index 0130e9c..83fdd1d 100644
--- a/share/html/Search/Elements/EditSort
+++ b/share/html/Search/Elements/EditSort
@@ -46,7 +46,6 @@
%#
%# END BPS TAGGED BLOCK }}}
<table valign="top">
-
% for my $o (0..3) {
% $Order[$o] ||= ''; $OrderBy[$o] ||= '';
<tr>
@@ -129,7 +128,6 @@ if ($Order =~ /\|/) {
}
</%INIT>
-
<%ARGS>
$Order => ''
$OrderBy => ''
diff --git a/share/html/Search/Elements/PickCFs b/share/html/Search/Elements/PickCFs
index e8d9c71..5c825b6 100644
--- a/share/html/Search/Elements/PickCFs
+++ b/share/html/Search/Elements/PickCFs
@@ -100,7 +100,6 @@ while ( my $CustomField = $CustomFields->Next ) {
$m->callback( Conditions => \@lines, Queues => \%queues );
</%INIT>
-
<%ARGS>
%queues => ()
$CustomFields
diff --git a/share/html/Search/Elements/PickCriteria b/share/html/Search/Elements/PickCriteria
index e248422..b1f86dc 100644
--- a/share/html/Search/Elements/PickCriteria
+++ b/share/html/Search/Elements/PickCriteria
@@ -46,28 +46,21 @@
%#
%# END BPS TAGGED BLOCK }}}
<&| /Widgets/TitleBox, title => loc('Add Criteria')&>
-
<table width="100%" cellspacing="0" cellpadding="0" border="0">
-
-
% $m->callback( %ARGS, CallbackName => "BeforeBasics" );
<& PickBasics, queues => \%queues &>
<& PickTicketCFs, queues => \%queues &>
<& PickObjectCFs, Class => 'Transaction', queues => \%queues &>
<& PickObjectCFs, Class => 'Queue', queues => \%queues &>
% $m->callback( %ARGS, CallbackName => "AfterCFs" );
-
<tr class="separator"><td colspan="3"><hr /></td></tr>
<tr>
<td class="label"><&|/l&>Aggregator</&></td>
<td class="operator" colspan="2"><& SelectAndOr, Name => "AndOr" &></td>
</tr>
-
</table>
-
</&>
-
<%ARGS>
$addquery => 0
$query => undef
diff --git a/share/html/Search/Elements/SelectPersonType b/share/html/Search/Elements/SelectPersonType
index 0fc541b..9e5ebaa 100644
--- a/share/html/Search/Elements/SelectPersonType
+++ b/share/html/Search/Elements/SelectPersonType
@@ -59,7 +59,6 @@
% }
% }
</select>
-
<%INIT>
my @types;
if ($Scope =~ /queue/) {
diff --git a/share/html/Widgets/BulkEdit b/share/html/Widgets/BulkEdit
index 73fc06a..b80763d 100644
--- a/share/html/Widgets/BulkEdit
+++ b/share/html/Widgets/BulkEdit
@@ -57,7 +57,6 @@
: (),
&>
% }
-
<%args>
$Types
$Meta
diff --git a/share/html/Widgets/BulkProcess b/share/html/Widgets/BulkProcess
index 714d435..12d6f46 100644
--- a/share/html/Widgets/BulkProcess
+++ b/share/html/Widgets/BulkProcess
@@ -61,7 +61,6 @@ for my $type ( @$Types ) {
}
}
</%init>
-
<%args>
$Arguments
$Types
diff --git a/share/html/Widgets/FinalizeWidgetArguments b/share/html/Widgets/FinalizeWidgetArguments
index 87f3ae0..3699517 100644
--- a/share/html/Widgets/FinalizeWidgetArguments
+++ b/share/html/Widgets/FinalizeWidgetArguments
@@ -59,7 +59,6 @@
}
return \%args;
</%init>
-
<%args>
$WidgetArguments => {}
</%args>
diff --git a/share/html/Widgets/SavedSearch b/share/html/Widgets/SavedSearch
index 33f41e2..30fd879 100644
--- a/share/html/Widgets/SavedSearch
+++ b/share/html/Widgets/SavedSearch
@@ -52,7 +52,6 @@ return \%ARGS;
</%method>
<%method process>
-
<%init>
my @actions;
$self->{SearchId} ||= $args->{'SavedChartSearchId'} || 'new';
@@ -152,7 +151,6 @@ return @actions;
$self
$args
</%ARGS>
-
</%method>
<%method show>
diff --git a/share/html/Widgets/SelectionBox b/share/html/Widgets/SelectionBox
index 154d43a..7d1ddaa 100644
--- a/share/html/Widgets/SelectionBox
+++ b/share/html/Widgets/SelectionBox
@@ -148,9 +148,7 @@ if ($self->{AutoSave} or $ARGS{$self->{Name}.'-Save'}) {
<%ARGS>
$self => undef
</%ARGS>
-
</%method>
-
<%method current>
% for (@{$self->{Current}}) {
<input type="hidden" class="hidden" name="<% $self->{Name} %>-Current" value="<%$_%>" />
@@ -197,7 +195,6 @@ selected="selected" \
<input name="update" type="submit" class="button" value="<&|/l&>Update</&>" />
% }
% }
-
% my $caption = "";
% unless ($self->{'AutoSave'}) {
% if ($self->{Modified}) {
@@ -206,7 +203,6 @@ selected="selected" \
<& /Elements/Submit, Caption => loc($caption), Label => loc('Save'), Name => $name.'-Save' &>
% }
</form>
-
<%ARGS>
$self => undef
$size => 10
@@ -215,5 +211,4 @@ $size => 10
my $name = $self->{Name};
my %selected = map {$_ => 1} @{$self->{Selected}};
</%INIT>
-
</%method>
diff --git a/share/html/Widgets/TitleBoxEnd b/share/html/Widgets/TitleBoxEnd
index bb1bc57..2c15021 100644
--- a/share/html/Widgets/TitleBoxEnd
+++ b/share/html/Widgets/TitleBoxEnd
@@ -48,12 +48,9 @@
<hr class="clear" />
</div>
</div>
-
% #Manually flush the content buffer after each titlebox is displayed
% $m->flush_buffer();
-
<%ARGS>
$title => undef
$content => undef
</%ARGS>
-
diff --git a/share/html/Widgets/TitleBoxStart b/share/html/Widgets/TitleBoxStart
index 2492857..e34be6b 100644
--- a/share/html/Widgets/TitleBoxStart
+++ b/share/html/Widgets/TitleBoxStart
@@ -73,7 +73,6 @@ $id => ''
$hideable => 1
$rolledup => 0
</%ARGS>
-
<%init>
$hideable = 1 if $rolledup;
#
commit f3bf15280b20c1a279c17c4908e4a640c695a9df
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Mar 24 19:39:17 2015 -0700
Clean up a few more newlines in our HTML
diff --git a/share/html/Elements/SelectResultsPerPage b/share/html/Elements/SelectResultsPerPage
index e593d3b..ef12d53 100644
--- a/share/html/Elements/SelectResultsPerPage
+++ b/share/html/Elements/SelectResultsPerPage
@@ -49,9 +49,7 @@
<select name="<% $Name %>">
% foreach my $value ( @values ) {
-<option value="<% $value %>" <% $value == $Default? 'selected="selected"': '' |n%>>
-<% shift @labels %>
-</option>
+<option value="<% $value %>" <% $value == $Default? 'selected="selected"': '' |n%>><% shift @labels %></option>
% }
</select>
diff --git a/share/html/Search/Elements/ConditionRow b/share/html/Search/Elements/ConditionRow
index 0ff3be0..2072f37 100644
--- a/share/html/Search/Elements/ConditionRow
+++ b/share/html/Search/Elements/ConditionRow
@@ -82,13 +82,13 @@ $handle_block = sub {
}
if ( $box->{'Type'} eq 'select' ) {
my $res = '';
- $res .= qq{<select id="$name" name="$name">};
+ $res .= qq{<select id="$name" name="$name">\n};
my @options = @{ $box->{'Options'} };
while( my $k = shift @options ) {
my $v = shift @options;
- $res .= qq{<option value="$k">$v</option>};
+ $res .= qq{ <option value="$k">$v</option>\n};
}
- $res .= qq{</select>};
+ $res .= qq{</select>\n};
return $res;
}
};
diff --git a/share/html/Widgets/TitleBoxStart b/share/html/Widgets/TitleBoxStart
index e34be6b..b95da07 100644
--- a/share/html/Widgets/TitleBoxStart
+++ b/share/html/Widgets/TitleBoxStart
@@ -54,9 +54,9 @@
$title_href ? qq[<a href="$title_href">] : '' | n
%><% $title %><% $title_raw |n %><% $title_href ? "</a>" : '' |n%></span>
<span class="right<%($titleright_href || $titleright || $titleright_raw) ? '' : '-empty' %>">\
- <% $titleright_href ? qq[<a href="$titleright_href">] : '' | n %>\
- <% $titleright %><% $titleright_raw |n%><% $titleright_href ? "</a>" : '' |n%>\
- </span>
+<% $titleright_href ? qq[<a href="$titleright_href">] : '' | n %>\
+<% $titleright %><% $titleright_raw |n%><% $titleright_href ? "</a>" : '' |n%>\
+</span>
</div>
<div class="titlebox-content <% $bodyclass %><% $rolledup ? " hidden" : ""%>" id="<% $tid %>">
<%ARGS>
-----------------------------------------------------------------------
More information about the rt-commit
mailing list