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

add moodpics for system and Seminary categories

Browse source
This commit is contained in:
coderkun 2014-04-27 12:36:30 +02:00
commit 9839d13212
28 changed files with 77 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

28
controllers/MediaController.inc
View file

@ -26,7 +26,7 @@
*/
public $permissions = array(
'index' => array('admin', 'moderator', 'user', 'guest'),
'seminaryheader' => array('admin', 'moderator', 'user'),
'seminarymoodpic' => array('admin', 'moderator', 'user'),
'seminary' => array('admin', 'moderator', 'user'),
'avatar' => array('admin', 'moderator', 'user'),
'achievement' => array('admin', 'moderator', 'user')
@ -95,21 +95,39 @@
/**
* Action: seminaryheader
* Action: seminarymoodpic
*
* Display the header of a Seminary.
* Display the moodpic for a category of a Seminary.
*
* @throws IdNotFoundException
* @param string $seminaryUrl URL-title of the Seminary
* @param string $category Category to show moodpic of
* @param string $action Action for processing the media
*/
public function seminaryheader($seminaryUrl, $action=null)
public function seminarymoodpic($seminaryUrl, $category=null, $action=null)
{
// Get Seminary
$seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl);
// Set index
switch($category)
{
case null:
$index = 'seminarymedia_id';
break;
case 'charactergroups':
$index = 'charactergroups_seminarymedia_id';
break;
case 'achievements':
$index = 'achievements_seminarymedia_id';
break;
case 'library':
$index = 'library_seminarymedia_id';
break;
}
// Get media
$media = $this->Media->getSeminaryMediaById($seminary['seminarymedia_id']);
$media = $this->Media->getSeminaryMediaById($seminary[$index]);
// Get file
$file = $this->getMediaFile($media, $action);

6
models/SeminariesModel.inc
View file

@ -49,7 +49,7 @@
{
// Get seminaries
return $this->db->query(
'SELECT id, created, created_user_id, title, url, course, description, seminarymedia_id '.
'SELECT id, created, created_user_id, title, url, course, description, seminarymedia_id, charactergroups_seminarymedia_id, achievements_seminarymedia_id, library_seminarymedia_id '.
'FROM seminaries '.
'ORDER BY created DESC'
);
@ -66,7 +66,7 @@
public function getSeminaryById($seminaryId)
{
$seminary = $this->db->query(
'SELECT id, created, created_user_id, title, url, course, description, seminarymedia_id '.
'SELECT id, created, created_user_id, title, url, course, description, seminarymedia_id, charactergroups_seminarymedia_id, achievements_seminarymedia_id, library_seminarymedia_id '.
'FROM seminaries '.
'WHERE id = ?',
'i',
@ -91,7 +91,7 @@
public function getSeminaryByUrl($seminaryUrl)
{
$seminary = $this->db->query(
'SELECT id, created, created_user_id, title, url, course, description, seminarymedia_id '.
'SELECT id, created, created_user_id, title, url, course, description, seminarymedia_id, charactergroups_seminarymedia_id, achievements_seminarymedia_id, library_seminarymedia_id '.
'FROM seminaries '.
'WHERE url = ?',
's',

0
views/binary/media/seminaryheader.tpl → views/binary/media/seminarymoodpic.tpl
View file

4
views/html/achievements/index.tpl
View file

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<?php if(!is_null($seminary['achievements_seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>" />
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url'], 'achievements'))?>">
</div>
<?php endif ?>
<ul class="breadcrumbs">

4
views/html/charactergroups/group.tpl
View file

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<?php if(!is_null($seminary['charactergroups_seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url'], 'charactergroups'))?>">
</div>
<?php endif ?>
<ul class="breadcrumbs">

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

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<?php if(!is_null($seminary['charactergroups_seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url'], 'charactergroups'))?>">
</div>
<?php endif ?>
<ul class="breadcrumbs">

4
views/html/charactergroups/index.tpl
View file

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<?php if(!is_null($seminary['charactergroups_seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url'], 'charactergroups'))?>">
</div>
<?php endif ?>
<ul class="breadcrumbs">

4
views/html/charactergroups/managegroup.tpl
View file

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<?php if(!is_null($seminary['charactergroups_seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url'], 'charactergroups'))?>">
</div>
<?php endif ?>
<ul class="breadcrumbs">

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

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<?php if(!is_null($seminary['charactergroups_seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url'], 'charactergroups'))?>">
</div>
<?php endif ?>
<ul class="breadcrumbs">

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

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
</div>
<?php endif ?>
<ul class="breadcrumbs">

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

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
</div>
<?php endif ?>
<ul class="breadcrumbs">

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

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
</div>
<?php endif ?>
<ul class="breadcrumbs">

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

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
</div>
<?php endif ?>
<ul class="breadcrumbs">

3
views/html/introduction/index.tpl
View file

@ -1,3 +1,6 @@
<div class="moodpic">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<h1><?=_('Introduction')?></h1>
<?php if(is_null($userId)) : ?>
<h2><?=_('Login')?></h2>

4
views/html/library/index.tpl
View file

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<?php if(!is_null($seminary['library_seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>" />
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url'], 'library'))?>">
</div>
<?php endif ?>
<ul class="breadcrumbs">

4
views/html/seminaries/create.tpl
View file

@ -1,8 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<?php endif ?>
<h1><?=_('Seminaries')?></h1>
<h2><?=_('New seminary')?></h2>

2
views/html/seminaries/delete.tpl
View file

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
</div>
<?php endif ?>
<h1><?=_('Seminaries')?></h1>

2
views/html/seminaries/edit.tpl
View file

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
</div>
<?php endif ?>
<h1><?=_('Seminaries')?></h1>

5
views/html/seminaries/index.tpl
View file

@ -1,3 +1,6 @@
<div class="moodpic">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<h1><?=_('Seminaries')?></h1>
<?php if(count(array_intersect(array('admin','moderator'),\hhu\z\controllers\IntermediateController::$user['roles'])) > 0) : ?>
<nav class="admin">
@ -8,7 +11,7 @@
<?php foreach($seminaries as &$seminary) : ?>
<li>
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>" />
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>" />
<?php endif ?>
<section>
<p class="fwb">

2
views/html/seminaries/seminary.tpl
View file

@ -1,6 +1,6 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminaryheader',$seminary['url']))?>">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
</div>
<?php endif ?>
<h1><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></h1>

3
views/html/users/create.tpl
View file

@ -1,3 +1,6 @@
<div class="moodpic">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<h1><?=_('Users')?></h1>
<h2><?=_('New user')?></h2>

3
views/html/users/delete.tpl
View file

@ -1,3 +1,6 @@
<div class="moodpic">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<h1><?=_('Users')?></h1>
<h2><?=_('Delete user')?></h2>

6
views/html/users/edit.tpl
View file

@ -1,3 +1,6 @@
<div class="moodpic">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<h1><?=_('Users')?></h1>
<h2><?=_('Edit user')?></h2>
@ -5,8 +8,7 @@
<fieldset>
<label for="username"><?=_('Username')?>:</label>
<input type="text" name="username" placeholder="<?=_('Username')?>" value="<?=$user['username']?>" /><br />
<label for="prename"><?=_('Prename')?>:</label>
<input name="prename" type="text" placeholder="<?=_('Prename')?>" value="<?=$user['prename']?>" /><br />
<label for="prename"><?=_('Prename')?>:</label> <input name="prename" type="text" placeholder="<?=_('Prename')?>" value="<?=$user['prename']?>" /><br />
<label for="surname"><?=_('Surname')?>:</label>
<input name="surname" type="text" placeholder="<?=_('Surname')?>" value="<?=$user['surname']?>" /><br />
<label for="email"><?=_('E‑mail address')?>:</label>

3
views/html/users/index.tpl
View file

@ -1,3 +1,6 @@
<div class="moodpic">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<h1><?=_('Users')?></h1>
<nav class="admin">
<li><a href="<?=$linker->link('create', 1)?>"><?=_('Create new user')?></a></li>

3
views/html/users/login.tpl
View file

@ -1,3 +1,6 @@
<div class="moodpic">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<h1><?=_('Users')?></h1>
<h2><?=_('Login')?></h2>

3
views/html/users/register.tpl
View file

@ -1,3 +1,6 @@
<div class="moodpic">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<h1><?=_('Users')?></h1>
<h2><?=_('Registration')?></h2>

3
views/html/users/user.tpl
View file

@ -1,3 +1,6 @@
<div class="moodpic">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<h1><?=_('Users')?></h1>
<?php if(count(array_intersect(array('admin','moderator'),\hhu\z\controllers\IntermediateController::$user['roles'])) > 0) : ?>
<nav class="admin">

BIN
www/grafics/questlab.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 79 KiB