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-22 00:42:37 +02:00
commit 8a8639519e
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
views/html/characters/register.tpl
View file

@ -6,7 +6,7 @@
<h1><?=$seminary['title']?></h1> <h1><?=$seminary['title']?></h1>
<h2><?=_('Create Character')?></h2> <h2><?=_('Create Character')?></h2>
<form method="post" action=""> <form method="post" action="" class="logreg">
<?php if($validation !== true) : ?> <?php if($validation !== true) : ?>
<ul> <ul>
<?php foreach($validation as $field => &$settings) : ?> <?php foreach($validation as $field => &$settings) : ?>

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

@ -44,17 +44,15 @@
<ul class="qglist"> <ul class="qglist">
<?php foreach($quests as &$quest) : ?> <?php foreach($quests as &$quest) : ?>
<li class="qgtitle"> <li class="qgtitle">
<a href="<?=$linker->link(array('quests','quest',$seminary['url'],$questgroup['url'],$quest['url']))?>" <?php if($quest['solved']) : ?>class="solved"<?php endif ?>><i class="fa <?=($quest['solved']) ? 'fa-check-square-o' : 'fa-share-square-o'?> fa-fw"></i><?=$quest['title']?></a> <a href="<?=$linker->link(array('quests','quest',$seminary['url'],$questgroup['url'],$quest['url']))?>" <?php if($quest['solved']) : ?>class="solved"<?php endif ?>><i class="fa <?=($quest['solved']) ? 'fa-check-square-o' : 'fa-square-o'?> fa-fw"></i><?=$quest['title']?></a>
<?php if(count($quest['relatedQuestgroups']) > 0) : ?>
<ul class="gplist">
<?php foreach($quest['relatedQuestgroups'] as &$relatedQuestgroup) : ?>
<li class="qgtitle">
<a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$relatedQuestgroup['url']))?>" class="bonus"><i class="fa fa-share-square-o fa-fw"><?=$relatedQuestgroup['title']?></i></a>
</li>
<?php endforeach ?>
</ul>
<?php endif ?>
</li> </li>
<?php if(count($quest['relatedQuestgroups']) > 0) : ?>
<?php foreach($quest['relatedQuestgroups'] as &$relatedQuestgroup) : ?>
<li class="qgtitle">
<a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$relatedQuestgroup['url']))?>" class="bonus"><i class="fa fa-share-square-o fa-fw"><?=$relatedQuestgroup['title']?></i></a>
</li>
<?php endforeach ?>
<?php endif ?>
<?php endforeach ?> <?php endforeach ?>
</ul> </ul>
<?php endif ?> <?php endif ?>

4
www/css/desktop.css
View file

@ -268,8 +268,8 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
/** Media Queries **/ /** Media Queries **/
@media only screen and (min-width:480px){ @media only screen and (min-width:480px){
.questgroups li,.ctopics li,.fll48{width:48%;float:left} .questgroups li,.ctopics li,.fll48{width:48%;display:inline-block;margin-right:2%}
.questgroups li:nth-child(even),.ctopics li:nth-child(even),.flr48{width:48%;float:right} .questgroups li:nth-child(even),.ctopics li:nth-child(even),.flr48{width:48%;display:inline-block;margin-right:0;vertical-align:top}
.xpinfo{display:inline-block;float:left;padding-right:20px} .xpinfo{display:inline-block;float:left;padding-right:20px}
.xpbar{width:50%} .xpbar{width:50%}