Skip to content
Snippets Groups Projects
Commit 994869d5 authored by Jeroen's avatar Jeroen
Browse files

OK I wrote a lengthy text with my previous commit, but due to an Up-to-date... 

OK I wrote a lengthy text with my previous commit, but due to an Up-to-date check failure it got aborted. So here it is in short. I added the translation functionality and fixed a bug that would cause the comment's subjects not to display. Apparantly it's comment->subject instead of just subject. I also wanted to make something in the comment header a bit more clear I already changed some colors but I would want the comment's rating/score to display black. It's grey now and on a grey background it isn't so clear to read (lisible in decent english?). So I added something that I thought would paint it black, but obviously it didn't. It's still grey. I didn't remove the code, it's only two lines, because it also works this way. For the rest I don't think that anything changed.

Jeroen.

P.S.: Dries, I think we can release it tomorrow, but wait and upload it to http://jeroen.drop.org first so I can check. And at noon we'll let it out. It's yearning to, I can here it growl and make roaring noises in my laptop...
parent 6f140c2a
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Hide whitespace changes
Inline Side-by-side
themes/jeroen/jeroen.theme
+ 21
− 18
View file @ 994869d5
......@@ -112,7 +112,7 @@ function abstract($story) {
case 12: $how = "Forged"; break;
default: $how = "Sneaked through";
}
echo "<FONT SIZE=\"-1\">$how by ". format_username($story->userid) ." on $timestamp
echo "<FONT SIZE=\"-1\">". strtr(t("$how by %a on %b"), array("%a" => format_username($story->userid), "%b" => $timestamp, "large")) .";
</FONT>
</TD>
<TD ALIGN=\"right\" BACKGROUND=\"themes/jeroen/images/menutitle.gif\" NOWRAP>
......@@ -129,9 +129,9 @@ function abstract($story) {
<TD>
<?PHP
if ($story->updates)
echo "<P><FONT COLOR=\"$this->hlc2\">Editor's note:</FONT>". check_output($story->updates, 1) ."</P>";
echo "<P><FONT COLOR=\"$this->hlc2\">". t("Editor's note") .":</FONT>". check_output($story->updates, 1) ."</P>";
if ($story->abstract)
echo "<P>". check_output($story->abstract, 1) ."</P>";
......@@ -197,7 +197,8 @@ function article($story, $reply) {
}
if ($story->userid) {
echo "<FONT SIZE=\"-1\">$how by ". format_username($story->userid) ." on $timestamp"; ?><? echo "</FONT>
echo "<FONT SIZE=\"-1\">". strtr(t("$how by %a on %b"), array("%a" => format_username($story->userid), "%b" => $timestamp, "large")) .";
</FONT>
</TD>
<TD ALIGN=\"right\" BACKGROUND=\"themes/jeroen/images/menutitle.gif\" NOWRAP>
<B><A HREF=\"search.php?category=". urlencode($story->section) ."\"><FONT COLOR=\"<? $this->fgc3; ?>\">$story->section</FONT></A></B>";
......@@ -224,7 +225,7 @@ function article($story, $reply) {
if ($story->updates)
echo "<P>check_output($story->abstract, 1)</P><P><FONT COLOR=\"$this->hlc2\">Editor's note by <A HREF=\"account.php?op=userinfo&uname=$story->editor\">$story->editor</A>:</FONT>$story->updates</P>";
else
else
echo check_output($story->abstract, 1);
if ($story->article)
echo "<P>". check_output($story->article, 1) ."</P>";
......@@ -255,7 +256,7 @@ function article($story, $reply) {
} // close article function
function controls() {
print comment_controls();
echo comment_controls();
}
function comment($comment, $link = "", $thread = "") {
......@@ -272,24 +273,26 @@ function comment($comment, $link = "", $thread = "") {
echo " <TR>";
echo " <TD>";
echo " <TABLE BORDER=\"0\" CELLPADDING=\"2\" CELLSPACING=\"0\"WIDTH=\"100%\">";
// Subject:
echo " <TR>";
echo " <TD ALIGN=\"right\" WIDTH=\"5%\">";
echo " <FONT COLOR=\"#FEFEFE\"><B>Subject:</B></TD><TD WIDTH=\"80%\">";
echo " <B>". check_output($subject) ."</B>";
echo " <FONT COLOR=\"#FEFEFE\"><B>". t("Subject") .":</B></TD><TD WIDTH=\"80%\">";
echo " <B>". check_output($comment->$subject) ."</B>";
echo " </FONT>";
echo " </TD>";
// Moderation:
echo " <TD BGCOLOR=\"#6C6C6C\" BACKGROUND=\"themes/jeroen/images/menutitle.gif\" ALIGN=\"right\"ROWSPAN=\"2\" VALIGN=\"middle\" WIDTH=\"15%\">";
echo comment_moderation($comment);
echo " <TD BGCOLOR=\"#6C6C6C\" BACKGROUND=\"themes/jeroen/images/menutitle.gif\" ALIGN=\"right\" ROWSPAN=\"2\" VALIGN=\"middle\" WIDTH=\"15%\">";
echo " <FONT COLOR=\"#000000\">";
echo comment_moderation($comment);
echo " </FONT>";
echo " </TD>";
echo " </TR>";
// Author:
echo " <TR>";
echo " <TD ALIGN=\"right\"><FONT COLOR=\"#FEFEFE\">Author:</FONT></TD><TD><B>" .format_username($comment->userid) . "</B> ";
echo " <TD ALIGN=\"right\"><FONT COLOR=\"#FEFEFE\">". t("Author") .":</FONT></TD><TD><B>" .format_username($comment->userid) . "</B> ";
if ($comment->userid != $anonymous) {
// Display extra information line:
if ($comment->fake_email) $info .= format_email($comment->fake_email);
......@@ -299,14 +302,14 @@ function comment($comment, $link = "", $thread = "") {
echo " <FONT COLOR=\"#FEFEFE\">on ". format_date($comment->timestamp) ."</FONT>";
echo " </TD>";
echo " </TR>";
echo " </TABLE>";
echo " </TD>";
echo " </TR>";
// Print body of comment:
if ($comment) echo " <TR><TD BGCOLOR=\"#E7E7E7\" BACKGROUND=\"themes/jeroen/images/sketch.gif\">" . check_output($comment->comment, 1) ."</TD></TR>";
// Print thread (if any):
if ($thread) echo " <TR><TD BGCOLOR=\"#E7E7E7\" BACKGROUND=\"themes/jeroen/images/sketch.gif\">$thread</TD></TR>";
......@@ -320,7 +323,7 @@ function comment($comment, $link = "", $thread = "") {
echo " </TR>";
echo " </TABLE>";
echo " <BR>";
} // close comment function
function box($subject, $content, $options = "") {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment