From 6fcd63ed11c213541601808ba7167ddc8b34c225 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Tue, 29 Apr 2014 18:30:53 +0200
Subject: [PATCH] character list section restructured

---
 views/html/characters/index.tpl  | 41 ++++++++++++++-----------------
 views/html/characters/manage.tpl | 42 ++++++++++++++------------------
 www/css/desktop.css              |  7 +++++-
 3 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/views/html/characters/index.tpl b/views/html/characters/index.tpl
index 237c20e0..e6435812 100644
--- a/views/html/characters/index.tpl
+++ b/views/html/characters/index.tpl
@@ -16,34 +16,29 @@
 
 <form method="post">
 	<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')?>" />
+		<select name="">
+			<option value="">Charaktername</option>
+			<option value="">XP</option>
+			<option value="">Rolle</option>
+			<option value="">Matrikelnummer</option>
+			<option value="">Studiengang</option>
+		</select>
+		<input type="submit" name="" value="Liste sortieren" />
 	</fieldset>
 </form>
 
-<ul class="gchars cf">
+<ul class="admnql">
 	<?php foreach($characters as &$character) : ?>
-	<li>
-		<p><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$character['charactertype_url'],$character['xplevel']['level'],'portrait'))?>"></p>
-		<p><a href="<?=$linker->link(array('characters','character',$seminary['url'],$character['url']))?>"><?=$character['name']?></a></p>
-		<?php if(in_array('username', $properties)) : ?><p><small><a href="<?=$linker->link(array('users','user',$character['user']['url']))?>"><?=$character['user']['username']?></a></small></p><?php endif ?>
-		<?php if(in_array('xps', $properties)) : ?><p><small><?=$character['xps']?> XP</small></p><?php endif ?>
-		<?php if(in_array('roles', $properties)) : ?>
-		<?php if(in_array('admin', $character['characterroles'])) : ?><p><small><?=_('Admin')?></small></p><?php endif ?>
-		<?php if(in_array('moderator', $character['characterroles'])) : ?><p><small><?=_('Moderator')?></small></p><?php endif ?>
-		<?php if(in_array('user', $character['characterroles'])) : ?><p><small><?=_('User')?></small></p><?php endif ?>
-		<?php endif ?>
+	<li class="cf">
+		<img src="<?=$linker->link(array('media','avatar',$seminary['url'],$character['charactertype_url'],$character['xplevel']['level'],'portrait'))?>">
+		<p><a href="<?=$linker->link(array('characters','character',$seminary['url'],$character['url']))?>"><?=$character['name']?></a><span><?=$character['xps']?> XP</span></p>
+		<p><small><a href="<?=$linker->link(array('users','user',$character['user']['url']))?>"><?=$character['user']['username']?></a></small>
+		<?php if(in_array('admin', $character['characterroles'])) : ?><small>(<?=_('Admin')?>)</small><?php endif ?>
+		<?php if(in_array('moderator', $character['characterroles'])) : ?><small>(<?=_('Moderator')?>)</small><?php endif ?>
+		<?php if(in_array('user', $character['characterroles'])) : ?><small>(<?=_('User')?>)</small><?php endif ?>
+		</p>
 		<?php foreach($character['characterfields'] as &$characterfield) : ?>
-		<?php if(array_key_exists('characterfields', $properties) && in_array($characterfield['url'], $properties['characterfields'])) : ?>
-		<p><small><?=$characterfield['value']?></small></p>
-		<?php endif ?>
+		<p class="chrflds"><?=$characterfield['value']?></p>
 		<?php endforeach ?>
 	</li>
 	<?php endforeach ?>
diff --git a/views/html/characters/manage.tpl b/views/html/characters/manage.tpl
index b3d1164d..e1312d17 100644
--- a/views/html/characters/manage.tpl
+++ b/views/html/characters/manage.tpl
@@ -11,36 +11,30 @@
 
 <form method="post">
 	<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')?>" />
+		<select name="">
+			<option value="">Charaktername</option>
+			<option value="">XP</option>
+			<option value="">Rolle</option>
+			<option value="">Matrikelnummer</option>
+			<option value="">Studiengang</option>
+		</select>
+		<input type="submit" name="" value="Liste sortieren" />
 	</fieldset>
 	<fieldset>
-		<legend class="fwb"><small><?=_('Selection')?>:</small></legend>
-		<ul class="gchars cf">
+		<ul class="admnql">
 			<?php foreach($characters as &$character) : ?>
-			<li>
+			<li class="cf">
 				<input type="checkbox" id="characters-<?=$character['id']?>" name="characters[]" value="<?=$character['id']?>" <?php if(in_array($character['id'], $selectedCharacters)) : ?>checked="checked"<?php endif ?> <?php if($character['id'] == \hhu\z\controllers\SeminaryController::$character['id']) : ?>disabled="disabled"<?php endif ?>/>
 				<label for="characters-<?=$character['id']?>">
-					<p><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$character['charactertype_url'],$character['xplevel']['level'],'portrait'))?>"></p>
-					<p><a href="<?=$linker->link(array('characters','character',$seminary['url'],$character['url']))?>"><?=$character['name']?></a></p>
-					<?php if(in_array('username', $properties)) : ?><p><small><a href="<?=$linker->link(array('users','user',$character['user']['url']))?>"><?=$character['user']['username']?></a></small></p><?php endif ?>
-					<?php if(in_array('xps', $properties)) : ?><p><small><?=$character['xps']?> XP</small></p><?php endif ?>
-					<?php if(in_array('roles', $properties)) : ?>
-					<?php if(in_array('admin', $character['characterroles'])) : ?><p><small><?=_('Admin')?></small></p><?php endif ?>
-					<?php if(in_array('moderator', $character['characterroles'])) : ?><p><small><?=_('Moderator')?></small></p><?php endif ?>
-					<?php if(in_array('user', $character['characterroles'])) : ?><p><small><?=_('User')?></small></p><?php endif ?>
-					<?php endif ?>
+					<img src="<?=$linker->link(array('media','avatar',$seminary['url'],$character['charactertype_url'],$character['xplevel']['level'],'portrait'))?>">
+					<p><a href="<?=$linker->link(array('characters','character',$seminary['url'],$character['url']))?>"><?=$character['name']?></a><span><?=$character['xps']?> XP</span></p>
+					<p><small><a href="<?=$linker->link(array('users','user',$character['user']['url']))?>"><?=$character['user']['username']?></a></small>
+					<?php if(in_array('admin', $character['characterroles'])) : ?><small>(<?=_('Admin')?>)</small><?php endif ?>
+					<?php if(in_array('moderator', $character['characterroles'])) : ?><small>(<?=_('Moderator')?>)</small><?php endif ?>
+					<?php if(in_array('user', $character['characterroles'])) : ?><small>(<?=_('User')?>)</small><?php endif ?>
+					</p>
 					<?php foreach($character['characterfields'] as &$characterfield) : ?>
-					<?php if(array_key_exists('characterfields', $properties) && in_array($characterfield['url'], $properties['characterfields'])) : ?>
-					<p><small><?=$characterfield['value']?></small></p>
-					<?php endif ?>
+					<p class="chrflds"><?=$characterfield['value']?></p>
 					<?php endforeach ?>
 				</label>
 			</li>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index f975513f..61151934 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -136,6 +136,11 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .admnql li{background:#fff;margin-bottom:8px;padding:5px 10px;border-radius:3px}
 .admnql p{margin:0}
 .admnql span{font-size:.875em;font-weight:normal;display:block}
+.admnql img{float:left;width:60px;height:60px;border-radius:30px;margin:5px 10px 0 0}
+.admnql .chrflds{display:inline-block;font-size:.875em}
+.admnql .chrflds:after{content:", "}
+.admnql .chrflds:last-child:after{content: ""}
+.admnql input{float:left;margin:6px 10px 0 0}
 
 .admnqf label{margin:10px 0 5px}
 .admnqf select{font-size:0.875em}
@@ -171,7 +176,7 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .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 label,input,select{display:inline;vertical-align:middle}
 .filter input[type=checkbox]{margin:0 8px 0 0}
 .filter label{margin-right:20px;font-size:.875em}