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-05-19 12:07:54 +02:00
commit a60c7a2c19
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
views/html/charactergroupsquests/quest.tpl
View file

@ -65,7 +65,7 @@
<section> <section>
<h1><i class="fa fa-users fa-fw"></i><?=$groupsgroup['name']?></h1> <h1><i class="fa fa-users fa-fw"></i><?=$groupsgroup['name']?></h1>
<ul class="grpqlist"> <ol class="grpqlist">
<?php foreach($groups as &$group) : ?> <?php foreach($groups as &$group) : ?>
<li> <li>
<span class="date"><?=$dateFormatter->format(new \DateTime($group['created']))?></span> <span class="date"><?=$dateFormatter->format(new \DateTime($group['created']))?></span>
@ -73,5 +73,5 @@
<span class="xp"><?=sprintf(_('%d XPs'), $group['xps'])?></span> <span class="xp"><?=sprintf(_('%d XPs'), $group['xps'])?></span>
</li> </li>
<?php endforeach ?> <?php endforeach ?>
</ul> </ol>
</section> </section>

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

@ -76,5 +76,9 @@
<?php endforeach ?> <?php endforeach ?>
</ul> </ul>
<?php if(!is_null($limit)) : ?> <?php if(!is_null($limit)) : ?>
<p><a href="<?=$linker->link('all',3)?>"><?=_('Show all')?></a></p> <nav class="admin">
<li>
<a href="<?=$linker->link('all',3)?>"><?=_('Show all')?></a>
</li>
</nav>
<?php endif ?> <?php endif ?>

17
www/css/desktop.css
View file

@ -153,6 +153,9 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.task strong{font-style:italic;font-weight:400} .task strong{font-style:italic;font-weight:400}
.task table{max-width:800px} .task table{max-width:800px}
.task td{background:#fff;padding:1px 5px;border:1px solid #d7d4cf} .task td{background:#fff;padding:1px 5px;border:1px solid #d7d4cf}
.task table option{font-size:0.675em}
.task input[type="text"].small{width:40px}
.task input[type="text"].medium{width:90px}
/** Popup Notification **/ /** Popup Notification **/
@ -234,9 +237,7 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.cglist li p{margin:0;display:inline} .cglist li p{margin:0;display:inline}
.cglist .gbanner{width:40px;height:40px;border-radius:3px;display:inline;margin:5px 5px 0 0} .cglist .gbanner{width:40px;height:40px;border-radius:3px;display:inline;margin:5px 5px 0 0}
.cglist .xp{display:block} .cglist .xp{display:block}
.cglist.rnkng li:nth-child(-n+3){border:3px solid #cd7f32;border-width:0 0 2px} .cglist.rnkng li:nth-child(3){margin-bottom:16px}
.cglist.rnkng li:nth-child(-n+2){border-color:#c0c0c0}
.cglist.rnkng li:nth-child(-n+1){border-color:#ffd700}
.cglist.rnkng li:nth-child(-n+3) a{display:inline-block;vertical-align:top;margin-top:10px} .cglist.rnkng li:nth-child(-n+3) a{display:inline-block;vertical-align:top;margin-top:10px}
.cgqlist li{background:#fff;margin-bottom:5px;padding:3px} .cgqlist li{background:#fff;margin-bottom:5px;padding:3px}
@ -265,10 +266,9 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
/** Charactergroup Quest **/ /** Charactergroup Quest **/
.grpqlist li{background:#fff;margin-bottom:6px;padding:5px 15px 5px 0;font-size:.875em;border-radius:3px} .grpqlist li{list-style-type:decimal;background:#fff;margin:0 0 6px 30px;padding:5px 15px;font-size:.875em;border-radius:3px}
.grpqlist .date{padding:0 15px;border-right:1px solid #dad8d5} .grpqlist .date{padding:0 15px 0 0;display:block}
.grpqlist .group{padding:0 15px} .grpqlist .xp{display:block}
.grpqlist .xp{float:right}
.gqgllry li{display:inline-block} .gqgllry li{display:inline-block}
@ -365,6 +365,9 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.gchars li{width:32%} .gchars li{width:32%}
.grpqlist .date{float:left}
.grpqlist .xp{float:right}
.achmnts .xpbar{width:89%} .achmnts .xpbar{width:89%}
.admnql span{float:right} .admnql span{float:right}