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 @@
-
+
-
)?>)
+
diff --git a/views/html/charactergroups/group.tpl b/views/html/charactergroups/group.tpl
index 5ef03248..bef1a928 100644
--- a/views/html/charactergroups/group.tpl
+++ b/views/html/charactergroups/group.tpl
@@ -1,6 +1,6 @@
-
+
-
)?>)
+
diff --git a/views/html/charactergroups/groupsgroup.tpl b/views/html/charactergroups/groupsgroup.tpl
index daa1c973..d87db53c 100644
--- a/views/html/charactergroups/groupsgroup.tpl
+++ b/views/html/charactergroups/groupsgroup.tpl
@@ -1,6 +1,6 @@
-
+
-
)?>)
+
diff --git a/views/html/charactergroups/index.tpl b/views/html/charactergroups/index.tpl
index d88d25eb..b3644e4a 100644
--- a/views/html/charactergroups/index.tpl
+++ b/views/html/charactergroups/index.tpl
@@ -1,6 +1,6 @@
-
+
-
)?>)
+
diff --git a/views/html/charactergroups/managegroup.tpl b/views/html/charactergroups/managegroup.tpl
index 53e1f19a..56059d30 100644
--- a/views/html/charactergroups/managegroup.tpl
+++ b/views/html/charactergroups/managegroup.tpl
@@ -1,6 +1,6 @@
-
+
-
)?>)
+
diff --git a/views/html/charactergroupsquests/quest.tpl b/views/html/charactergroupsquests/quest.tpl
index 45267e1a..6cb8b605 100644
--- a/views/html/charactergroupsquests/quest.tpl
+++ b/views/html/charactergroupsquests/quest.tpl
@@ -1,6 +1,6 @@
-
+
-
)?>)
+
diff --git a/views/html/characters/character.tpl b/views/html/characters/character.tpl
index a26f0a27..b0a683d9 100644
--- a/views/html/characters/character.tpl
+++ b/views/html/characters/character.tpl
@@ -1,6 +1,6 @@
-
)?>)
+
diff --git a/views/html/characters/index.tpl b/views/html/characters/index.tpl
index a7b7a0a2..5880a076 100644
--- a/views/html/characters/index.tpl
+++ b/views/html/characters/index.tpl
@@ -1,6 +1,6 @@
-
)?>)
+
diff --git a/views/html/characters/manage.tpl b/views/html/characters/manage.tpl
index 5102eeaa..476d7973 100644
--- a/views/html/characters/manage.tpl
+++ b/views/html/characters/manage.tpl
@@ -1,6 +1,6 @@
-
)?>)
+
diff --git a/views/html/characters/register.tpl b/views/html/characters/register.tpl
index 970dd25b..781fc841 100644
--- a/views/html/characters/register.tpl
+++ b/views/html/characters/register.tpl
@@ -1,6 +1,6 @@
-
)?>)
+
diff --git a/views/html/introduction/index.tpl b/views/html/introduction/index.tpl
index 42979a96..0f4aff40 100644
--- a/views/html/introduction/index.tpl
+++ b/views/html/introduction/index.tpl
@@ -1,3 +1,6 @@
+
+
)?>)
+
=_('Introduction')?>
=_('Login')?>
diff --git a/views/html/library/index.tpl b/views/html/library/index.tpl
index 37b423ae..4170fffe 100644
--- a/views/html/library/index.tpl
+++ b/views/html/library/index.tpl
@@ -1,6 +1,6 @@
-
+
-
)?>)
+
diff --git a/views/html/seminaries/create.tpl b/views/html/seminaries/create.tpl
index 22a9acaa..45637e02 100644
--- a/views/html/seminaries/create.tpl
+++ b/views/html/seminaries/create.tpl
@@ -1,8 +1,6 @@
-
-
)?>)
+
-
=_('Seminaries')?>
=_('New seminary')?>
diff --git a/views/html/seminaries/delete.tpl b/views/html/seminaries/delete.tpl
index 8e53fdb5..49387278 100644
--- a/views/html/seminaries/delete.tpl
+++ b/views/html/seminaries/delete.tpl
@@ -1,6 +1,6 @@
-
)?>)
+
=_('Seminaries')?>
diff --git a/views/html/seminaries/edit.tpl b/views/html/seminaries/edit.tpl
index 27974c1b..70cd86a9 100644
--- a/views/html/seminaries/edit.tpl
+++ b/views/html/seminaries/edit.tpl
@@ -1,6 +1,6 @@
-
)?>)
+
=_('Seminaries')?>
diff --git a/views/html/seminaries/index.tpl b/views/html/seminaries/index.tpl
index 922a6e03..7879cd7b 100644
--- a/views/html/seminaries/index.tpl
+++ b/views/html/seminaries/index.tpl
@@ -1,3 +1,6 @@
+
+
)?>)
+
=_('Seminaries')?>
0) : ?>