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

resize Quest images to the actually used size

Browse source
This commit is contained in:
oliver 2015-08-20 13:23:03 +02:00
parent 5cb60679e0
commit b854554ed0
3 changed files with 30 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configs/AppConfig.inc
View file

@ -85,8 +85,12 @@
*/
public static $media = array(
'questgroup' => array(
'width' => 480,
'height' => 5000
'width' => 480,
'height' => 5000
),
'quest' => array(
'width' => 200,
'height' => 200
),
'avatar' => array(
'width' => 500,

64
controllers/MediaController.inc
View file

@ -473,54 +473,32 @@
// Load and process file
$file = null;
switch($action)
if(is_null($action) || !in_array(strtoupper($format), self::getImageTypes()))
{
// No action
case null:
// Do not process the file
$file = file_get_contents($media['filename']);
break;
case 'questgroup':
if(!in_array(strtoupper($format), self::getImageTypes())) {
$file = file_get_contents($media['filename']);
}
else
{
// Do not process the file
$file = file_get_contents($media['filename']);
}
else
{
// Process file
switch($action)
{
case 'questgroup':
case 'quest':
case 'avatar':
case 'charactergroup':
case 'charactergroupsquest':
$file = self::resizeImage(
$media['filename'],
$format,
\nre\configs\AppConfig::$media['questgroup']['width'],
\nre\configs\AppConfig::$media['questgroup']['height']
\nre\configs\AppConfig::$media[$action]['width'],
\nre\configs\AppConfig::$media[$action]['height']
);
}
break;
case 'avatar':
$file = self::resizeImage(
$media['filename'],
$format,
\nre\configs\AppConfig::$media['avatar']['width'],
\nre\configs\AppConfig::$media['avatar']['height']
);
break;
case 'charactergroup':
$file = self::resizeImage(
$media['filename'],
$format,
\nre\configs\AppConfig::$media['charactergroup']['width'],
\nre\configs\AppConfig::$media['charactergroup']['height']
);
break;
case 'charactergroupsquest':
$file = self::resizeImage(
$media['filename'],
$format,
\nre\configs\AppConfig::$media['charactergroupsquest']['width'],
\nre\configs\AppConfig::$media['charactergroupsquest']['height']
);
break;
default:
throw new ParamsNotValidException($action);
break;
break;
default:
throw new ParamsNotValidException($action);
break;
}
}

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

@ -19,10 +19,10 @@
<?php foreach($questtexts['Prolog'] as &$questtext) : ?>
<p class="qtext cf">
<?php if(array_key_exists('media', $questtext)) : ?>
<a href="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>" /></a>
<a href="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url'], 'quest'))?>" /></a>
<?php elseif(!is_null($media) && !$mediaShown) : ?>
<?php $mediaShown = true; ?>
<a href="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url']))?>" /></a>
<a href="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$media['url'],'quest'))?>" /></a>
<?php endif ?>
<?=$t->t($questtext['text'])?>
</p>
@ -85,7 +85,7 @@
<?php foreach($questtexts['Epilog'] as &$questtext) : ?>
<p class="qtext cf">
<?php if(array_key_exists('media', $questtext)) : ?>
<a href="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>" /></a>
<a href="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url']))?>"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questtext['media']['url'],'quest'))?>" /></a>
<?php endif ?>
<?=$t->t($questtext['text'])?>
</p>