yokcel (yokcel) wrote in changelog,
yokcel
yokcel
changelog

[livejournal] r23372: LJSUP-14383: Need ability to add delimet...

Committer: ybuhvalova
LJSUP-14383: Need ability to add delimeters on page Customize Journal Style
U   trunk/bin/upgrading/s2layers/core1.s2
U   trunk/cgi-bin/LJ/S2.pm
U   trunk/cgi-bin/LJ/Widget/S2PropGroup.pm
U   trunk/htdocs/stc/widgets/customizetheme.css
Modified: trunk/bin/upgrading/s2layers/core1.s2
===================================================================
--- trunk/bin/upgrading/s2layers/core1.s2	2012-11-27 11:29:50 UTC (rev 23371)
+++ trunk/bin/upgrading/s2layers/core1.s2	2012-11-27 13:18:13 UTC (rev 23372)
@@ -76,6 +76,10 @@
     "If the string contains a valid HTTP or HTTPS URL it is returned. Otherwise, an empty string is returned.";
 }
 
+class OptionsDelimeter 
+"Delimeters for options page."
+{}
+
 class Color
 "Represents a color."
 {

Modified: trunk/cgi-bin/LJ/S2.pm
===================================================================
--- trunk/cgi-bin/LJ/S2.pm	2012-11-27 11:29:50 UTC (rev 23371)
+++ trunk/cgi-bin/LJ/S2.pm	2012-11-27 13:18:13 UTC (rev 23372)
@@ -709,7 +709,7 @@
     }
 
     my $have_style = 0;
-
+    
     if ($verify && $styleid) {
         #my $dbr = LJ::S2::get_s2_reader();       LJSVD375
         my $dbr = LJ::get_db_writer();
@@ -2229,6 +2229,13 @@
     return $lnk;
 }
 
+sub OptionsDelimeter
+{
+    return {
+        '_type' => 'OptionsDelimeter',
+        };
+}
+
 sub Image
 {
     my ($url, $w, $h, $alttext, %extra) = @_;

Modified: trunk/cgi-bin/LJ/Widget/S2PropGroup.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/S2PropGroup.pm	2012-11-27 11:29:50 UTC (rev 23371)
+++ trunk/cgi-bin/LJ/Widget/S2PropGroup.pm	2012-11-27 13:18:13 UTC (rev 23372)
@@ -233,6 +233,9 @@
     $existing_display = LJ::eall($existing_display);
 
     my $ret;
+    if ($type eq "OptionsDelimeter") {
+        $row_class =~ s/graybg//;
+        }
     $ret .= "<tr class='prop-row$row_class' width='100%'>";
 
     if ($linklist_tab) {
@@ -242,7 +245,7 @@
     }
 
     $ret .= "<td class='prop-header'>" . LJ::eall($prop->{des}) . " " . LJ::help_icon("s2opt_$name") . "</td>"
-        unless $type eq "Color";
+        unless $type eq "Color" or $type eq "OptionsDelimeter";
 
     if ($prop->{values}) {
         $ret .= "<td class='prop-input'>";
@@ -311,8 +314,18 @@
         );
         $ret .= "</td>";
         $ret .= "<td>" . LJ::eall($prop->{des}) . " " . LJ::help_icon("s2opt_$name") . "</td>";
+    } 
+    elsif ($type eq "OptionsDelimeter") {
+        $ret .= "<td class='prop-delimeter' colspan='2'>";
+        if($prop->{des}){
+            $ret .= "<fieldset><legend>" . $prop->{des} . "</legend></fieldset>";
+            }
+        else {
+            $ret .= "<hr/>";   
+            }
+        $ret .= "</td>";
     }
-
+    
     my $offhelp = ! $can_use ? LJ::help_icon('s2propoff', ' ') : "";
     $ret .= " $offhelp";
 

Modified: trunk/htdocs/stc/widgets/customizetheme.css
===================================================================
--- trunk/htdocs/stc/widgets/customizetheme.css	2012-11-27 11:29:50 UTC (rev 23371)
+++ trunk/htdocs/stc/widgets/customizetheme.css	2012-11-27 13:18:13 UTC (rev 23372)
@@ -57,11 +57,14 @@
     background: #ECF6FF url(/img/customize/arrow-down.gif?v=1) left center no-repeat;
 }
 .customize-content fieldset {
-    border-bottom: 0px none;
-    border-left: 0px none;
-    border-right: 0px none;
+    border: 0px none;
+    border-top: 1px solid gray;
     margin: 15px 0 5px 0;
-}
+    }
+    .prop-delimeter fieldset {
+        margin: 0;
+        padding-bottom: 0;
+        }
 
 .customize-content fieldset legend {
     font-size: 22px;
@@ -69,7 +72,15 @@
     font-style: normal;
     margin: 0;
     padding: 0 7px 0 6px;
-}
+    }
+    .prop-delimeter fieldset legend {
+        font-size: 18px;
+        }
+    .prop-delimeter HR {
+        height: 1px;
+        background: gray;
+        color: gray;
+        }
 .customize-content fieldset legend span {
     font-size: 11px;
     padding: 0 0 8px 0;

Tags: css, livejournal, pm, s2, ybuhvalova, yokcel
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments