[otrs-cvs] otrs/Kernel/Output/HTML Layout.pm, 1.78,
1.79 LayoutTicket.pm, 1.20, 1.21
cvs-log at otrs.org
cvs-log at otrs.org
Wed Apr 2 08:59:27 GMT 2008
Comments:
Update of /home/cvs/otrs/Kernel/Output/HTML
In directory lancelot:/tmp/cvs-serv26457/Kernel/Output/HTML
Modified Files:
Layout.pm LayoutTicket.pm
Log Message:
* Fixed bug#1116 - made uses of <br> and <input> comply with XHTML.
Author: ot
Index: Layout.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Output/HTML/Layout.pm,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** Layout.pm 2 Apr 2008 04:48:33 -0000 1.78
--- Layout.pm 2 Apr 2008 08:59:22 -0000 1.79
***************
*** 991,995 ****
}
else {
! $Start.$Target.$End."<input type=\"hidden\" name=\"$Self->{SessionName}\" value=\"$Self->{SessionID}\">";
}
}iegx;
--- 991,995 ----
}
else {
! $Start.$Target.$End."<input type=\"hidden\" name=\"$Self->{SessionName}\" value=\"$Self->{SessionID}\"/>";
}
}iegx;
***************
*** 1657,1661 ****
}
if ($HTMLMode) {
! $Text =~ s/\n/<br>\n/g;
$Text =~ s/ / /g;
}
--- 1657,1661 ----
}
if ($HTMLMode) {
! $Text =~ s{\n}{<br/>\n}g;
$Text =~ s/ / /g;
}
***************
*** 1720,1724 ****
my $Age = defined( $Param{Age} ) ? $Param{Age} : return;
! my $Space = $Param{Space} || '<BR>';
my $AgeStrg = '';
if ( $Age =~ /^-(.*)/ ) {
--- 1720,1724 ----
my $Age = defined( $Param{Age} ) ? $Param{Age} : return;
! my $Space = $Param{Space} || '<br/>';
my $AgeStrg = '';
if ( $Age =~ /^-(.*)/ ) {
***************
*** 1756,1760 ****
my $Age = defined( $Param{Age} ) ? $Param{Age} : return;
! my $Space = $Param{Space} || '<BR>';
my $AgeStrg = '';
if ( $Age =~ /^-(.*)/ ) {
--- 1756,1760 ----
my $Age = defined( $Param{Age} ) ? $Param{Age} : return;
! my $Space = $Param{Space} || '<br/>';
my $AgeStrg = '';
if ( $Age =~ /^-(.*)/ ) {
***************
*** 3277,3281 ****
. "Year\" size=\"4\" maxlength=\"4\" "
. "value=\""
! . sprintf( "%02d", ( $Param{ $Prefix . 'Year' } || $Y ) ) . "\">";
}
--- 3277,3281 ----
. "Year\" size=\"4\" maxlength=\"4\" "
. "value=\""
! . sprintf( "%02d", ( $Param{ $Prefix . 'Year' } || $Y ) ) . "\"/>";
}
***************
*** 3300,3304 ****
. "Month\" size=\"2\" maxlength=\"2\" "
. "value=\""
! . sprintf( "%02d", ( $Param{ $Prefix . 'Month' } || $M ) ) . "\">";
}
--- 3300,3304 ----
. "Month\" size=\"2\" maxlength=\"2\" "
. "value=\""
! . sprintf( "%02d", ( $Param{ $Prefix . 'Month' } || $M ) ) . "\"/>";
}
***************
*** 3323,3327 ****
. "Day\" size=\"2\" maxlength=\"2\" "
. "value=\""
! . ( $Param{ $Prefix . 'Day' } || $D ) . "\">";
}
if ( $Format eq 'DateInputFormatLong' ) {
--- 3323,3327 ----
. "Day\" size=\"2\" maxlength=\"2\" "
. "value=\""
! . ( $Param{ $Prefix . 'Day' } || $D ) . "\"/>";
}
if ( $Format eq 'DateInputFormatLong' ) {
***************
*** 3351,3355 ****
. sprintf( "%02d",
( defined( $Param{ $Prefix . 'Hour' } ) ? int( $Param{ $Prefix . 'Hour' } ) : $h ) )
! . "\">";
}
--- 3351,3355 ----
. sprintf( "%02d",
( defined( $Param{ $Prefix . 'Hour' } ) ? int( $Param{ $Prefix . 'Hour' } ) : $h ) )
! . "\"/>";
}
***************
*** 3382,3386 ****
: $m
)
! ) . "\">";
}
}
--- 3382,3386 ----
: $m
)
! ) . "\"/>";
}
}
***************
*** 3398,3402 ****
. "Used\" value=\"1\""
. $Checked
! . "> ";
}
--- 3398,3402 ----
. "Used\" value=\"1\""
. $Checked
! . "/> ";
}
Author: ot
Index: LayoutTicket.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Output/HTML/LayoutTicket.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** LayoutTicket.pm 14 Jan 2008 14:38:59 -0000 1.20
--- LayoutTicket.pm 2 Apr 2008 08:59:22 -0000 1.21
***************
*** 1,5 ****
# --
# Kernel/Output/HTML/LayoutTicket.pm - provides generic ticket HTML output
! # Copyright (C) 2001-2008 OTRS GmbH, http://otrs.org/
# --
# $Id$
--- 1,5 ----
# --
# Kernel/Output/HTML/LayoutTicket.pm - provides generic ticket HTML output
! # Copyright (C) 2001-2008 OTRS AG, http://otrs.org/
# --
# $Id$
***************
*** 7,11 ****
# This software comes with ABSOLUTELY NO WARRANTY. For details, see
# the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
# --
--- 7,11 ----
# This software comes with ABSOLUTELY NO WARRANTY. For details, see
# the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
# --
***************
*** 36,48 ****
. $Self->{CGIHandle}
. '" method="post">'
! . '<input type="hidden" name="Action" value="AgentTicketCompose">'
. '<input type="hidden" name="ArticleID" value="'
! . $Param{ArticleID} . '">'
. '<input type="hidden" name="TicketID" value="'
! . $Param{TicketID} . '">'
. $Self->OptionStrgHashRef(
Name => 'ResponseID',
Data => $Param{StdResponsesRef},
! ) . '<input class="button" type="submit" value="$Text{"Compose"}"></form>';
}
else {
--- 36,48 ----
. $Self->{CGIHandle}
. '" method="post">'
! . '<input type="hidden" name="Action" value="AgentTicketCompose"/>'
. '<input type="hidden" name="ArticleID" value="'
! . $Param{ArticleID} . '"/>'
. '<input type="hidden" name="TicketID" value="'
! . $Param{TicketID} . '"/>'
. $Self->OptionStrgHashRef(
Name => 'ResponseID',
Data => $Param{StdResponsesRef},
! ) . '<input class="button" type="submit" value="$Text{"Compose"}"/></form>';
}
else {
***************
*** 319,323 ****
. $_
. '" value="'
! . $Self->{LayoutObject}->Ascii2Html( Text => $LastKey ) . '">';
}
}
--- 319,323 ----
. $_
. '" value="'
! . $Self->{LayoutObject}->Ascii2Html( Text => $LastKey ) . '"/>';
}
}
***************
*** 338,346 ****
. '" value="'
. $Self->{LayoutObject}->Ascii2Html( Text => $Ticket{"TicketFreeKey$_"} )
! . '" size="18">';
}
else {
$Data{"TicketFreeKeyField$_"}
! = '<input type="text" name="TicketFreeKey' . $_ . '" value="" size="18">';
}
}
--- 338,346 ----
. '" value="'
. $Self->{LayoutObject}->Ascii2Html( Text => $Ticket{"TicketFreeKey$_"} )
! . '" size="18"/>';
}
else {
$Data{"TicketFreeKeyField$_"}
! = '<input type="text" name="TicketFreeKey' . $_ . '" value="" size="18"/>';
}
}
***************
*** 373,381 ****
. '" value="'
. $Self->{LayoutObject}->Ascii2Html( Text => $Ticket{"TicketFreeText$_"} )
! . '" size="30">';
}
else {
$Data{"TicketFreeTextField$_"}
! = '<input type="text" name="TicketFreeText' . $_ . '" value="" size="30">';
}
}
--- 373,381 ----
. '" value="'
. $Self->{LayoutObject}->Ascii2Html( Text => $Ticket{"TicketFreeText$_"} )
! . '" size="30"/>';
}
else {
$Data{"TicketFreeTextField$_"}
! = '<input type="text" name="TicketFreeText' . $_ . '" value="" size="30"/>';
}
}
***************
*** 475,479 ****
. $_
. '" value="'
! . $Self->{LayoutObject}->Ascii2Html( Text => $LastKey ) . '">';
}
}
--- 475,479 ----
. $_
. '" value="'
! . $Self->{LayoutObject}->Ascii2Html( Text => $LastKey ) . '"/>';
}
}
***************
*** 494,502 ****
. '" value="'
. $Self->{LayoutObject}->Ascii2Html( Text => $Article{"ArticleFreeKey$_"} )
! . '" size="18">';
}
else {
$Data{"ArticleFreeKeyField$_"}
! = '<input type="text" name="ArticleFreeKey' . $_ . '" value="" size="18">';
}
}
--- 494,502 ----
. '" value="'
. $Self->{LayoutObject}->Ascii2Html( Text => $Article{"ArticleFreeKey$_"} )
! . '" size="18"/>';
}
else {
$Data{"ArticleFreeKeyField$_"}
! = '<input type="text" name="ArticleFreeKey' . $_ . '" value="" size="18"/>';
}
}
***************
*** 529,537 ****
. '" value="'
. $Self->{LayoutObject}->Ascii2Html( Text => $Article{"ArticleFreeText$_"} )
! . '" size="30">';
}
else {
$Data{"ArticleFreeTextField$_"}
! = '<input type="text" name="ArticleFreeText' . $_ . '" value="" size="30">';
}
}
--- 529,537 ----
. '" value="'
. $Self->{LayoutObject}->Ascii2Html( Text => $Article{"ArticleFreeText$_"} )
! . '" size="30"/>';
}
else {
$Data{"ArticleFreeTextField$_"}
! = '<input type="text" name="ArticleFreeText' . $_ . '" value="" size="30"/>';
}
}
More information about the cvs-log
mailing list