kareila: (Default)
kareila ([personal profile] kareila) wrote in [site community profile] changelog2009-08-10 06:19 am

[dw-free] color previews on /manage/circle/add

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

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

Show the preset colour boxes; update the preview background colour.

Patch by [personal profile] carynb.

Files modified:
  • htdocs/manage/circle/add.bml
--------------------------------------------------------------------------------
diff -r 1df9c481fc3b -r c2649312b8ae htdocs/manage/circle/add.bml
--- a/htdocs/manage/circle/add.bml	Mon Aug 10 05:33:37 2009 +0000
+++ b/htdocs/manage/circle/add.bml	Mon Aug 10 01:18:58 2009 -0500
@@ -299,17 +299,22 @@
     foreach (@color) {
         if ($col==0) { $ret .= "<tr>\n"; }
         $col++;
-        my $ecolor = LJ::ehtml($_->{'item'});
         my $colspan = '';
         my $wh = '16';
         if ($_ eq $color[$#color]) {
             $colspan = "colspan='2'";
             $wh = '32';
         }
+        my $ecolor = LJ::ehtml($_->{'item'});
+        my $jsattrs = qq~href='javascript:void(0);' style='text-decoration: none; background-color: $_->{code};' ~
+            . qq~onclick=\\"setBGColor(findel('editfriend_add_1_fg_value_disp'),'$_->{code}');~
+            . qq~document.editFriends.editfriend_add_1_fg.value = '$_->{code}';~
+            . qq~document.getElementById('preview').style.color = '$_->{code}';\\"~;
+
         $ret .= qq~
    <script type='text/javascript' language='JavaScript'>
    <!--
-   document.write("<td $colspan bgcolor='$_->{code}'><a href='javascript:void(0);' style='text-decoration: none;' onclick=\\"setBGColor(findel('editfriend_add_1_fg_value_disp'),'$_->{code}');document.editFriends.editfriend_add_1_fg.value = '$_->{code}';document.getElementById('preview').style.color = '$_->{code}';\\"><img src='/img/dot.gif' width='$wh' height='16' title='$ecolor - $_->{code}' alt='$ecolor - $_->{code}' border='0'></a></td>");
+   document.write("<td $colspan><a $jsattrs><img src='/img/dot.gif' width='$wh' height='16' title='$ecolor - $_->{code}' alt='$ecolor - $_->{code}' border='0'></a></td>");
    // -->
    </script>
    ~;
@@ -370,7 +375,7 @@
     $ret .= "<td><input type=\"text\" maxlength=\"7\" value=\"$bgvalue\" ";
     $ret .= "name=\"editfriend_add_1_bg\" size=\"8\" ";
     $ret .= "onchange=\"setBGColorWithId(findel('editfriend_add_1_bg_value_disp'),";
-    $ret .= "'editfriend_add_1_bg');setBGColorwithId(findel('";
+    $ret .= "'editfriend_add_1_bg'); setBGColorWithId(findel('";
     $ret .= "preview'),'editfriend_add_1_bg');\" onfocus=\"\" ";
     $ret .= "id=\"editfriend_add_1_bg\" /></td>";
 
@@ -388,10 +393,15 @@
             $wh = '32';
         }
         my $ecolor = LJ::ehtml($_->{'item'});
+        my $jsattrs = qq~href='javascript:void(0);' style='text-decoration: none; background-color: $_->{code};' ~
+            . qq~onclick=\\"setBGColor(findel('editfriend_add_1_bg_value_disp'),'$_->{code}');~
+            . qq~document.editFriends.editfriend_add_1_bg.value = '$_->{code}';~
+            . qq~setBGColor(findel('preview'),'$_->{code}');\\"~;
+
         $ret .= qq~
    <script type='text/javascript' language='JavaScript'>
    <!--
-   document.write("<td $colspan bgcolor='$_->{code}'><a href='javascript:void(0);' style='text-decoration: none;' onclick=\\"setBGColor(findel('editfriend_add_1_bg_value_disp'),'$_->{code}');document.editFriends.editfriend_add_1_bg.value = '$_->{code}';setBGColor(findel('preview'),'$_->{code}');\\"><img src='/img/dot.gif' width='$wh' height='16' title='$ecolor - $_->{code}' alt='$ecolor - $_->{code}' border='0'></a></td>");
+   document.write("<td $colspan><a $jsattrs><img src='/img/dot.gif' width='$wh' height='16' title='$ecolor - $_->{code}' alt='$ecolor - $_->{code}' border='0'></a></td>");
    // -->
    </script>
    ~;
--------------------------------------------------------------------------------
denise: Image: Me, facing away from camera, on top of the Castel Sant'Angelo in Rome (Default)

[staff profile] denise 2009-08-10 11:06 pm (UTC)(link)
FIRST COMMIT WOOOOOO
yvi: Kaylee half-smiling, looking very pretty (Default)

[personal profile] yvi 2009-08-11 07:24 am (UTC)(link)
\o/
carynb: (Default)

[personal profile] carynb 2009-08-12 01:46 pm (UTC)(link)
Thanks!

(and I gotta say, I gave a little 'w00t!' when I saw this come through! I'm still a little surprised that I got off my ass and actually started contributing instead of just talking about it. *g*)
denise: Image: Me, facing away from camera, on top of the Castel Sant'Angelo in Rome (Default)

[staff profile] denise 2009-08-12 02:50 pm (UTC)(link)
And I'm so glad you did! We love having new people working with us, and I really hope you'll stick around :)