[ljcom] r10578: LJSUP-8870: get_give_buttons replaced by...: changelog

Committer: mchervonniy

LJSUP-8870: get_give_buttons replaced by print_give_buttons

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/flexiblesquares/layout.s2
U   trunk/bin/upgrading/s2layers/nebula/layout.s2
U   trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
U   trunk/bin/upgrading/s2layers/sup/layout.s2
U   trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
U   trunk/bin/upgrading/s2layers/unearthed/layout.s2
U   trunk/bin/upgrading/s2layers/voxhtml/layout.s2

Modified: trunk/bin/upgrading/s2layers/3column/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/3column/layout.s2	2011-05-30 06:21:06 UTC (rev 10577)
+++ trunk/bin/upgrading/s2layers/3column/layout.s2	2011-05-30 09:00:16 UTC (rev 10578)
@@ -845,7 +845,7 @@
             """<a href="$link.url" title="$link.caption"><img src="$img_url" border="0" title="$link.caption" alt="$link.caption" /></a>""";
         }
         if ($key == "give_button") {
-            print $e->get_give_button("string", "$*SITEROOT/img/style/3column/donate.gif");
+            $e->print_give_button("string", "$*SITEROOT/img/style/3column/donate.gif");
         }
     }
     """</div>

Modified: trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2011-05-30 06:21:06 UTC (rev 10577)
+++ trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2011-05-30 09:00:16 UTC (rev 10578)
@@ -782,10 +782,8 @@
             $link->print_raw();
         }
         if ($k == "give_button") {
-            var string give_button = $this->get_give_button("string");
-            if ($give_button != "") {
-                print safe """ &middot; $give_button""";
-            }
+            """ &middot; """;
+            $this->print_give_button("string");
         }
     }
 

Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2	2011-05-30 06:21:06 UTC (rev 10577)
+++ trunk/bin/upgrading/s2layers/component/layout.s2	2011-05-30 09:00:16 UTC (rev 10578)
@@ -2063,9 +2063,7 @@
             }
             $icon = "";
             $link->print_raw();
-            if ($k == "give_button") {
-                print $this->get_give_button("string", "$*SITEROOT/palimg/component/btn_donate.gif");
-            }
+            $this->print_give_button("string", "$*SITEROOT/palimg/component/btn_donate.gif");
         }
         print "</div></td>";
         return true;

Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-05-30 06:21:06 UTC (rev 10577)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2011-05-30 09:00:16 UTC (rev 10578)
@@ -1831,10 +1831,8 @@
                 $link->print_raw();
             }
             if ($link_key == "give_button") {
-                var string give_button = $this->get_give_button("string");
-                if ($give_button != "") {
-                    print safe """$give_button | """;
-                }
+                $this->print_give_button("string");
+                """ | """;
             }
         }
 

Modified: trunk/bin/upgrading/s2layers/nebula/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/nebula/layout.s2	2011-05-30 06:21:06 UTC (rev 10577)
+++ trunk/bin/upgrading/s2layers/nebula/layout.s2	2011-05-30 09:00:16 UTC (rev 10578)
@@ -1463,10 +1463,8 @@
                 $l->print_raw();
             }
             if ($ls == "give_button") {
-                var string give_button = $e->get_give_button("string");
-                if ($give_button != "") {
-                    print safe "$link_separator$give_button";
-                }
+                print safe $link_separator;
+                $e->print_give_button("string");
             }
         }
     }

Modified: trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-05-30 06:21:06 UTC (rev 10577)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-05-30 09:00:16 UTC (rev 10578)
@@ -1738,10 +1738,9 @@
               $link->print_raw();
             }
             if ($link_key == "give_button") {
-                var string give_button = $this->get_give_button("string");
-                if ($give_button != "") {
-                    print safe """<li>$give_button</li>""";
-                }
+                """<li>""";
+                $this->print_give_button("string");
+                """</li>""";
             }
           }
           """

Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2011-05-30 06:21:06 UTC (rev 10577)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2011-05-30 09:00:16 UTC (rev 10578)
@@ -395,10 +395,9 @@
                     $link->print_raw();
                 }
                 if ($link_key == "give_button") {
-                    var string give_button = $e->get_give_button("string");
-                    if ($give_button != "") {
-                        print safe """<li class="$link_key btn btn-simple"><span><span><span>$give_button</span></span></span></li>""";
-                    }
+                    print safe """<li class="$link_key btn btn-simple"><span><span><span>""";
+                    $e->print_give_button("string");
+                    print safe """</span></span></span></li>""";
                 }
             }
 

Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-05-30 06:21:06 UTC (rev 10577)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-05-30 09:00:16 UTC (rev 10578)
@@ -1222,10 +1222,8 @@
                 $link->print_raw();
             }
             if ($link_key == "give_button") {
-                var string give_button = $e->get_give_button("string");
-                if ($give_button != "") {
-                    print safe """ | $give_button""";
-                }
+                """ | """;
+                $e->print_give_button("string");
             }
         }
         print "</h4>";

Modified: trunk/bin/upgrading/s2layers/unearthed/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-05-30 06:21:06 UTC (rev 10577)
+++ trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-05-30 09:00:16 UTC (rev 10578)
@@ -1007,12 +1007,6 @@
             if (defined $l and $ls !="tell_friend") {
                 $sidebar = $sidebar + """<a href="$l.url">$l.caption</a><br /> """;
             }
-            if ($ls == "give_button") {
-                var string give_button = $e->get_give_button("string");
-                if ($give_button != "") {
-                    $sidebar = $sidebar + $give_button + "<br/>";
-                }
-            }
         }
     }
     $sidebar = $sidebar + $this->lay_entry_sidebar_nav();

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-05-30 06:21:06 UTC (rev 10577)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-05-30 09:00:16 UTC (rev 10578)
@@ -2151,10 +2151,9 @@
 
     foreach var string link_key ($.link_keyseq) {
         if ($link_key == "give_button") {
-            var string give_button = $this->get_give_button("string");
-            if ($give_button != "") {
-                print safe """<li class="asset-meta-comments item asset-meta-no-comments">$give_button</li>""";
-            }
+            """<li class="asset-meta-comments item asset-meta-no-comments">""";
+            $this->print_give_button("string");
+            """</li>""";
         } else {
             $link = $this->get_link($link_key);
             if (defined $link) {

Post a new comment
Error

Anonymous comments are disabled in this journal
We will log you in after post

We will log you in after post

We will log you in after post

We will log you in after post

We will log you in after post

Anonymously

switch

LiveJournal

Facebook

Twitter

OpenId

Google

MailRu

VKontakte

Anonymously

default userpic

Your reply will be screened

Your IP address will be recorded

Preview comment

Help
0 comments

Post a new comment
0 comments

Log in

[ljcom] r10578: LJSUP-8870: get_give_buttons replaced by...

[ljcom] r13108: LJSUP-14178: Add ability to customize ne...

[ljcom] r13093: LJSUP-13899: No custom userhead in page ...

[ljcom] r13083: LJSUP-14473: Admin pages' style and code...

Error