From 28f59db19045cea3c415fbaca38df9ff9d5005ca Mon Sep 17 00:00:00 2001
From: uhensler <none@none>
Date: Tue, 11 Jul 2017 14:56:29 +0200
Subject: [PATCH] iOO-2861: Show a info text in the pagination of the blogs and
 the podcasts

---
 .../modules/webFeed/ui/ItemsController.java   |  4 +-
 .../webFeed/ui/blog/_content/posts.html       | 54 ++++++++++---------
 .../webFeed/ui/podcast/_content/episodes.html | 43 +++++++++------
 3 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java b/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java
index 207410f9913..0c882166c9d 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java
+++ b/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java
@@ -172,13 +172,13 @@ public class ItemsController extends BasicController implements Activateable2 {
 		vcItems.contextPut("helper", helper);
 
 		olderItemsLink = LinkFactory.createLink("feed.older.items", vcItems, this);
-		olderItemsLink.setCustomDisplayText("&laquo;");
+		olderItemsLink.setCustomDisplayText("&laquo; " + translate("feed.older.items"));
 		olderItemsLink.setCustomEnabledLinkCSS("o_backward");
 		olderItemsLink.setTitle("feed.older.items");
 
 		newerItemsLink = LinkFactory.createLink("feed.newer.items", vcItems, this);
 		newerItemsLink.setCustomEnabledLinkCSS("o_forward");
-		newerItemsLink.setCustomDisplayText("&raquo;");
+		newerItemsLink.setCustomDisplayText(translate("feed.newer.items") + " &raquo;");
 		newerItemsLink.setTitle("feed.newer.items");
 
 		startpageLink = LinkFactory.createLink("feed.startpage", vcItems, this);
diff --git a/src/main/java/org/olat/modules/webFeed/ui/blog/_content/posts.html b/src/main/java/org/olat/modules/webFeed/ui/blog/_content/posts.html
index ec46e534b1c..770f7586321 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/blog/_content/posts.html
+++ b/src/main/java/org/olat/modules/webFeed/ui/blog/_content/posts.html
@@ -90,31 +90,33 @@
 		</div>
 	#end
 	
-	<ul class="pagination">
-		<li>
-			#if ( $helper.hasOlderItems($items) )
-				$r.getComponent("feed.older.items").setEnabled($true)
-			#else
-				$r.getComponent("feed.older.items").setEnabled($false)
-			#end
-			$r.render("feed.older.items")
-		</li>
-		<li>
-			#if ( $helper.hasNewerItems() )
-				$r.getComponent("feed.startpage").setEnabled($true)
-			#else
-				$r.getComponent("feed.startpage").setEnabled($false)
-			#end
-			$r.render("feed.startpage")
-		</li>
-		<li>
-			#if ( $helper.hasNewerItems() )
-				$r.getComponent("feed.newer.items").setEnabled($true)
-			#else
-				$r.getComponent("feed.newer.items").setEnabled($false)
-			#end
-			$r.render("feed.newer.items")
-		</li>
-	</ul>
+	<div class="o_button_group">
+		<ul class="pagination">
+			<li>
+				#if ( $helper.hasOlderItems($items) )
+					$r.getComponent("feed.older.items").setEnabled($true)
+				#else
+					$r.getComponent("feed.older.items").setEnabled($false)
+				#end
+				$r.render("feed.older.items")
+			</li>
+			<li>
+				#if ( $helper.hasNewerItems() )
+					$r.getComponent("feed.startpage").setEnabled($true)
+				#else
+					$r.getComponent("feed.startpage").setEnabled($false)
+				#end
+				$r.render("feed.startpage")
+			</li>
+			<li>
+				#if ( $helper.hasNewerItems() )
+					$r.getComponent("feed.newer.items").setEnabled($true)
+				#else
+					$r.getComponent("feed.newer.items").setEnabled($false)
+				#end
+				$r.render("feed.newer.items")
+			</li>
+		</ul>
+	</div>
 #end
 </div>
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html b/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html
index f7f0e5d1bfd..a1de4b90c72 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html
+++ b/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html
@@ -119,20 +119,33 @@
 		</div>
 	#end
 	
-	<ul class="pagination">
-		#if ( $helper.hasOlderItems($items) )
-		<li>
-			$r.render("feed.older.items")
-		</li>
-		#end
-		#if ( $helper.hasNewerItems() )
-		<li>
-			$r.render("feed.startpage")
-		</li>
-		<li>
-			$r.render("feed.newer.items")
-		</li>
-		#end
-	</ul>
+	<div class="o_button_group">
+		<ul class="pagination">
+			<li>
+				#if ( $helper.hasOlderItems($items) )
+					$r.getComponent("feed.older.items").setEnabled($true)
+				#else
+					$r.getComponent("feed.older.items").setEnabled($false)
+				#end
+				$r.render("feed.older.items")
+			</li>
+			<li>
+				#if ( $helper.hasNewerItems() )
+					$r.getComponent("feed.startpage").setEnabled($true)
+				#else
+					$r.getComponent("feed.startpage").setEnabled($false)
+				#end
+				$r.render("feed.startpage")
+			</li>
+			<li>
+				#if ( $helper.hasNewerItems() )
+					$r.getComponent("feed.newer.items").setEnabled($true)
+				#else
+					$r.getComponent("feed.newer.items").setEnabled($false)
+				#end
+				$r.render("feed.newer.items")
+			</li>
+		</ul>
+	</div>
 #end
 </div>
\ No newline at end of file
-- 
GitLab