From 79eabe176839373f7a56e1338836a08b4f9199c8 Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Sun, 30 Mar 2014 15:03:11 +0200
Subject: [PATCH] update headlines: let content begin at h1 (Issue #50)

---
 controllers/QuestsController.inc           |  8 ++++++++
 views/html/charactergroups/group.tpl       | 13 +++++--------
 views/html/charactergroups/groupsgroup.tpl |  9 ++++-----
 views/html/charactergroups/index.tpl       |  5 ++---
 views/html/characters/character.tpl        | 13 +++++++------
 views/html/characters/index.tpl            |  4 ++--
 views/html/error/index.tpl                 |  2 +-
 views/html/introduction/index.tpl          |  2 +-
 views/html/questgroups/questgroup.tpl      |  6 +++---
 views/html/quests/quest.tpl                |  6 ++----
 views/html/quests/submission.tpl           |  9 ++++++---
 views/html/quests/submissions.tpl          | 12 +++++++-----
 views/html/seminaries/create.tpl           |  4 ++--
 views/html/seminaries/delete.tpl           |  4 ++--
 views/html/seminaries/edit.tpl             |  4 ++--
 views/html/seminaries/index.tpl            |  2 +-
 views/html/seminaries/seminary.tpl         |  5 ++---
 views/html/users/create.tpl                |  4 ++--
 views/html/users/delete.tpl                |  4 ++--
 views/html/users/edit.tpl                  |  4 ++--
 views/html/users/index.tpl                 |  2 +-
 views/html/users/login.tpl                 |  4 ++--
 views/html/users/user.tpl                  |  8 ++++----
 23 files changed, 70 insertions(+), 64 deletions(-)

diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc
index 51d42cc8..51e1664c 100644
--- a/controllers/QuestsController.inc
+++ b/controllers/QuestsController.inc
@@ -265,6 +265,10 @@
 			
 			// Get Questgroup
 			$questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl);
+			$questgroup['picture'] = null;
+			if(!is_null($questgroup['questgroupspicture_id'])) {
+				$questgroup['picture'] = $this->Media->getMediaById($questgroup['questgroupspicture_id']);
+			}
 			
 			// Get Quest
 			$quest = $this->Quests->getQuestByUrl($seminary['id'], $questgroup['id'], $questUrl);
@@ -314,6 +318,10 @@
 			
 			// Get Questgroup
 			$questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl);
+			$questgroup['picture'] = null;
+			if(!is_null($questgroup['questgroupspicture_id'])) {
+				$questgroup['picture'] = $this->Media->getMediaById($questgroup['questgroupspicture_id']);
+			}
 			
 			// Get Quest
 			$quest = $this->Quests->getQuestByUrl($seminary['id'], $questgroup['id'], $questUrl);
diff --git a/views/html/charactergroups/group.tpl b/views/html/charactergroups/group.tpl
index 9f5bd147..ff53d1cf 100644
--- a/views/html/charactergroups/group.tpl
+++ b/views/html/charactergroups/group.tpl
@@ -1,17 +1,14 @@
-<!--<h2><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h2>
-<h3><?=$seminary['title']?></h3>
-<h4><a href="<?=$linker->link(array('index',$seminary['url']),1)?>"><?=_('Character Groups')?></a></h4>
-<h5><a href="<?=$linker->link(array('groupsgroup',$seminary['url'],$groupsgroup['url']),1)?>"><?=$groupsgroup['name']?></a></h5>
--->
 <div class="moodpic">
 	<img src="http://s1.directupload.net/images/140323/tpzvoy5c.png">
 </div>
+<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
+<h2><a href="<?=$linker->link(array('index',$seminary['url']),1)?>"><?=_('Character Groups')?></a></h2>
 <section class="gdata cf">
 	<div class="gbanner">
 		<img src="http://s1.directupload.net/images/140325/3eqybn4i.png">
 	</div>
 	<div class="gdesc">
-		<h1><?=$group['name']?></h1>
+		<h3><?=$group['name']?></h3>
 		<span>Schweb wie ein Schmetterling! Stich wie eine Biene!</span>
 	</div>
 	<ul>
@@ -22,7 +19,7 @@
 </section>
 
 <section>
-	<h2><i class="fa fa-users fa-fw"></i><?=_('Characters')?></h2>
+	<h1><i class="fa fa-users fa-fw"></i><?=_('Characters')?></h1>
 	<ul class="gchars cf">
 		<?php foreach($characters as &$character) : ?>
 		<li>
@@ -60,7 +57,7 @@
 </section>
 
 <section>
-	<h2><i class="fa fa-pencil-square-o fa-fw"></i><?=_('Quests')?></h2>
+	<h1><i class="fa fa-pencil-square-o fa-fw"></i><?=_('Quests')?></h1>
 	<ul class="gquests">
 		<?php foreach($quests as &$quest) : ?>
 		<li class="cf">
diff --git a/views/html/charactergroups/groupsgroup.tpl b/views/html/charactergroups/groupsgroup.tpl
index fdae0ed5..016742b6 100644
--- a/views/html/charactergroups/groupsgroup.tpl
+++ b/views/html/charactergroups/groupsgroup.tpl
@@ -1,7 +1,6 @@
-<h2><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h2>
-<h3><?=$seminary['title']?></h3>
-<h4><a href="<?=$linker->link(array('index',$seminary['url']),1)?>"><?=_('Character Groups')?></a></h4>
-<h5><?=$groupsgroup['name']?></h5>
+<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
+<h2><a href="<?=$linker->link(array('index',$seminary['url']),1)?>"><?=_('Character Groups')?></a></h2>
+<h3><?=$groupsgroup['name']?></h3>
 
 <ul>
 	<?php foreach($groups as &$group) : ?>
@@ -10,7 +9,7 @@
 </ul>
 
 
-<h5><?=_('Character Groups Quests')?></h5>
+<h3><?=_('Character Groups Quests')?></h3>
 <ul>
 	<?php foreach($quests as &$quest) : ?>
 	<li><a href="<?=$linker->link(array('charactergroupsquests','quest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>"><?=$quest['title']?></a></li>
diff --git a/views/html/charactergroups/index.tpl b/views/html/charactergroups/index.tpl
index e1726ce7..0a2cd85b 100644
--- a/views/html/charactergroups/index.tpl
+++ b/views/html/charactergroups/index.tpl
@@ -1,6 +1,5 @@
-<h2><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h2>
-<h3><?=$seminary['title']?></h3>
-<h4><?=_('Character Groups')?></h4>
+<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
+<h2><?=_('Character Groups')?></h2>
 
 <ul>
 	<?php foreach($groupsgroups as &$group) : ?>
diff --git a/views/html/characters/character.tpl b/views/html/characters/character.tpl
index cb7ec385..9feff427 100644
--- a/views/html/characters/character.tpl
+++ b/views/html/characters/character.tpl
@@ -1,5 +1,6 @@
 <h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
-<h2><i class="fa fa-user fa-fw"></i><?=$character['name']?></h2>
+<h2><a href="<?=$linker->link(array('index',$seminary['url']),1)?>"><?=_('Characters')?></a></h2>
+<h3><i class="fa fa-user fa-fw"></i><?=$character['name']?></h3>
 
 <section class="cf">
 	<div class="cinfo">
@@ -22,7 +23,7 @@
 			<p><small>Platz</small></p>
 		</div>
 
-		<h2><i class="fa fa-certificate fa-fw"></i>Belohnungen</h2>
+		<h1><i class="fa fa-certificate fa-fw"></i>Belohnungen</h1>
 		<ul class="crewards">
 			<li>
 				<p class="unlocked"><i class="fa fa-check-circle fa-fw"></i>Aktive Beteiligung</p>
@@ -47,7 +48,7 @@
 </section>
 
 <section>
-	<h2><i class="fa fa-users fa-fw"></i><?=_('Character Groups')?></h2>
+	<h1><i class="fa fa-users fa-fw"></i><?=_('Character Groups')?></h1>
 	<ul class="cgroups cf">
 		<li class="cf">
 			<img src="http://s1.directupload.net/images/140325/3eqybn4i.png">
@@ -65,7 +66,7 @@
 
 <div class="cf">
 <section class="fll48">
-	<h2><i class="fa fa-trophy fa-fw"></i>Neue Achievements</h2>
+	<h1><i class="fa fa-trophy fa-fw"></i>Neue Achievements</h1>
 	<ul class="cranks">
 		<li>
 			<a href="#" title="Achievement-Titel"><img src="http://legende-von-zyren.de/img/achieve/1b.jpg"></a>
@@ -96,7 +97,7 @@
 </section>
 
 <section class="flr48">
-	<h2><i class="fa fa-list fa-fw"></i>Ranking</h2>
+	<h1><i class="fa fa-list fa-fw"></i>Ranking</h1>
 	<ul class="cranks">
 		<li>
 			<a href="#" title="Achievement-Titel"><img src="http://s7.directupload.net/images/140325/e2wdqhqa.png"></a>
@@ -128,7 +129,7 @@
 </div>
 
 <section>
-	<h2><i class="fa fa-book fa-fw"></i>Thematischer Fortschritt</h2>
+	<h1><i class="fa fa-book fa-fw"></i>Thematischer Fortschritt</h1>
 	<ul class="ctopics cf">
 		<li>
 			<p><small><a href="#">Klassifikation</a> (3/5)</small></p>
diff --git a/views/html/characters/index.tpl b/views/html/characters/index.tpl
index cd0fde8b..94759710 100644
--- a/views/html/characters/index.tpl
+++ b/views/html/characters/index.tpl
@@ -1,5 +1,5 @@
-<h2><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h2>
-<h3><?=_('Characters')?></h3>
+<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
+<h2><?=_('Characters')?></h2>
 
 <ul>
 	<?php foreach($characters as &$character) : ?>
diff --git a/views/html/error/index.tpl b/views/html/error/index.tpl
index 7f2f0cbb..0f68bc07 100644
--- a/views/html/error/index.tpl
+++ b/views/html/error/index.tpl
@@ -1,2 +1,2 @@
-<h2><?=_('Error')?></h2>
+<h1><?=_('Error')?></h1>
 <p class="error"><?=$code?>: <?=$string?></p>
diff --git a/views/html/introduction/index.tpl b/views/html/introduction/index.tpl
index de8740da..90ca59f7 100644
--- a/views/html/introduction/index.tpl
+++ b/views/html/introduction/index.tpl
@@ -1,4 +1,4 @@
-<h2><?=_('Introduction')?></h2>
+<h1><?=_('Introduction')?></h1>
 <p>Ein Projekt zum Thema „Gamification im Lehrumfeld“ – basierend auf <a href="http://legende-von-zyren.de">Die Legende von Zyren</a>.</p>
 <p>Entwickler:</p>
 <ul>
diff --git a/views/html/questgroups/questgroup.tpl b/views/html/questgroups/questgroup.tpl
index ff4af3ab..aa9bf3e5 100644
--- a/views/html/questgroups/questgroup.tpl
+++ b/views/html/questgroups/questgroup.tpl
@@ -3,14 +3,14 @@
 	<img src="<?=$linker->link(array('media','index',$seminary['url'],$picture['url']))?>" />
 </div>
 <?php endif ?>
-<h2><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h2>
+<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
 
 <?=$questgroupshierarchypath?>
 
 <?php if(!is_null($questgroup['hierarchy'])) : ?>
-<h3><?=$questgroup['hierarchy']['title_singular']?> <?=$questgroup['hierarchy']['questgroup_pos']?>: <?=$questgroup['title']?></h3>
+<h2><?=$questgroup['hierarchy']['title_singular']?> <?=$questgroup['hierarchy']['questgroup_pos']?>: <?=$questgroup['title']?></h2>
 <?php else : ?>
-<h3><?=$questgroup['title']?></h3>
+<h2><?=$questgroup['title']?></h2>
 <?php endif ?>
 <?php foreach($texts as &$text) : ?>
 <p><?=\hhu\z\Utils::t($text['text'])?></p>
diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index 3d440d50..fe27c287 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -3,11 +3,9 @@
 	<img src="<?=$linker->link(array('media','index',$seminary['url'],$questgroup['picture']['url']))?>" />
 </div>
 <?php endif ?>
-<h2><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h2>
-
+<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
 <?=$questgroupshierarchypath?>
-
-<h3><?=$quest['title']?></h3>
+<h2><?=$quest['title']?></h2>
 
 <?php if(!is_null($queststatustext)) : ?>
 <section>
diff --git a/views/html/quests/submission.tpl b/views/html/quests/submission.tpl
index 17f986f2..6417f76e 100644
--- a/views/html/quests/submission.tpl
+++ b/views/html/quests/submission.tpl
@@ -1,7 +1,10 @@
-<h2><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h2>
-
+<?php if(!is_null($questgroup['picture'])) : ?>
+<div class="moodpic">
+	<img src="<?=$linker->link(array('media','index',$seminary['url'],$questgroup['picture']['url']))?>" />
+</div>
+<?php endif ?>
+<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
 <?=$questgroupshierarchypath?>
-<?=$questgroupspicture?>
 
 <?php if(!is_null($media)) : ?>
 <img src="<?=$linker->link(array('media','index',$seminary['url'],$media['url']))?>" />
diff --git a/views/html/quests/submissions.tpl b/views/html/quests/submissions.tpl
index b53085d6..f14c2a8f 100644
--- a/views/html/quests/submissions.tpl
+++ b/views/html/quests/submissions.tpl
@@ -1,9 +1,11 @@
-<h2><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h2>
-
+<?php if(!is_null($questgroup['picture'])) : ?>
+<div class="moodpic">
+	<img src="<?=$linker->link(array('media','index',$seminary['url'],$questgroup['picture']['url']))?>" />
+</div>
+<?php endif ?>
+<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
 <?=$questgroupshierarchypath?>
-<?=$questgroupspicture?>
-
-<h3><?=$quest['title']?></h3>
+<h2><?=$quest['title']?></h2>
 
 <?php if(!is_null($media)) : ?>
 <img src="<?=$linker->link(array('media','index',$seminary['url'],$media['url']))?>" />
diff --git a/views/html/seminaries/create.tpl b/views/html/seminaries/create.tpl
index f50d2af0..823eec70 100644
--- a/views/html/seminaries/create.tpl
+++ b/views/html/seminaries/create.tpl
@@ -1,5 +1,5 @@
-<h2><?=_('Seminaries')?></h2>
-<h3><?=_('New seminary')?></h3>
+<h1><?=_('Seminaries')?></h1>
+<h2><?=_('New seminary')?></h2>
 
 <form method="post" action="<?=$linker->link('create', 1)?>">
 	<fieldset>
diff --git a/views/html/seminaries/delete.tpl b/views/html/seminaries/delete.tpl
index b9542006..d2253f14 100644
--- a/views/html/seminaries/delete.tpl
+++ b/views/html/seminaries/delete.tpl
@@ -1,5 +1,5 @@
-<h2><?=_('Seminaries')?></h2>
-<h3><?=_('Delete seminary')?></h3>
+<h1><?=_('Seminaries')?></h1>
+<h2><?=_('Delete seminary')?></h2>
 
 <?=sprintf(_('Should the seminary “%s” really be deleted?'), $seminary['title'])?>
 <form method="post">
diff --git a/views/html/seminaries/edit.tpl b/views/html/seminaries/edit.tpl
index 7905f17d..007acf15 100644
--- a/views/html/seminaries/edit.tpl
+++ b/views/html/seminaries/edit.tpl
@@ -1,5 +1,5 @@
-<h2><?=_('Seminaries')?></h2>
-<h3><?=_('Edit seminary')?></h3>
+<h1><?=_('Seminaries')?></h1>
+<h2><?=_('Edit seminary')?></h2>
 
 <form method="post">
 	<fieldset>
diff --git a/views/html/seminaries/index.tpl b/views/html/seminaries/index.tpl
index bd5c73e4..8ac8c8b0 100644
--- a/views/html/seminaries/index.tpl
+++ b/views/html/seminaries/index.tpl
@@ -1,4 +1,4 @@
-<h2><?=_('Seminaries')?></h2>
+<h1><?=_('Seminaries')?></h1>
 <nav>
 	<li><a href="<?=$linker->link('create', 1)?>"><?=_('Create new seminary')?></a></li>
 </nav>
diff --git a/views/html/seminaries/seminary.tpl b/views/html/seminaries/seminary.tpl
index 252e84f0..c85d0a92 100644
--- a/views/html/seminaries/seminary.tpl
+++ b/views/html/seminaries/seminary.tpl
@@ -4,12 +4,11 @@
 </div>
 <?php endif ?>
 
-<h2><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h2>
-<h3><?=_('Description')?></h3>
+<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>
 <p><?=\hhu\z\Utils::t($seminary['description'])?></p>
 
 <?php foreach($questgroupshierarchy as &$hierarchy) : ?>
-<h3><?=$hierarchy['title_plural']?></h3>
+<h2><?=$hierarchy['title_plural']?></h2>
 <ul class="questgroups cf">
 	<?php foreach($hierarchy['questgroups'] as &$group) : ?>
 	<li>
diff --git a/views/html/users/create.tpl b/views/html/users/create.tpl
index b4e22763..8536804d 100644
--- a/views/html/users/create.tpl
+++ b/views/html/users/create.tpl
@@ -1,5 +1,5 @@
-<h2><?=_('Users')?></h2>
-<h3><?=_('New user')?></h3>
+<h1><?=_('Users')?></h1>
+<h2><?=_('New user')?></h2>
 
 <form method="post" action="<?=$linker->link('create', 1)?>">
 	<fieldset>
diff --git a/views/html/users/delete.tpl b/views/html/users/delete.tpl
index ea23061f..10f280ab 100644
--- a/views/html/users/delete.tpl
+++ b/views/html/users/delete.tpl
@@ -1,5 +1,5 @@
-<h2><?=_('Users')?></h2>
-<h3><?=_('Delete user')?></h3>
+<h1><?=_('Users')?></h1>
+<h2><?=_('Delete user')?></h2>
 
 <?=sprintf(_('Should the user “%s” (%s) really be deleted?'), $user['username'], $user['email'])?>
 <form method="post">
diff --git a/views/html/users/edit.tpl b/views/html/users/edit.tpl
index bb3655c7..ef47268c 100644
--- a/views/html/users/edit.tpl
+++ b/views/html/users/edit.tpl
@@ -1,5 +1,5 @@
-<h2><?=_('Users')?></h2>
-<h3><?=_('Edit user')?></h3>
+<h1><?=_('Users')?></h1>
+<h2><?=_('Edit user')?></h2>
 
 <form method="post">
 	<fieldset>
diff --git a/views/html/users/index.tpl b/views/html/users/index.tpl
index f747e6a5..5d2883af 100644
--- a/views/html/users/index.tpl
+++ b/views/html/users/index.tpl
@@ -1,4 +1,4 @@
-<h2><?=_('Users')?></h2>
+<h1><?=_('Users')?></h1>
 <nav>
 	<li><a href="<?=$linker->link('create', 1)?>"><?=_('Create new user')?></a></li>
 </nav>
diff --git a/views/html/users/login.tpl b/views/html/users/login.tpl
index f6e0171a..36c13da4 100644
--- a/views/html/users/login.tpl
+++ b/views/html/users/login.tpl
@@ -1,5 +1,5 @@
-<h2><?=_('Users')?></h2>
-<h3><?=_('Login')?></h3>
+<h1><?=_('Users')?></h1>
+<h2><?=_('Login')?></h2>
 
 <form method="post" action="<?=$linker->link(array(), 2)?>">
 	<fieldset>
diff --git a/views/html/users/user.tpl b/views/html/users/user.tpl
index 1ba66b0d..3a6ea526 100644
--- a/views/html/users/user.tpl
+++ b/views/html/users/user.tpl
@@ -1,5 +1,5 @@
-<h2><?=_('Users')?></h2>
-<h3><?=$user['username']?></h3>
+<h1><?=_('Users')?></h1>
+<h2><?=$user['username']?></h2>
 <nav>
 	<li><a href="<?=$linker->link('edit', 3)?>"><?=_('Edit user')?></a></li>
 	<li><a href="<?=$linker->link('delete', 3)?>"><?=_('Delete user')?></a></li>
@@ -8,12 +8,12 @@
 	<?=sprintf(_('registered on %s'), $dateFormatter->format(new \DateTime($user['created'])))?>
 </p>
 
-<h3><?=_('Characters')?></h3>
+<h2><?=_('Characters')?></h2>
 <ul>
 	<?php foreach($characters as &$character) : ?>
 	<li><a href="<?=$linker->link(array('characters','character',$character['seminary_url'],$character['url']))?>"><?=$character['name']?></a> (<?=$character['xps']?> XPs, <?=_('Level')?> <?=$character['xplevel']['level']?><?php if(!is_null($character['xplevel']['name'])) : ?>: <?=$character['xplevel']['name']?><?php endif ?>) (<a href="<?=$linker->link(array('seminaries',$character['seminary_url']))?>"><?=$character['seminary_title']?></a>)</li>
 	<?php endforeach ?>
 </ul>
 
-<h3><?=_('Roles')?></h3>
+<h2><?=_('Roles')?></h2>
 <?=$userroles?>