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-14 18:32:08 +02:00
commit da1936bc35
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
questtypes/submit/html/submission.tpl
View file

@ -21,7 +21,7 @@
</ol> </ol>
<?php endif ?> <?php endif ?>
<form method="post"> <form method="post" class="logreg">
<?php $submission = array_pop($submissions); ?> <?php $submission = array_pop($submissions); ?>
<?php if(!$solved) : ?> <?php if(!$solved) : ?>
<?=_('Comment')?><br /> <?=_('Comment')?><br />

8
views/html/charactergroups/groupsgroup.tpl
View file

@ -34,8 +34,12 @@
<li><a href="<?=$linker->link(array('charactergroupsquests','create',$seminary['url'],$groupsgroup['url']))?>"><?=sprintf(_('Create new %s-Quest'), $groupsgroup['name'])?></a></li> <li><a href="<?=$linker->link(array('charactergroupsquests','create',$seminary['url'],$groupsgroup['url']))?>"><?=sprintf(_('Create new %s-Quest'), $groupsgroup['name'])?></a></li>
</nav> </nav>
<?php endif ?> <?php endif ?>
<ul class="cgqlist">
<ul class="cgqlist cf">
<?php foreach($quests as &$quest) : ?> <?php foreach($quests as &$quest) : ?>
<li><a href="<?=$linker->link(array('charactergroupsquests','quest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>"><?=$quest['title']?></a></li> <li class="cf">
<img src="http://questlab.hhu.de/media/charactergroupsquest/Die-Legende-von-Zyren/Gilden/Denn-Plopp-hei%C3%9Ft-Stopp">
<p><a href="<?=$linker->link(array('charactergroupsquests','quest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>"><?=$quest['title']?></a></p>
</li>
<?php endforeach ?> <?php endforeach ?>
</ul> </ul>

16
www/css/desktop.css
View file

@ -150,6 +150,10 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.admnqf select{font-size:0.875em} .admnqf select{font-size:0.875em}
.task img{max-width:100%} .task img{max-width:100%}
.task strong{font-style:italic;font-weight:400}
.task table{max-width:800px}
.task td{background:#fff;padding:1px 5px;border:1px solid #d7d4cf}
/** Popup Notification **/ /** Popup Notification **/
@ -229,7 +233,10 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.cglist li{list-style-type:decimal;background:#fff;margin:0 0 6px 30px;padding:5px 15px;border-radius:3px} .cglist li{list-style-type:decimal;background:#fff;margin:0 0 6px 30px;padding:5px 15px;border-radius:3px}
.cglist li p{margin:0} .cglist li p{margin:0}
.cglist .xp{display:block} .cglist .xp{display:block}
.cgqlist li{list-style-type:square;margin-left:25px;padding:2px 15px}
.cgqlist li{background:#fff;margin-bottom:5px;padding:3px}
.cgqlist img{float:left;width:40px;height:40px;border-radius:3px;margin-right:10px}
.cgqlist p{margin:5px 0 0}
/** Charactergroup Profile **/ /** Charactergroup Profile **/
@ -315,8 +322,8 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.textinput input[type=text]{height:16px;font-size:.875em} .textinput input[type=text]{height:16px;font-size:.875em}
.crossword table{max-width:800px;border-spacing:2px;border-collapse:separate} .crossword table{border-spacing:2px;border-collapse:separate}
.crossword td{background:#d7d4cf;padding:1px} .crossword td{background:#d7d4cf;padding:1px;border:0}
.crossword input[type=text]{text-align:center;height:26px;width:100%;min-width:8px;max-width:40px;margin:0;padding:0;border:none;text-transform:uppercase} .crossword input[type=text]{text-align:center;height:26px;width:100%;min-width:8px;max-width:40px;margin:0;padding:0;border:none;text-transform:uppercase}
.crossword ol{list-style-type:decimal;margin-left:25px} .crossword ol{list-style-type:decimal;margin-left:25px}
.crossword li{margin-top:20px} .crossword li{margin-top:20px}
@ -379,6 +386,9 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.achmnts .desc{padding-top:0} .achmnts .desc{padding-top:0}
.achmnts .unlcked{font-size:.75em;float:right;margin:-6px -4px 0 0;color:#878787} .achmnts .unlcked{font-size:.75em;float:right;margin:-6px -4px 0 0;color:#878787}
.cgqlist li{width:48%;float:left}
.cgqlist li:nth-child(odd){float:right}
.libindx li{float:left;width:32%;margin-right:2%} .libindx li{float:left;width:32%;margin-right:2%}
.libindx li:nth-child(2n){float:left} .libindx li:nth-child(2n){float:left}
.libindx li:nth-child(3n){margin-right:0} .libindx li:nth-child(3n){margin-right:0}