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-16 15:42:41 +02:00
commit d4ea370949
3 changed files with 75 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

64
questtypes/bossfight/html/quest.tpl
View file

@ -1,39 +1,31 @@
<table>
<tbody>
<tr>
<td>
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$character['avatar_url']))?>" />
</td>
<td>
<?php if(array_key_exists('bossmedia', $fight)) : ?>
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$fight['bossmedia']['url']))?>" />
<?php endif ?>
</td>
</tr>
<tr>
<td>
<?=$character['name']?>:
<?php if($lives['character'] > 0) : ?>
<?php foreach(range(1,$lives['character']) as $i) : ?>
♥
<?php endforeach ?>
<?php else : ?>
<?=_('lost')?>
<?php endif ?>
</td>
<td>
<?=$fight['bossname']?>:
<?php if($lives['boss'] > 0) : ?>
<?php foreach(range(1,$lives['boss']) as $i) : ?>
♥
<?php endforeach ?>
<?php else : ?>
<?=_('lost')?>
<?php endif ?>
</td>
</tr>
</tbody>
</table>
<div class="cf">
<section class="opponent">
<p class="fwb"><?=$character['name']?></p>
<p class="portrait"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$character['avatar_url']))?>" class="hero" /></p>
<p>
<?php if($lives['character'] > 0) : ?>
<?php foreach(range(1,$lives['character']) as $i) : ?>
<i class="fa fa-heart fa-fw"></i>
<?php endforeach ?>
<?php else : ?>
<?=_('lost')?>
<?php endif ?>
</p>
</section>
<section class="opponent">
<p class="fwb"><?=$fight['bossname']?></p>
<p class="portrait"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$fight['bossmedia']['url']))?>" class="boss" /></p>
<p>
<?php if($lives['boss'] > 0) : ?>
<?php foreach(range(1,$lives['boss']) as $i) : ?>
<i class="fa fa-heart fa-fw"></i>
<?php endforeach ?>
<?php else : ?>
<?=_('lost')?>
<?php endif ?>
</p>
</section>
</div>
<p><?=\hhu\z\Utils::t($stage['text'])?></p>

79
questtypes/bossfight/html/submission.tpl
View file

@ -1,43 +1,38 @@
<table>
<tbody>
<tr>
<td>
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$character['avatar_url']))?>" />
</td>
<td>
<?php if(array_key_exists('bossmedia', $fight)) : ?>
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$fight['bossmedia']['url']))?>" />
<?php endif ?>
</td>
</tr>
<?php foreach($stages as &$stage) : ?>
<tr>
<td colspan="2">
<?=$stage['question']?>
</td>
</tr>
<tr>
<td>
<?=$character['name']?>:
<?php if($stage['lives']['character'] > 0) : ?>
<?php foreach(range(1,$stage['lives']['character']) as $i) : ?>
♥
<?php endforeach ?>
<?php else : ?>
<?=_('lost')?>
<?php endif ?>
</td>
<td>
<?=$fight['bossname']?>:
<?php if($stage['lives']['boss'] > 0) : ?>
<?php foreach(range(1,$stage['lives']['boss']) as $i) : ?>
♥
<?php endforeach ?>
<?php else : ?>
<?=_('lost')?>
<?php endif ?>
</td>
</tr>
<div class="cf">
<section class="opponent">
<p class="portrait"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$character['avatar_url']))?>" class="hero" /></p>
</section>
<section class="opponent">
<p class="portrait"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$fight['bossmedia']['url']))?>" class="boss" /></p>
</section>
</div>
<?php foreach($stages as &$stage) : ?>
<p><?=$stage['question']?></p>
<div class="cf">
<section class="opponent">
<p class="fwb"><?=$character['name']?></p>
<p>
<?php if($lives['character'] > 0) : ?>
<?php foreach(range(1,$lives['character']) as $i) : ?>
<i class="fa fa-heart fa-fw"></i>
<?php endforeach ?>
</tbody>
</table>
<?php else : ?>
<?=_('lost')?>
<?php endif ?>
</p>
</section>
<section class="opponent">
<p class="fwb"><?=$fight['bossname']?></p>
<p>
<?php if($lives['boss'] > 0) : ?>
<?php foreach(range(1,$lives['boss']) as $i) : ?>
<i class="fa fa-heart fa-fw"></i>
<?php endforeach ?>
<?php else : ?>
<?=_('lost')?>
<?php endif ?>
</p>
</section>
</div>
<?php endforeach ?>

10
www/css/desktop.css
View file

@ -182,6 +182,14 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.crossword li{margin-top:20px}
.crossword .index{position:absolute;font-size:0.625em;margin:-2px 0 0 2px}
.opponent{width:50%;float:left}
.opponent .portrait{height:250px;overflow:hidden;margin-bottom:15px}
.opponent .hero{background:#fff;max-width:130px}
.opponent .boss{max-width:100%}
.opponent p{text-align:center}
.opponent .fa{font-size:1.25em;color:#c7135b;padding-right:0}
/** Media Queries **/
@media only screen and (min-width:480px){
@ -198,6 +206,8 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
.gdata ul{clear:both}
.gchars li{width:32%;margin-right:5px}
.gchars li:nth-child(even){float:left}
.opponent .hero{max-width:200px}
}
@media only screen and (min-width:768px){