coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
coderkun 2014-04-28 10:09:26 +02:00
commit 4cd5408f9a
8 changed files with 49 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
views/html/characters/character.tpl
View file

@ -21,7 +21,7 @@
<div class="xpbar"> <div class="xpbar">
<span style="width:<?=round($character['quest_xps']*100/$seminary['achievable_xps'])?>%"></span> <span style="width:<?=round($character['quest_xps']*100/$seminary['achievable_xps'])?>%"></span>
</div> </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>
<div class="cdata square"> <div class="cdata square">
<p class="value"><?=$character['xplevel']['level']?></p> <p class="value"><?=$character['xplevel']['level']?></p>
@ -64,19 +64,19 @@
<li> <li>
<a href="<?=$linker->link($rankCharacter['url'],3)?>"><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$rankCharacter['charactertype_url'],$rankCharacter['xplevel'],'portrait'))?>"></a> <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><?=$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> </li>
<?php endforeach ?> <?php endforeach ?>
<li> <li>
<img src="<?=$linker->link(array('media','avatar',$seminary['url'],$character['charactertype_url'],$character['xplevel']['level'],'portrait'))?>"> <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 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> </li>
<?php foreach($ranking['inferior'] as $index => &$rankCharacter) : ?> <?php foreach($ranking['inferior'] as $index => &$rankCharacter) : ?>
<li> <li>
<a href="<?=$linker->link($rankCharacter['url'],3)?>"><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$rankCharacter['charactertype_url'],$rankCharacter['xplevel'],'portrait'))?>"></a> <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><?=$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> </li>
<?php endforeach ?> <?php endforeach ?>
</ul> </ul>
@ -87,7 +87,7 @@
<?php foreach($groups as &$group) : ?> <?php foreach($groups as &$group) : ?>
<li class="cf"> <li class="cf">
<img src="http://s1.directupload.net/images/140325/3eqybn4i.png"> <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> </li>
<?php endforeach ?> <?php endforeach ?>
</ul> </ul>

19
views/html/characters/index.tpl
View file

@ -15,15 +15,16 @@
<?php endif ?> <?php endif ?>
<form method="post"> <form method="post">
<fieldset> <fieldset class="filter">
<legend><?=_('Properties')?></legend> <ul>
<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 /> <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>
<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 /> <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>
<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 /> <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) : ?> <?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 /> <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 ?> <?php endforeach ?>
<input type="submit" name="set-properties" value="<?=_('Set properties')?>" /> </ul>
<input class="cta" type="submit" name="set-properties" value="<?=_('Set properties')?>" />
</fieldset> </fieldset>
</form> </form>

19
views/html/characters/manage.tpl
View file

@ -10,18 +10,19 @@
<h1><?=_('Manage')?></h1> <h1><?=_('Manage')?></h1>
<form method="post"> <form method="post">
<fieldset> <fieldset class="filter">
<legend><?=_('Properties')?></legend> <ul>
<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 /> <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>
<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 /> <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>
<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 /> <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) : ?> <?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 /> <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 ?> <?php endforeach ?>
</ul>
<input type="submit" name="set-properties" value="<?=_('Set properties')?>" /> <input type="submit" name="set-properties" value="<?=_('Set properties')?>" />
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend><?=_('Selection')?>:</legend> <legend class="fwb"><small><?=_('Selection')?>:</small></legend>
<ul class="gchars cf"> <ul class="gchars cf">
<?php foreach($characters as &$character) : ?> <?php foreach($characters as &$character) : ?>
<li> <li>

4
views/html/html.tpl
View file

@ -13,7 +13,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready( $(document).ready(
function() { function() {
$("#qtextbox").niceScroll({autohidemode:false,cursorcolor:"#c2beb9"}); $(".qtextbox").niceScroll({autohidemode:false,cursorcolor:"#c2beb9"});
} }
); );
</script> </script>
@ -43,7 +43,7 @@
<header> <header>
<nav> <nav>
<input type="checkbox" id="toggle"> <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($loggedUser)) : ?>
<?php if(!is_null($loggedCharacter)) : ?> <?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> <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>

2
views/html/questgroups/questgroup.tpl
View file

@ -11,7 +11,7 @@
<h1><?=$questgroup['title']?></h1> <h1><?=$questgroup['title']?></h1>
<?php endif ?> <?php endif ?>
<?php if(count($texts) > 0): ?> <?php if(count($texts) > 0): ?>
<div id="qtextbox"> <div class="qtextbox">
<?php foreach($texts as &$text) : ?> <?php foreach($texts as &$text) : ?>
<p class="qtext"><?=\hhu\z\Utils::t($text['text'])?></p> <p class="qtext"><?=\hhu\z\Utils::t($text['text'])?></p>
<?php endforeach ?> <?php endforeach ?>

2
views/html/quests/index.tpl
View file

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?> <?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<div class="moodpic"> <div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>" /> <img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
</div> </div>
<?php endif ?> <?php endif ?>
<ul class="breadcrumbs"> <ul class="breadcrumbs">

8
views/html/quests/quest.tpl
View file

@ -9,7 +9,7 @@
<?php if(array_key_exists('Prolog', $questtexts) && count($questtexts['Prolog']) > 0) : ?> <?php if(array_key_exists('Prolog', $questtexts) && count($questtexts['Prolog']) > 0) : ?>
<section> <section>
<h1 id="questtext"><?=_('Prolog')?></h1> <h1 id="questtext"><?=_('Prolog')?></h1>
<div id="qtextbox"> <div class="qtextbox">
<?php $mediaShown = false; ?> <?php $mediaShown = false; ?>
<?php foreach($questtexts['Prolog'] as &$questtext) : ?> <?php foreach($questtexts['Prolog'] as &$questtext) : ?>
<p class="qtext cf"> <p class="qtext cf">
@ -72,7 +72,7 @@
<?php if(array_key_exists('Epilog', $questtexts) && count($questtexts['Epilog']) > 0) : ?> <?php if(array_key_exists('Epilog', $questtexts) && count($questtexts['Epilog']) > 0) : ?>
<section> <section>
<h1 id="questtext"><?=_('Epilog')?></h1> <h1 id="questtext"><?=_('Epilog')?></h1>
<div id="qtextbox"> <div class="qtextbox">
<?php foreach($questtexts['Epilog'] as &$questtext) : ?> <?php foreach($questtexts['Epilog'] as &$questtext) : ?>
<p class="qtext cf"> <p class="qtext cf">
<?php if(array_key_exists('media', $questtext)) : ?> <?php if(array_key_exists('media', $questtext)) : ?>
@ -83,10 +83,10 @@
<?php if(count($questtext['relatedQuestsgroups']) > 0 || !empty($questtext['abort_text'])) : ?> <?php if(count($questtext['relatedQuestsgroups']) > 0 || !empty($questtext['abort_text'])) : ?>
<ul> <ul>
<?php foreach($questtext['relatedQuestsgroups'] as &$relatedQuestgroup) : ?> <?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 endforeach ?>
<?php if(!empty($questtext['abort_text'])) : ?> <?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 ?> <?php endif ?>
</ul> </ul>
<?php endif ?> <?php endif ?>

25
www/css/desktop.css
View file

@ -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} .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,.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;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} article{padding:70px 0 30px}
aside{display:none} aside{display:none}
@ -112,7 +111,7 @@ aside{display:none}
.qglist .qgtitle .bonus{background:#f5821f} .qglist .qgtitle .bonus{background:#f5821f}
.qglist .qgtitle .bonus:hover{background:#f68e34} .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{padding-right:15px}
.qtext img,.grpqimg{float:right;margin-left:15px;max-width:30%;max-height:200px;border-radius:3px} .qtext img,.grpqimg{float:right;margin-left:15px;max-width:30%;max-height:200px;border-radius:3px}
@ -155,19 +154,26 @@ 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} .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 label{display:block;font-size:.875em}
.logreg input{margin:5px 0 15px} .logreg input{margin:5px 0 15px}
.logreg .cta{display:block} .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 li{display:inline-block;margin-right:5px;text-align:center}
.avatar img{border-radius:3px} .avatar img{border-radius:3px}
/** Character Profile **/ /** 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{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} .cdata.square{text-align:center;width:10%;padding-top:0}
@ -210,9 +216,9 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.gdata{margin:20px 0 40px 0} .gdata{margin:20px 0 40px 0}
.gdata li{float:left;background:#fff;padding:5px 15px;margin:0 5px 5px 0;border-radius:3px} .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 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} .gchars .fa{position:absolute;margin:-10px 0 0}
.gquests li{padding:12px 15px 0 15px;border-radius:3px} .gquests li{padding:12px 15px 0 15px;border-radius:3px}
@ -315,6 +321,7 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.cinfo{float:left;width:70%} .cinfo{float:left;width:70%}
.cportrait{float:right;width:25%} .cportrait{float:right;width:25%}
.cportrait img{max-height:100%}
.gbanner img{float:left;margin:20px 20px 0 0} .gbanner img{float:left;margin:20px 20px 0 0}
.gbanner h1{margin:25px 0 2px} .gbanner h1{margin:25px 0 2px}