[geeklog-cvs] Geeklog-1.x/public_html/docs theme.html, 1.90, 1.91 themevars.html, 1.23, 1.24

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs
In directory qs1489.pair.com:/tmp/cvs-serv69821/public_html/docs

Modified Files:
	theme.html themevars.html 
Log Message:
Use {story_text_no_br} in the story templates


Index: themevars.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/themevars.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** themevars.html	27 Jul 2008 16:50:44 -0000	1.23
--- themevars.html	10 Aug 2008 11:01:58 -0000	1.24
***************
*** 208,211 ****
--- 208,220 ----
          single page, it contains <em>both</em> the intro text <em>and</em> the
          body text of the story.</td></tr>
+ <tr><td><code>story_text_no_br</code></td>
+     <td>Welcome and let me be the first to congratulate you on installing Geeklog ...</td>
+     <td>When displayed on the index page, this variable contains The "intro
+         text" part of a story. However, when displayed as an article on a
+         single page, it contains <em>both</em> the intro text <em>and</em> the
+         body text of the story. The difference between <tt>story_introtext</tt>
+         and <tt>story_text_no_br</tt> is that <tt>story_introtext</tt> inserts
+         two HTML <tt><br></tt> tags between the intro and the body text
+         whereas <tt>story_text_no_br</tt> does not do that (hence the name).</td></tr>
  <tr><td><code>lang_todays_featured_article</code></td>
      <td>Today's Featured Article</td>

Index: theme.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** theme.html	27 Jul 2008 16:50:44 -0000	1.90
--- theme.html	10 Aug 2008 11:01:58 -0000	1.91
***************
*** 199,206 ****
  <h2><a name="changes">Theme changes in Geeklog 1.5.1</a></h2>
  
! <p>Note: Themes made for Geeklog 1.5.0 should be compatible with Geeklog 1.5.1.
! We only made a few optional additions and a few adjustments for special setups
! (e.g. multi-language sites, right-to-left languages) which are detailed
! below.</p>
  
  <h3>Multilingual blocks</h3>
--- 199,207 ----
  <h2><a name="changes">Theme changes in Geeklog 1.5.1</a></h2>
  
! <p>Note: Themes made for Geeklog 1.5.0 are mostly compatible with Geeklog 1.5.1. We only made one mandatory change (for the Configuration admin panel) - all the other changes listed below are optional or adjustments for special setups (e.g. multi-language sites, right-to-left languages). See details below.</p>
! 
! <h3>Important change: Configuration</h3>
! 
! <p>The JavaScript code used for the Configuration admin panel used a generic name which caused conflicts with other JavaScript code. You should update the file <tt>admin/config/config_element.thtml</tt> to make sure your theme works with Geeklog 1.5.1.</p>
  
  <h3>Multilingual blocks</h3>
***************
*** 226,234 ****
  <ul>
  <li>In Geeklog 1.5.0, the behaviour of the variable <code>{page_title}</code>
!     changed so that it now only contains the actual page title or the site's
!     slogan (in earlier versions, it contained both the site's name and either
!     the page title or the site's slogan). This was done so that the combination
!     <code>{page_title}{page_site_splitter}{site_name}</code> could be used
!     to place the page title before the site's name for better <a
      href="http://en.wikipedia.org/wiki/Search_engine_optimization"
      class="wikipedia" title="Search Engine Optimization">SEO</a>. If you prefer
--- 227,235 ----
  <ul>
  <li>In Geeklog 1.5.0, the behaviour of the variable <code>{page_title}</code>
!     (in <tt>header.thtml</tt>) changed so that it now only contains the actual
!     page title or the site's slogan (in earlier versions, it contained both the
!     site's name and either the page title or the site's slogan). This was done
!     so that the combination <code>{page_title}{page_site_splitter}{site_name}</code>
!     could be used to place the page title before the site's name for better <a
      href="http://en.wikipedia.org/wiki/Search_engine_optimization"
      class="wikipedia" title="Search Engine Optimization">SEO</a>. If you prefer
***************
*** 251,254 ****
--- 252,260 ----
      no changes in functionality and other commentbar layouts will continue to
      work as before.</li>
+ <li>The story template files <tt>archivestorytext.thtml</tt>,
+     <tt>featuredstorytext.thtml</tt>, and <tt>storytext.thtml</tt> are now
+     using the <code>{story_text_no_br}</code> variable to refer to the story
+     text. Template files that use <code>{story_introtext}</code> here will
+     continue to work as before.</li>
  </ul>