[geeklog-cvs] Geeklog-1.x/system lib-story.php,1.99,1.100

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv37264

Modified Files:
	lib-story.php 
Log Message:
float images left and right instead of align="left" so they can be specifically aditionally formatted with CSS and a layout switch can change the floating

Index: lib-story.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** lib-story.php	21 May 2007 06:19:38 -0000	1.99
--- lib-story.php	9 Aug 2007 07:58:21 -0000	1.100
***************
*** 161,165 ****
              $imageurl = COM_getTopicImageUrl( $imageurl );
              $article->set_var( 'story_topic_image_url', $imageurl );
!             $topicimage = '<img src="' . $imageurl . '" align="'
                          . $_CONF['article_image_align'] . '" alt="'
                          . $topicname . '" title="' . $topicname . '">';
--- 161,165 ----
              $imageurl = COM_getTopicImageUrl( $imageurl );
              $article->set_var( 'story_topic_image_url', $imageurl );
!             $topicimage = '<img src="' . $imageurl . '" class="float'
                          . $_CONF['article_image_align'] . '" alt="'
                          . $topicname . '" title="' . $topicname . '">';
***************
*** 195,199 ****
  
      $show_comments = true;
!     
      // n = 'Compact display' for list of stories. p = 'Preview' mode.
      if(( $index == 'n' ) || ( $index == 'p' ))
--- 195,199 ----
  
      $show_comments = true;
! 
      // n = 'Compact display' for list of stories. p = 'Preview' mode.
      if(( $index == 'n' ) || ( $index == 'p' ))
***************
*** 300,304 ****
              $article->set_var('read_more_class', 'class="story-read-more-link"');
          }
!         
          $article->set_var( 'start_storylink_anchortag', '<a href="'
                  . $articleUrl . '" class="non-ul">' );
--- 300,304 ----
              $article->set_var('read_more_class', 'class="story-read-more-link"');
          }
! 
          $article->set_var( 'start_storylink_anchortag', '<a href="'
                  . $articleUrl . '" class="non-ul">' );
***************
*** 311,315 ****
              )
          );
!         
          if(( $story->DisplayElements('commentcode') >= 0 ) and ( $show_comments ))
          {
--- 311,315 ----
              )
          );
! 
          if(( $story->DisplayElements('commentcode') >= 0 ) and ( $show_comments ))
          {
***************
*** 817,822 ****
          }
          $norm = $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
!         $left = $lLinkPrefix . '<img ' . $sizeattributes . 'align="left" src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
!         $right = $lLinkPrefix . '<img ' . $sizeattributes . 'align="right" src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
  
          $fulltext = $intro . ' ' . $body;
--- 817,822 ----
          }
          $norm = $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
!         $left = $lLinkPrefix . '<img ' . $sizeattributes . 'class="alignleft" src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
!         $right = $lLinkPrefix . '<img ' . $sizeattributes . 'class="alignright" src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
  
          $fulltext = $intro . ' ' . $body;