[Codestriker-commits] CVS update: codestriker/template/en/default viewtopic.html.tmpl
Brought to you by:
sits
Menu
▾
▴
[Codestriker-commits] CVS update: codestriker/template/en/default viewtopic.html.tmpl
|
From: <si...@us...> - 2008-06-24 02:56:16
|
User: sits
Date: 08/06/23 19:56:15
Modified: lib/Codestriker/Http DeltaRenderer.pm TabToNbspLineFilter.pm
lib/Codestriker/Action ViewTopic.pm
html codestriker.css
template/en/default viewtopic.html.tmpl
Removed: lib/Codestriker/Http LineBreakLineFilter.pm
Log:
Use CSS for space formatting rather than
Index: DeltaRenderer.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Http/DeltaRenderer.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DeltaRenderer.pm 23 Jun 2008 07:12:06 -0000 1.14
+++ DeltaRenderer.pm 24 Jun 2008 02:56:15 -0000 1.15
@@ -13,7 +13,6 @@
use Codestriker::Http::HtmlEntityLineFilter;
use Codestriker::Http::TabToNbspLineFilter;
-use Codestriker::Http::LineBreakLineFilter;
use Codestriker::Http::HighlightLineFilter;
use Codestriker::Http::HighlightedLxrLineFilter;
use Codestriker::Http::NonHighlightedLxrLineFilter;
@@ -61,14 +60,12 @@
@{$self->{line_filters}} = ();
if (defined $Codestriker::highlighter && $Codestriker::highlighter ne '') {
push @{$self->{line_filters}}, Codestriker::Http::HighlightLineFilter->new($Codestriker::highlighter, $tabwidth);
- push @{$self->{line_filters}}, Codestriker::Http::LineBreakLineFilter->new();
if (defined $lxr_config) {
push @{$self->{line_filters}}, Codestriker::Http::HighlightedLxrLineFilter->new($lxr_config);
}
} else {
push @{$self->{line_filters}}, Codestriker::Http::HtmlEntityLineFilter->new();
push @{$self->{line_filters}}, Codestriker::Http::TabToNbspLineFilter->new($tabwidth);
- push @{$self->{line_filters}}, Codestriker::Http::LineBreakLineFilter->new();
if (defined $lxr_config) {
push @{$self->{line_filters}}, Codestriker::Http::NonHighlightedLxrLineFilter->new($lxr_config);
}
Index: TabToNbspLineFilter.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Http/TabToNbspLineFilter.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TabToNbspLineFilter.pm 20 Jun 2008 02:34:00 -0000 1.3
+++ TabToNbspLineFilter.pm 24 Jun 2008 02:56:15 -0000 1.4
@@ -32,7 +32,7 @@
my ($self, $text) = @_;
my $tabwidth = $self->{tabwidth};
- 1 while $text =~ s/\t+/' ' x
+ 1 while $text =~ s/\t+/' ' x
(length($&) * $tabwidth - length($`) % $tabwidth)/eo;
return $text;
Index: LineBreakLineFilter.pm
===================================================================
RCS file: LineBreakLineFilter.pm
diff -N LineBreakLineFilter.pm
--- LineBreakLineFilter.pm 20 Jun 2008 02:34:00 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-###############################################################################
-# Codestriker: Copyright (c) 2001, 2002 David Sitsky. All rights reserved.
-# si...@us...
-#
-# This program is free software; you can redistribute it and modify it under
-# the terms of the GPL.
-
-# Line filter for handling line-breaks.
-# entities.
-
-package Codestriker::Http::LineBreakLineFilter;
-
-use strict;
-
-use Codestriker::Http::LineFilter;
-
-@Codestriker::Http::LineBreakLineFilter::ISA =
- ("Codestriker::Http::LineFilter");
-
-sub new {
- my ($type) = @_;
-
- my $self = Codestriker::Http::LineFilter->new();
- return bless $self, $type;
-}
-
-# Convert the spaces appropriately for line-breaking.
-sub _filter {
- my ($self, $text) = @_;
-
- # Replace more than one space with the appropriate number of line breaks.
- # Ensure a real space is left there so if necessary, the browser can
- # perform wrapping.
- $text =~ s/( [ ]+)/' ' . (' ' x (length($1)-1))/eog;
-
- return $text;
-}
-
-1;
Index: ViewTopic.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/ViewTopic.pm,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ViewTopic.pm 19 Jun 2008 03:33:51 -0000 1.62
+++ ViewTopic.pm 24 Jun 2008 02:56:15 -0000 1.63
@@ -164,7 +164,7 @@
# Set template variables relating to coloured mode.
if ($mode == $Codestriker::COLOURED_MODE) {
$vars->{'mode'} = 'coloured';
- } elsif ($mode == $Codestrikier::COLOURED_MONO_MODE) {
+ } elsif ($mode == $Codestriker::COLOURED_MONO_MODE) {
$vars->{'mode'} = 'coloured_mono';
} else {
$vars->{'mode'} = 'unknown';
Index: codestriker.css
===================================================================
RCS file: /cvsroot/codestriker/codestriker/html/codestriker.css,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- codestriker.css 23 Jun 2008 10:12:16 -0000 1.24
+++ codestriker.css 24 Jun 2008 02:56:15 -0000 1.25
@@ -15,52 +15,52 @@
TD.line {background-color: #99cccc; font-family: Georgia, serif; font-size: medium}
/* Normal text */
-TD.n {font-family: Georgia, serif; font-size: smaller}
+TD.n {white-space: pre; font-family: Georgia, serif; font-size: smaller}
/* Normal text monospaced */
-TD.msn {font-family: monospace; font-size: smaller}
+TD.msn {white-space: pre; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: smaller}
/* Added text */
-TD.a {background-color: #abd; font-family: Georgia, serif; font-size: smaller}
+TD.a {white-space: pre; background-color: #abd; font-family: Georgia, serif; font-size: smaller}
/* Added text monospaced */
-TD.msa {background-color: #abd; font-family: monospace; font-size: smaller}
+TD.msa {white-space: pre; background-color: #abd; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: smaller}
/* Added file */
TD.af {background-color: #abd}
/* Added blank text */
-TD.ab {background-color: #cccccc; font-family: Georgia, serif; font-size: smaller}
+TD.ab {white-space: pre; background-color: #cccccc; font-family: Georgia, serif; font-size: smaller}
/* Added blank text monospaced */
-TD.msab {background-color: #cccccc; font-family: monospace; font-size: smaller}
+TD.msab {white-space: pre; background-color: #cccccc; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: smaller}
/* Removed text */
-TD.r {background-color: #ff9999; font-family: Georgia, serif; font-size: smaller}
+TD.r {white-space: pre; background-color: #ff9999; font-family: Georgia, serif; font-size: smaller}
/* Removed text monospaced */
-TD.msr {background-color: #ff9999; font-family: monospace; font-size: smaller}
+TD.msr {white-space: pre; background-color: #ff9999; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: smaller}
/* Removed file */
TD.rf {background-color: #ff9999}
/* Removed blank text */
-TD.rb {background-color: #cccccc; font-family: Georgia, serif; font-size: smaller}
+TD.rb {white-space: pre; background-color: #cccccc; font-family: Georgia, serif; font-size: smaller}
/* Changed text */
-TD.c {background-color: #ffff77; font-family: Georgia, serif; font-size: smaller}
+TD.c {white-space: pre; background-color: #ffff77; font-family: Georgia, serif; font-size: smaller}
/* Changed text monospaced */
-TD.msc {background-color: #ffff77; font-family: monospace; font-size: smaller}
+TD.msc {white-space: pre; background-color: #ffff77; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: smaller}
/* Changed file */
TD.cf {background-color: #ffff77}
/* Changed blank text */
-TD.cb {background-color: #eeee77; font-family: Georgia, serif; font-size: smaller}
+TD.cb {white-space: pre; background-color: #eeee77; font-family: Georgia, serif; font-size: smaller}
/* Changed blank text monospaced */
-TD.mscb {background-color: #eeee77; font-family: monospace; font-size: smaller}
+TD.mscb {white-space: pre; background-color: #eeee77; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: smaller}
/* Table of contents links */
A.toc { font-family: Georgia, serif; font-size: smaller}
@@ -70,30 +70,30 @@
A.toc:link:hover { text-decoration: underline; }
/* Line number with comment */
-A.comment { color: #ff0000; font-family: Georgia, serif; font-size: smaller}
+A.comment { color: #ff0000; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: smaller}
A.comment:link { color: ff0000; text-decoration: none }
A.comment:visited { color: inherit; text-decoration: none }
A.comment:visited:hover { text-decoration: underline; }
A.comment:link:hover { text-decoration: underline; }
/* Line number with no comment */
-A.nocom { font-family: Georgia, serif; font-size: smaller}
+A.nocom { font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: smaller}
A.nocom:link { color: inherit; text-decoration: none }
A.nocom:visited { color: inherit; text-decoration: none }
A.nocom:visited:hover { text-decoration: underline; }
A.nocom:link:hover { text-decoration: underline; }
/* Monospaced line with added text */
-SPAN.msa {background-color: #abd; font-family: monospace; font-size: medium}
+SPAN.msa {background-color: #abd; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: medium}
/* Monospaced line with removed text */
-SPAN.msr {background-color: #ff9999; font-family: monospace; font-size: medium}
+SPAN.msr {background-color: #ff9999; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: medium}
/* Monospaced line with changed text */
-SPAN.msc {background-color: #ffff77; font-family: monospace; font-size: medium}
+SPAN.msc {background-color: #ffff77; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: medium}
/* Monospaced line with normal text */
-SPAN.ms {font-family: monospace; font-size: medium}
+SPAN.ms {font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace; font-size: medium}
/* Monospaced line number with comment */
SPAN.mscom {color: #ff0000; font-family: monospace; font-size: medium}
@@ -138,9 +138,9 @@
/* Style comment listings. */
TR.comments {background-color: #abd; font-family: Georgia, serif} /* space */
TR.commenth {background-color: #cccccc; font-family: Georgia, serif} /* header */
-TR.commentb {background-color: #eeeeee; font-family: monospace} /* comment body */
-TD.commentb {background-color: #eeeeee; font-family: monospace} /* comment body */
-TR.commentc {background-color: #eeeeee; font-family: monospace} /* context */
+TR.commentb {background-color: #eeeeee; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace} /* comment body */
+TD.commentb {background-color: #eeeeee; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace} /* comment body */
+TR.commentc {background-color: #eeeeee; font-family: Consolas, "Nimbus Mono L", LucidaConsole, "Bitstream Vera Sans Mono", monospace} /* context */
/* Style for topic title headings. */
Index: viewtopic.html.tmpl
===================================================================
RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopic.html.tmpl,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- viewtopic.html.tmpl 23 Jun 2008 10:12:16 -0000 1.48
+++ viewtopic.html.tmpl 24 Jun 2008 02:56:15 -0000 1.49
@@ -87,7 +87,7 @@
mode = mode %]
<p>
-<span class="general_comment">[% add_general_comment_element %] to topic.</span>
+<span class="general_comment">[[% add_general_comment_element %]] to topic.</span>
<p>
[%# Render the delta header in the footer if only one file is being viewed. #%]
@@ -104,7 +104,7 @@
</table>
<p>
-<span class="general_comment">[% add_general_comment_element %] to topic.</span>
+<span class="general_comment">[[% add_general_comment_element %]] to topic.</span>
[% PROCESS trailer.html.tmpl %]
|
