mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-11-24 08:16 pm

[dw-free] Search and destroy for weird instances of 'lj' in things

[commit: http://hg.dwscoalition.org/dw-free/rev/ef785c00cbac]

http://bugs.dwscoalition.org/show_bug.cgi?id=1389

Rename 'ljedittime' to 'edittime' as part of the LJ cruft cleanup.

Patch by [personal profile] kareila.

Files modified:
  • bin/upgrading/s2layers/basicboxes/layout.s2
  • bin/upgrading/s2layers/boxesandborders/layout.s2
  • bin/upgrading/s2layers/colorside/layout.s2
  • bin/upgrading/s2layers/core1.s2
  • bin/upgrading/s2layers/core2.s2
  • bin/upgrading/s2layers/crossroads/layout.s2
  • bin/upgrading/s2layers/fluidmeasure/layout.s2
  • bin/upgrading/s2layers/modish/layout.s2
  • bin/upgrading/s2layers/steppingstones/layout.s2
  • bin/upgrading/s2layers/tranquilityiii/layout.s2
  • htdocs/stc/lj_base.css
  • htdocs/talkread.bml
--------------------------------------------------------------------------------
diff -r be246bd19221 -r ef785c00cbac bin/upgrading/s2layers/basicboxes/layout.s2
--- a/bin/upgrading/s2layers/basicboxes/layout.s2	Tue Nov 24 20:12:09 2009 +0000
+++ b/bin/upgrading/s2layers/basicboxes/layout.s2	Tue Nov 24 20:16:30 2009 +0000
@@ -154,7 +154,7 @@ ul.entry-interaction-links { text-align:
 
 .comment-content { margin-top: 1em; }
 
-.comment .ljedittime { margin-top: 1em; }
+.comment .edittime { margin-top: 1em; }
 .comment .header .datetime { color: $*color_entry_title; }
 
 .comment .multiform-checkbox { display: block;
diff -r be246bd19221 -r ef785c00cbac bin/upgrading/s2layers/boxesandborders/layout.s2
--- a/bin/upgrading/s2layers/boxesandborders/layout.s2	Tue Nov 24 20:12:09 2009 +0000
+++ b/bin/upgrading/s2layers/boxesandborders/layout.s2	Tue Nov 24 20:16:30 2009 +0000
@@ -161,7 +161,7 @@ ul.entry-interaction-links { text-align:
 
 .comment-content { margin-top: 1em; }
 
-.comment .ljedittime { margin-top: 1em; }
+.comment .edittime { margin-top: 1em; }
 .comment .header .datetime { color: $*color_entry_title; }
 
 .comment .multiform-checkbox { display: block;
diff -r be246bd19221 -r ef785c00cbac bin/upgrading/s2layers/colorside/layout.s2
--- a/bin/upgrading/s2layers/colorside/layout.s2	Tue Nov 24 20:12:09 2009 +0000
+++ b/bin/upgrading/s2layers/colorside/layout.s2	Tue Nov 24 20:16:30 2009 +0000
@@ -177,7 +177,7 @@ right: 5px;}
 
 .comment-content { margin-top: 1em; }
 
-.comment .ljedittime { margin-top: 1em; }
+.comment .edittime { margin-top: 1em; }
 .comment .header .datetime { font-size: small;
     color: $*color_entry_title; }
 
diff -r be246bd19221 -r ef785c00cbac bin/upgrading/s2layers/core1.s2
--- a/bin/upgrading/s2layers/core1.s2	Tue Nov 24 20:12:09 2009 +0000
+++ b/bin/upgrading/s2layers/core1.s2	Tue Nov 24 20:16:30 2009 +0000
@@ -2253,7 +2253,7 @@ function RecentPage::print_sticky_entry(
 
 function Comment::print_edit_text() {
     if ($this.edited) {
-        print "<br /><br /><span class='ljedittime'><em>$*text_comment_edittime " + $this->edittime_display() + "</em></span>";
+        print "<br /><br /><span class='edittime'><em>$*text_comment_edittime " + $this->edittime_display() + "</em></span>";
     }
 }
 
diff -r be246bd19221 -r ef785c00cbac bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Tue Nov 24 20:12:09 2009 +0000
+++ b/bin/upgrading/s2layers/core2.s2	Tue Nov 24 20:16:30 2009 +0000
@@ -4010,7 +4010,7 @@ function RecentPage::print_sticky_entry(
 
 function Comment::print_edit_text() {
     if ($this.edited) {
-        print "<div class='ljedittime'><em>$*text_comment_edittime ";
+        print "<div class='edittime'><em>$*text_comment_edittime ";
         $this->print_edittime();
         print "</em></div>";
     }
diff -r be246bd19221 -r ef785c00cbac bin/upgrading/s2layers/crossroads/layout.s2
--- a/bin/upgrading/s2layers/crossroads/layout.s2	Tue Nov 24 20:12:09 2009 +0000
+++ b/bin/upgrading/s2layers/crossroads/layout.s2	Tue Nov 24 20:16:30 2009 +0000
@@ -258,7 +258,7 @@ ul.entry-interaction-links { text-align:
 .comment-content { margin-top: 2em;
     padding: .25em .25em .5em .25em; }
 
-.comment .ljedittime { margin-top: 1em; }
+.comment .edittime { margin-top: 1em; }
 .comment-content .datetime { font-size: small;
     font-style: italic; }
 
diff -r be246bd19221 -r ef785c00cbac bin/upgrading/s2layers/fluidmeasure/layout.s2
--- a/bin/upgrading/s2layers/fluidmeasure/layout.s2	Tue Nov 24 20:12:09 2009 +0000
+++ b/bin/upgrading/s2layers/fluidmeasure/layout.s2	Tue Nov 24 20:16:30 2009 +0000
@@ -339,7 +339,7 @@ padding-top: 2em; } /*die in a fire, IE7
     margin-top: -1.5em;
     white-space: nowrap; }
 
-.ljedittime .datetime {
+.edittime .datetime {
     float: none;
 }
 
@@ -353,7 +353,7 @@ padding-top: 2em; } /*die in a fire, IE7
 
 .comment-content { margin-top: 1em; }
 
-.comment .ljedittime { margin-top: 1em; }
+.comment .edittime { margin-top: 1em; }
 .comment-content .datetime { color: #666; }
 
 .comment .multiform-checkbox { display: block;
diff -r be246bd19221 -r ef785c00cbac bin/upgrading/s2layers/modish/layout.s2
--- a/bin/upgrading/s2layers/modish/layout.s2	Tue Nov 24 20:12:09 2009 +0000
+++ b/bin/upgrading/s2layers/modish/layout.s2	Tue Nov 24 20:16:30 2009 +0000
@@ -121,7 +121,7 @@ ul.entry-interaction-links { text-align:
 
 .comment-content { margin-top: 1em; }
 
-.comment .ljedittime { margin-top: 1em; }
+.comment .edittime { margin-top: 1em; }
 .comment .header .datetime { color: $*color_entry_title; }
 
 .comment .multiform-checkbox { display: block;
diff -r be246bd19221 -r ef785c00cbac bin/upgrading/s2layers/steppingstones/layout.s2
--- a/bin/upgrading/s2layers/steppingstones/layout.s2	Tue Nov 24 20:12:09 2009 +0000
+++ b/bin/upgrading/s2layers/steppingstones/layout.s2	Tue Nov 24 20:16:30 2009 +0000
@@ -173,7 +173,7 @@ ul.entry-interaction-links { text-align:
 
 .comment-content { margin-top: 1em; }
 
-.comment .ljedittime { margin-top: 1em; }
+.comment .edittime { margin-top: 1em; }
 .comment .header .datetime { color: $*color_entry_title; }
 
 .comment .multiform-checkbox { display: block;
diff -r be246bd19221 -r ef785c00cbac bin/upgrading/s2layers/tranquilityiii/layout.s2
--- a/bin/upgrading/s2layers/tranquilityiii/layout.s2	Tue Nov 24 20:12:09 2009 +0000
+++ b/bin/upgrading/s2layers/tranquilityiii/layout.s2	Tue Nov 24 20:16:30 2009 +0000
@@ -172,7 +172,7 @@ ul.entry-interaction-links li.entry-read
 
 .comment-content { margin-top: 1em; }
 
-.comment .ljedittime { margin-top: 1em; }
+.comment .edittime { margin-top: 1em; }
 .comment .header .datetime { font-size: small;
     color: $*color_entry_title; }
 
diff -r be246bd19221 -r ef785c00cbac htdocs/stc/lj_base.css
--- a/htdocs/stc/lj_base.css	Tue Nov 24 20:12:09 2009 +0000
+++ b/htdocs/stc/lj_base.css	Tue Nov 24 20:16:30 2009 +0000
@@ -133,7 +133,7 @@ div.lj_ippu_titlebar {
     color: #f00;
 }
 
-.ljedittime {
+.edittime {
     font-size: smaller;
 }
 
diff -r be246bd19221 -r ef785c00cbac htdocs/talkread.bml
--- a/htdocs/talkread.bml	Tue Nov 24 20:12:09 2009 +0000
+++ b/htdocs/talkread.bml	Tue Nov 24 20:16:30 2009 +0000
@@ -681,7 +681,7 @@ body<=
                     # quote all non-LJ tags
                     $event =~ s{<(?!/?lj)(.*?)>} {&lt;$1&gt;}gi;
                 }
-                my $edit_html = $edittime ? "<br /><br /><span class='ljedittime'><em>" . BML::ml('.edittime', { edittime => $edittime }) . "</em></span>" : "";
+                my $edit_html = $edittime ? "<br /><br /><span class='edittime'><em>" . BML::ml('.edittime', { edittime => $edittime }) . "</em></span>" : "";
                 $ret .= "$event$edit_html";
 
                 $ret .= "<p style='margin: 0.7em 0 0.2em 0'><font size='-2'>";
--------------------------------------------------------------------------------

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org