From 9839d132120247aac5a59e86b8451f8d0f364f7c Mon Sep 17 00:00:00 2001 From: coderkun Date: Sun, 27 Apr 2014 12:36:30 +0200 Subject: [PATCH] add moodpics for system and Seminary categories --- controllers/MediaController.inc | 28 ++++++++++++++---- models/SeminariesModel.inc | 6 ++-- ...seminaryheader.tpl => seminarymoodpic.tpl} | 0 views/html/achievements/index.tpl | 4 +-- views/html/charactergroups/group.tpl | 4 +-- views/html/charactergroups/groupsgroup.tpl | 4 +-- views/html/charactergroups/index.tpl | 4 +-- views/html/charactergroups/managegroup.tpl | 4 +-- views/html/charactergroupsquests/quest.tpl | 4 +-- views/html/characters/character.tpl | 2 +- views/html/characters/index.tpl | 2 +- views/html/characters/manage.tpl | 2 +- views/html/characters/register.tpl | 2 +- views/html/introduction/index.tpl | 3 ++ views/html/library/index.tpl | 4 +-- views/html/seminaries/create.tpl | 4 +-- views/html/seminaries/delete.tpl | 2 +- views/html/seminaries/edit.tpl | 2 +- views/html/seminaries/index.tpl | 5 +++- views/html/seminaries/seminary.tpl | 2 +- views/html/users/create.tpl | 3 ++ views/html/users/delete.tpl | 3 ++ views/html/users/edit.tpl | 6 ++-- views/html/users/index.tpl | 3 ++ views/html/users/login.tpl | 3 ++ views/html/users/register.tpl | 3 ++ views/html/users/user.tpl | 3 ++ www/grafics/questlab.jpg | Bin 0 -> 80563 bytes 28 files changed, 77 insertions(+), 35 deletions(-) rename views/binary/media/{seminaryheader.tpl => seminarymoodpic.tpl} (100%) create mode 100644 www/grafics/questlab.jpg diff --git a/controllers/MediaController.inc b/controllers/MediaController.inc index 67935c29..8916be90 100644 --- a/controllers/MediaController.inc +++ b/controllers/MediaController.inc @@ -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); diff --git a/models/SeminariesModel.inc b/models/SeminariesModel.inc index 207411df..494aadc3 100644 --- a/models/SeminariesModel.inc +++ b/models/SeminariesModel.inc @@ -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', diff --git a/views/binary/media/seminaryheader.tpl b/views/binary/media/seminarymoodpic.tpl similarity index 100% rename from views/binary/media/seminaryheader.tpl rename to views/binary/media/seminarymoodpic.tpl diff --git a/views/html/achievements/index.tpl b/views/html/achievements/index.tpl index c4c17556..2a4951cb 100644 --- a/views/html/achievements/index.tpl +++ b/views/html/achievements/index.tpl @@ -1,6 +1,6 @@ - +
- +