[ljcom] r10349: LJSUP-8466: ability to edit Share-link

U   trunk/bin/upgrading/s2layers/3column/layout.s2
U   trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
U   trunk/bin/upgrading/s2layers/component/layout.s2
U   trunk/bin/upgrading/s2layers/cuteness/layout.s2

Modified: trunk/bin/upgrading/s2layers/3column/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/3column/layout.s2	2011-04-06 04:03:01 UTC (rev 10348)
+++ trunk/bin/upgrading/s2layers/3column/layout.s2	2011-04-06 07:18:49 UTC (rev 10349)
@@ -108,8 +108,8 @@
     set i_edit = "";
     property string i_tags { des = "Icon: Edit Tags"; note = "If you don't set this, a default image will be used."; }
     set i_tags = "";
-    property string i_tellafriend { des = "Icon: Tell a Friend"; note = "If you don't set this, a default image will be used."; }
-    set i_tellafriend = "";
+    property string i_share { des = "Icon: Tell a Friend"; note = "If you don't set this, a default image will be used."; }
+    set i_share = "";
     property string i_flag { des = "Icon: Flag"; note = "If you don't set this, a default image will be used."; }
     set i_flag = "";
     property string i_tracknew { des = "Icon: Track New Comments"; note = "If you don't set this, a default image will be used."; }
@@ -287,7 +287,7 @@
     if ($*i_leave == "")      { $*i_leave      = "$*IMGDIR/style/3column/leavecomment.gif"; } else { $*i_leave = clean_url($*i_leave); }
     if ($*i_edit == "")       { $*i_edit       = "$*IMGDIR/style/3column/editentry.gif"; } else { $*i_edit = clean_url($*i_edit); }
     if ($*i_tags == "")       { $*i_tags       = "$*IMGDIR/style/3column/edittags.gif"; } else { $*i_tags = clean_url($*i_tags); }
-    if ($*i_tellafriend == ""){ $*i_tellafriend= "$*IMGDIR/style/3column/tellafriend.gif"; } else { $*i_tellafriend = clean_url($*i_tellafriend); }
+    if ($*i_share == "")      { $*i_share      = "$*IMGDIR/style/3column/share.gif"; } else { $*i_share = clean_url($*i_share); }
     if ($*i_flag == "")       { $*i_flag       = "$*IMGDIR/style/3column/flag.gif"; } else { $*i_flag = clean_url($*i_flag); }
     if ($*i_tracknew == "")   { $*i_tracknew   = "$*IMGDIR/style/3column/trackcomments.gif"; } else { $*i_tracknew = clean_url($*i_tracknew); }
     if ($*i_untracknew == "") { $*i_untracknew = "$*IMGDIR/style/3column/untrackcomments.gif"; } else { $*i_untracknew = clean_url($*i_untracknew); }
@@ -745,7 +745,7 @@
 
     $e.comments->print();
     print safe """<a href="$e.permalink_url" title="$*t_perma"><img src="$*i_perma" border="0" alt="$*t_perma" title="$*t_perma" /></a>""";
-    var string{} my_captions = {"edit_entry" => "$*i_edit", "mem_add" => "$*i_mem", "edit_tags" => "$*i_tags", "watch_comments" => "$*i_tracknew", "unwatch_comments" => "$*i_untracknew", "tell_friend" => "$*i_tellafriend", "share" => "$*i_tellafriend", "flag" => "$*i_flag"};
+    var string{} my_captions = {"edit_entry" => "$*i_edit", "mem_add" => "$*i_mem", "edit_tags" => "$*i_tags", "watch_comments" => "$*i_tracknew", "unwatch_comments" => "$*i_untracknew", "share" => "$*i_share", "flag" => "$*i_flag"};
     var Link link;
 
     foreach var string key ($e.link_keyseq) {
@@ -813,7 +813,7 @@
         print safe """$comments_showspam""";
     }
     print safe """<a href="$e.permalink_url" title="$*t_perma"><img src="$*i_perma" border="0" alt="$*t_perma" title="$*t_perma" /></a>""";
-    var string{} my_captions = {"edit_entry" => "$*i_edit", "mem_add" => "$*i_mem", "edit_tags" => "$*i_tags", "watch_comments" => "$*i_tracknew", "unwatch_comments" => "$*i_untracknew", "tell_friend" => "$*i_tellafriend", "share" => $*i_tellafriend, "flag" => "$*i_flag"};
+    var string{} my_captions = {"edit_entry" => "$*i_edit", "mem_add" => "$*i_mem", "edit_tags" => "$*i_tags", "watch_comments" => "$*i_tracknew", "unwatch_comments" => "$*i_untracknew", "share" => "$*i_share", "flag" => "$*i_flag"};
     var Link link;
 
     foreach var string key ($e.link_keyseq) {
@@ -1345,7 +1345,7 @@
 <div style="font: 8pt Verdana; text-align:right; padding:2px 10px 2px 10px; line-height:20px; margin-bottom:0px; margin-top:5px; border-top: 1px dashed $*entries_border;">
 """;
 
-var string[] my_imgs = ["$*i_comment", "$*i_leave", "$*i_perma", "$*i_edit", "$*i_tags", "$*i_mem", "$*i_tracknew", "$*i_tellafriend", "$*i_flag"];
+var string[] my_imgs = ["$*i_comment", "$*i_leave", "$*i_perma", "$*i_edit", "$*i_tags", "$*i_mem", "$*i_tracknew", "$*i_share", "$*i_flag"];
 
 foreach var string img ($my_imgs) {
     """<a style="background-color: $*button_bg; text-decoration:none; margin:2px; padding:2px;" href="#"><img src="$img" border="0" alt="Icon" /></a>$*t_divider""";

Modified: trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2011-04-06 04:03:01 UTC (rev 10348)
+++ trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2011-04-06 07:18:49 UTC (rev 10349)
@@ -142,6 +142,7 @@
     property use text_hidespam;
     property use text_spam_comment;
     property use text_view_games;
+    property use text_share;
 }
 
 propgroup customcss {

Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2	2011-04-06 04:03:01 UTC (rev 10348)
+++ trunk/bin/upgrading/s2layers/component/layout.s2	2011-04-06 07:18:49 UTC (rev 10349)
@@ -82,7 +82,7 @@
     property string url { noui = 1; }
     property string mem_img { noui = 1; }
     property string edit_img { noui = 1; }
-    property string tellfriend_img { noui = 1; }
+    property string share_img { noui = 1; }
     property string flag_img { noui = 1; }
     property string tags_img { noui = 1; }
     property string track_img { noui = 1; }
@@ -737,7 +737,7 @@
     $*cbl = palimg_modify("component/curve-bottom-left.gif", [PalItem(0, $*inside_border), PalItem(1, $*outside_border), PalItem(2, $*header_bgcolor)]);
     $*cbr = palimg_modify("component/curve-bottom-right.gif", [PalItem(0, $*inside_border), PalItem(1, $*outside_border), PalItem(2, $*header_bgcolor)]);
     $*mem_img = palimg_modify("component/btn_memories.gif", [PalItem(10, $*inside_border), PalItem(14, $*outside_border)]);
-    $*tellfriend_img = palimg_modify("component/btn_tellfriend.gif", [PalItem(3, $*inside_border), PalItem(2, $*outside_border)]);
+    $*share_img = palimg_modify("component/btn_share.gif", [PalItem(3, $*inside_border), PalItem(2, $*outside_border)]);
     $*edit_img = palimg_modify("component/btn_edit.gif", [PalItem(12, $*inside_border), PalItem(14, $*outside_border)]);
     $*tags_img = palimg_modify("component/btn_tags.gif", [PalItem(12, $*inside_border), PalItem(14, $*outside_border)]);
     $*flag_img = palimg_modify("component/btn_flag.gif", [PalItem(6, $*inside_border), PalItem(4, $*outside_border)]);
@@ -2035,8 +2035,7 @@
             "edit_entry" => $*edit_img,
             "edit_tags" => $*tags_img,
             "mem_add" => $*mem_img,
-            "tell_friend" => $*tellfriend_img,
-            "share" => $*tellfriend_img,
+            "share" => $*share_img,
             "flag" => $*flag_img,
             "watch_comments" => $*track_img,
             "unwatch_comments" => $*untrack_img,

Modified: trunk/bin/upgrading/s2layers/cuteness/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/cuteness/layout.s2	2011-04-06 04:03:01 UTC (rev 10348)
+++ trunk/bin/upgrading/s2layers/cuteness/layout.s2	2011-04-06 07:18:49 UTC (rev 10349)
@@ -187,6 +187,7 @@
         property use text_showspam;
         property use text_hidespam;
 	property use text_view_games;
+	property use text_share;
 }