Author: gmazza
Date: Mon Dec 9 00:06:51 2013
New Revision: 1549360
URL: http://svn.apache.org/r1549360
Log:
New #showMetaDescription() Velocity macro added.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
roller/trunk/app/src/main/webapp/themes/basic/permalink-mobile.vm
roller/trunk/app/src/main/webapp/themes/basic/permalink.vm
roller/trunk/app/src/main/webapp/themes/basic/weblog-mobile.vm
roller/trunk/app/src/main/webapp/themes/basic/weblog.vm
roller/trunk/app/src/main/webapp/themes/brushedmetal/permalink.vm
roller/trunk/app/src/main/webapp/themes/brushedmetal/weblog.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm
roller/trunk/app/src/main/webapp/themes/sotto/permalink.vm
roller/trunk/app/src/main/webapp/themes/sotto/weblog.vm
roller/trunk/docs/roller-template-guide.odt
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java Mon Dec
9 00:06:51 2013
@@ -716,11 +716,11 @@ public class Weblog implements Serializa
/**
- * A short description about the weblog.
+ * A description for the weblog (its purpose, authors, etc.)
*
- * This field difers from the 'description' attribute in the sense that the
- * description is meant to hold more of a tagline, while this attribute is
- * more of a full paragraph (or two) about section.
+ * This field is meant to hold a paragraph or two describing the weblog, in contrast
+ * to the short sentence or two 'description' attribute meant for blog taglines
+ * and HTML header META description tags.
*
*/
public String getAbout() {
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=1549360&r1=1549359&r2=1549360&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 Mon Dec 9 00:06:51 2013
@@ -23,6 +23,7 @@ These are the documented macros in order
#includeTemplate($weblog $pageName)
#showAutodiscoveryLinks($weblog)
#showTrackbackAutodiscovery($entry)
+ #showMetaDescription()
#showWeblogEntriesPager($pager)
#showNextPrevEntriesControl($pager)
@@ -137,6 +138,22 @@ Show RSS, Atom and RSD auto-discovery li
#end
#end
+#**
+Adds a meta description tag, suitable for use in HTML header sections. This tag is frequently
used by
+search engines to provide a short description for links returned. The description value
will set to the
+weblog's tagline if on a multiple blog entry page or the weblog entry search description
if on a single
+blog entry (permalink) page. If the relevant description value has not been configured no
meta tag
+will be created.
+*#
+#macro(showMetaDescription)
+ #if ($model.permalink)
+ #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">
+ #end
+#end
#**
Shows weblog entries pager via default day template
Modified: roller/trunk/app/src/main/webapp/themes/basic/permalink-mobile.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/permalink-mobile.vm?rev=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/permalink-mobile.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/permalink-mobile.vm Mon Dec 9 00:06:51
2013
@@ -7,6 +7,8 @@
<link rel="stylesheet" type="text/css" href="$model.weblog.stylesheet">
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/mobile/1.3.2/jquery.mobile-1.3.2.min.css"
/>
+ #showMetaDescription()
+
<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
<script type="text/javascript">
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=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/permalink.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/permalink.vm Mon Dec 9 00:06:51 2013
@@ -5,6 +5,7 @@
<title>$model.weblogEntry.title : $model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+ #showMetaDescription()
</head>
<body>
Modified: roller/trunk/app/src/main/webapp/themes/basic/weblog-mobile.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/weblog-mobile.vm?rev=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/weblog-mobile.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/weblog-mobile.vm Mon Dec 9 00:06:51 2013
@@ -4,9 +4,11 @@
<meta charset="UTF-8">
<title>$model.weblog.name</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
+ #showMetaDescription()
<link rel="stylesheet" type="text/css" href="$model.weblog.stylesheet">
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/mobile/1.3.2/jquery.mobile-1.3.2.min.css"
/>
+
<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
<script type="text/javascript">
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=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/weblog.vm Mon Dec 9 00:06:51 2013
@@ -5,6 +5,7 @@
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+ #showMetaDescription()
</head>
<body>
<script type="text/javascript">
Modified: roller/trunk/app/src/main/webapp/themes/brushedmetal/permalink.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/brushedmetal/permalink.vm?rev=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/brushedmetal/permalink.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/brushedmetal/permalink.vm Mon Dec 9 00:06:51
2013
@@ -5,6 +5,7 @@
<title>$model.weblogEntry.title : $model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+ #showMetaDescription()
</head>
<body>
Modified: roller/trunk/app/src/main/webapp/themes/brushedmetal/weblog.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/brushedmetal/weblog.vm?rev=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/brushedmetal/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/brushedmetal/weblog.vm Mon Dec 9 00:06:51 2013
@@ -5,6 +5,7 @@
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+ #showMetaDescription()
</head>
<body>
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=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm Mon Dec 9 00:06:51 2013
@@ -142,6 +142,7 @@
}
</style>
<link rel="stylesheet" type="text/css" href='$url.page("custom.css")' />
+ #showMetaDescription()
</head>
<body>
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=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm Mon Dec 9 00:06:51 2013
@@ -6,6 +6,7 @@
<title>$model.weblog.name: $model.weblog.description</title>
#showAutodiscoveryLinks($model.weblog)
<link rel="stylesheet" type="text/css" href='$url.page("custom.css")' />
+ #showMetaDescription()
</head>
<body>
Modified: roller/trunk/app/src/main/webapp/themes/sotto/permalink.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/sotto/permalink.vm?rev=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/sotto/permalink.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/sotto/permalink.vm Mon Dec 9 00:06:51 2013
@@ -6,6 +6,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>$model.weblogEntry.title : $model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
+ #showMetaDescription()
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
</head>
Modified: roller/trunk/app/src/main/webapp/themes/sotto/weblog.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/sotto/weblog.vm?rev=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/sotto/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/sotto/weblog.vm Mon Dec 9 00:06:51 2013
@@ -7,6 +7,7 @@
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
<link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
+ #showMetaDescription()
</head>
<body>
Modified: roller/trunk/docs/roller-template-guide.odt
URL: http://svn.apache.org/viewvc/roller/trunk/docs/roller-template-guide.odt?rev=1549360&r1=1549359&r2=1549360&view=diff
==============================================================================
Binary files - no diff available.
|