fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2010-05-17 04:47 am
  • Add Memory
  • Share This Entry

[dw-free] Option to Choose Placement of Metadata

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

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

Option to place metadata before or after entry text. (Will be found in
http://www.dreamwidth.org/customize/options). Some CSS tweaks to make the
metadata look good in both positions.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/bases/layout.s2
  • bin/upgrading/s2layers/basicboxes/layout.s2
  • bin/upgrading/s2layers/blanket/layout.s2
  • bin/upgrading/s2layers/boxesandborders/layout.s2
  • bin/upgrading/s2layers/brittle/layout.s2
  • bin/upgrading/s2layers/colorside/layout.s2
  • bin/upgrading/s2layers/core2.s2
  • bin/upgrading/s2layers/core2base/layout.s2
  • bin/upgrading/s2layers/crossroads/layout.s2
  • bin/upgrading/s2layers/drifting/layout.s2
  • bin/upgrading/s2layers/easyread/layout.s2
  • bin/upgrading/s2layers/fluidmeasure/layout.s2
  • bin/upgrading/s2layers/funkycircles/layout.s2
  • bin/upgrading/s2layers/modish/layout.s2
  • bin/upgrading/s2layers/modular/layout.s2
  • bin/upgrading/s2layers/negatives/layout.s2
  • bin/upgrading/s2layers/nouveauoleanders/layout.s2
  • bin/upgrading/s2layers/refriedtablet/layout.s2
  • bin/upgrading/s2layers/skittlishdreams/layout.s2
  • bin/upgrading/s2layers/steppingstones/layout.s2
  • bin/upgrading/s2layers/tranquilityiii/layout.s2
--------------------------------------------------------------------------------
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/bases/layout.s2
--- a/bin/upgrading/s2layers/bases/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/bases/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -17,6 +17,7 @@ propgroup presentation {
     property use use_journalstyle_entry_page;
     property use layout_type;
     property use tags_page_type;
+    property use entry_metadata_position;
     property use use_custom_friend_colors;
     property use use_shared_pic;
 }
@@ -548,6 +549,14 @@ border-bottom: 0.083em solid $*color_ent
 .metadata ul {padding: 0; margin: 0; list-style: none; }
 .metadata li {padding: 0.167em 0.833em 0.167em 0.833em; margin: 0; border-bottom: 0.083em solid $*color_entry_border;} 
 .metadata-label {font-weight: bold; }
+.page-recent .journal-type-P .metadata.top-metadata li,
+.page-recent .journal-type-I .metadata.top-metadata li,
+.page-recent .journal-type-P .metadata.top-metadata li + li + li,
+.page-recent .journal-type-I .metadata.top-metadata li + li + li { background: $*color_entry_background; }
+.page-recent .journal-type-P .metadata.top-metadata li + li,
+.page-recent .journal-type-I .metadata.top-metadata li + li,
+.page-recent .journal-type-P .metadata.top-metadata li + li + li + li,
+.page-recent .journal-type-I .metadata.top-metadata li + li + li + li { background: $*color_comment_title_background; }
 
 /* ====================== ENTRY TAGS ======================= */
 
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/basicboxes/layout.s2
--- a/bin/upgrading/s2layers/basicboxes/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/basicboxes/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -110,6 +110,7 @@ margin: .5em 0; }
 .entry-content { margin: 1em 0; }
 
 .metadata { margin: 1em 0 0 0; }
+.metadata.top-metadata { margin-bottom: 2em; }
 .metadata-label { font-weight: bold; }
 .metadata ul li { margin-left: 0; padding-left: 0; }
 
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/blanket/layout.s2
--- a/bin/upgrading/s2layers/blanket/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/blanket/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -17,6 +17,7 @@ propgroup presentation {
     property use use_journalstyle_entry_page;
     property use layout_type;
     property use tags_page_type;
+    property use entry_metadata_position;
     property use use_custom_friend_colors;
     property use use_shared_pic;
 }
@@ -332,6 +333,7 @@ span.poster { font-size: 0.9em; font-wei
 span.poster { font-size: 0.9em; font-weight: normal; text-transform: uppercase; letter-spacing: 0; padding: 0; $page_title_colors }
 
 .metadata { margin: 2em 0 0 0; }
+.metadata.top-metadata { margin: 1em 0 2em 0; }
 div.metadata ul { padding: 0; margin: 0; }
 div.metadata ul li { list-style: none; font-size: 0.9em; font-weight: normal; text-transform: lowercase; letter-spacing: 0; padding: 0; $page_title_colors }
 span.metadata-label-location, span.metadata-label-mood, span.metadata-label-music { display: none; }
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/boxesandborders/layout.s2
--- a/bin/upgrading/s2layers/boxesandborders/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/boxesandborders/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -129,6 +129,7 @@ margin: .5em 0; }
 .entry-content { margin: 1em 0; }
 
 .metadata { margin: 1em 0 0 0; }
+.metadata.top-metadata { margin-bottom: 2em; }
 .metadata-label { font-weight: bold; }
 .metadata ul li { margin-left: 0; padding-left: 0; }
 
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/brittle/layout.s2
--- a/bin/upgrading/s2layers/brittle/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/brittle/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -16,6 +16,7 @@ propgroup presentation {
     property use layout_type;
     property use tags_page_type;
     property use sidebar_width;
+    property use entry_metadata_position;
     property use use_custom_friend_colors;
     property use use_shared_pic;
 }
@@ -441,6 +442,8 @@ span.poster {
 
 .metadata { margin: 1.25em 0 0 0; }
 
+.metadata.top-metadata { margin: 10px 0 1.25em 0; }
+
 div.metadata ul {
     padding: 0;
     margin: 0;
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/colorside/layout.s2
--- a/bin/upgrading/s2layers/colorside/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/colorside/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -130,6 +130,7 @@ right: 5px;}
 .entry-content { margin-top: 2em; }
 
 .metadata { margin: 1em 0 0 0; }
+.metadata.top-metadata { margin-top: 1.25em; margin-bottom: 2em; }
 .metadata-label { font-weight: bold; }
 .metadata ul li { margin-left: 0; padding-left: 0; }
 
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/core2.s2	Mon May 17 04:46:58 2010 +0000
@@ -1196,6 +1196,11 @@ property string userpics_position {
    values = "left|Left|right|Right";
    }
 
+property string entry_metadata_position {
+    des = "Place metadata after or before entry text";
+    values = "top|Before text|bottom|After text";
+    }
+
 property bool linklist_support {
     des = "Display link list";
 }
@@ -1225,6 +1230,7 @@ set tags_aware = true;
 set tags_aware = true;
 set comment_userpic_style = "";
 set userpics_position = "left";
+set entry_metadata_position = "bottom";
 set linklist_support = true;
 set userlite_interaction_links = "icons";
 set entry_management_links = "icons";
@@ -4140,8 +4146,9 @@ function Page::print_entry(Entry e)
     """<div class="inner">\n""";
     $e->print_userpic();
     $e->print_poster();
+    if ($*entry_metadata_position == "top") { $e->print_metadata(); }
     $e->print_text();
-    $e->print_metadata();
+    if ($*entry_metadata_position == "bottom") { $e->print_metadata(); }
     """</div>\n""";
     """</div>\n""";
     """</div>\n""";
@@ -4297,7 +4304,8 @@ function EntryLite::print_metadata() {
 }
 function Entry::print_metadata() {
     if (size $.metadata) {
-        """<div class="metadata">\n<ul>\n""";
+        var string position = ($*entry_metadata_position == "top") ? " top-metadata" : " bottom-metadata";
+        """<div class="metadata$position">\n<ul>\n""";
         foreach var string m ($.metadata) {
             var string metadata_name = lang_metadata_title($m);
             """<li><span class="metadata-label metadata-label-$m">$metadata_name: </span>""";
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/core2base/layout.s2
--- a/bin/upgrading/s2layers/core2base/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/core2base/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -14,6 +14,7 @@ propgroup presentation {
     property use tags_page_type;
     property use sidebar_width;
     property use sidebar_width_doubled;
+    property use entry_metadata_position;
     property use use_custom_friend_colors;
     property use use_shared_pic;
 }
@@ -504,6 +505,12 @@ h2#pagetitle {
 .metadata li {
     margin-bottom: .5em;
 }
+.metadata.top-metadata ul {
+    margin: 0;
+}
+.metadata.top-metadata {
+    margin-bottom: 1em;
+}
 
 .tag ul {
     display: inline;
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/crossroads/layout.s2
--- a/bin/upgrading/s2layers/crossroads/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/crossroads/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -150,6 +150,7 @@ body { margin: 0; }
 
 .metadata { margin: 1em 0 0 .5em;
     font-size: small; }
+.metadata.top-metadata { padding-top: .5em; }
 .metadata-label { font-style: italic; }
 .metadata ul { margin-top: 0; padding-top: 0;
 margin-bottom: 0; padding-bottom: 0; }
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/drifting/layout.s2
--- a/bin/upgrading/s2layers/drifting/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/drifting/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -168,6 +168,7 @@ propgroup presentation
     property use num_items_recent;
     property use num_items_reading;
     property use use_journalstyle_entry_page;
+    property use entry_metadata_position;
     property use use_custom_friend_colors;
     property use use_shared_pic;
 }
@@ -956,8 +957,9 @@ function Page::print_entry (Entry e)
         $e->print_time("long_day", "");
         println "</div>";
 
+        if ($*entry_metadata_position == "top") { $e->print_metadata(); }
         $e->print_text();
-        $e->print_metadata();
+        if ($*entry_metadata_position == "bottom") { $e->print_metadata(); }
         $e->print_tags();
         $e->print_management_links();
         $e->print_interaction_links("topcomment");
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/easyread/layout.s2
--- a/bin/upgrading/s2layers/easyread/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/easyread/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -17,6 +17,7 @@ propgroup presentation {
     property use use_journalstyle_entry_page;
     property use layout_type;
     property use tags_page_type;
+    property use entry_metadata_position
     property use use_shared_pic;
 }
 
@@ -516,6 +517,10 @@ h2.module-header a {
     position: relative;
 }
 
+.entry .metadata.top-metadata {
+    margin-top: 0;
+}
+
 .entry h3.entry-title {
     font-size: 2em;
 }
@@ -675,4 +680,4 @@ div.page-top {
 /* End of CSS file */""";
 end_css();
 """</style>""";
-}
\ No newline at end of file
+}
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/fluidmeasure/layout.s2
--- a/bin/upgrading/s2layers/fluidmeasure/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/fluidmeasure/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -272,6 +272,7 @@ position: relative; /*more asinine IE7 h
 .entry-content { margin: 1em .5em; }
 
 .metadata { margin: 1em 0 0 0; }
+.metadata.top-metadata { margin-bottom: 2em; }
 .metadata-label { font-weight: bold; }
 .metadata ul li { margin-left: 0; padding-left: 0; }
 
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/funkycircles/layout.s2
--- a/bin/upgrading/s2layers/funkycircles/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/funkycircles/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -636,6 +636,10 @@ h2#pagetitle {
         font-style: italic;
         }
 
+.entry .contents .metadata.top-metadata ul {
+    margin: 0;
+    }
+
 .entry .footer,
 .month .footer,
 .page-entry .comment .footer,
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/modish/layout.s2
--- a/bin/upgrading/s2layers/modish/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/modish/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -80,6 +80,7 @@ margin: .5em 0; }
 .entry-content { margin: 1em 0; }
 
 .metadata { margin: 1em 0 0 0; }
+.metadata.top-metadata { margin-bottom: 2em; }
 .metadata-label { font-weight: bold; }
 .metadata ul li { margin-left: 0; padding-left: 0; }
 
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/modular/layout.s2
--- a/bin/upgrading/s2layers/modular/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/modular/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -290,6 +290,7 @@ table.talkform { padding: 1em;
 .entry .metadata { font-style: italic;
     margin-bottom: -1.5em;
     }
+.entry .metadata.top-metadata { margin-top: 1em; margin-bottom: 0; }
 
 .entry .footer,
 .comment .footer { padding: .5em .5em 1em .5em;
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -17,6 +17,7 @@ propgroup presentation {
     property use use_journalstyle_entry_page;
     property use layout_type;
     property use tags_page_type;
+    property use entry_metadata_position;
     property use use_custom_friend_colors;
     property use use_shared_pic;
 }
@@ -678,8 +679,9 @@ function Page::print_entry (Entry e)
             print ")";
         println "</div>";
     println "</div>";
+    if ($*entry_metadata_position == "top") { $e->print_metadata(); }
     $e->print_text();
-    $e->print_metadata();
+    if ($*entry_metadata_position == "bottom") { $e->print_metadata(); }
     $e->print_tags();
     println "<div class=\"footer\">";
     $e->print_interaction_links( "topcomment" );
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/nouveauoleanders/layout.s2
--- a/bin/upgrading/s2layers/nouveauoleanders/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/nouveauoleanders/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -194,17 +194,18 @@ body { margin: 0;
     font-style: italic; }
 
 .metadata { margin: 1em 0 0 0;
-    font-size: small; }
+    font-size: small;
+    clear: both; }
 .metadata-label { font-style: italic; }
 .metadata ul { margin-top: 0; padding-top: 0;
 margin-bottom: 0; padding-bottom: 0; }
 .metadata ul li { margin-left: 0; padding-left: 0; }
 
-.metadata,
-.entry .footer { clear: both; }
+.metadata.top-metadata { clear: none; }
 
 .entry .footer { margin: .5em 0 0 0;
-    padding-bottom: .5em; }
+    padding-bottom: .5em;
+    clear: both; }
 .entry .footer > .inner:first-child { font-size: small;
     padding: 1px; } /*float uneveness fix */
 
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/refriedtablet/layout.s2
--- a/bin/upgrading/s2layers/refriedtablet/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/refriedtablet/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -268,6 +268,15 @@ span.restrictions {
     margin-bottom: -1em;
 }
 
+.has-userpic .metadata.top-metadata {
+    margin-top: 5em;
+    margin-bottom: -5em !important;
+}
+
+.no-userpic .metadata.top-metadata {
+    margin-top: 0;
+}
+
 .metadata ul {
     margin: 0em;
     padding: 0em;
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/skittlishdreams/layout.s2
--- a/bin/upgrading/s2layers/skittlishdreams/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/skittlishdreams/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -28,7 +28,8 @@ propgroup presentation {
     property use layout_type;
     property use sidebar_width;
     property use tags_page_type;
-    property use userpics_position; 
+    property use userpics_position;
+    property use entry_metadata_position;
     property use use_custom_friend_colors;
     property use use_shared_pic;
 }
@@ -594,6 +595,7 @@ blockquote {margin: 1em; padding: 1em; $
 .tag li {display: inline; list-style: none; padding: 0px; }
 *+html .tag li {padding: 0 5px; }
 
+.entry .metadata.top-metadata { padding-top: 10px; }
 .entry .metadata ul {margin: 0px; padding: 0px; }
 .entry .metadata li {list-style: none; }
 .entry .footer .inner, .comment .footer .inner {text-align: right; }
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/steppingstones/layout.s2
--- a/bin/upgrading/s2layers/steppingstones/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/steppingstones/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -122,6 +122,7 @@ H1, H2, H3, H4, H5 { font-weight: normal
 .entry-content { margin: 1em 0; }
 
 .metadata { margin: 1em 0 0 0; }
+.metadata.top-metadata { margin-bottom: 2em; }
 .metadata-label { font-weight: bold; }
 .metadata ul li { margin-left: 0; padding-left: 0; }
 
diff -r 23d785f124fa -r c26731f9a499 bin/upgrading/s2layers/tranquilityiii/layout.s2
--- a/bin/upgrading/s2layers/tranquilityiii/layout.s2	Fri May 14 06:17:07 2010 +0000
+++ b/bin/upgrading/s2layers/tranquilityiii/layout.s2	Mon May 17 04:46:58 2010 +0000
@@ -118,6 +118,7 @@ body { margin: 0;
 .metadata { margin: 1em 0 0 0;
     font-size: small;
     clear: both; }
+.metadata.top-metadata { margin-top: 1em; clear: none; }
 .metadata-label { font-style: italic; }
 .metadata ul { margin-top: 0; padding-top: 0;
 margin-bottom: 0; padding-bottom: 0; }
--------------------------------------------------------------------------------