[Phpslash-commit] CVS: phpslash-ft/class Story.class,1.22,1.23

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv13145/phpslash-ft/class

Modified Files:
	Story.class 
Log Message:
moved also text to story.tpl

Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Story.class	2001/12/07 17:52:16	1.22
--- Story.class	2001/12/07 18:40:27	1.23
***************
*** 15,19 ****
   */
   
! /* First let's bring in my parent class - moved to config.php3 - jvs - 1111/2001 */
  // require($_PSL[classdir] . '/Story_base.class');
  
--- 15,19 ----
   */
   
! /* First let's bring in my parent class - moved to config.php3 jvs 11/11/2001 */
  // require($_PSL[classdir] . '/Story_base.class');
  
***************
*** 94,98 ****
        $this->template->set_var(array(
           rows      => "",
!          ALSO_TEXT => ""
        ));
     }
--- 94,98 ----
        $this->template->set_var(array(
           rows      => "",
!          alsoblock => ""
        ));
     }
***************
*** 276,279 ****
--- 276,280 ----
              all the variables stay there -nh */
           if ($this->template->get_var("row") == "") {
+ 	    $this->template->set_block($template,"alsotext","alsoblock");
              $this->template->set_block($template,"row","rows");
           }
***************
*** 321,325 ****
           $this->template->set_var(array(
              rows            => "",
!             ALSO_TEXT       => "",
              LIST_TOPIC_ID   => "",
              LIST_TOPIC_NAME => "",
--- 322,326 ----
           $this->template->set_var(array(
              rows            => "",
!             alsoblock       => "",
              LIST_TOPIC_ID   => "",
              LIST_TOPIC_NAME => "",
***************
*** 327,333 ****
           ));
           if (is_array($topic_id_ary)) {
              for ($i = 0 ; $i < count($topic_id_ary) ; $i++) {
                 $this->template->set_var(array(
-                   ALSO_TEXT       => "<FONT SIZE=\"1\" FACE=\"arial, helvetica\">".pslgetText("Also filed under").":<BR>",
                    LIST_TOPIC_ID   => $topic_id_ary[$i],
                    LIST_TOPIC_NAME => $topic_name_ary[$i],
--- 328,335 ----
           ));
           if (is_array($topic_id_ary)) {
+ 
+ 	    $this->template->parse("alsoblock", "alsotext", true);
              for ($i = 0 ; $i < count($topic_id_ary) ; $i++) {
                 $this->template->set_var(array(
                    LIST_TOPIC_ID   => $topic_id_ary[$i],
                    LIST_TOPIC_NAME => $topic_name_ary[$i],
***************
*** 350,354 ****
           $this->template->set_var(array(
              rows      => "",
!             ALSO_TEXT => ""
           ));
        } elseif( $mode == "full") {
--- 352,356 ----
           $this->template->set_var(array(
              rows      => "",
!             alsoblock => ""
           ));
        } elseif( $mode == "full") {
***************
*** 415,418 ****
--- 417,421 ----
        if ($this->template->get_var("row") == "") {
           $this->template->set_block("printStory","row","rows");
+          $this->template->set_block("printStory","alsotext","alsoblock");
        }
  
***************
*** 440,444 ****
              $this->template->set_var(array(
                 rows      => "",
!                ALSO_TEXT => ""
              ));
              
--- 443,447 ----
              $this->template->set_var(array(
                 rows      => "",
!                alsoblock => ""
              ));
              
***************
*** 469,479 ****
  
              if (is_array($topic_id_ary)) {
!        
                 $max = count($topic_id_ary);
! 
                 for ($k = 0 ; $k < $max ; $k++) {
  
                    $this->template->set_var(array(
-                      ALSO_TEXT       => "<FONT SIZE=\"1\" FACE=\"arial, helvetica\">".pslgetText("Also filed under").":<BR>",
                       LIST_TOPIC_ID   => $topic_id_ary[$k],
                       LIST_TOPIC_NAME => $topic_name_ary[$k],
--- 472,482 ----
  
              if (is_array($topic_id_ary)) {
!                
                 $max = count($topic_id_ary);
!                
! 	       $this->template->parse("alsoblock", "alsotext", true);
                 for ($k = 0 ; $k < $max ; $k++) {
  
                    $this->template->set_var(array(
                       LIST_TOPIC_ID   => $topic_id_ary[$k],
                       LIST_TOPIC_NAME => $topic_name_ary[$k],
***************
*** 533,537 ****
        $this->template->set_var(array(
           rows      => "",
!          ALSO_TEXT => ""
        ));
       
--- 536,540 ----
        $this->template->set_var(array(
           rows      => "",
!          alsoblock     => ""
        ));
       
***************
*** 587,591 ****
       $this->template->set_var(array(
           rows      => "",
!          ALSO_TEXT => ""
        ));
  
--- 590,594 ----
       $this->template->set_var(array(
           rows      => "",
!          alsoblock => ""
        ));
  
***************
*** 593,596 ****
--- 596,600 ----
        if ($this->template->get_var("row") == "") {
           $this->template->set_block("printStory","row","rows");
+ 	 $this->template->set_block("printStory","alsotext","alsoblock");
        }
  
***************
*** 672,675 ****
--- 676,682 ----
        if (is_array($topic_id_ary)) {
          
+ 	 if( count($topic_id_ary) > 1) {
+ 	    $this->template->parse("alsoblock", "alsotext", true);
+ 	 }
           for ($i = 1 ; $i < count($topic_id_ary) ; $i++) {
  
***************
*** 686,691 ****
              $list_topic_name =  $this->db->Record[topic_name];
              $this->template->set_var(array(
-                ALSO_TEXT       => "<FONT SIZE=\"-1\">".pslgetText("Also filed und
- er").":<BR>",
                 LIST_TOPIC_ID   => $topic_id_ary[$i],
                 LIST_TOPIC_NAME => $list_topic_name,
--- 693,696 ----
***************
*** 700,704 ****
        $this->template->set_var(array(
           rows      => "",
!          ALSO_TEXT => ""
        ));
  
--- 705,709 ----
        $this->template->set_var(array(
           rows      => "",
!          alsoblock => ""
        ));