From b5a4d875c8729d82f8c5d34dc0f4f46b22203a08 Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Sun, 4 May 2014 01:41:54 +0200
Subject: [PATCH] add a meaningful title to HTML-pages (Issue #185)

---
 app/controllers/IntermediateController.inc    |  56 +++++++++++++++++
 configs/AppConfig.inc                         |   3 +-
 controllers/AchievementsController.inc        |   4 ++
 controllers/CharactergroupsController.inc     |  46 ++++++++++++++
 .../CharactergroupsquestsController.inc       |  25 +++++++-
 controllers/CharactersController.inc          |  26 ++++++++
 controllers/HtmlController.inc                |  43 +++++++++++++
 controllers/LibraryController.inc             |   9 +++
 controllers/QuestgroupsController.inc         |  13 ++++
 controllers/QuestsController.inc              |  22 +++++++
 controllers/SeminariesController.inc          |  16 +++++
 controllers/UsersController.inc               |  25 ++++++++
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo   | Bin 13703 -> 13865 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po   |  57 ++++++++++--------
 questtypes/submit/html/quest.tpl              |   2 +-
 views/html/characters/manage.tpl              |   2 +-
 views/html/html.tpl                           |   2 +-
 views/html/quests/submissions.tpl             |   2 +-
 views/html/seminaries/create.tpl              |   6 +-
 views/html/seminaries/delete.tpl              |   6 +-
 views/html/seminaries/edit.tpl                |   6 +-
 views/html/users/manage.tpl                   |   2 +-
 22 files changed, 334 insertions(+), 39 deletions(-)

diff --git a/app/controllers/IntermediateController.inc b/app/controllers/IntermediateController.inc
index 19647d7e..e2f8c75d 100644
--- a/app/controllers/IntermediateController.inc
+++ b/app/controllers/IntermediateController.inc
@@ -31,6 +31,12 @@
 		 * @var array
 		 */
 		public static $user = null;
+		/**
+		 * Title information
+		 * 
+		 * @var array
+		 */
+		private $title = array();
 		
 		
 		
@@ -92,6 +98,56 @@
 		}
 		
 		
+		/**
+		 * Return current title information.
+		 * 
+		 * @return	string	Title information
+		 */
+		public function getTitle()
+		{
+			return $this->title;
+		}
+		
+		
+		
+		
+		/**
+		 * Add a piece of information to the current title.
+		 * 
+		 * @param	string	$title Title information
+		 */
+		protected function addTitle($title)
+		{
+			$this->title[] = $title;
+		}
+		
+		
+		/**
+		 * Add a piece of information to the current title and localize
+		 * it.
+		 * 
+		 * @param	string	$title Title information
+		 */
+		protected function addTitleLocalized($title)
+		{
+			$title = gettext($title);
+			
+			$args = func_get_args();
+			if(count($args) > 0) {
+				$title = call_user_func_array(
+					'sprintf',
+					array_merge(
+						array($title),
+						array_slice($args, 1)
+					)
+				);
+			}
+			
+			
+			$this->title[] = $title;
+		}
+		
+		
 		
 		
 		/**
diff --git a/configs/AppConfig.inc b/configs/AppConfig.inc
index 150e69bc..5e1c96fe 100644
--- a/configs/AppConfig.inc
+++ b/configs/AppConfig.inc
@@ -113,7 +113,8 @@
 		 */
 		public static $misc = array(
 			'ranking_range'		=> 2,
-			'achievements_range'	=> 3
+			'achievements_range'	=> 3,
+			'title_delimiter'	=> ' – '
 		);
 		
 		
diff --git a/controllers/AchievementsController.inc b/controllers/AchievementsController.inc
index 89b3f703..9450321b 100644
--- a/controllers/AchievementsController.inc
+++ b/controllers/AchievementsController.inc
@@ -158,6 +158,10 @@
 			$character['rank'] = $this->Achievements->getCountRank($seminary['id'], count($achievedAchievements));
 			
 			
+			// Set title
+			$this->addTitleLocalized('Achievements');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('character', $character);
diff --git a/controllers/CharactergroupsController.inc b/controllers/CharactergroupsController.inc
index e82d1fae..5e9ba675 100644
--- a/controllers/CharactergroupsController.inc
+++ b/controllers/CharactergroupsController.inc
@@ -86,6 +86,10 @@
 			$groupsgroups = $this->Charactergroups->getGroupsroupsForSeminary($seminary['id']);
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Character Groups');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroups', $groupsgroups);
@@ -117,6 +121,11 @@
 			$quests = $this->Charactergroupsquests->getQuestsForCharactergroupsgroup($groupsgroup['id']);
 			
 			
+			// Set titile
+			$this->addTitle($groupsgroup['name']);
+			$this->addTitleLocalized('Character Groups');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroup', $groupsgroup);
@@ -178,6 +187,10 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('New Character groups-group');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('charactergroupsgroupname', $charactergroupsgroupname);
@@ -243,6 +256,10 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Edit Character groups-group');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('charactergroupsgroupname', $charactergroupsgroupname);
@@ -287,6 +304,10 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Delete Character groups-group');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroup', $groupsgroup);
@@ -330,6 +351,11 @@
 			$quests = $this->Charactergroupsquests->getQuestsForGroup($group['id']);
 			
 			
+			// Set titile
+			$this->addTitle($group['name']);
+			$this->addTitle($groupsgroup['name']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroup', $groupsgroup);
@@ -411,6 +437,11 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitle($group['name']);
+			$this->addTitle($groupsgroup['name']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroup', $groupsgroup);
@@ -478,6 +509,11 @@
 			}
 			
 			
+			// Set title
+			$this->addTitleLocalized('New %s Character group', $groupsgroup['name']);
+			$this->addTitle($groupsgroup['name']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroup', $groupsgroup);
@@ -549,6 +585,11 @@
 			}
 			
 			
+			// Set title
+			$this->addTitleLocalized('Edit %s Character group', $groupsgroup['name']);
+			$this->addTitle($groupsgroup['name']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroup', $groupsgroup);
@@ -599,6 +640,11 @@
 			}
 			
 			
+			// Set title
+			$this->addTitleLocalized('Delete %s Character group', $groupsgroup['name']);
+			$this->addTitle($groupsgroup['name']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroup', $groupsgroup);
diff --git a/controllers/CharactergroupsquestsController.inc b/controllers/CharactergroupsquestsController.inc
index 09a0da0d..a68b15f9 100644
--- a/controllers/CharactergroupsquestsController.inc
+++ b/controllers/CharactergroupsquestsController.inc
@@ -94,6 +94,11 @@
 			}
 			
 			
+			// Set title
+			$this->addTitle($quest['title']);
+			$this->addTitle($groupsgroup['name']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroup', $groupsgroup);
@@ -226,7 +231,10 @@
 			}
 			
 			
-			
+			// Set title
+			$this->addTitle($quest['title']);
+			$this->addTitle($groupsgroup['name']);
+			$this->addTitle($seminary['title']);
 			
 			// Pass data to view
 			$this->set('seminary', $seminary);
@@ -327,6 +335,11 @@
 			}
 			
 			
+			// Set title
+			$this->addTitleLocalized('New %s-Quest', $groupsgroup['name']);
+			$this->addTitle($groupsgroup['name']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroup', $groupsgroup);
@@ -436,6 +449,11 @@
 			}
 			
 			
+			// Set title
+			$this->addTitleLocalized('Edit %s-Quest', $groupsgroup['name']);
+			$this->addTitle($groupsgroup['name']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroup', $groupsgroup);
@@ -492,6 +510,11 @@
 			}
 			
 			
+			// Set title
+			$this->addTitleLocalized('Delete %s-Quest', $groupsgroup['name']);
+			$this->addTitle($groupsgroup['name']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('groupsgroup', $groupsgroup);
diff --git a/controllers/CharactersController.inc b/controllers/CharactersController.inc
index c0303da4..6f98b3ca 100644
--- a/controllers/CharactersController.inc
+++ b/controllers/CharactersController.inc
@@ -108,6 +108,10 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Characters');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('characters', $characters);
@@ -180,6 +184,11 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitle($character['name']);
+			$this->addTitleLocalized('Characters');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('character', $character);
@@ -294,6 +303,10 @@
 			$xplevels = $this->Characters->getXPLevelsForSeminary($seminary['id']);
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Create Character');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('types', $types);
@@ -421,6 +434,10 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Manage Characters');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('characters', $characters);
@@ -546,6 +563,11 @@
 			// Get XP-levels
 			$xplevels = $this->Characters->getXPLevelsForSeminary($seminary['id']);
 			
+			
+			// Set titile
+			$this->addTitleLocalized('Edit Character');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('types', $types);
@@ -595,6 +617,10 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Delete Character');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('character', $character);
diff --git a/controllers/HtmlController.inc b/controllers/HtmlController.inc
index 4c85e074..bf79a7db 100644
--- a/controllers/HtmlController.inc
+++ b/controllers/HtmlController.inc
@@ -44,6 +44,19 @@
 		}
 		
 		
+		/**
+		 * Postfilter that is executed after running the Controller.
+		 * 
+		 * @param	Request		$request	Current request
+		 * @param	Response	$response	Current response
+		 */
+		public function postFilter(\nre\core\Request $request, \nre\core\Response $response)
+		{
+			// Get title
+			$this->set('title', $this->getTitle());
+		}
+		
+		
 		/**
 		 * Action: index.
 		 * 
@@ -63,6 +76,36 @@
 			$this->set('notifications', $this->Notification->getNotifications());
 		}
 		
+		
+		
+		
+		/**
+		 * Get title information from IntermediateController if possible
+		 * and create a title.
+		 * 
+		 * @return	string	Title for the current page
+		 */
+		private function getTitle()
+		{
+			$title = array();
+			
+			// Get title of IntermediateController
+			$intermediateController = $this->agent->getIntermediateAgent()->controller;
+			if($intermediateController instanceof \hhu\z\controllers\IntermediateController) {
+				$title = $intermediateController->getTitle();
+			}
+			if(!is_array($title)) {
+				$title = array($title);
+			}
+			
+			// Add application name
+			$title[] = \nre\configs\AppConfig::$app['name'];
+			
+			
+			// Return title with delimiter
+			return implode(\nre\configs\AppConfig::$misc['title_delimiter'], $title);
+		}
+		
 	}
 
 ?>
diff --git a/controllers/LibraryController.inc b/controllers/LibraryController.inc
index 9cbfb24e..a82387e6 100644
--- a/controllers/LibraryController.inc
+++ b/controllers/LibraryController.inc
@@ -77,6 +77,10 @@
 			}
 			
 			
+			// Set title
+			$this->addTitleLocalized('Library');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('totalQuestcount', $totalQuestcount);
@@ -124,6 +128,11 @@
 			}
 			
 			
+			// Set title
+			$this->addTitle($questtopic['title']);
+			$this->addTitleLocalized('Library');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('questtopic', $questtopic);
diff --git a/controllers/QuestgroupsController.inc b/controllers/QuestgroupsController.inc
index 8e4d01c4..3d24a678 100644
--- a/controllers/QuestgroupsController.inc
+++ b/controllers/QuestgroupsController.inc
@@ -185,6 +185,15 @@
 			}
 			
 			
+			// Set titile
+			if(!is_null($questgroup['hierarchy'])) {
+				$this->addTitle(sprintf('%s %d: %s', $questgroup['hierarchy']['title_singular'], $questgroup['hierarchy']['questgroup_pos'], $questgroup['title']));
+			}
+			else {
+				$this->addTitle($questgroup['title']);
+			}
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('questgroup', $questgroup);
@@ -229,6 +238,10 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Create Questgroup');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 		}
diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc
index fff85c44..9c02d16a 100644
--- a/controllers/QuestsController.inc
+++ b/controllers/QuestsController.inc
@@ -107,6 +107,10 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Quests');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('quests', $quests);
@@ -285,6 +289,10 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitle($quest['title']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('questgroup', $questgroup);
@@ -340,6 +348,11 @@
 			$solvedSubmissionCharacters = $this->Characters->getCharactersSolvedQuest($quest['id']);
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Submissions');
+			$this->addTitle($quest['title']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('questgroup', $questgroup);
@@ -391,6 +404,11 @@
 			$output = $this->renderTaskSubmission($questtype['classname'], $seminary, $questgroup, $quest, $character);
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Submission of %s', $character['name']);
+			$this->addTitle($quest['title']);
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('questgroup', $questgroup);
@@ -510,6 +528,10 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Create Quest');
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('questgroups', $questgroups);
diff --git a/controllers/SeminariesController.inc b/controllers/SeminariesController.inc
index 13259c75..c4e72dd6 100644
--- a/controllers/SeminariesController.inc
+++ b/controllers/SeminariesController.inc
@@ -80,6 +80,9 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Seminaries');
+			
 			// Pass data to view
 			$this->set('seminaries', $seminaries);
 		}
@@ -147,6 +150,9 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitle($seminary['title']);
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('questgroupshierarchy', $questgroupshierarchy);
@@ -172,6 +178,10 @@
 				$user = $this->Seminaries->getSeminaryById($seminaryId);
 				$this->redirect($this->linker->link(array($seminary['url']), 1));
 			}
+			
+			
+			// Set titile
+			$this->addTitleLocalized('New seminary');
 		}
 		
 		
@@ -208,6 +218,9 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Edit seminary');
+			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 		}
@@ -244,6 +257,9 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Delete seminary');
+			
 			// Show confirmation
 			$this->set('seminary', $seminary);
 		}
diff --git a/controllers/UsersController.inc b/controllers/UsersController.inc
index d7d5bd45..5a32ab51 100644
--- a/controllers/UsersController.inc
+++ b/controllers/UsersController.inc
@@ -56,6 +56,9 @@
 			$users = $this->Users->getUsers();
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Users');
+			
 			// Pass data to view
 			$this->set('users', $users);
 		}
@@ -103,6 +106,10 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized($user['username']);
+			$this->addTitleLocalized('Users');
+			
 			// Pass data to view
 			$this->set('user', $user);
 			$this->set('characters', $characters);
@@ -144,6 +151,9 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Login');
+			
 			// Pass data to view
 			$this->set('username', $username);
 			$this->set('referrer', $referrer);
@@ -213,6 +223,9 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Registration');
+			
 			// Pass data to view
 			$this->set('username', $username);
 			$this->set('prename', $prename);
@@ -326,6 +339,9 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Manage users');
+			
 			// Pass data to view
 			$this->set('users', $users);
 			$this->set('selectedUsers', $selectedUsers);
@@ -388,6 +404,9 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('New user');
+			
 			// Pass data to view
 			$this->set('username', $username);
 			$this->set('prename', $prename);
@@ -476,6 +495,9 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Edit user');
+			
 			// Pass data to view
 			$this->set('username', $username);
 			$this->set('prename', $prename);
@@ -517,6 +539,9 @@
 			}
 			
 			
+			// Set titile
+			$this->addTitleLocalized('Delete user');
+			
 			// Show confirmation
 			$this->set('user', $user);
 		}
diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo
index 021da61d770c527e10e72d132f152bae9ed1edd1..bd93aeec4bdc6f348eb150239d33d7b7cfec25b0 100644
GIT binary patch
delta 4712
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

delta 4559
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

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po
index 45298b42..49619558 100644
--- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
+++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Legend of Z\n"
-"POT-Creation-Date: 2014-05-03 22:40+0100\n"
-"PO-Revision-Date: 2014-05-03 22:41+0100\n"
+"POT-Creation-Date: 2014-05-04 01:22+0100\n"
+"PO-Revision-Date: 2014-05-04 01:22+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -89,7 +89,7 @@ msgid "max."
 msgstr "max."
 
 #: questtypes/submit/html/quest.tpl:28
-msgid "Submissions"
+msgid "Your submissions"
 msgstr "Deine Lösungsvorschläge"
 
 #: questtypes/submit/html/quest.tpl:32 questtypes/submit/html/submission.tpl:6
@@ -289,7 +289,7 @@ msgstr "Motto"
 #: views/html/charactergroups/creategroup.tpl:59
 #: views/html/charactergroups/creategroupsgroup.tpl:50
 #: views/html/charactergroupsquests/create.tpl:75
-#: views/html/characters/register.tpl:94 views/html/seminaries/create.tpl:12
+#: views/html/characters/register.tpl:94 views/html/seminaries/create.tpl:14
 #: views/html/users/create.tpl:96
 msgid "create"
 msgstr "erstellen"
@@ -317,7 +317,7 @@ msgstr "Soll die %s-Gruppen „%s“ wirklich gelöscht werden?"
 #: views/html/charactergroups/deletegroup.tpl:15
 #: views/html/charactergroups/deletegroupsgroup.tpl:14
 #: views/html/charactergroupsquests/delete.tpl:15
-#: views/html/characters/delete.tpl:17 views/html/seminaries/delete.tpl:11
+#: views/html/characters/delete.tpl:17 views/html/seminaries/delete.tpl:13
 #: views/html/users/delete.tpl:11
 msgid "delete"
 msgstr "löschen"
@@ -325,7 +325,7 @@ msgstr "löschen"
 #: views/html/charactergroups/deletegroup.tpl:16
 #: views/html/charactergroups/deletegroupsgroup.tpl:15
 #: views/html/charactergroupsquests/delete.tpl:16
-#: views/html/characters/delete.tpl:18 views/html/seminaries/delete.tpl:12
+#: views/html/characters/delete.tpl:18 views/html/seminaries/delete.tpl:14
 #: views/html/users/delete.tpl:12
 msgid "cancel"
 msgstr "abbrechen"
@@ -501,8 +501,8 @@ msgstr "Die XP-Angabe ist ungültig"
 #: views/html/charactergroupsquests/edit.tpl:56
 #: views/html/charactergroupsquests/edit.tpl:57
 #: views/html/questgroups/create.tpl:14 views/html/questgroups/create.tpl:15
-#: views/html/seminaries/create.tpl:9 views/html/seminaries/create.tpl:10
-#: views/html/seminaries/edit.tpl:11 views/html/seminaries/edit.tpl:12
+#: views/html/seminaries/create.tpl:11 views/html/seminaries/create.tpl:12
+#: views/html/seminaries/edit.tpl:13 views/html/seminaries/edit.tpl:14
 msgid "Title"
 msgstr "Titel"
 
@@ -569,7 +569,7 @@ msgid "File invalid"
 msgstr "Die Datei ist ungültig"
 
 #: views/html/charactergroupsquests/manage.tpl:66
-#: views/html/seminaries/edit.tpl:14 views/html/users/edit.tpl:103
+#: views/html/seminaries/edit.tpl:16 views/html/users/edit.tpl:103
 msgid "save"
 msgstr "speichern"
 
@@ -677,8 +677,7 @@ msgstr "Das Kursfeld „%s“ ist ungültig"
 msgid "Seminary fields"
 msgstr "Kursfelder"
 
-#: views/html/characters/index.tpl:13 views/html/characters/manage.tpl:10
-#: views/html/users/index.tpl:7 views/html/users/manage.tpl:8
+#: views/html/characters/index.tpl:13 views/html/users/index.tpl:7
 msgid "Manage"
 msgstr "Verwalten"
 
@@ -718,6 +717,10 @@ msgstr "Moderator"
 msgid "User"
 msgstr "Benutzer"
 
+#: views/html/characters/manage.tpl:10
+msgid "Manage Characters"
+msgstr "Charaktere verwalten"
+
 #: views/html/characters/manage.tpl:48 views/html/users/manage.tpl:39
 msgid "Add role"
 msgstr "Füge Rolle hinzu"
@@ -767,15 +770,15 @@ msgstr "oder"
 msgid "register yourself"
 msgstr "registriere dich"
 
-#: views/html/html.tpl:76
+#: views/html/html.tpl:77
 msgid "Achievement"
 msgstr "Achievement"
 
-#: views/html/html.tpl:86
+#: views/html/html.tpl:87
 msgid "Level-up"
 msgstr "Levelaufstieg"
 
-#: views/html/html.tpl:88 views/html/html.tpl:90
+#: views/html/html.tpl:89 views/html/html.tpl:91
 #, php-format
 msgid "You have reached level %d"
 msgstr "Du hast Level %d erreicht"
@@ -812,8 +815,8 @@ msgstr "Gesamtfortschritt: %d%%"
 msgid "Users"
 msgstr "Benutzer"
 
-#: views/html/menu/index.tpl:3 views/html/seminaries/create.tpl:4
-#: views/html/seminaries/delete.tpl:6 views/html/seminaries/edit.tpl:6
+#: views/html/menu/index.tpl:3 views/html/seminaries/create.tpl:5
+#: views/html/seminaries/delete.tpl:7 views/html/seminaries/edit.tpl:7
 #: views/html/seminaries/index.tpl:4
 msgid "Seminaries"
 msgstr "Kurse"
@@ -912,24 +915,28 @@ msgstr "Auf ins Abenteuer!"
 msgid "Submission of %s"
 msgstr "Lösung von %s"
 
+#: views/html/quests/submissions.tpl:7
+msgid "Submissions"
+msgstr "Lösungen"
+
 #: views/html/quests/submissions.tpl:10
 msgid "submitted"
 msgstr "eingereicht"
 
-#: views/html/seminaries/create.tpl:5
+#: views/html/seminaries/create.tpl:8
 msgid "New seminary"
 msgstr "Neuer Kurs"
 
-#: views/html/seminaries/delete.tpl:7 views/html/seminaries/seminary.tpl:10
+#: views/html/seminaries/delete.tpl:10 views/html/seminaries/seminary.tpl:10
 msgid "Delete seminary"
 msgstr "Kurs löschen"
 
-#: views/html/seminaries/delete.tpl:9
+#: views/html/seminaries/delete.tpl:11
 #, php-format
 msgid "Should the seminary “%s” really be deleted?"
 msgstr "Soll der Kurs „%s“ wirklich gelöscht werden?"
 
-#: views/html/seminaries/edit.tpl:7 views/html/seminaries/seminary.tpl:9
+#: views/html/seminaries/edit.tpl:10 views/html/seminaries/seminary.tpl:9
 msgid "Edit seminary"
 msgstr "Kurs bearbeiten"
 
@@ -1115,6 +1122,10 @@ msgstr "registriert am %s"
 msgid "Login failed"
 msgstr "Die Anmeldung war nicht korrekt"
 
+#: views/html/users/manage.tpl:8
+msgid "Manage users"
+msgstr "Benutzer verwalten"
+
 #: views/html/users/register.tpl:8
 msgid "Registration"
 msgstr "Registrierung"
@@ -1127,15 +1138,9 @@ msgstr "Registrieren"
 msgid "Roles"
 msgstr "Rollen"
 
-#~ msgid "Past submissions"
-#~ msgstr "Vorherige Lösungen"
-
 #~ msgid "Edit Character group"
 #~ msgstr "Gruppe bearbeiten"
 
-#~ msgid "Manage Character group"
-#~ msgstr "Gruppe verwalten"
-
 #~ msgid "Delete Character group"
 #~ msgstr "Gruppe löschen"
 
diff --git a/questtypes/submit/html/quest.tpl b/questtypes/submit/html/quest.tpl
index 65e28b77..d1742f25 100644
--- a/questtypes/submit/html/quest.tpl
+++ b/questtypes/submit/html/quest.tpl
@@ -25,7 +25,7 @@
 <?php endif ?>
 
 <?php if(count($submissions) > 0) : ?>
-<h2><?=_('Submissions')?></h2>
+<h2><?=_('Your submissions')?></h2>
 <ol class="admnql">
 	<?php foreach($submissions as $index => &$submission) : ?>
 	<li>
diff --git a/views/html/characters/manage.tpl b/views/html/characters/manage.tpl
index c86cd26b..727adeb8 100644
--- a/views/html/characters/manage.tpl
+++ b/views/html/characters/manage.tpl
@@ -7,7 +7,7 @@
 	<li><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></li>
 	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('characters','index',$seminary['url']))?>"><?=_('Characters')?></a></li>
 </ul>
-<h1><?=_('Manage')?></h1>
+<h1><?=_('Manage Characters')?></h1>
 
 <form method="post">
 	<fieldset class="filter">
diff --git a/views/html/html.tpl b/views/html/html.tpl
index af8499bc..c05a92a7 100644
--- a/views/html/html.tpl
+++ b/views/html/html.tpl
@@ -3,7 +3,7 @@
 
 <head>
 	<meta charset="utf-8" />
-	<title><?=\nre\configs\AppConfig::$app['name']?></title>
+	<title><?=(isset($title)) ? $title : \nre\configs\AppConfig::$app['name']?></title>
 	<meta name="viewport" content="width=device-width,initial-scale=1.0">
 	<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
 	<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
diff --git a/views/html/quests/submissions.tpl b/views/html/quests/submissions.tpl
index 37699e48..760d0c9b 100644
--- a/views/html/quests/submissions.tpl
+++ b/views/html/quests/submissions.tpl
@@ -4,7 +4,7 @@
 </div>
 <?php endif ?>
 <?=$questgroupshierarchypath?>
-<h1><?=$quest['title']?></h1>
+<h1><?=$quest['title']?> (<?=_('Submissions')?>)</h1>
 
 <section>
 	<h1><?=_('submitted')?></h1>
diff --git a/views/html/seminaries/create.tpl b/views/html/seminaries/create.tpl
index 45637e02..425f2367 100644
--- a/views/html/seminaries/create.tpl
+++ b/views/html/seminaries/create.tpl
@@ -1,9 +1,11 @@
 <div class="moodpic">
 	<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
 </div>
-<h1><?=_('Seminaries')?></h1>
-<h2><?=_('New seminary')?></h2>
+<ul class="breadcrumbs">
+	<li><a href="<?=$linker->link('index',1)?>"><?=_('Seminaries')?></a></li>
+</ul>
 
+<h1><?=_('New seminary')?></h1>
 <form method="post" action="<?=$linker->link('create', 1)?>" class="logreg">
 	<fieldset>
 		<label for="title"><?=_('Title')?>:</label>
diff --git a/views/html/seminaries/delete.tpl b/views/html/seminaries/delete.tpl
index 49387278..a79d009a 100644
--- a/views/html/seminaries/delete.tpl
+++ b/views/html/seminaries/delete.tpl
@@ -3,9 +3,11 @@
 	<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
 </div>
 <?php endif ?>
-<h1><?=_('Seminaries')?></h1>
-<h2><?=_('Delete seminary')?></h2>
+<ul class="breadcrumbs">
+	<li><a href="<?=$linker->link('index',1)?>"><?=_('Seminaries')?></a></li>
+</ul>
 
+<h1><?=_('Delete seminary')?></h1>
 <?=sprintf(_('Should the seminary “%s” really be deleted?'), $seminary['title'])?>
 <form method="post">
 	<input type="submit" name="delete" value="<?=_('delete')?>" />
diff --git a/views/html/seminaries/edit.tpl b/views/html/seminaries/edit.tpl
index 70cd86a9..f94b1916 100644
--- a/views/html/seminaries/edit.tpl
+++ b/views/html/seminaries/edit.tpl
@@ -3,9 +3,11 @@
 	<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
 </div>
 <?php endif ?>
-<h1><?=_('Seminaries')?></h1>
-<h2><?=_('Edit seminary')?></h2>
+<ul class="breadcrumbs">
+	<li><a href="<?=$linker->link('index',1)?>"><?=_('Seminaries')?></a></li>
+</ul>
 
+<h1><?=_('Edit seminary')?></h1>
 <form method="post" class="logreg">
 	<fieldset>
 		<label for="title"><?=_('Title')?>:</label>
diff --git a/views/html/users/manage.tpl b/views/html/users/manage.tpl
index 8d4a1495..5debb913 100644
--- a/views/html/users/manage.tpl
+++ b/views/html/users/manage.tpl
@@ -5,7 +5,7 @@
 	<li><a href="<?=$linker->link('index',1)?>"><?=_('Users')?></a></li>
 </ul>
 
-<h1><?=_('Manage')?></h1>
+<h1><?=_('Manage users')?></h1>
 
 <form method="post">
 	<fieldset class="filter">