fixed #710 - added labels to the top bar (update vanilla!)

merged "loading" and "more_posts" in topic i18n data, changed behaviour so that on mobile, only the spinner shows.

public/language/cs/topic.json

@@ -36,8 +36,7 @@
 	"favourites.has_no_favourites": "Nemáte žádné oblíbené příspěvky, přidejte některý příspěvek k oblíbeným a uvidíte ho zde!",
 
 	"posted_by": "odeslal",
-	"loading": "Načítání",
-	"more_posts": "více příspěvků",
+	"loading_more_posts": "Načítání více příspěvků",
 	"move_topic": "Přesunout téma",
 	"move_post": "Přesunout příspěvek",
 	"fork_topic": "Rozdělit příspěvek",

public/language/de/topic.json

@@ -33,8 +33,7 @@
 	"favourites.has_no_favourites":"Du hast noch keine Favoriten.",
 
 	"posted_by": "Geposted von",
-	"loading": "Lade",
-	"more_posts": "Mehr Posts",
+	"loading_more_posts": "Lade Mehr Posts",
 	"move_topic": "Thema verschieben",
 	"topic_will_be_moved_to": "Dieses Thema wird verschoben nach",
 

public/language/en/topic.json

@@ -36,8 +36,7 @@
 	"favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
 
 	"posted_by": "posted by",
-	"loading": "Loading",
-	"more_posts": "More Posts",
+	"loading_more_posts": "Loading More Posts",
 	"move_topic": "Move Topic",
 	"move_post": "Move Post",
 	"fork_topic": "Fork Topic",

public/language/es/topic.json

@@ -32,8 +32,7 @@
 	"favourites.has_no_favourites": "No tienes favoritos, puedes agregar alguno y volver a verlos aqui!",
 
 	"posted_by": "Publicado por",
-	"loading": "Cargando",
-	"more_posts": "Más posts",
+	"loading_more_posts": "Cargando más posts",
 	"move_topic": "Mover Tema",
 	"topic_will_be_moved_to": "Este tema sera movido a la categoría",
 

public/language/fr/topic.json

@@ -32,8 +32,7 @@
 	"favourites.has_no_favourites": "Vous n'avez aucun Favoris, mettre en favoris des messages pour les voir apparaître ici!",
 
 	"posted_by": "posté par",
-	"loading": "Chargement",
-	"more_posts": "d'autres Messages",
+	"loading_more_posts": "Chargement d'autres Messages",
 	"move_topic": "Déplacer le Sujet",
 	"topic_will_be_moved_to": "Ce sujet sera déplacé vers la catégorie",
 

public/language/it/topic.json

@@ -36,8 +36,7 @@
 	"favourites.has_no_favourites": "Non hai ancun post preferito; aggiungi qualche post ai preferiti per vederli qui!",
 
 	"posted_by": "scritto da",
-	"loading": "Caricamento",
-	"more_posts": "Altri Post",
+	"loading_more_posts": "Caricamento altri post",
 	"move_topic": "Spsota Discussione",
 	"move_post": "Sposta Post",
 	"fork_topic": "Fork Topic",

public/templates/header.tpl

@@ -55,31 +55,31 @@
 			<div class="navbar-collapse collapse navbar-ex1-collapse">
 				<ul id="main-nav" class="nav navbar-nav">
 					<li>
-						<a href="{relative_path}/recent"><i class="fa fa-clock-o" title="[[global:header.recent]]"></i></a>
+						<a href="{relative_path}/recent"><i class="fa fa-fw fa-clock-o" title="[[global:header.recent]]"></i><span class="visible-xs-inline"> Recent Topics</span></a>
 					</li>
 					<li class="nodebb-loggedin">
-						<a href="{relative_path}/unread"><i id="unread-count" class="fa fa-inbox" data-content="0" title="[[global:header.unread]]"></i></a>
+						<a href="{relative_path}/unread"><i id="unread-count" class="fa fa-fw fa-inbox" data-content="0" title="[[global:header.unread]]"></i><span class="visible-xs-inline"> Unread Topics</span></a>
 					</li>
 					<li>
-						<a href="{relative_path}/users"><i class="fa fa-users" title="[[global:header.users]]"></i></a>
+						<a href="{relative_path}/users"><i class="fa fa-fw fa-users" title="[[global:header.users]]"></i><span class="visible-xs-inline"> Users</span></a>
 					</li>
 					<li class="{adminDisplay}">
-						<a href="{relative_path}/admin"><i class="fa fa-cogs" title="[[global:header.admin]]"></i></a>
+						<a href="{relative_path}/admin"><i class="fa fa-fw fa-cogs" title="[[global:header.admin]]"></i><span class="visible-xs-inline"> Admin Panel</span></a>
 					</li>
 					<!-- IF allowGuestSearching -->
 					<li class="visible-xs">
-						<a href="{relative_path}/search">[[global:header.search]]</a>
+						<a href="{relative_path}/search">[[global:header.search]] Search</a>
 					</li>
 					<!-- ENDIF allowGuestSearching -->
 					<!-- BEGIN navigation -->
 					<li class="{navigation.class}">
 						<a href="{relative_path}{navigation.route}" title="{navigation.title}">
 							<!-- IF navigation.iconClass -->
-							<i class="fa {navigation.iconClass}"></i>
+							<i class="fa fa-fw {navigation.iconClass}"></i>
 							<!-- ENDIF navigation.iconClass -->
 
 							<!-- IF navigation.text -->
-							<span class="{navigation.textClass}">{navigation.text}</span>
+							<span class="{navigation.textClass} visible-xs-inline">{navigation.text}</span>
 							<!-- ENDIF navigation.text -->
 						</a>
 					</li>

public/templates/topic.tpl

@@ -166,7 +166,7 @@
 	<div class="well col-md-11 col-xs-12 pull-right hide">
 		<div class="topic-main-buttons pull-right inline-block hide">
 			<div class="loading-indicator" done="0" style="display:none;">
-				[[topic:loading]] <span class="hidden-xs hidden-sm" style="display:inline!important;">[[topic:more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
+				<span class="hidden-xs-inline">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
 			</div>
 			<button class="btn btn-primary post_reply" type="button">[[topic:reply]]</button>
 			<div class="btn-group thread-tools hide">