roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1546817 [4/4] - in /roller/branches/rome2: ./ app/src/main/java/org/apache/roller/planet/business/jpa/ app/src/main/java/org/apache/roller/planet/pojos/ app/src/main/java/org/apache/roller/util/ app/src/main/java/org/apache/roller/weblogge...
Date Sun, 01 Dec 2013 14:42:55 GMT
Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/search/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/search/package.html:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/startup/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/startup/package.html:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/themes/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/themes/package.html:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/package.html:r1529476-1546815

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
(original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
Sun Dec  1 14:42:52 2013
@@ -680,6 +680,12 @@ username.allowedChars=A-Za-z0-9
 # weblog entry editor
 weblogentry.editor.showFullPermalink=true
 
+# Starting with Roller 5.1 SEO-friendlier hyphens instead
+# of underscores used by default to separate words in blog
+# URLs.  Set to true below to use pre-5.1 default of
+# underscores instead.
+weblogentry.title.useUnderscoreSeparator=false
+
 # editor theme to be used (corresponds to directory name under /theme)
 editor.theme=tan
 

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/business/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/business/package.html:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/datamodel40.png
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/datamodel40.png:r1529476-1546815

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/package.html:r1529476-1546815

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm Sun Dec  1 14:42:52
2013
@@ -26,13 +26,16 @@ These are the documented macros in order
 
     #showWeblogEntriesPager($pager)
     #showNextPrevEntriesControl($pager)
+    #showMobileNextPrevEntriesControl($pager)
 
     #showWeblogEntryComments($entry)
+    #showMobileWeblogEntryComments($entry)
     #showWeblogEntryCommentForm($entry)
 
     #showWeblogEntryLinksList($entries)
     #showBookmarkLinksList($folderObj $expanding $subfolders)
     #showWeblogCategoryLinksList($categoryObj $expanding $subcats)
+    #showMobileCategoryLinksList($categoryObj)
     #showReferrersList($weblog)
     #showAtomFeedsList($weblog)
     #showRSSFeedsList($weblog)
@@ -43,8 +46,13 @@ These are the documented macros in order
     #showAuthorMenu($vertical)
 
     #showWeblogSearchForm($weblog)
+    #showMobileSearchForm($weblog)
     #showWeblogSearchAgainForm($weblog)
+    #showMobileSearchAgainForm($weblog)
     #showNextPrevSearchControl($pager)
+    #showMobileNextPrevSearchControl($pager)
+    
+    #showMobilePopupDialog($id $header $message)
 
     #_showCommonJavaScript()
     
@@ -58,8 +66,9 @@ Parse and include page template from web
 #macro(includeTemplate $weblog $pageName)
     #set($pageArg = false)## This is required for such constructs; see Velocity docs and
ROL-689
     #set($pageArg = $weblog.getPageByName($pageName))
-    #if ($pageArg) 
-       #parse($pageArg.id "|" $model.deviceType)
+    #if ($pageArg)
+       #set($pageId = $pageArg.id+'|'+$model.deviceType)
+       #parse($pageId)
     #end
 #end
 
@@ -136,8 +145,9 @@ Shows weblog entries pager via default d
     #set($dayPage = $model.weblog.getPageByName("_day"))
     #set($map = $pager.getEntries())
     #foreach($day in $map.keySet())
-        #set($entries = $map.get($day))   
-        #parse($dayPage.id "|" $model.deviceType)
+        #set($entries = $map.get($day))
+        #set($pageId = $dayPage.id+'|'+$model.deviceType)
+        #parse($pageId)
     #end
 #end
 
@@ -161,7 +171,7 @@ Shows weblog entries pager via default d
         #set($nextName = $pager.nextCollectionName)
     #end
     #if ($prevLink)
-        &laquo; <a href="$prevLink">$prevName</a> |  
+        &laquo; <a href="$prevLink">$prevName</a> | 
     #end
     #if ($prevLink || $nextLink)
         <a href="$pager.getHomeLink()">$pager.getHomeName()</a>
@@ -170,6 +180,54 @@ Shows weblog entries pager via default d
         | <a href="$nextLink">$nextName</a> &raquo;
     #end
 #end
+## Mobile Version
+#macro(showMobileNextPrevEntriesControl $pager)
+    #set($prevLink = false)
+    #set($nextLink = false)
+    #if ($pager.prevLink)
+        #set($prevLink = $pager.prevLink)
+        #set($prevName = $pager.prevName)
+    #elseif ($pager.prevCollectionLink)
+        #set($prevLink = $pager.prevCollectionLink)
+        #set($prevName = $pager.prevCollectionName)
+    #end
+    #if ($pager.nextLink)
+        #set($nextLink = $pager.nextLink)
+        #set($nextName = $pager.nextName)
+    #elseif ($pager.nextCollectionLink)
+        #set($nextLink = $pager.nextCollectionLink)
+        #set($nextName = $pager.nextCollectionName)
+    #end
+    #if ($prevLink || $nextLink)
+    <div data-role="navbar" data-iconpos="top">
+      <ul>
+        #if ($prevLink)
+          <li>
+            <a href="$prevLink" data-transition="fade" data-theme="c" data-icon="arrow-l">
+              $prevName
+            </a>
+          </li>
+        #end
+        ## If we do not want the home link on the first page remove >> || $nextLink
+        #if ($prevLink || $nextLink)
+          <li>
+            <a href="$pager.getHomeLink()" data-transition="fade" data-theme="c" data-icon="home">
+              $pager.getHomeName()
+            </a>
+          </li>
+        #end
+        #if ($nextLink)
+          <li>
+            <a href="$nextLink" data-transition="fade" data-theme="c" data-icon="arrow-r">
+              $nextName
+            </a>
+          </li>
+        #end
+      </ul>
+    </div>
+  #end
+    
+#end
 
 
 #** 
@@ -219,6 +277,52 @@ Show comments for weblog entry according
     #end
     </div>
 #end
+## Mobile Version
+#macro(showMobileWeblogEntryComments $entry)
+    <!-- showMobileWeblogEntryComments -->
+    #if($model.commentForm.preview)
+      #set($comments = [$model.commentForm.previewComment])
+      #set( $heading = $text.get( "macro.weblog.preview" ))
+    #else
+      #set($comments = $entry.getComments(true, true))
+      #set( $heading = $text.get( "macro.weblog.comments" ))
+    #end
+    #if($comments.size() > 0)
+      <ul data-role="listview" data-divider-theme="b" data-inset="true">
+        <li data-role="list-divider">
+          $heading
+        </li>
+        #foreach( $comment in $comments )
+          #if($comment.approved || $model.commentForm.preview)
+            ##<li data-role="list-divider" data-theme="c">
+              ## TODO
+            ##<a name="comment-$comment.timestamp" id="comment-$comment.timestamp"></a>
+            ##</li>
+            <li data-theme="c">
+              <p class="ui-li-desc content-textbox">
+                 $comment.content
+              </p>
+              <p class="ui-li-desc content-textbox">
+                $text.get("macro.weblog.postedby")
+                #if (!$utils.isEmpty($comment.name) && !$utils.isEmpty($comment.url))
+                   <a rel="nofollow" href="$comment.url"><b>$comment.name</b></a>
+                #elseif (!$utils.isEmpty($comment.name))
+                   <b>$comment.name</b>
+                #elseif ($comment.remoteHost)
+                   <b>$comment.remoteHost</b>
+                #else
+                   <b>$text.get("macro.weblog.comment.unknown")</b>
+                #end
+
+                $text.get("macro.weblog.on") $utils.formatDate($comment.postTime, $text.get(
"macro.weblog.datepattern" ))
+                ##<a href="$url.comment($entry.anchor, $comment.timestamp)" title="$text.get(
"macro.weblog.commentpermalink.title" )" data-role="button" data-inline="true" data-mini="true">#</a>
+              </p>
+            </li>
+          #end
+        #end
+      </ul>
+    #end
+#end
 
 
 #** 
@@ -239,8 +343,7 @@ Show comments form for weblog entry. 
         <span class="status">$cform.message</span>
     #end
 
-    <form method="post" action="$url.entry($entry.anchor)" focus="name" 
-        name="commentForm" onsubmit="fixURL(this); return validateComments(this)">   

+    <form method="post" action="$url.entry($entry.anchor)" focus="name" name="commentForm"
onsubmit="fixURL(this); return validateComments(this)">
         <input type="hidden" name="method" value="post" />
 
         <ul>
@@ -257,20 +360,18 @@ Show comments form for weblog entry. 
                 <input type="text" name="url" class="text large" value="$cform.url" size="50"
maxlength="255" />
             </li>
 
-        #if ($config.commentEmailNotify)
-            <li><input type="checkbox" class="checkbox" id="notify" name="notify"
#if($cform.notify)CHECKED #end/>
-                <label for="notify" class="choice">$text.get( "macro.weblog.notifyMeOfComments"
)</label>
-            </li>
-        #end
+            #if ($config.commentEmailNotify)
+                <li><input type="checkbox" class="checkbox" id="notify" name="notify"
#if($cform.notify)CHECKED #end/>
+                    <label for="notify" class="choice">$text.get( "macro.weblog.notifyMeOfComments"
)</label>
+                </li>
+            #end
             <li>
                 <input type="checkbox" class="checkbox" id="rememberInfo" name="rememberInfo"
/>
                 <label for="rememberInfo" class="choice">$text.get( "macro.weblog.rememberinfo"
)</label>
             </li>
             <li>
                 <label class="desc">$text.get( "macro.weblog.yourcomment" )</label>
-             
-            <textarea name="content" class="textarea large" cols="40" rows="10">$cform.content</textarea>
-
+                <textarea name="content" class="textarea large" cols="40" rows="10">$cform.content</textarea>
             </li>
             <li class="info">
                 <span class="comments-syntax-indicator">
@@ -347,7 +448,6 @@ Show comments form for weblog entry. 
 #else
     <span class="status">$text.get( "comments.disabled" )</span>
 #end
-
     </div>
 #end
 
@@ -462,7 +562,35 @@ Show weblog's categories in specified pa
         </ul>
     #end
 #end
-
+## Mobile version
+#macro(showMobileCategoryLinksList $categoryObject)
+    <!-- showMobileCategoryLinksList -->
+    <div data-role="popup" id="categories" data-theme="none">
+      <div data-role="collapsible-set" data-theme="b" data-content-theme="c" data-collapsed-icon="arrow-r"
data-expanded-icon="arrow-d" style="margin:0; width:250px;">
+        <div data-role="collapsible" data-collapsed="false" data-inset="false">
+          <h2>Categories</h2>
+          <ul data-role="listview">
+            #if ($model.weblogCategory || $model.permalink)
+              <li><a href="$url.category($categoryObject.path)" data-transition="fade">$text.get("macro.weblog.allcategories")</a></li>
+            #else
+              <li class="ui-btn-active"><a href="$url.category($categoryObject.path)"
data-transition="fade">$text.get("macro.weblog.allcategories")</a></li>
+            #end
+            #set($active = $text.get("macro.weblog.allcategories"))
+            #set($cats = $categoryObject.getWeblogCategories())
+            #foreach($cat in $cats)
+              #if ($model.weblogCategory && $model.weblogCategory.path == $cat.path
|| ($model.permalink && $model.weblogEntry.category.path == $cat.path))
+                <li class="ui-btn-active"><a href="$url.category($cat.path)" data-transition="fade">$cat.name</a></li>
+                #set($active = $cat.name)
+              #else
+                <li><a href="$url.category($cat.path)" data-transition="fade">$cat.name</a></li>
+              #end
+            #end
+          </ul>
+        </div>
+      </div>
+    </div>
+    <a href="#categories" data-rel="popup" data-role="button">Categories - $active</a>
+#end
 
 #**
 Recursively display a bookmark folder and children as HTML ul list (undocumented).
@@ -708,11 +836,9 @@ Show weblog author menu with vertical or
 Show search form for a weblog.
 *#
 #macro(showWeblogSearchForm $weblog $showCatChooser)
-    <form id="searchForm" method="get" action="$url.search"
-        style="margin: 0; padding: 0" onsubmit="return validateSearch(this)">
+    <form id="searchForm" method="get" action="$url.search" style="margin: 0; padding:
0" onsubmit="return validateSearch(this)">
         <p>
-          <input type="text" id="q" name="q" size="10" class="text small"
-              maxlength="255" value="#if($model.term)$model.term#end" />
+          <input type="text" id="q" name="q" size="10" class="text small" maxlength="255"
value="#if($model.term)$model.term#end" />
           #if( $showCatChooser )
             #set( $cats = $model.weblog.getWeblogCategories("nil") )
             <select name="cat">
@@ -736,6 +862,38 @@ Show search form for a weblog.
         }
     </script>
 #end
+## Mobile Version
+#macro(showMobileSearchForm $weblog $showCatChooser)
+    <form id="searchForm" method="get" action="$url.search" onsubmit="return validateSearch(this)">
+        <p>
+          <input type="search" id="q" name="q" placeholder="Search..." maxlength="255"
value="#if($model.term)$model.term#end" />
+          #if( $showCatChooser )
+            #set( $cats = $model.weblog.getWeblogCategories("nil") )
+            <select name="cat">
+            <option value="">- $text.get("mainPage.category") -</option>
+            #foreach( $cat in $cats )
+              <option #if($cat.name == $model.term)selected="selected"#end>$cat.name</option>
+            #end
+            </select>
+          #end
+          <input type="submit" id="searchbutton" data-role="button" data-theme="e" value="$text.get(
"macro.weblog.searchbutton" )" />
+        </p>
+    </form>
+    <script type="text/javascript">
+        function validateSearch(form) {
+            if (form.q.value == "") {
+                $("#searchDialog").popup('open').focus();
+                $("#searchDialog").popup({ afterclose: function( event, ui ) {
+                    form.q.focus();
+                    }
+                });
+                return false;
+            }
+            return true;
+        }
+    </script>
+    #showMobilePopupDialog('searchDialog','Search', $text.get("macro.weblog.searchalert"))
+#end
 
 
 #** 
@@ -746,10 +904,7 @@ Show search again form for a weblog.
         $text.get( "macro.weblog.searchdictionary", [$model.term, $model.term, $model.term]
)
         $text.get( "macro.weblog.searchhits", [$model.hits])
         <form method="get" action="$url.search" style="margin: 5px">
-            <input type="text" id="q" name="q" class="text medium"
-                maxlength="255" value="$model.term"
-                style="padding-left: 1px" /><br />
-
+            <input type="text" id="q" name="q" class="text medium" maxlength="255" value="$model.term"
style="padding-left: 1px" /><br />
             #set( $cats = $model.weblog.getWeblogCategories("nil") )
             <select name="cat" class="select">
             <option value="">$text.get( "macro.searchresults.incategory" )</option>
@@ -764,6 +919,26 @@ Show search again form for a weblog.
         $text.get( "macro.weblog.searchgoogle", [$model.term, $url.absoluteSite, $url.site,
${website.handle}] )
     </div>
 #end
+## Mobile Version
+#macro(showMobileSearchAgainForm $weblog)
+    <div id="searchAgain">
+        $text.get( "macro.weblog.searchdictionary", [$model.term, $model.term, $model.term]
)
+        $text.get( "macro.weblog.searchhits", [$model.hits])
+        <form method="get" action="$url.search" style="margin: 5px">
+            <input type="search" id="q" name="q" placeholder="Search..." maxlength="255"
value="$model.term" />
+            #set( $cats = $model.weblog.getWeblogCategories("nil") )
+            <select name="cat" class="select">
+            <option value="">$text.get( "macro.searchresults.incategory" )</option>
+            #foreach( $cat in $cats )
+              <option #if($cat.name == $model.weblogCategory.name)selected="selected"#end>$cat.name</option>
+            #end
+            </select>
+
+            <input type="submit" data-role="button" data-theme="e" value="$text.get( "macro.weblog.searchagain"
)" />
+        </form>
+
+    </div>
+#end
 
 
 #** 
@@ -797,8 +972,72 @@ Show next/prev pager for search results.
         | <a href="$nextLink">$nextName</a> &raquo;
     #end
 #end
+## Mobile Version
+#macro(showMobileNextPrevSearchControl $pager)
+    #set( $min = $model.offset + 1 )
+    #set( $max = $model.offset + $model.limit )
+    #if( $max > $model.hits )#set( $max = $model.hits )#end
+    <h3>
+       $text.get("searchSummary.text", [$min, $max, $model.hits])
+    </h3>
+    #set($prevLink = false)
+    #set($nextLink = false)
+    #if ($pager.prevLink)
+        #set($prevLink = $pager.prevLink)
+        #set($prevName = $pager.prevName)
+    #end
+    #if ($pager.nextLink)
+        #set($nextLink = $pager.nextLink)
+        #set($nextName = $pager.nextName)
+    #end
+
+    ## Show the pager
+    #if ($prevLink || $nextLink)
+      <div data-role="navbar" data-iconpos="top">
+        <ul>
+          #if ($prevLink)
+            <li>
+              <a href="$prevLink" data-transition="fade" data-theme="c" data-icon="arrow-l">
+                $prevName
+              </a>
+            </li>
+          #end
+          ## If we do not want the home link on the first page remove >> || $nextLink
+          #if ($prevLink || $nextLink)
+            <li>
+              <a href="$pager.getHomeLink()" data-transition="fade" data-theme="c" data-icon="home">
+                $pager.getHomeName()
+              </a>
+            </li>
+          #end
+          #if ($nextLink)
+            <li>
+              <a href="$nextLink" data-transition="fade" data-theme="c" data-icon="arrow-r">
+                $nextName
+              </a>
+            </li>
+          #end
+        </ul>
+      </div>
+    #end
+#end
 
 
+#** 
+Show mobile alert popup.
+*#
+#macro(showMobilePopupDialog $id $header $message)
+ <div data-role="popup" id="$id" data-dismissible="false" style="white-space: normal"
class="ui-corner-all">
+    <div data-role="footer" data-theme="b" class="ui-corner-top">
+      <h1>$header</h1>
+    </div>
+    <div data-role="content" data-theme="d" class="ui-corner-bottom ui-content">
+      <h3 class="wrap ui-title">$message</h3>
+      <a href="#" data-role="button" data-inline="true" data-rel="back" data-transition="fade"
data-theme="c">OK</a>
+    </div>
+  </div>
+#end
+
 #**
 Include Javascript code needed for expanding folder macros (undocumented).
 *#

Modified: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
(original)
+++ roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
Sun Dec  1 14:42:52 2013
@@ -348,7 +348,7 @@ public class BookmarkTest extends TestCa
     private String fileToString( InputStream is ) throws java.io.IOException {
         BufferedReader br = new BufferedReader(new InputStreamReader(is));
         String s = null;
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         while ( (s=br.readLine()) != null ) {
             sb.append( s );
         }

Propchange: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
            ('svn:mergeinfo' removed)

Propchange: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui:r1529476-1546815

Modified: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
(original)
+++ roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
Sun Dec  1 14:42:52 2013
@@ -70,7 +70,7 @@ public class CommentValidatorTest extend
         WeblogEntryComment comment = createEmptyComment();
 
         // string that exceeds default excess size threshold of 1000
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int i=0; i<101; i++) {
             sb.append("0123456789");
         }

Propchange: roller/branches/rome2/app/src/test/resources/uploadsdir/testblog1/sub1/hawk.jpg
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/test/resources/uploadsdir/testblog1/sub1/hawk.jpg:r1529476-1546815

Propchange: roller/branches/rome2/app/src/test/resources/uploadsdir/testblog1/sub1/sub2/nasa.jpg
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/test/resources/uploadsdir/testblog1/sub1/sub2/nasa.jpg:r1529476-1546815



Mime
View raw message