From b0c1c8bf3ce3298efa13b14c492137f5a436304c Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Sun, 27 Apr 2014 13:25:59 +0200
Subject: [PATCH 1/6] allow more than one scrolling text on one page

---
 views/html/html.tpl                   | 2 +-
 views/html/questgroups/questgroup.tpl | 2 +-
 views/html/quests/quest.tpl           | 8 ++++----
 www/css/desktop.css                   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/views/html/html.tpl b/views/html/html.tpl
index 91382c88..6accd686 100644
--- a/views/html/html.tpl
+++ b/views/html/html.tpl
@@ -13,7 +13,7 @@
 	<script type="text/javascript">
 	$(document).ready(
 	function() {
-		$("#qtextbox").niceScroll({autohidemode:false,cursorcolor:"#c2beb9"});
+		$(".qtextbox").niceScroll({autohidemode:false,cursorcolor:"#c2beb9"});
 	}
 	);
 	</script>
diff --git a/views/html/questgroups/questgroup.tpl b/views/html/questgroups/questgroup.tpl
index fb371147..aadc169e 100644
--- a/views/html/questgroups/questgroup.tpl
+++ b/views/html/questgroups/questgroup.tpl
@@ -11,7 +11,7 @@
 <h1><?=$questgroup['title']?></h1>
 <?php endif ?>
 <?php if(count($texts) > 0): ?>
-<div id="qtextbox">
+<div class="qtextbox">
 <?php foreach($texts as &$text) : ?>
 <p class="qtext"><?=\hhu\z\Utils::t($text['text'])?></p>
 <?php endforeach ?>
diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index 91762197..16028ee8 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -9,7 +9,7 @@
 <?php if(array_key_exists('Prolog', $questtexts) && count($questtexts['Prolog']) > 0) : ?>
 <section>
 	<h1 id="questtext"><?=_('Prolog')?></h1>
-	<div id="qtextbox">
+	<div class="qtextbox">
 		<?php $mediaShown = false; ?>
 		<?php foreach($questtexts['Prolog'] as &$questtext) : ?>
 		<p class="qtext cf">
@@ -72,7 +72,7 @@
 <?php if(array_key_exists('Epilog', $questtexts) && count($questtexts['Epilog']) > 0) : ?>
 <section>
 	<h1 id="questtext"><?=_('Epilog')?></h1>
-	<div id="qtextbox">
+	<div class="qtextbox">
 		<?php foreach($questtexts['Epilog'] as &$questtext) : ?>
 		<p class="qtext cf">
 			<?php if(array_key_exists('media', $questtext)) : ?>
@@ -83,10 +83,10 @@
 		<?php if(count($questtext['relatedQuestsgroups']) > 0 || !empty($questtext['abort_text'])) : ?>
 		<ul>
 			<?php foreach($questtext['relatedQuestsgroups'] as &$relatedQuestgroup) : ?>
-			<li><a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$relatedQuestgroup['url']))?>"><?=$relatedQuestgroup['entry_text']?></a></li>
+			<li><p><a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$relatedQuestgroup['url']))?>"><?=$relatedQuestgroup['entry_text']?></a></p></li>
 			<?php endforeach ?>
 			<?php if(!empty($questtext['abort_text'])) : ?>
-			<li><a href="<?=$linker->link(array('quest',$seminary['url'],$relatedquesttext['quest']['questgroup_url'],$relatedquesttext['quest']['url'],$relatedquesttext['type_url']),1)?>"><?=$questtext['abort_text']?></a></li>
+			<li><p><a href="<?=$linker->link(array('quest',$seminary['url'],$relatedquesttext['quest']['questgroup_url'],$relatedquesttext['quest']['url'],$relatedquesttext['type_url']),1)?>"><?=$questtext['abort_text']?></a></p></li>
 			<?php endif ?>
 		</ul>
 		<?php endif ?>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index eb76292d..716af80b 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -112,7 +112,7 @@ aside{display:none}
 .qglist .qgtitle .bonus{background:#f5821f}
 .qglist .qgtitle .bonus:hover{background:#f68e34}
 
-#qtextbox{font-size:.875em;border-radius:5px;background:#fff;border:15px solid #fff;max-height:200px;overflow:hidden}
+.qtextbox{font-size:.875em;border-radius:5px;background:#fff;border:15px solid #fff;max-height:200px;overflow:hidden}
 .qtext{padding-right:15px}
 .qtext img,.grpqimg{float:right;margin-left:15px;max-width:30%;max-height:200px;border-radius:3px}
 

From 7ff31be05075cce2bcdf33ce0fbd4b07828945b5 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Sun, 27 Apr 2014 14:34:09 +0200
Subject: [PATCH 2/6] filter design for character list

---
 views/html/characters/index.tpl  | 19 ++++++++++---------
 views/html/characters/manage.tpl | 19 ++++++++++---------
 www/css/desktop.css              | 15 +++++++++++----
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/views/html/characters/index.tpl b/views/html/characters/index.tpl
index 5880a076..237c20e0 100644
--- a/views/html/characters/index.tpl
+++ b/views/html/characters/index.tpl
@@ -15,15 +15,16 @@
 <?php endif ?>
 
 <form method="post">
-	<fieldset>
-		<legend><?=_('Properties')?></legend>
-		<input type="checkbox" id="username" name="properties[]" value="username" <?php if(in_array('username', $properties)) : ?>checked="checked"<?php endif ?> /><label for="username"><?=_('Username')?></label><br />
-		<input type="checkbox" id="xps" name="properties[]" value="xps" <?php if(in_array('xps', $properties)) : ?>checked="checked"<?php endif ?> /><label for="xps"><?=_('XPs')?></label><br />
-		<input type="checkbox" id="roles" name="properties[]" value="roles" <?php if(in_array('roles', $properties)) : ?>checked="checked"<?php endif ?> /><label for="roles"><?=_('Roles')?></label><br />
-		<?php foreach($characterfields as &$characterfield) : ?>
-		<input type="checkbox" id="characterfield-<?=$characterfield['url']?>" name="properties[characterfields][]" value="<?=$characterfield['url']?>" <?php if(array_key_exists('characterfields', $properties) && in_array($characterfield['url'], $properties['characterfields'])) : ?>checked="checked"<?php endif ?> /><label for="characterfield-<?=$characterfield['url']?>"><?=$characterfield['url']?></label><br />
-		<?php endforeach ?>
-		<input type="submit" name="set-properties" value="<?=_('Set properties')?>" />
+	<fieldset class="filter">
+		<ul>
+			<li><input type="checkbox" id="username" name="properties[]" value="username" <?php if(in_array('username', $properties)) : ?>checked="checked"<?php endif ?> /><label for="username"><?=_('Username')?></label></li>
+			<li><input type="checkbox" id="xps" name="properties[]" value="xps" <?php if(in_array('xps', $properties)) : ?>checked="checked"<?php endif ?> /><label for="xps"><?=_('XPs')?></label></li>
+			<li><input type="checkbox" id="roles" name="properties[]" value="roles" <?php if(in_array('roles', $properties)) : ?>checked="checked"<?php endif ?> /><label for="roles"><?=_('Roles')?></label></li>
+			<?php foreach($characterfields as &$characterfield) : ?>
+			<li><input type="checkbox" id="characterfield-<?=$characterfield['url']?>" name="properties[characterfields][]" value="<?=$characterfield['url']?>" <?php if(array_key_exists('characterfields', $properties) && in_array($characterfield['url'], $properties['characterfields'])) : ?>checked="checked"<?php endif ?> /><label for="characterfield-<?=$characterfield['url']?>"><?=$characterfield['url']?></label></li>
+			<?php endforeach ?>
+		</ul>
+		<input class="cta" type="submit" name="set-properties" value="<?=_('Set properties')?>" />
 	</fieldset>
 </form>
 
diff --git a/views/html/characters/manage.tpl b/views/html/characters/manage.tpl
index 476d7973..b3d1164d 100644
--- a/views/html/characters/manage.tpl
+++ b/views/html/characters/manage.tpl
@@ -10,18 +10,19 @@
 <h1><?=_('Manage')?></h1>
 
 <form method="post">
-	<fieldset>
-		<legend><?=_('Properties')?></legend>
-		<input type="checkbox" id="username" name="properties[]" value="username" <?php if(in_array('username', $properties)) : ?>checked="checked"<?php endif ?> /><label for="username"><?=_('Username')?></label><br />
-		<input type="checkbox" id="xps" name="properties[]" value="xps" <?php if(in_array('xps', $properties)) : ?>checked="checked"<?php endif ?> /><label for="xps"><?=_('XPs')?></label><br />
-		<input type="checkbox" id="roles" name="properties[]" value="roles" <?php if(in_array('roles', $properties)) : ?>checked="checked"<?php endif ?> /><label for="roles"><?=_('Roles')?></label><br />
-		<?php foreach($characterfields as &$characterfield) : ?>
-		<input type="checkbox" id="characterfield-<?=$characterfield['url']?>" name="properties[characterfields][]" value="<?=$characterfield['url']?>" <?php if(array_key_exists('characterfields', $properties) && in_array($characterfield['url'], $properties['characterfields'])) : ?>checked="checked"<?php endif ?> /><label for="characterfield-<?=$characterfield['url']?>"><?=$characterfield['url']?></label><br />
-		<?php endforeach ?>
+	<fieldset class="filter">
+		<ul>
+			<li><input type="checkbox" id="username" name="properties[]" value="username" <?php if(in_array('username', $properties)) : ?>checked="checked"<?php endif ?> /><label for="username"><?=_('Username')?></label></li>
+			<li><input type="checkbox" id="xps" name="properties[]" value="xps" <?php if(in_array('xps', $properties)) : ?>checked="checked"<?php endif ?> /><label for="xps"><?=_('XPs')?></label></li>
+			<li><input type="checkbox" id="roles" name="properties[]" value="roles" <?php if(in_array('roles', $properties)) : ?>checked="checked"<?php endif ?> /><label for="roles"><?=_('Roles')?></label></li>
+			<?php foreach($characterfields as &$characterfield) : ?>
+			<li><input type="checkbox" id="characterfield-<?=$characterfield['url']?>" name="properties[characterfields][]" value="<?=$characterfield['url']?>" <?php if(array_key_exists('characterfields', $properties) && in_array($characterfield['url'], $properties['characterfields'])) : ?>checked="checked"<?php endif ?> /><label for="characterfield-<?=$characterfield['url']?>"><?=$characterfield['url']?></label></li>
+			<?php endforeach ?>
+		</ul>
 		<input type="submit" name="set-properties" value="<?=_('Set properties')?>" />
 	</fieldset>
 	<fieldset>
-		<legend><?=_('Selection')?>:</legend>
+		<legend class="fwb"><small><?=_('Selection')?>:</small></legend>
 		<ul class="gchars cf">
 			<?php foreach($characters as &$character) : ?>
 			<li>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index 716af80b..41e907dc 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -155,13 +155,20 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .notify .fa-times{float:right;padding:0;margin:-12px -10px 0 0;color:#d4d2ce}
 
 
-/** Login & Registration **/
+/** Login, Registration & Filter **/
 
-.logreg{width:auto;display:inline-block;padding:15px 20px;background:#eae8e4;border-radius:3px}
+.logreg{margin:15px 0;width:auto;display:inline-block;padding:15px 20px;background:#eae8e4;border-radius:3px}
 .logreg label{display:block;font-size:.875em}
 .logreg input{margin:5px 0 15px}
 .logreg .cta{display:block}
 
+.filter{margin:10px 0 20px;display:block;width:auto;padding:15px 20px;background:#eae8e4;border-radius:3px}
+.filter ul{margin:0}
+.filter li{display:inline-block;margin-bottom:8px}
+.filter label,input{display:inline;vertical-align:middle}
+.filter input[type=checkbox]{margin:0 8px 0 0}
+.filter label{margin-right:20px;font-size:.875em}
+
 .avatar li{display:inline-block;margin-right:5px;text-align:center}
 .avatar img{border-radius:3px}
 
@@ -210,9 +217,9 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .gdata{margin:20px 0 40px 0}
 .gdata li{float:left;background:#fff;padding:5px 15px;margin:0 5px 5px 0;border-radius:3px}
 
-.gchars li{background:#fff;padding:15px 0;border-radius:3px;display:inline-block;margin-bottom:5px;width:49%;text-align:center;vertical-align:top}
+.gchars li{background:#fff;padding:15px 5px;border-radius:3px;display:inline-block;margin-bottom:4px;width:49%;text-align:center;vertical-align:top;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
 .gchars img{width:50px;height:50px;border-radius:25px}
-.gchars p{margin:0;padding:0}
+.gchars p{margin:0;padding:0;overflow:hidden;text-overflow:ellipsis}
 .gchars .fa{position:absolute;margin:-10px 0 0}
 
 .gquests li{padding:12px 15px 0 15px;border-radius:3px}

From 0b0c3acc729b06d1608e9e4c56150145c1894159 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Sun, 27 Apr 2014 17:01:10 +0200
Subject: [PATCH 3/6] replaced unwanted special character with correct space

---
 views/html/characters/character.tpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/views/html/characters/character.tpl b/views/html/characters/character.tpl
index b0a683d9..8c931279 100644
--- a/views/html/characters/character.tpl
+++ b/views/html/characters/character.tpl
@@ -21,7 +21,7 @@
 			<div class="xpbar">
 				<span style="width:<?=round($character['quest_xps']*100/$seminary['achievable_xps'])?>%"></span>
 			</div>
-			<p><small><?=_('Total progress')?>: <?=round($character['quest_xps']*100/$seminary['achievable_xps'])?> %</small></p>
+			<p><small><?=_('Total progress')?>: <?=round($character['quest_xps']*100/$seminary['achievable_xps'])?>%</small></p>
 		</div>
 		<div class="cdata square">
 			<p class="value"><?=$character['xplevel']['level']?></p>
@@ -64,19 +64,19 @@
 			<li>
 				<a href="<?=$linker->link($rankCharacter['url'],3)?>"><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$rankCharacter['charactertype_url'],$rankCharacter['xplevel'],'portrait'))?>"></a>
 				<p><?=$character['rank']-count($ranking['superior'])+$index?>. <a href="<?=$linker->link($rankCharacter['url'],3)?>"><?=$rankCharacter['name']?></a></p>
-				<p><small><?=_('Level')?> <?=$rankCharacter['xplevel']?> (<?=sprintf(_('%d XPs'), $rankCharacter['xps'])?>)</small></p>
+				<p><small><?=_('Level')?> <?=$rankCharacter['xplevel']?> (<?=sprintf(_('%d XPs'), $rankCharacter['xps'])?>)</small></p>
 			</li>
 			<?php endforeach ?>
 			<li>
 				<img src="<?=$linker->link(array('media','avatar',$seminary['url'],$character['charactertype_url'],$character['xplevel']['level'],'portrait'))?>">
 				<p class="fwb"><?=$character['rank']?>. <?=$character['name']?></p>
-				<p><small><?=_('Level')?> <?=$character['xplevel']['level']?> (<?=sprintf(_('%d XPs'), $character['xps'])?>)</small></p>
+				<p><small><?=_('Level')?> <?=$character['xplevel']['level']?> (<?=sprintf(_('%d XPs'), $character['xps'])?>)</small></p>
 			</li>
 			<?php foreach($ranking['inferior'] as $index => &$rankCharacter) : ?>
 			<li>
 				<a href="<?=$linker->link($rankCharacter['url'],3)?>"><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$rankCharacter['charactertype_url'],$rankCharacter['xplevel'],'portrait'))?>"></a>
 				<p><?=$character['rank']+$index+1?>. <a href="<?=$linker->link($rankCharacter['url'],3)?>"><?=$rankCharacter['name']?></a></p>
-				<p><small><?=_('Level')?> <?=$rankCharacter['xplevel']?> (<?=sprintf(_('%d XPs'), $rankCharacter['xps'])?>)</small></p>
+				<p><small><?=_('Level')?> <?=$rankCharacter['xplevel']?> (<?=sprintf(_('%d XPs'), $rankCharacter['xps'])?>)</small></p>
 			</li>
 			<?php endforeach ?>
 		</ul>
@@ -87,7 +87,7 @@
 			<?php foreach($groups as &$group) : ?>
 			<li class="cf">
 				<img src="http://s1.directupload.net/images/140325/3eqybn4i.png">
-				<a href="<?=$linker->link(array('charactergroups','group',$seminary['url'],$group['charactergroupsgroup_url'],$group['url']))?>"><?=$group['name']?></a><p><span><?=sprintf(_('%d XPs'), $group['xps'])?></span></p>
+				<a href="<?=$linker->link(array('charactergroups','group',$seminary['url'],$group['charactergroupsgroup_url'],$group['url']))?>"><?=$group['name']?></a><p><span><?=sprintf(_('%d XPs'), $group['xps'])?></span></p>
 			</li>
 			<?php endforeach ?>
 		</ul>

From 7cc38652e788b66e5308ce23dffdd5b5630f2556 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Sun, 27 Apr 2014 17:14:22 +0200
Subject: [PATCH 4/6] correct seminary moodpic for quest list & smaller avatar
 for mobile 320px

---
 views/html/quests/index.tpl | 2 +-
 www/css/desktop.css         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/views/html/quests/index.tpl b/views/html/quests/index.tpl
index 8e927524..03724b57 100644
--- a/views/html/quests/index.tpl
+++ b/views/html/quests/index.tpl
@@ -1,6 +1,6 @@
 <?php if(!is_null($seminary['seminarymedia_id'])) : ?>
 <div class="moodpic">
-	<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>" />
+	<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
 </div>
 <?php endif ?>
 <ul class="breadcrumbs">
diff --git a/www/css/desktop.css b/www/css/desktop.css
index 41e907dc..226aa4d4 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -174,7 +174,7 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 
 /** Character Profile **/
 
-.cportrait img{width:100%}
+.cportrait img{max-width:100%;max-height:300px}
 
 .cdata{display:inline-block;background:#fff;border-radius:3px;padding:12px 20px 0 20px;margin-bottom:5px}
 .cdata.square{text-align:center;width:10%;padding-top:0}
@@ -322,6 +322,7 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 
 .cinfo{float:left;width:70%}
 .cportrait{float:right;width:25%}
+.cportrait img{max-height:100%}
 
 .gbanner img{float:left;margin:20px 20px 0 0}
 .gbanner h1{margin:25px 0 2px}

From 367a11f5956160bbe97ad9dbcef4ada0c82b7433 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Sun, 27 Apr 2014 19:59:23 +0200
Subject: [PATCH 5/6] enable scrolling in opened menu on mobile resolutions

---
 www/css/desktop.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/css/desktop.css b/www/css/desktop.css
index 226aa4d4..e5068d9d 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -81,7 +81,7 @@ menu .smnry{font-size:0.875em;padding:8px 0 8px 12px;background:#0c2e32;border-b
 
 #toggle,.toggle{display:none}
 .toggle{display:inline-block;padding:15px 15px 15px 0;position:relative;cursor:pointer;-webkit-touch-callout:none;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none}
-#toggle:checked ~ menu{display:block;opacity:1}
+#toggle:checked ~ menu{display:block;position:fixed;left:0;top:54px;bottom:0;overflow-y:auto;opacity:1}
 #navicon{display:block;color:#d9e5e7}
 
 article{padding:70px 0 30px}

From dd372114fd28e326219868e9de6a91894b1d52a8 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Sun, 27 Apr 2014 20:16:48 +0200
Subject: [PATCH 6/6] ie fix: menu button now clickable

---
 views/html/html.tpl | 2 +-
 www/css/desktop.css | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/views/html/html.tpl b/views/html/html.tpl
index 6accd686..d48eeeb7 100644
--- a/views/html/html.tpl
+++ b/views/html/html.tpl
@@ -43,7 +43,7 @@
 	<header>
 		<nav>
 			<input type="checkbox" id="toggle">
-			<label for="toggle" class="toggle" onclick><a id="navicon"><i class="fa fa-bars"></i>Menü</a></label>
+			<label for="toggle" class="toggle" onclick><i class="fa fa-bars"></i>Menü</label>
 			<?php if(!is_null($loggedUser)) : ?>
 			<?php if(!is_null($loggedCharacter)) : ?>
 			<a href="<?=$linker->link(array('characters','character',$loggedSeminary['url'],$loggedCharacter['url']))?>" id="profile"><i class="fa fa-user fa-fw"></i><?=$loggedCharacter['name']?><span class="circlenote"><?=$loggedCharacter['xplevel']?></span></a>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index e5068d9d..af513c72 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -80,9 +80,8 @@ menu .smnry{font-size:0.875em;padding:8px 0 8px 12px;background:#0c2e32;border-b
 .circlenote{margin-left:15px;background:#bcd75e;border-radius:0.8em;display:inline-block;color:#0f373c;font-weight:bold;line-height:1.6em;text-align:center;width:1.6em;font-size:.8em}
 
 #toggle,.toggle{display:none}
-.toggle{display:inline-block;padding:15px 15px 15px 0;position:relative;cursor:pointer;-webkit-touch-callout:none;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none}
+.toggle{color:#d9e5e7;display:inline-block;padding:15px 15px 15px 0;position:relative;cursor:pointer;-webkit-touch-callout:none;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none}
 #toggle:checked ~ menu{display:block;position:fixed;left:0;top:54px;bottom:0;overflow-y:auto;opacity:1}
-#navicon{display:block;color:#d9e5e7}
 
 article{padding:70px 0 30px}
 aside{display:none}