Re: svn commit: r1618424 - in /roller/trunk: app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/ app/src/main/webapp/WEB-INF/jsps/core/ app/src/main/webapp/WEB-INF/velocity/ app/src/main/webapp/WEB-INF/velocity/templates/feeds/ app/src/main/webapp...

Sat, 16 Aug 2014 15:54:45 -0700

Sorry, I found a had-to-fix bug as I was moving the Brushed Metal theme from 5.0.x to Roller-extras. This should not affect Dave's theme tests with blogs.apache.org as AFAICT they don't use blog taglines in their theme. I'm finished (again) with any coding changes. 

Glen

On 08/16/2014 06:45 PM, gma...@apache.org wrote:

Author: gmazza
Date: Sat Aug 16 22:45:32 2014
New Revision: 1618424

URL: http://svn.apache.org/r1618424
Log:
Fixed bugs (sorry) -- (1)  was putting blog tagline into meta description field 
for blog homepages instead of the blog about text; (2) permalink pages of 
themes were missing the (Google) analytics tracking keys, (3) removed 
model.weblog.description calls in the themes and replaced with 
model.weblog.about or model.weblog.tagline depending on which was actually 
needed.

Modified:
     
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
     roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
     
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
     
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
     
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
     
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm
     roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
     roller/trunk/app/src/main/webapp/themes/basic/permalink.vm
     roller/trunk/app/src/main/webapp/themes/basic/weblog.vm
     roller/trunk/app/src/main/webapp/themes/basicmobile/permalink-mobile.vm
     roller/trunk/app/src/main/webapp/themes/basicmobile/permalink.vm
     roller/trunk/app/src/main/webapp/themes/basicmobile/weblog-mobile.vm
     roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm
     roller/trunk/app/src/main/webapp/themes/fauxcoly/std_header.vm
     roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm
     roller/trunk/app/src/main/webapp/themes/frontpage/_blogprofile.vm
     roller/trunk/app/src/main/webapp/themes/gaurav/entry.vm
     roller/trunk/app/src/main/webapp/themes/gaurav/search.vm
     roller/trunk/app/src/main/webapp/themes/gaurav/std_head.vm
     roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm
     roller/trunk/app/src/main/webapp/themes/gaurav/weblog.vm
     roller/trunk/docs/roller-template-guide.odt

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
 Sat Aug 16 22:45:32 2014
@@ -108,16 +108,10 @@ public final class WeblogWrapper {
          return StringEscapeUtils.escapeHtml4(this.pojo.getName());
      }
- /* Deprecated in Roller 5.1 */ 
-    public String getDescription() {
-        return getTagline();
-    }
-
      public String getTagline() {
          return HTMLSanitizer.conditionallySanitize(this.pojo.getTagline());
      }
- 
      public UserWrapper getCreator() {
          return UserWrapper.wrap(this.pojo.getCreator());
      }
@@ -125,8 +119,7 @@ public final class WeblogWrapper {
      public Boolean getEnableBloggerApi() {
          return this.pojo.getEnableBloggerApi();
      }
-
-
+
      public WeblogCategoryWrapper getBloggerCategory() {
          return WeblogCategoryWrapper.wrap(this.pojo.getBloggerCategory(), 
urlStrategy);
      }
@@ -376,7 +369,7 @@ public final class WeblogWrapper {
       * this is a special method to access the original pojo
       * we don't really want to do this, but it's necessary
       * because some parts of the rendering process still need the
-     * orginal pojo object
+     * original pojo object
       */
      public Weblog getPojo() {
          return this.pojo;

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp Sat Aug 16 
22:45:32 2014
@@ -85,7 +85,7 @@
<tr> 
                             <td class="mm_subtable_label"><s:text 
name='generic.description' /></td>
-                           <td><s:property value="#perms.weblog.description" 
escape="false" /></td>
+                           <td><s:property value="#perms.weblog.about" escape="false" 
/></td>
                         </tr>
<tr> 

Modified: 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
 (original)
+++ 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
 Sat Aug 16 22:45:32 2014
@@ -24,7 +24,7 @@
    <title>$utils.escapeXML($utils.removeHTML($model.weblog.name)) 
(Comments)</title>
    <link>$url.home</link>
    <atom:link rel="self" type="application/rss+xml" 
href="$url.feed.comments.rss($model.categoryName, $model.excerpts)" />
-  <description>$utils.escapeXML($model.weblog.description)</description>
+  <description>$utils.escapeXML($model.weblog.tagline)</description>
    <language>en-us</language>
    <copyright>Copyright $utils.formatDate($model.weblog.lastModified, 
"yyyy")</copyright>
    
<lastBuildDate>$utils.formatRfc822Date($model.weblog.lastModified)</lastBuildDate>

Modified: 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
 (original)
+++ 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
 Sat Aug 16 22:45:32 2014
@@ -20,7 +20,7 @@
  #set($pager = $model.weblogEntriesPager)
  <feed xmlns="http://www.w3.org/2005/Atom";>
      <title type="html">$utils.escapeXML($model.weblog.name)</title>
-    <subtitle 
type="html">$utils.escapeXML($model.weblog.description)</subtitle>
+    <subtitle type="html">$utils.escapeXML($model.weblog.tagline)</subtitle>
      <id>$url.feed.entries.atom</id>
      #if($model.tags)
          <link rel="self" type="application/atom+xml" 
href="$url.feed.entries.atomByTags($model.tags, $model.excerpts)" />

Modified: 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
 (original)
+++ 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
 Sat Aug 16 22:45:32 2014
@@ -30,7 +30,7 @@
    #else
      <atom:link rel="self" type="application/rss+xml" 
href="$url.feed.entries.rss" />
    #end
-  <description>$utils.escapeXML($model.weblog.description)</description>
+  <description>$utils.escapeXML($model.weblog.tagline)</description>
    <language>en-us</language>
    <copyright>Copyright $utils.formatDate($model.weblog.lastModified, 
"yyyy")</copyright>
    
<lastBuildDate>$utils.formatRfc822Date($model.weblog.lastModified)</lastBuildDate>

Modified: 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm
 (original)
+++ 
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/feeds/weblog-files-atom.vm
 Sat Aug 16 22:45:32 2014
@@ -20,7 +20,7 @@
  #set($pager = $model.mediaFilesPager)
  <feed xmlns="http://www.w3.org/2005/Atom";>
      <title type="html">$utils.escapeXML($model.weblog.name)</title>
-    <subtitle 
type="html">$utils.escapeXML($model.weblog.description)</subtitle>
+    <subtitle type="html">$utils.escapeXML($model.weblog.tagline)</subtitle>
      <id>$url.feed.mediaFiles.atom</id>
      <link rel="self" type="application/atom+xml" 
href="$url.feed.mediaFiles.atom" />
      <link rel="alternate" type="text/html" href="$url.home" />

Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm Sat Aug 16 
22:45:32 2014
@@ -150,8 +150,8 @@ will be created.
          #if ($utils.isNotEmpty($model.weblogEntry.searchDescription))
              <meta name="description" 
content="$model.weblogEntry.searchDescription">
          #end
-    #elseif ($utils.isNotEmpty($model.weblog.description))
-        <meta name="description" content="$model.weblog.description">
+    #elseif ($utils.isNotEmpty($model.weblog.about))
+        <meta name="description" content="$model.weblog.about">
      #end
  #end

Modified: roller/trunk/app/src/main/webapp/themes/basic/permalink.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/permalink.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/permalink.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/permalink.vm Sat Aug 16 
22:45:32 2014
@@ -5,7 +5,8 @@
      <meta http-equiv="X-UA-Compatible" content="IE=edge">
      <title>$model.weblogEntry.title : $model.weblog.name</title>
      #showAutodiscoveryLinks($model.weblog)
-    <link rel="stylesheet" media="all" href="$model.weblog.stylesheet">
+    #showAnalyticsTrackingCode($model.weblog)
+    <link rel="stylesheet" href="$model.weblog.stylesheet">
      #showMetaDescription()
  </head>
  <!-- permalink -->

Modified: roller/trunk/app/src/main/webapp/themes/basic/weblog.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/weblog.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/weblog.vm Sat Aug 16 22:45:32 
2014
@@ -7,7 +7,7 @@
      #showAutodiscoveryLinks($model.weblog)
      #showAnalyticsTrackingCode($model.weblog)
      <script src="http://code.jquery.com/jquery-2.1.1.min.js";></script>
-    <link rel="stylesheet" media="all" href="$model.weblog.stylesheet">
+    <link rel="stylesheet" href="$model.weblog.stylesheet">
      #showMetaDescription()
  </head>
  <!-- weblog -->

Modified: 
roller/trunk/app/src/main/webapp/themes/basicmobile/permalink-mobile.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basicmobile/permalink-mobile.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basicmobile/permalink-mobile.vm 
(original)
+++ roller/trunk/app/src/main/webapp/themes/basicmobile/permalink-mobile.vm Sat 
Aug 16 22:45:32 2014
@@ -11,15 +11,14 @@
    <link rel="stylesheet" 
href="$url.absoluteSite/roller-ui/styles/jquery.mobile-theme/jquery.mobile.icons.min.css" />
    <link rel="stylesheet" 
href="http://code.jquery.com/mobile/1.4.2/jquery.mobile.structure-1.4.2.min.css"; />
    #showMetaDescription()
+  #showAnalyticsTrackingCode($model.weblog)
<script src="http://code.jquery.com/jquery-2.1.1.min.js";></script> <script> 
-
      $(document).bind("mobileinit", function(){
        $.mobile.ajaxEnabled = false;
      });
-
    </script>
<script src="http://code.jquery.com/mobile/1.4.2/jquery.mobile-1.4.2.min.js";></script> 

Modified: roller/trunk/app/src/main/webapp/themes/basicmobile/permalink.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basicmobile/permalink.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basicmobile/permalink.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basicmobile/permalink.vm Sat Aug 16 
22:45:32 2014
@@ -7,6 +7,7 @@
      #showAutodiscoveryLinks($model.weblog)
      <link rel="stylesheet" media="all" href="$model.weblog.stylesheet">
      #showMetaDescription()
+    #showAnalyticsTrackingCode($model.weblog)
  </head>
  <!-- permalink -->
  <body>

Modified: roller/trunk/app/src/main/webapp/themes/basicmobile/weblog-mobile.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basicmobile/weblog-mobile.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basicmobile/weblog-mobile.vm 
(original)
+++ roller/trunk/app/src/main/webapp/themes/basicmobile/weblog-mobile.vm Sat 
Aug 16 22:45:32 2014
@@ -6,6 +6,7 @@
    <title>$model.weblog.name</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
    #showMetaDescription()
+  #showAnalyticsTrackingCode($model.weblog)
<link rel="stylesheet" href="$model.weblog.stylesheet"> 
    <link rel="stylesheet" 
href="$url.absoluteSite/roller-ui/styles/jquery.mobile-theme/default.min.css" />

Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm Sat Aug 16 
22:45:32 2014
@@ -144,6 +144,7 @@
      </style>
      <link rel="stylesheet" href='$url.page("custom.css")' />
      #showMetaDescription()
+    #showAnalyticsTrackingCode($model.weblog)
  </head>
  <body>

Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/std_header.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/std_header.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/std_header.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/std_header.vm Sat Aug 16 
22:45:32 2014
@@ -1,6 +1,6 @@
  <div id="main_title">
  <h1><a href="$url.home">$model.weblog.name</a></h1>
-<p>$model.weblog.description</p>
+<p>$model.weblog.tagline</p>
  </div>
<div id="page_menu"> 

Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm Sat Aug 16 
22:45:32 2014
@@ -4,7 +4,7 @@
      <meta charset="utf-8">
      <meta http-equiv="X-UA-Compatible" content="IE=edge">
      #includeTemplate($model.weblog "standard_head")
-    <title>$model.weblog.name: $model.weblog.description</title>
+    <title>$model.weblog.name: $model.weblog.tagline</title>
      #showAutodiscoveryLinks($model.weblog)
      #showAnalyticsTrackingCode($model.weblog)
      <link rel="stylesheet" href='$url.page("custom.css")' />

Modified: roller/trunk/app/src/main/webapp/themes/frontpage/_blogprofile.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/frontpage/_blogprofile.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/frontpage/_blogprofile.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/frontpage/_blogprofile.vm Sat Aug 
16 22:45:32 2014
@@ -6,7 +6,7 @@
          </tr>
          <tr>
              <td>Description</td>
-            <td>$profileWeblog.description</td>
+            <td>$profileWeblog.about</td>
          </tr>
          <tr>
              <td>Created by</td>

Modified: roller/trunk/app/src/main/webapp/themes/gaurav/entry.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/entry.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/entry.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/entry.vm Sat Aug 16 22:45:32 
2014
@@ -6,6 +6,8 @@
    #includeTemplate($model.weblog "standard_head")
    <title>$model.weblog.name: $model.weblogEntry.title</title>
    <link rel="stylesheet" href='$url.page("custom.css")' />
+  #showAnalyticsTrackingCode($model.weblog)
+  #showMetaDescription()
  </head>
  <body>
@@ -19,7 +21,7 @@ 
        
                <div class="row">
                        <div class="col-lg-12">
-                               <h1 
class="page-header">$model.weblog.name&nbsp;<small>$model.weblog.description</small></h1>
+                               <h1 
class="page-header">$model.weblog.name&nbsp;<small>$model.weblog.tagline</small></h1>
                        </div>
                </div>
                <div class="row">

Modified: roller/trunk/app/src/main/webapp/themes/gaurav/search.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/search.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/search.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/search.vm Sat Aug 16 
22:45:32 2014
@@ -37,7 +37,7 @@
        
                <div class="row">
                        <div class="col-lg-12">
-                               <h1 
class="page-header">$model.weblog.name&nbsp;<small>$model.weblog.description</small></h1>
+                               <h1 
class="page-header">$model.weblog.name&nbsp;<small>$model.weblog.tagline</small></h1>
                        </div>
          </div>
                

Modified: roller/trunk/app/src/main/webapp/themes/gaurav/std_head.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/std_head.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/std_head.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/std_head.vm Sat Aug 16 
22:45:32 2014
@@ -1,6 +1,6 @@
  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
  #if ($model.permalink == false)
-   <meta name="Description" content="$model.weblog.description">
+   <meta name="Description" content="$model.weblog.about">
  #else
     <meta name="Description" content="$model.weblogEntry.searchDescription">
  #end

Modified: roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/tags_index.vm Sat Aug 16 
22:45:32 2014
@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    #includeTemplate($model.weblog "standard_head")
-  <title>$model.weblog.name: $model.weblog.description</title>
+  <title>$model.weblog.name: $model.weblog.tagline</title>
  </head>
  <body>
@@ -18,7 +18,7 @@ 
        
                <div class="row">
                        <div class="col-lg-12">
-                               <h1 
class="page-header">$model.weblog.name&nbsp;<small>$model.weblog.description</small></h1>
+                               <h1 
class="page-header">$model.weblog.name&nbsp;<small>$model.weblog.tagline</small></h1>
                        </div>
                </div>
                

Modified: roller/trunk/app/src/main/webapp/themes/gaurav/weblog.vm
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/weblog.vm?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/weblog.vm Sat Aug 16 
22:45:32 2014
@@ -2,9 +2,11 @@
  <html lang="en">
  <head>
        #includeTemplate($model.weblog "standard_head")
-       <title>$model.weblog.name: $model.weblog.description</title>
+       <title>$model.weblog.name: $model.weblog.tagline</title>
        #showAutodiscoveryLinks($model.weblog)
        <link rel="stylesheet" href='$url.page("custom.css")' />
+    #showAnalyticsTrackingCode($model.weblog)
+    #showMetaDescription()
  </head>
  <body>
@@ -18,7 +20,7 @@ 
                
                <div class="row">
                        <div class="col-lg-12">
-                               <h1 
class="page-header">$model.weblog.name&nbsp;<small>$model.weblog.description</small></h1>
+                               <h1 
class="page-header">$model.weblog.name&nbsp;<small>$model.weblog.tagline</small></h1>
                        </div>
                </div>
                

Modified: roller/trunk/docs/roller-template-guide.odt
URL: 
http://svn.apache.org/viewvc/roller/trunk/docs/roller-template-guide.odt?rev=1618424&r1=1618423&r2=1618424&view=diff
==============================================================================
Binary files - no diff available.

Reply via email to