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

add ?public? option for Character groups Quests (implements #146)

Browse source
This commit is contained in:
oliver 2016-03-26 19:15:02 +01:00
parent f876913ced
commit 74b093a61f
7 changed files with 94 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
controllers/CharactergroupsquestsController.inc
View file

@ -535,6 +535,7 @@
$rules = $quest['rules']; $rules = $quest['rules'];
$wonText = $quest['won_text']; $wonText = $quest['won_text'];
$lostText = $quest['lost_text']; $lostText = $quest['lost_text'];
$public = $quest['public'];
$fields = array('title', 'xps'); $fields = array('title', 'xps');
$validation = array(); $validation = array();
@ -552,6 +553,7 @@
$rules = $this->request->getPostParam('rules'); $rules = $this->request->getPostParam('rules');
$wonText = $this->request->getPostParam('wonText'); $wonText = $this->request->getPostParam('wonText');
$lostText = $this->request->getPostParam('lostText'); $lostText = $this->request->getPostParam('lostText');
$public = !is_null($this->request->getPostParam('public'));
// Validate icon // Validate icon
$icon = null; $icon = null;
@ -606,7 +608,8 @@
$xps, $xps,
$rules, $rules,
$wonText, $wonText,
$lostText $lostText,
$public
); );
$quest = $this->Charactergroupsquests->getQuestById($quest['id']); $quest = $this->Charactergroupsquests->getQuestById($quest['id']);
@ -654,6 +657,7 @@
$this->set('rules', $rules); $this->set('rules', $rules);
$this->set('wonText', $wonText); $this->set('wonText', $wonText);
$this->set('lostText', $lostText); $this->set('lostText', $lostText);
$this->set('public', $public);
$this->set('mimetypes', $mimetypes); $this->set('mimetypes', $mimetypes);
$this->set('validation', $validation); $this->set('validation', $validation);
$this->set('validationSettings', $validationSettings); $this->set('validationSettings', $validationSettings);

3
db/create.sql
View file

@ -508,6 +508,7 @@ CREATE TABLE `charactergroupsquests` (
`won_text` text COLLATE utf8mb4_unicode_ci NOT NULL, `won_text` text COLLATE utf8mb4_unicode_ci NOT NULL,
`lost_text` text COLLATE utf8mb4_unicode_ci NOT NULL, `lost_text` text COLLATE utf8mb4_unicode_ci NOT NULL,
`questsmedia_id` int(11) DEFAULT NULL, `questsmedia_id` int(11) DEFAULT NULL,
`public` tinyint(1) NOT NULL DEFAULT '1',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `charactergroupsgroup_id_2` (`charactergroupsgroup_id`,`url`), UNIQUE KEY `charactergroupsgroup_id_2` (`charactergroupsgroup_id`,`url`),
KEY `created_user_id` (`created_user_id`), KEY `created_user_id` (`created_user_id`),
@ -2662,4 +2663,4 @@ DELIMITER ;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2016-03-26 16:16:45 -- Dump completed on 2016-03-26 19:13:31

BIN
locale/de_DE/LC_MESSAGES/The Legend of Z.mo
View file

Binary file not shown.

122
locale/de_DE/LC_MESSAGES/The Legend of Z.po
View file

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: The Legend of Z\n" "Project-Id-Version: The Legend of Z\n"
"POT-Creation-Date: 2016-03-26 17:43+0100\n" "POT-Creation-Date: 2016-03-26 19:10+0100\n"
"PO-Revision-Date: 2016-03-26 17:45+0100\n" "PO-Revision-Date: 2016-03-26 19:10+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: de_DE\n" "Language: de_DE\n"
@ -18,12 +18,12 @@ msgstr ""
"X-Poedit-SearchPath-2: controllers\n" "X-Poedit-SearchPath-2: controllers\n"
#: controllers/CharactergroupsachievementsController.inc:175 #: controllers/CharactergroupsachievementsController.inc:175
#: views/html/charactergroups/groupsgroup.tpl:50 #: views/html/charactergroups/groupsgroup.tpl:52
#, php-format #, php-format
msgid "%s-Achievements" msgid "%s-Achievements"
msgstr "%sachievements" msgstr "%sachievements"
#: controllers/CharactersController.inc:417 controllers/UsersController.inc:339 #: controllers/CharactersController.inc:438 controllers/UsersController.inc:339
#: views/ajax/characters/index.tpl:10 views/ajax/users/index.tpl:10 #: views/ajax/characters/index.tpl:10 views/ajax/users/index.tpl:10
#: views/html/characters/index.tpl:45 views/html/characters/manage.tpl:33 #: views/html/characters/index.tpl:45 views/html/characters/manage.tpl:33
#: views/html/characters/manage.tpl:48 views/html/characters/manage.tpl:56 #: views/html/characters/manage.tpl:48 views/html/characters/manage.tpl:56
@ -33,7 +33,7 @@ msgstr "%sachievements"
msgid "Admin" msgid "Admin"
msgstr "Administrator" msgstr "Administrator"
#: controllers/CharactersController.inc:423 controllers/UsersController.inc:345 #: controllers/CharactersController.inc:444 controllers/UsersController.inc:345
#: views/ajax/characters/index.tpl:12 views/ajax/users/index.tpl:12 #: views/ajax/characters/index.tpl:12 views/ajax/users/index.tpl:12
#: views/html/characters/index.tpl:46 views/html/characters/manage.tpl:34 #: views/html/characters/index.tpl:46 views/html/characters/manage.tpl:34
#: views/html/characters/manage.tpl:49 views/html/characters/manage.tpl:57 #: views/html/characters/manage.tpl:49 views/html/characters/manage.tpl:57
@ -43,7 +43,7 @@ msgstr "Administrator"
msgid "Moderator" msgid "Moderator"
msgstr "Moderator" msgstr "Moderator"
#: controllers/CharactersController.inc:429 controllers/UsersController.inc:351 #: controllers/CharactersController.inc:450 controllers/UsersController.inc:351
#: views/ajax/characters/index.tpl:14 views/ajax/users/index.tpl:14 #: views/ajax/characters/index.tpl:14 views/ajax/users/index.tpl:14
#: views/html/characters/index.tpl:47 views/html/characters/manage.tpl:35 #: views/html/characters/index.tpl:47 views/html/characters/manage.tpl:35
#: views/html/characters/manage.tpl:51 views/html/characters/manage.tpl:59 #: views/html/characters/manage.tpl:51 views/html/characters/manage.tpl:59
@ -514,20 +514,20 @@ msgid "Questtype textinput"
msgstr "Texteingabe" msgstr "Texteingabe"
#: views/ajax/quests/index.tpl:29 views/html/charactergroups/group.tpl:29 #: views/ajax/quests/index.tpl:29 views/html/charactergroups/group.tpl:29
#: views/html/charactergroups/group.tpl:42 #: views/html/charactergroups/group.tpl:49
#: views/html/charactergroupsquests/manage.tpl:17 #: views/html/charactergroupsquests/manage.tpl:17
#: views/html/charactergroupsquests/manage.tpl:85 #: views/html/charactergroupsquests/manage.tpl:85
#: views/html/charactergroupsquests/quest.tpl:21 #: views/html/charactergroupsquests/quest.tpl:21
#: views/html/charactergroupsquests/quest.tpl:167 #: views/html/charactergroupsquests/quest.tpl:167
#: views/html/characters/character.tpl:81 #: views/html/characters/character.tpl:90
#: views/html/characters/character.tpl:83 #: views/html/characters/character.tpl:92
#: views/html/characters/character.tpl:95 #: views/html/characters/character.tpl:110
#: views/html/characters/character.tpl:97 #: views/html/characters/character.tpl:112
#: views/html/characters/character.tpl:107 #: views/html/characters/character.tpl:128
#: views/html/characters/character.tpl:109 #: views/html/characters/character.tpl:130
#: views/html/characters/character.tpl:125 views/html/quests/index.tpl:71 #: views/html/characters/character.tpl:146 views/html/quests/index.tpl:71
#: views/html/seminaries/index.tpl:27 views/html/seminarybar/index.tpl:11 #: views/html/seminaries/index.tpl:27 views/html/seminarybar/index.tpl:14
#: views/html/seminarybar/index.tpl:49 views/html/seminarybar/index.tpl:51 #: views/html/seminarybar/index.tpl:57 views/html/seminarybar/index.tpl:59
#, php-format #, php-format
msgid "%d XPs" msgid "%d XPs"
msgstr "%d XP" msgstr "%d XP"
@ -545,7 +545,7 @@ msgstr "Fehler"
#: views/html/achievements/conditions.tpl:4 #: views/html/achievements/conditions.tpl:4
#: views/html/achievements/create.tpl:4 views/html/achievements/delete.tpl:4 #: views/html/achievements/create.tpl:4 views/html/achievements/delete.tpl:4
#: views/html/achievements/edit.tpl:4 views/html/achievements/index.tpl:12 #: views/html/achievements/edit.tpl:4 views/html/achievements/index.tpl:12
#: views/html/achievements/manage.tpl:4 views/html/charactergroups/group.tpl:65 #: views/html/achievements/manage.tpl:4 views/html/charactergroups/group.tpl:72
#: views/html/seminaries/copy.tpl:103 views/html/seminarymenu/index.tpl:6 #: views/html/seminaries/copy.tpl:103 views/html/seminarymenu/index.tpl:6
msgid "Achievements" msgid "Achievements"
msgstr "Achievements" msgstr "Achievements"
@ -628,8 +628,8 @@ msgid "Group by"
msgstr "Gruppiert über" msgstr "Gruppiert über"
#: views/html/achievements/conditions.tpl:65 #: views/html/achievements/conditions.tpl:65
#: views/html/achievements/conditions.tpl:136 views/html/html.tpl:82 #: views/html/achievements/conditions.tpl:136 views/html/html.tpl:85
#: views/html/html.tpl:94 #: views/html/html.tpl:97
msgid "Achievement" msgid "Achievement"
msgstr "Achievement" msgstr "Achievement"
@ -808,8 +808,8 @@ msgstr "Erhalten"
#: views/html/charactergroupsachievements/edit.tpl:65 #: views/html/charactergroupsachievements/edit.tpl:65
#: views/html/charactergroupsquests/create.tpl:70 #: views/html/charactergroupsquests/create.tpl:70
#: views/html/charactergroupsquests/create.tpl:71 #: views/html/charactergroupsquests/create.tpl:71
#: views/html/charactergroupsquests/edit.tpl:71 #: views/html/charactergroupsquests/edit.tpl:73
#: views/html/charactergroupsquests/edit.tpl:72 #: views/html/charactergroupsquests/edit.tpl:74
#: views/html/charactergroupsqueststations/create.tpl:83 #: views/html/charactergroupsqueststations/create.tpl:83
#: views/html/charactergroupsqueststations/create.tpl:84 #: views/html/charactergroupsqueststations/create.tpl:84
#: views/html/charactergroupsqueststations/edit.tpl:83 #: views/html/charactergroupsqueststations/edit.tpl:83
@ -836,8 +836,8 @@ msgstr "Titel"
#: views/html/charactergroupsachievements/edit.tpl:66 #: views/html/charactergroupsachievements/edit.tpl:66
#: views/html/charactergroupsquests/create.tpl:80 #: views/html/charactergroupsquests/create.tpl:80
#: views/html/charactergroupsquests/create.tpl:81 #: views/html/charactergroupsquests/create.tpl:81
#: views/html/charactergroupsquests/edit.tpl:81 #: views/html/charactergroupsquests/edit.tpl:83
#: views/html/charactergroupsquests/edit.tpl:82 #: views/html/charactergroupsquests/edit.tpl:84
#: views/html/charactergroupsquests/quest.tpl:41 #: views/html/charactergroupsquests/quest.tpl:41
#: views/html/seminaries/copy.tpl:69 views/html/seminaries/copy.tpl:70 #: views/html/seminaries/copy.tpl:69 views/html/seminaries/copy.tpl:70
#: views/html/seminaries/create.tpl:70 views/html/seminaries/create.tpl:71 #: views/html/seminaries/create.tpl:70 views/html/seminaries/create.tpl:71
@ -980,7 +980,7 @@ msgstr "Persönlicher Fortschritt: %d%%"
#: views/html/achievements/index.tpl:61 views/html/charactergroups/group.tpl:28 #: views/html/achievements/index.tpl:61 views/html/charactergroups/group.tpl:28
#: views/html/charactergroups/managegroup.tpl:16 #: views/html/charactergroups/managegroup.tpl:16
#: views/html/characters/character.tpl:44 views/html/seminarybar/index.tpl:12 #: views/html/characters/character.tpl:47 views/html/seminarybar/index.tpl:15
msgid "Rank" msgid "Rank"
msgstr "Platz" msgstr "Platz"
@ -989,8 +989,8 @@ msgstr "Platz"
msgid "You achieved %d of %d Achievements so far" msgid "You achieved %d of %d Achievements so far"
msgstr "Du hast bislang %d von insgesamt %d Achievements erreicht" msgstr "Du hast bislang %d von insgesamt %d Achievements erreicht"
#: views/html/achievements/index.tpl:68 views/html/charactergroups/group.tpl:79 #: views/html/achievements/index.tpl:68 views/html/charactergroups/group.tpl:86
#: views/html/seminarybar/index.tpl:33 #: views/html/seminarybar/index.tpl:36
#, php-format #, php-format
msgid "achieved at: %s" msgid "achieved at: %s"
msgstr "erhalten am: %s" msgstr "erhalten am: %s"
@ -1003,7 +1003,7 @@ msgstr "Spiele weiter, um diesen geheimen Erfolg freizuschalten"
#: views/html/charactergroups/editgroup.tpl:79 #: views/html/charactergroups/editgroup.tpl:79
#: views/html/charactergroups/editgroupsgroup.tpl:46 #: views/html/charactergroups/editgroupsgroup.tpl:46
#: views/html/charactergroupsachievements/manage.tpl:21 #: views/html/charactergroupsachievements/manage.tpl:21
#: views/html/charactergroupsquests/edit.tpl:90 #: views/html/charactergroupsquests/edit.tpl:92
#: views/html/charactergroupsqueststations/station.tpl:36 #: views/html/charactergroupsqueststations/station.tpl:36
#: views/html/characters/edit.tpl:131 views/html/charactertitles/index.tpl:17 #: views/html/characters/edit.tpl:131 views/html/charactertitles/index.tpl:17
#: views/html/charactertypes/index.tpl:20 views/html/introduction/index.tpl:22 #: views/html/charactertypes/index.tpl:20 views/html/introduction/index.tpl:22
@ -1039,7 +1039,7 @@ msgstr "bearbeiten"
#: views/html/charactergroupsqueststations/edittask.tpl:4 #: views/html/charactergroupsqueststations/edittask.tpl:4
#: views/html/charactergroupsqueststations/station.tpl:4 #: views/html/charactergroupsqueststations/station.tpl:4
#: views/html/charactergroupsqueststations/station.tpl:136 #: views/html/charactergroupsqueststations/station.tpl:136
#: views/html/characters/character.tpl:117 views/html/seminaries/copy.tpl:105 #: views/html/characters/character.tpl:138 views/html/seminaries/copy.tpl:105
#: views/html/seminarymenu/index.tpl:5 #: views/html/seminarymenu/index.tpl:5
msgid "Character Groups" msgid "Character Groups"
msgstr "Gruppen" msgstr "Gruppen"
@ -1267,17 +1267,17 @@ msgstr "Mitglied"
msgid "Characters" msgid "Characters"
msgstr "Charaktere" msgstr "Charaktere"
#: views/html/charactergroups/group.tpl:49 #: views/html/charactergroups/group.tpl:56
#: views/html/charactergroups/groupsgroup.tpl:32 #: views/html/charactergroups/groupsgroup.tpl:32
#, php-format #, php-format
msgid "%s-Quests" msgid "%s-Quests"
msgstr "%squests" msgstr "%squests"
#: views/html/charactergroups/group.tpl:56 #: views/html/charactergroups/group.tpl:63
#: views/html/charactergroupsquests/create.tpl:72 #: views/html/charactergroupsquests/create.tpl:72
#: views/html/charactergroupsquests/create.tpl:73 #: views/html/charactergroupsquests/create.tpl:73
#: views/html/charactergroupsquests/edit.tpl:73 #: views/html/charactergroupsquests/edit.tpl:75
#: views/html/charactergroupsquests/edit.tpl:74 #: views/html/charactergroupsquests/edit.tpl:76
#: views/html/characters/index.tpl:24 views/html/characters/index.tpl:87 #: views/html/characters/index.tpl:24 views/html/characters/index.tpl:87
#: views/html/characters/manage.tpl:13 views/html/questgroups/questgroup.tpl:62 #: views/html/characters/manage.tpl:13 views/html/questgroups/questgroup.tpl:62
#: views/html/quests/create.tpl:68 views/html/quests/create.tpl:69 #: views/html/quests/create.tpl:68 views/html/quests/create.tpl:69
@ -1286,8 +1286,8 @@ msgstr "%squests"
msgid "XPs" msgid "XPs"
msgstr "XP" msgstr "XP"
#: views/html/charactergroups/group.tpl:68 #: views/html/charactergroups/group.tpl:75
#: views/html/charactergroups/groupsgroup.tpl:53 #: views/html/charactergroups/groupsgroup.tpl:55
#: views/html/charactergroupsachievements/manage.tpl:11 #: views/html/charactergroupsachievements/manage.tpl:11
#, php-format #, php-format
msgid "Manage %s-Achievements" msgid "Manage %s-Achievements"
@ -1303,7 +1303,7 @@ msgstr "Neue %s-Gruppe"
msgid "Create new %s-Quest" msgid "Create new %s-Quest"
msgstr "Neue %s-Quest erstellen" msgstr "Neue %s-Quest erstellen"
#: views/html/charactergroups/groupsgroup.tpl:52 #: views/html/charactergroups/groupsgroup.tpl:54
#: views/html/charactergroupsachievements/manage.tpl:8 #: views/html/charactergroupsachievements/manage.tpl:8
#, php-format #, php-format
msgid "Create new %s-Achievement" msgid "Create new %s-Achievement"
@ -1393,30 +1393,30 @@ msgid "XPs invalid"
msgstr "Die XP-Angabe ist ungültig" msgstr "Die XP-Angabe ist ungültig"
#: views/html/charactergroupsquests/create.tpl:74 #: views/html/charactergroupsquests/create.tpl:74
#: views/html/charactergroupsquests/edit.tpl:75 #: views/html/charactergroupsquests/edit.tpl:77
#: views/html/questgroups/create.tpl:54 views/html/quests/index.tpl:10 #: views/html/questgroups/create.tpl:54 views/html/quests/index.tpl:10
msgid "Questgroup" msgid "Questgroup"
msgstr "Questgruppe" msgstr "Questgruppe"
#: views/html/charactergroupsquests/create.tpl:82 #: views/html/charactergroupsquests/create.tpl:82
#: views/html/charactergroupsquests/create.tpl:83 #: views/html/charactergroupsquests/create.tpl:83
#: views/html/charactergroupsquests/edit.tpl:83 #: views/html/charactergroupsquests/edit.tpl:85
#: views/html/charactergroupsquests/edit.tpl:84 #: views/html/charactergroupsquests/edit.tpl:86
#: views/html/charactergroupsquests/quest.tpl:46 #: views/html/charactergroupsquests/quest.tpl:46
msgid "Rules" msgid "Rules"
msgstr "Regeln" msgstr "Regeln"
#: views/html/charactergroupsquests/create.tpl:84 #: views/html/charactergroupsquests/create.tpl:84
#: views/html/charactergroupsquests/create.tpl:85 #: views/html/charactergroupsquests/create.tpl:85
#: views/html/charactergroupsquests/edit.tpl:85 #: views/html/charactergroupsquests/edit.tpl:87
#: views/html/charactergroupsquests/edit.tpl:86 #: views/html/charactergroupsquests/edit.tpl:88
msgid "Won-text" msgid "Won-text"
msgstr "Gewonnentext" msgstr "Gewonnentext"
#: views/html/charactergroupsquests/create.tpl:86 #: views/html/charactergroupsquests/create.tpl:86
#: views/html/charactergroupsquests/create.tpl:87 #: views/html/charactergroupsquests/create.tpl:87
#: views/html/charactergroupsquests/edit.tpl:87 #: views/html/charactergroupsquests/edit.tpl:89
#: views/html/charactergroupsquests/edit.tpl:88 #: views/html/charactergroupsquests/edit.tpl:90
msgid "Lost-text" msgid "Lost-text"
msgstr "Verlorentext" msgstr "Verlorentext"
@ -1437,6 +1437,10 @@ msgstr "Soll die %s-Quest „%s“ wirklich gelöscht werden?"
msgid "Edit %s-Quest" msgid "Edit %s-Quest"
msgstr "%s-Quest bearbeiten" msgstr "%s-Quest bearbeiten"
#: views/html/charactergroupsquests/edit.tpl:72
msgid "public"
msgstr "öffentlich"
#: views/html/charactergroupsquests/manage.tpl:22 #: views/html/charactergroupsquests/manage.tpl:22
#: views/html/charactergroupsquests/quest.tpl:27 #: views/html/charactergroupsquests/quest.tpl:27
#: views/html/seminaries/copy.tpl:77 #: views/html/seminaries/copy.tpl:77
@ -1611,40 +1615,40 @@ msgstr "gescheitert um %s"
msgid "Back to overview" msgid "Back to overview"
msgstr "Zurück zur Übersicht" msgstr "Zurück zur Übersicht"
#: views/html/characters/character.tpl:17 views/html/characters/edit.tpl:14 #: views/html/characters/character.tpl:20 views/html/characters/edit.tpl:14
msgid "Edit Character" msgid "Edit Character"
msgstr "Charakter bearbeiten" msgstr "Charakter bearbeiten"
#: views/html/characters/character.tpl:20 views/html/characters/delete.tpl:10 #: views/html/characters/character.tpl:23 views/html/characters/delete.tpl:10
msgid "Delete Character" msgid "Delete Character"
msgstr "Charakter löschen" msgstr "Charakter löschen"
#: views/html/characters/character.tpl:30 #: views/html/characters/character.tpl:33
msgid "Total progress" msgid "Total progress"
msgstr "Fortschritt" msgstr "Fortschritt"
#: views/html/characters/character.tpl:35 #: views/html/characters/character.tpl:38
#: views/html/characters/character.tpl:81 #: views/html/characters/character.tpl:90
#: views/html/characters/character.tpl:95 #: views/html/characters/character.tpl:110
#: views/html/characters/character.tpl:107 #: views/html/characters/character.tpl:128
#: views/html/charactertypes/edit.tpl:111 views/html/seminarybar/index.tpl:49 #: views/html/charactertypes/edit.tpl:111 views/html/seminarybar/index.tpl:57
#: views/html/users/user.tpl:42 views/html/xplevels/manage.tpl:37 #: views/html/users/user.tpl:42 views/html/xplevels/manage.tpl:37
msgid "Level" msgid "Level"
msgstr "Level" msgstr "Level"
#: views/html/characters/character.tpl:46 #: views/html/characters/character.tpl:49
msgid "Milestones" msgid "Milestones"
msgstr "Meilensteine" msgstr "Meilensteine"
#: views/html/characters/character.tpl:73 #: views/html/characters/character.tpl:76
msgid "Ranking" msgid "Ranking"
msgstr "Ranking" msgstr "Ranking"
#: views/html/characters/character.tpl:134 views/html/seminarybar/index.tpl:19 #: views/html/characters/character.tpl:155 views/html/seminarybar/index.tpl:22
msgid "Last Quest" msgid "Last Quest"
msgstr "Letzter Speicherpunkt" msgstr "Letzter Speicherpunkt"
#: views/html/characters/character.tpl:140 #: views/html/characters/character.tpl:161
msgid "Topic progress" msgid "Topic progress"
msgstr "Thematischer Fortschritt" msgstr "Thematischer Fortschritt"
@ -1711,7 +1715,7 @@ msgstr "männlich"
msgid "Display settings" msgid "Display settings"
msgstr "Anzeigeeinstellungen" msgstr "Anzeigeeinstellungen"
#: views/html/characters/edit.tpl:90 #: views/html/characters/edit.tpl:90 views/html/html.tpl:106
msgid "Charactertitle" msgid "Charactertitle"
msgstr "Charaktertitel" msgstr "Charaktertitel"
@ -1990,11 +1994,11 @@ msgstr "oder"
msgid "register yourself" msgid "register yourself"
msgstr "registriere dich" msgstr "registriere dich"
#: views/html/html.tpl:104 #: views/html/html.tpl:112
msgid "Level-up" msgid "Level-up"
msgstr "Levelaufstieg" msgstr "Levelaufstieg"
#: views/html/html.tpl:106 views/html/html.tpl:108 #: views/html/html.tpl:114 views/html/html.tpl:116
#, php-format #, php-format
msgid "You have reached level %d" msgid "You have reached level %d"
msgstr "Du hast Level %d erreicht" msgstr "Du hast Level %d erreicht"
@ -2516,11 +2520,11 @@ msgstr "Quests anzeigen"
msgid "Recalculate XPs" msgid "Recalculate XPs"
msgstr "XP neuberechnen" msgstr "XP neuberechnen"
#: views/html/seminarybar/index.tpl:26 #: views/html/seminarybar/index.tpl:29
msgid "Last Achievement" msgid "Last Achievement"
msgstr "Letztes Achievement" msgstr "Letztes Achievement"
#: views/html/seminarybar/index.tpl:57 #: views/html/seminarybar/index.tpl:65
#, php-format #, php-format
msgid "Show %s-Profile" msgid "Show %s-Profile"
msgstr "%s-Profil anzeigen" msgstr "%s-Profil anzeigen"

38
models/CharactergroupsquestsModel.inc
View file

@ -50,7 +50,7 @@
public function getQuestsForCharactergroupsgroup($groupsgroupId) public function getQuestsForCharactergroupsgroup($groupsgroupId)
{ {
return $this->db->query( return $this->db->query(
'SELECT id, questgroups_id, title, url, xps, questsmedia_id '. 'SELECT id, questgroups_id, title, url, xps, questsmedia_id, public '.
'FROM charactergroupsquests '. 'FROM charactergroupsquests '.
'WHERE charactergroupsgroup_id = ? '. 'WHERE charactergroupsgroup_id = ? '.
'ORDER BY created ASC', 'ORDER BY created ASC',
@ -71,7 +71,7 @@
public function getQuestByUrl($groupsgroupId, $questUrl) public function getQuestByUrl($groupsgroupId, $questUrl)
{ {
$data = $this->db->query( $data = $this->db->query(
'SELECT id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, questsmedia_id '. 'SELECT id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, questsmedia_id, public '.
'FROM charactergroupsquests '. 'FROM charactergroupsquests '.
'WHERE charactergroupsgroup_id = ? AND url = ?', 'WHERE charactergroupsgroup_id = ? AND url = ?',
'is', 'is',
@ -97,7 +97,7 @@
public function getQuestById($questId) public function getQuestById($questId)
{ {
$data = $this->db->query( $data = $this->db->query(
'SELECT id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, questsmedia_id '. 'SELECT id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, questsmedia_id, public '.
'FROM charactergroupsquests '. 'FROM charactergroupsquests '.
'WHERE id = ?', 'WHERE id = ?',
'i', 'i',
@ -322,9 +322,9 @@
{ {
$this->db->query( $this->db->query(
'INSERT INTO charactergroupsquests '. 'INSERT INTO charactergroupsquests '.
'(created_user_id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text) '. '(created_user_id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, public) '.
'VALUES '. 'VALUES '.
'(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', '(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0)',
'iiisssdsss', 'iiisssdsss',
$userId, $userId,
$groupsgroupId, $groupsgroupId,
@ -346,23 +346,24 @@
/** /**
* Edit a Character groups Quest. * Edit a Character groups Quest.
* *
* @param int $questId ID of Character groups Quest to edit * @param int $questId ID of Character groups Quest to edit
* @param int $groupsgroupId ID of Character groups-group * @param int $groupsgroupId ID of Character groups-group
* @param int $questgroupId ID of Quest group * @param int $questgroupId ID of Quest group
* @param string $title Title of new Quest * @param string $title Title of new Quest
* @param string $description Description of new Quset * @param string $description Description of new Quset
* @param int $xps Amount of XPs for new Quest * @param int $xps Amount of XPs for new Quest
* @param string $rules Rules of new Quest * @param string $rules Rules of new Quest
* @param string $wonText Won-text of new Quset * @param string $wonText Won-text of new Quset
* @param string $lostText Lost-text of new Quest * @param string $lostText Lost-text of new Quest
* @param boolean $public Whether Quest is public visible or not
*/ */
public function editQuest($questId, $groupsgroupId, $questgroupId, $title, $description, $xps, $rules, $wonText, $lostText) public function editQuest($questId, $groupsgroupId, $questgroupId, $title, $description, $xps, $rules, $wonText, $lostText, $public)
{ {
$this->db->query( $this->db->query(
'UPDATE charactergroupsquests '. 'UPDATE charactergroupsquests '.
'SET charactergroupsgroup_id = ?, questgroups_id = ?, title = ?, url = ?, description = ?, xps = ?, rules = ?, won_text = ?, lost_text= ? '. 'SET charactergroupsgroup_id = ?, questgroups_id = ?, title = ?, url = ?, description = ?, xps = ?, rules = ?, won_text = ?, lost_text= ?, public = ? '.
'WHERE id = ?', 'WHERE id = ?',
'iisssdsssi', 'iisssdsssii',
$groupsgroupId, $groupsgroupId,
$questgroupId, $questgroupId,
$title, $title,
@ -372,6 +373,7 @@
$rules, $rules,
$wonText, $wonText,
$lostText, $lostText,
$public,
$questId $questId
); );
} }
@ -400,8 +402,8 @@
// Copy Quest // Copy Quest
$this->db->query( $this->db->query(
'INSERT INTO charactergroupsquests '. 'INSERT INTO charactergroupsquests '.
'(created_user_id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text) '. '(created_user_id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, public) '.
'SELECT ?, ?, ?, title, url, description, xps, rules, won_text, lost_text '. 'SELECT ?, ?, ?, title, url, description, xps, rules, won_text, lost_text, public '.
'FROM charactergroupsquests '. 'FROM charactergroupsquests '.
'WHERE id = ?', 'WHERE id = ?',
'iiii', 'iiii',

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

@ -38,10 +38,12 @@
<ul class="cgqlist cf"> <ul class="cgqlist cf">
<?php foreach($quests as &$quest) : ?> <?php foreach($quests as &$quest) : ?>
<?php if($quest['public'] || count(array_intersect(array('admin', 'moderator'), \hhu\z\controllers\SeminaryController::$character['characterroles'])) > 0) : ?>
<li class="cf"> <li class="cf">
<img src="<?=$linker->link(array('media','charactergroupsquest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>" /> <img src="<?=$linker->link(array('media','charactergroupsquest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>" />
<p><a href="<?=$linker->link(array('charactergroupsquests','quest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>"><?=$quest['title']?></a></p> <p><a href="<?=$linker->link(array('charactergroupsquests','quest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>"><?=$quest['title']?></a></p>
</li> </li>
<?php endif ?>
<?php endforeach ?> <?php endforeach ?>
</ul> </ul>

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

@ -68,6 +68,8 @@
</ul> </ul>
</fieldset> </fieldset>
<fieldset> <fieldset>
<input type="checkbox" id="public" name="public" <?php if($public) : ?>checked="checked"<?php endif ?> />
<label for="public"><?=_('public')?></label>
<label for="title"><?=_('Title')?>:</label> <label for="title"><?=_('Title')?>:</label>
<input type="text" id="title" name="title" placeholder="<?=_('Title')?>" title="<?=_('Title')?>" maxlength="<?=$validationSettings['title']['maxlength']?>" value="<?=$title?>" <?=(array_key_exists('title', $validation)) ? 'class="invalid"' : null?> /> <input type="text" id="title" name="title" placeholder="<?=_('Title')?>" title="<?=_('Title')?>" maxlength="<?=$validationSettings['title']['maxlength']?>" value="<?=$title?>" <?=(array_key_exists('title', $validation)) ? 'class="invalid"' : null?> />
<label for="xps"><?=_('XPs')?>:</label> <label for="xps"><?=_('XPs')?>:</label>