http://bugs.dwscoalition.org/show_bug.cgi?id=4245
authorfu
Fri Jan 27 17:59:59 2012 +0800
changeset 42405bab31c9f015
parent 4239 555a213bdacc
child 4241 37aa8a1ac7c8
http://bugs.dwscoalition.org/show_bug.cgi?id=4245

Call keywords in list context, so that we get a list instead of a comma-separated string. Add a bit of padding because we no longer have a physical comma.

Patch by fu.
bin/upgrading/s2layers/bases/layout.s2
bin/upgrading/s2layers/blanket/layout.s2
bin/upgrading/s2layers/brittle/layout.s2
bin/upgrading/s2layers/core2base/layout.s2
bin/upgrading/s2layers/drifting/layout.s2
bin/upgrading/s2layers/easyread/layout.s2
bin/upgrading/s2layers/fiveam/layout.s2
bin/upgrading/s2layers/negatives/layout.s2
bin/upgrading/s2layers/skittlishdreams/layout.s2
bin/upgrading/s2layers/zesty/layout.s2
cgi-bin/LJ/S2/IconsPage.pm
     1.1 --- a/bin/upgrading/s2layers/bases/layout.s2	Fri Jan 27 13:51:52 2012 +0800
     1.2 +++ b/bin/upgrading/s2layers/bases/layout.s2	Fri Jan 27 17:59:59 2012 +0800
     1.3 @@ -943,7 +943,7 @@
     1.4  .icon-info .keywords ul li {
     1.5      display: inline;
     1.6      list-style: none;
     1.7 -    padding: 0;
     1.8 +    padding: 0 .25em 0 0;
     1.9      }
    1.10  
    1.11  .icons-container .manage-link {
     2.1 --- a/bin/upgrading/s2layers/blanket/layout.s2	Fri Jan 27 13:51:52 2012 +0800
     2.2 +++ b/bin/upgrading/s2layers/blanket/layout.s2	Fri Jan 27 17:59:59 2012 +0800
     2.3 @@ -926,12 +926,13 @@
     2.4  
     2.5  .icon-info .keywords ul {
     2.6      display: inline;
     2.7 +    padding-left: 0;
     2.8      }
     2.9  
    2.10  .icon-info .keywords ul li {
    2.11      display: inline;
    2.12      list-style: none;
    2.13 -    padding: 0;
    2.14 +    padding: 0 .25em 0 0;
    2.15      }
    2.16  
    2.17  $userpic_css
     3.1 --- a/bin/upgrading/s2layers/brittle/layout.s2	Fri Jan 27 13:51:52 2012 +0800
     3.2 +++ b/bin/upgrading/s2layers/brittle/layout.s2	Fri Jan 27 17:59:59 2012 +0800
     3.3 @@ -813,6 +813,7 @@
     3.4  .icon-info .keywords ul li {
     3.5      display: inline;
     3.6      list-style: none;
     3.7 +    padding: 0 .25em 0 0;
     3.8      }
     3.9  
    3.10  /*--- comments ---*/
     4.1 --- a/bin/upgrading/s2layers/core2base/layout.s2	Fri Jan 27 13:51:52 2012 +0800
     4.2 +++ b/bin/upgrading/s2layers/core2base/layout.s2	Fri Jan 27 17:59:59 2012 +0800
     4.3 @@ -634,7 +634,7 @@
     4.4  
     4.5  .keywords ul li {
     4.6      display: inline;
     4.7 -    padding: .25em;
     4.8 +    padding: 0 .25em 0 0;
     4.9  }
    4.10  
    4.11  /* modules */
     5.1 --- a/bin/upgrading/s2layers/drifting/layout.s2	Fri Jan 27 13:51:52 2012 +0800
     5.2 +++ b/bin/upgrading/s2layers/drifting/layout.s2	Fri Jan 27 17:59:59 2012 +0800
     5.3 @@ -981,6 +981,7 @@
     5.4  
     5.5      .icon-info .keywords ul li {
     5.6          display: inline;
     5.7 +        padding: 0 .25em 0 0;
     5.8      }
     5.9  
    5.10      /* Footer
     6.1 --- a/bin/upgrading/s2layers/easyread/layout.s2	Fri Jan 27 13:51:52 2012 +0800
     6.2 +++ b/bin/upgrading/s2layers/easyread/layout.s2	Fri Jan 27 17:59:59 2012 +0800
     6.3 @@ -770,6 +770,7 @@
     6.4  
     6.5  .icon-info .keywords ul li {
     6.6      display: inline;
     6.7 +    padding: 0 .25em 0 0;
     6.8      }
     6.9  
    6.10  $userpic_css
     7.1 --- a/bin/upgrading/s2layers/fiveam/layout.s2	Fri Jan 27 13:51:52 2012 +0800
     7.2 +++ b/bin/upgrading/s2layers/fiveam/layout.s2	Fri Jan 27 17:59:59 2012 +0800
     7.3 @@ -962,7 +962,7 @@
     7.4      }
     7.5  
     7.6  .icon-info .keywords ul li {
     7.7 -    padding: 0;
     7.8 +    padding: 0 .25em 0 0;
     7.9      }
    7.10  
    7.11  /* Modules
     8.1 --- a/bin/upgrading/s2layers/negatives/layout.s2	Fri Jan 27 13:51:52 2012 +0800
     8.2 +++ b/bin/upgrading/s2layers/negatives/layout.s2	Fri Jan 27 17:59:59 2012 +0800
     8.3 @@ -667,7 +667,7 @@
     8.4      .icon-info .keywords ul li {
     8.5          display: inline;
     8.6          list-style: none;
     8.7 -        padding: 0;
     8.8 +        padding: 0 .25em 0 0;
     8.9          }
    8.10  
    8.11      .module-section-two .module,
     9.1 --- a/bin/upgrading/s2layers/skittlishdreams/layout.s2	Fri Jan 27 13:51:52 2012 +0800
     9.2 +++ b/bin/upgrading/s2layers/skittlishdreams/layout.s2	Fri Jan 27 17:59:59 2012 +0800
     9.3 @@ -1025,6 +1025,7 @@
     9.4  
     9.5  .keywords ul li {
     9.6      display: inline;
     9.7 +    padding: 0 .25em 0 0;
     9.8      }
     9.9  
    9.10  $entryicon_css
    10.1 --- a/bin/upgrading/s2layers/zesty/layout.s2	Fri Jan 27 13:51:52 2012 +0800
    10.2 +++ b/bin/upgrading/s2layers/zesty/layout.s2	Fri Jan 27 17:59:59 2012 +0800
    10.3 @@ -1107,7 +1107,7 @@
    10.4  .icon-info .keywords ul li {
    10.5      display: inline;
    10.6      list-style: none;
    10.7 -    padding: 0;
    10.8 +    padding: 0 .25em 0 0;
    10.9      }
   10.10  
   10.11  /* ReplyPage reply box */
    11.1 --- a/cgi-bin/LJ/S2/IconsPage.pm	Fri Jan 27 13:51:52 2012 +0800
    11.2 +++ b/cgi-bin/LJ/S2/IconsPage.pm	Fri Jan 27 17:59:59 2012 +0800
    11.3 @@ -35,11 +35,11 @@
    11.4          my @newpics;
    11.5          my $default_pic;
    11.6          foreach my $pic ( @allpics ) {
    11.7 -            my $keyword = $pic->keywords;
    11.8 +            my @keyword = $pic->keywords;
    11.9              if ( $pic->is_default ) {
   11.10 -                $default_pic = { keywords => [ $keyword ] , userpic => $pic };
   11.11 +                $default_pic = { keywords => \@keyword, userpic => $pic };
   11.12              } else {
   11.13 -                push @newpics, { keywords => [ $keyword ], userpic => $pic };
   11.14 +                push @newpics, { keywords => \@keyword, userpic => $pic };
   11.15              }
   11.16          }
   11.17          @pics = $default_pic if $default_pic;
   11.18 @@ -123,4 +123,4 @@
   11.19      return $p;
   11.20  }
   11.21  
   11.22 -1;
   11.23 \ No newline at end of file
   11.24 +1;