diff --git a/controllers/CharactergroupsquestsController.inc b/controllers/CharactergroupsquestsController.inc index 42e47e2d..f4ba8916 100644 --- a/controllers/CharactergroupsquestsController.inc +++ b/controllers/CharactergroupsquestsController.inc @@ -181,6 +181,16 @@ $this->Charactergroupsquests->uploadMediaForQuest($this->Auth->getUserId(), $seminary['id'], $quest['id'], $file, $filename); } } + + // Delete media + if(!is_null($this->request->getPostParam('deletemedia'))) + { + $uploadIds = $this->request->getPostParam('uploads'); + var_dump($uploadIds); + foreach($uploadIds as $uploadId) { + $this->Uploads->deleteSeminaryupload($uploadId); + } + } // Set XPs of Character groups for this Character groups Quest if(!is_null($this->request->getPostParam('setxps'))) diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo index 629a5b8e..2e434038 100644 Binary files a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo and b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo differ diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po index 87815d0f..06b05622 100644 --- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po +++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: The Legend of Z\n" -"POT-Creation-Date: 2015-04-08 12:28+0100\n" -"PO-Revision-Date: 2015-04-08 12:29+0100\n" +"POT-Creation-Date: 2015-04-08 15:55+0100\n" +"PO-Revision-Date: 2015-04-08 15:56+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -105,7 +105,6 @@ msgstr "" #: questtypes/textinput/html/edittask.tpl:44 #: views/html/achievements/conditions.tpl:151 #: views/html/achievements/create.tpl:109 views/html/achievements/edit.tpl:112 -#: views/html/charactergroupsquests/manage.tpl:66 #: views/html/charactertypes/edit.tpl:124 views/html/library/edit.tpl:46 #: views/html/library/edit.tpl:86 views/html/quests/edit.tpl:114 #: views/html/users/edit.tpl:105 views/html/xplevels/manage.tpl:49 @@ -258,7 +257,7 @@ msgstr "Fehler beim Dateiupload: %s" #: views/html/charactergroups/editgroup.tpl:65 #: views/html/charactergroupsquests/create.tpl:66 #: views/html/charactergroupsquests/edit.tpl:67 -#: views/html/charactergroupsquests/manage.tpl:63 +#: views/html/charactergroupsquests/manage.tpl:72 #: views/html/charactertypes/edit.tpl:117 views/html/questgroups/create.tpl:65 #: views/html/questgroups/edit.tpl:53 views/html/quests/create.tpl:62 #: views/html/quests/edit.tpl:65 views/html/seminaries/create.tpl:60 @@ -272,7 +271,7 @@ msgstr "Erlaubte Dateiformate" #: views/html/charactergroups/editgroup.tpl:68 #: views/html/charactergroupsquests/create.tpl:69 #: views/html/charactergroupsquests/edit.tpl:70 -#: views/html/charactergroupsquests/manage.tpl:63 +#: views/html/charactergroupsquests/manage.tpl:72 #: views/html/charactertypes/edit.tpl:120 views/html/questgroups/create.tpl:68 #: views/html/questgroups/edit.tpl:56 views/html/quests/create.tpl:65 #: views/html/quests/edit.tpl:68 views/html/seminaries/create.tpl:63 @@ -287,7 +286,7 @@ msgstr "%s-Dateien" #: views/html/charactergroups/editgroup.tpl:68 #: views/html/charactergroupsquests/create.tpl:69 #: views/html/charactergroupsquests/edit.tpl:70 -#: views/html/charactergroupsquests/manage.tpl:63 +#: views/html/charactergroupsquests/manage.tpl:72 #: views/html/charactertypes/edit.tpl:120 views/html/questgroups/create.tpl:68 #: views/html/questgroups/edit.tpl:56 views/html/quests/create.tpl:65 #: views/html/quests/edit.tpl:68 views/html/seminaries/create.tpl:63 @@ -391,7 +390,7 @@ msgstr "Texteingabe" #: views/ajax/quests/index.tpl:29 views/html/charactergroups/group.tpl:33 #: views/html/charactergroups/group.tpl:46 #: views/html/charactergroupsquests/manage.tpl:21 -#: views/html/charactergroupsquests/manage.tpl:81 +#: views/html/charactergroupsquests/manage.tpl:88 #: views/html/charactergroupsquests/quest.tpl:25 #: views/html/charactergroupsquests/quest.tpl:73 #: views/html/characters/character.tpl:83 @@ -512,7 +511,7 @@ msgid "Group by" msgstr "Gruppiert über" #: views/html/achievements/conditions.tpl:69 -#: views/html/achievements/conditions.tpl:136 views/html/html.tpl:80 +#: views/html/achievements/conditions.tpl:136 views/html/html.tpl:83 msgid "Achievement" msgstr "Achievement" @@ -1188,18 +1187,26 @@ msgstr "Medien" msgid "File invalid" msgstr "Die Datei ist ungültig" -#: views/html/charactergroupsquests/manage.tpl:79 +#: views/html/charactergroupsquests/manage.tpl:68 +msgid "delete selected" +msgstr "markierte löschen" + +#: views/html/charactergroupsquests/manage.tpl:73 +msgid "upload" +msgstr "hochladen" + +#: views/html/charactergroupsquests/manage.tpl:86 msgid "Not attended" msgstr "Nicht teilgenommen" -#: views/html/charactergroupsquests/manage.tpl:88 +#: views/html/charactergroupsquests/manage.tpl:95 msgid "Set XPs" msgstr "Setze XP" #: views/html/charactergroupsquests/quest.tpl:16 #, php-format msgid "Manage %s-Quest" -msgstr "%s-Quest Verwalten" +msgstr "%s-Quest verwalten" #: views/html/charactergroupsquests/quest.tpl:55 msgid "Won Quest" @@ -1471,11 +1478,11 @@ msgstr "oder" msgid "register yourself" msgstr "registriere dich" -#: views/html/html.tpl:90 +#: views/html/html.tpl:93 msgid "Level-up" msgstr "Levelaufstieg" -#: views/html/html.tpl:92 views/html/html.tpl:94 +#: views/html/html.tpl:95 views/html/html.tpl:97 #, php-format msgid "You have reached level %d" msgstr "Du hast Level %d erreicht" diff --git a/models/UploadsModel.inc b/models/UploadsModel.inc index d4510ec6..26f188a0 100644 --- a/models/UploadsModel.inc +++ b/models/UploadsModel.inc @@ -135,6 +135,40 @@ return $data[0]; } + + + /** + * Delete a Seminary upload. + * + * @param int $uploadId ID of Seminary upload to delete + */ + public function deleteSeminaryupload($uploadId) + { + $this->db->setAutocommit(false); + + try { + // Get Upload + $upload = $this->getSeminaryuploadById($uploadId); + + // Delete database record + $this->db->query( + 'DELETE FROM seminaryuploads '. + 'WHERE id = ?', + 'i', + $uploadId + ); + + // Delete file + $filename = ROOT.DS.\nre\configs\AppConfig::$dirs['seminaryuploads'].DS.$upload['url']; + unlink($filename); + } + catch(\nre\exceptions\DatamodelException $e) { + $this->db->rollback(); + $this->db->setAutocommit(true); + } + + $this->db->setAutocommit(true); + } } diff --git a/views/html/charactergroupsquests/manage.tpl b/views/html/charactergroupsquests/manage.tpl index ada60330..126f8878 100644 --- a/views/html/charactergroupsquests/manage.tpl +++ b/views/html/charactergroupsquests/manage.tpl @@ -51,19 +51,26 @@ - -

: 0) : ?>(  MiB)

-
+ + + +
+

- +

: 0) : ?>(  MiB)

+
diff --git a/www/css/desktop.css b/www/css/desktop.css index f60c060c..9125f7c9 100644 --- a/www/css/desktop.css +++ b/www/css/desktop.css @@ -461,3 +461,8 @@ aside .cranks li:nth-child(odd){background:#f7f5f2} div.cond{display:none;margin-left:15px} input[type="checkbox"]:checked + label + div.cond{display:block} +form.mng{margin:30px 0} +form.mng p{margin:0} +form.mng ul{margin:0} +form.mng input[type="submit"]{margin:0} +.mnglst li{text-align:center}