From 74b093a61fc6e0d517eafec99e80f6a639ca8ce6 Mon Sep 17 00:00:00 2001 From: oliver Date: Sat, 26 Mar 2016 19:15:02 +0100 Subject: [PATCH] add ?public? option for Character groups Quests (implements #146) --- .../CharactergroupsquestsController.inc | 6 +- db/create.sql | 3 +- locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 31038 -> 31073 bytes locale/de_DE/LC_MESSAGES/The Legend of Z.po | 122 +++++++++--------- models/CharactergroupsquestsModel.inc | 38 +++--- views/html/charactergroups/groupsgroup.tpl | 2 + views/html/charactergroupsquests/edit.tpl | 2 + 7 files changed, 94 insertions(+), 79 deletions(-) diff --git a/controllers/CharactergroupsquestsController.inc b/controllers/CharactergroupsquestsController.inc index 5bd3c2ef..332a0dc6 100644 --- a/controllers/CharactergroupsquestsController.inc +++ b/controllers/CharactergroupsquestsController.inc @@ -535,6 +535,7 @@ $rules = $quest['rules']; $wonText = $quest['won_text']; $lostText = $quest['lost_text']; + $public = $quest['public']; $fields = array('title', 'xps'); $validation = array(); @@ -552,6 +553,7 @@ $rules = $this->request->getPostParam('rules'); $wonText = $this->request->getPostParam('wonText'); $lostText = $this->request->getPostParam('lostText'); + $public = !is_null($this->request->getPostParam('public')); // Validate icon $icon = null; @@ -606,7 +608,8 @@ $xps, $rules, $wonText, - $lostText + $lostText, + $public ); $quest = $this->Charactergroupsquests->getQuestById($quest['id']); @@ -654,6 +657,7 @@ $this->set('rules', $rules); $this->set('wonText', $wonText); $this->set('lostText', $lostText); + $this->set('public', $public); $this->set('mimetypes', $mimetypes); $this->set('validation', $validation); $this->set('validationSettings', $validationSettings); diff --git a/db/create.sql b/db/create.sql index caf94791..d695be29 100644 --- a/db/create.sql +++ b/db/create.sql @@ -508,6 +508,7 @@ CREATE TABLE `charactergroupsquests` ( `won_text` text COLLATE utf8mb4_unicode_ci NOT NULL, `lost_text` text COLLATE utf8mb4_unicode_ci NOT NULL, `questsmedia_id` int(11) DEFAULT NULL, + `public` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (`id`), UNIQUE KEY `charactergroupsgroup_id_2` (`charactergroupsgroup_id`,`url`), KEY `created_user_id` (`created_user_id`), @@ -2662,4 +2663,4 @@ DELIMITER ; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!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 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 5d8359a7956bff0a44eed00a225ae6b5dc004c4c..10d06a7ed7fad85a604f9ea5d8c03068d90f24ac 100644 GIT binary patch delta 7736 zcmdn@iSgkl#`=3gEK?a67#OZFGBC(6Ffi=lV_+y}Vql1o1&J~+Sg12F@G>wkSgJEH za4;}1xT`ZT@G~$l1gJAG2rw`(B&ahma56A36hh^z)fpJ%7#J8@p!~(^3=G^13=C`3 z85oop7#Mb_GcYJHFfiO!2isTA@JF42L7IVqK~jT(L7ahs!Bm5RL7Rbr!B>NUfro*C zp;Ci^fscWKp-lr~(NrisUxR@`h=GA&r3Tm_hCNXAH#Hy*eWt;{z{A0|SG&CIf>8Lp=k7jwS+~58MPq>aceU$fMQ2Rn}I=| zfq}tF8)9LUHUony0|P^mHUoni0|UbhZAet@*M>OsJXGI3Z3YG{1_p*d+6)Z!Vhjun z>N*esI~_>SXX-$LXsQmxqE$K!42cX33@3CTKG4#I7-*^svA_k&57C9_OV$MiEdxV^ zE+k|Z>Ow;Hv@RqhZ|Xuq=7BClJvi~a(1jTM2`ced7ZUfZdJGIk3=9lHdXOM<)q@!1 zr3VS}2t5V{MFs|jT0Ka}%-4g&`360RMcecs4&AEoYKbLh!IY#38q! z@_(STm;nQW1Oo$ufdRxGPbfdi0OFA1dIN|-olttN0mQ1?7twL4s7n2;wkvBZvjgP<}9!jyHlhDBB1UwKY(>-3XFcCmDe~UeB<~ z2ok6Jpc>8?K`gurwdg05&tVMlfr>H2=jO%`gB^?^4)8XHSQriE=NLmmpvD*yB9n~4 z7BZ}X${#QWd9E@lRCh=Ccz9A7hthoj6G80tYK zRE`7x2}vXEmJo+5w}ezy+o1+tvV&tB8XK%2K3)Ws-)RN0=oplKXaz|#f1n16T0{7n){tD}WDO}F0<9qq zinWGBX|^@Qz7hz(o}tki5@cOai3QdW2dssPpSOkt)l-NDhS%1RApK$usRLMTAhn*B z4a5NfHW2eNZ6G09ZvzRrb{j~@EwO=w+z}g4K~&GcaK#2<;Ts!>kNIpN8dPl|E_Sko z802lsz@W^)zz}Q;F`yjEZ?}awWHnUX1zSjz-hk@A4;6o53-QPYTZjj~*)lM2f$~4Q z9VDoP>>&AC&JJR+u^l9F+1NqSf}b74;0P!`-VWlBOgl)NR@y;)-V5a~hSJ;ZAR%+w z4r1{WsQ6bq28Mc2ON7%N;zK@rh=F4EkT_Gbhd9K<9ujA^_7DeoLDj|BLmZw1w$!k(lemz@W##z;NCP(h~aT1W~Bv%)ns4 zz`zjY3<;rbXNb>dJ3~TfIh4P_84^`{oFO52%o!3ASD@lIq4Z;CNN##t?+ghN4i`v} zNV`BJ^j#ov=H&v3^JEuD6lJ+U;;_gC;(%tTc)trIaZY!EIB++Vf7%6-IN!TK93tWh z$@h}35PrRtE2QMJcZHOEX|9ks>vM(V<0-C?hQeZ3NbWf33TZ3eaD{{rvm3-g`fiZy z<=_T!c!C=w$Sd6#7<3sJ7?!y~689B1NN#)S1`eTm25xtVfTTO5jb`l*u{aJ&=emRP zDFZ`|J0x*Uf%50OLwvB^9TMkz+#ylH>;X~F;{oxxiU-7jo=|?22c*2H_W*gco`GR0 zn8CoX+5-}I8$BQf?e>6Jcmyhb-UCv0-}Hdg?{_^QQSb*!b9h3kVG&P=#de+$ha`JK z>X2$rNMfDp$-oc@YE64GFbIJ1zmyjw&a}NC7Fa|1_Fj;<_xFPMGz`j*_JX9DBriys zDTRu6LiJ7Xf;emeRNoq?_(m^?2M>Bd($Z-!28Mc27wfVY#HSCS8eT)`4^a9mRO2r% zNXW2wLxPmon}LCefq_BJ8)C4cH#kliw7nq~Sb9S|;OGr0H$0&FqP!s<%Jycc2RDxk zyg_lnz|iRpiTi%2#(Cb5f@dkzf=%9#pxgshf6W`>pgU0YPoexb-V6+n7#SG8LiOM9 zg_!@;7h?WvUr5OP@~wv$z~=`E0dYS_+$s4%#NGWMK^fo&iJ}-kh);9;AO@B}=^8%< zhBFKd3{8HJ?Cb9jad?(LB-fPtLqed>9};p4{2_JB#(IBA1w!KRaUjG8uLB_=#1sUHJKi9Og+f6P2P#4N#zBw}at?wN$-Yp2 zcM!z9sX>sSp9>MMXV@47@#*d$NE`2D5F}`x20;o8reKJ?crc`dQw@d`D4xL(hnELK zistT%V9vn6uqhOhR$hfdJn|tFQZoJv zWnj<+<$vukhy{^h5DPNH7{CJrg<%kb%EBN;bZ;0W4!49s(!!ZANKih4>i-56XA6gj z%Y;MX*dQF@W6y9%Q63QvF{dn?fuSBW^wJj&alk65f?eT|67B|+|2-TM6`~Q4Ak~V1 zIKVXmVnK8SM7|^f;^0oG_yVZ-&Im{doQr@s>r=l3Z0}>CR>X@S;AtezFDY*2a zArA0>(vkJi5Fcbg6*fgf44M%Q$qnnF;-{hF51|@=L_=HAgO+L9K>Y@;vgY$ zJPu;fy*NlnvBg7tE*B3`XBZDDFD&9A*)lX9k`3dbbXGhhBue8U4r+~u*wYseikf-` zhRN}edU<6$#KJpJjh~?w{ELSq7S;raPel?SL9LnqGJt`>G6CWs{{%=XPfCCUaYh2f zA!P{+3>=IM42>X~fq|hb5u$E#A_IdwDF4q)g!p7W?Hr9C|JZl2{)lK^*!!3F1+{WCn(M&`_vqGDLw@ zG9;A-Cqo>Pn+(xV3#BI{LtMT%8RFoT$&eu3kPPwZ&SZ$gk0e7Ja4{JY61S5f<;lxr zNFBqG0x7y(QyA*OW51~>5Q7_2AaUHD0*UkaDG-+)Pl3eQy%b1@JWhdB)Bm9I%BheL zv4YZxsgNk^NQF3HdMd<2OH(0bh%5s4;h)-nFAO>lsL40Td zrJbSTerXT~#il_*sv->%CEaNdAFfM-gw(k-NJw3Us=t>8$xT1&p$wIDh(`Z(h(Sf^ z5FfXuLlRk6I>d(y(jg8$o(?I?@1;X5`U9n9G9Z)pCKpD@V8U!*SE|$!M7@&{|F+ejD5=DlYkdo0n6B1HBnUIi*$b^JYDpXxTCM3wq zpystf>0YS0Q!>F(Q_nCLs&REDB&fG#LbBP>Oh_WS1~upbL<7SIsKx)F7I9@k94L?l zu}~rlk~TE5AP)1*0$aool?BNS8BldKSs?rB85nx9AU>L%1&M+USrDII&Vq!*O(^{U zs_uCfBoY0A@+Gn%QKXv<(dV2E2?@_^NC<{xL)rnc*$fO;pt0j@NGJ9}HUonNDF3tN zKor>LFfe#CFff$oFfiCLFfbg>fpkupav}NKE*Fx03UeX7;dQwXeJ`N$3VD#WU2q;m zeMcU+h-KKF2eJ5V9wcpPNrI-h}|9yGV(oev4}NGP3^4+)X#d`QqvfNGeL5AoTG zd`Jjv&W8l;`Fv1NGBDhQs(S+!|C0|1L9PObKEVQrI++4U)M^(n)PpCLObZ|*nRW$` z?37*r$sSEmdTjy3AvX#jZM_EtklZ0q2x$|F7D6g1%R)#LL={3TN+^V+g?y;|ltM_; zZYz|2RtO#c7cYWjFO4Ed8t^ZI1Yr@BURnh4@r@!#E%v1dQh-PmL$Z|-l#VKfl%!3? zklZo57@}@@F~mXpiy_(XTrnhVyr?f`U@Kj|398y&dNmRY%kVG@P98%&fgUauPs=rVUsSR&J)xCy_e=CPL zI5pl7BVPRK+>2+1xQ^z14D2H#HA4x5Cj>nDN5oURiU-^OKLtmNQ=2Y%3Sc$arS*MEPQ-i;SDu z6qpzpPfX@ioXmJ?@?1rG#?zbcDi$*`o}3)0oX>b^@TAKsRhmYP?RlbM_` IIiunl06-y_NdN!< delta 7701 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 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 c89e167a..ba36f3a7 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: 2016-03-26 17:43+0100\n" -"PO-Revision-Date: 2016-03-26 17:45+0100\n" +"POT-Creation-Date: 2016-03-26 19:10+0100\n" +"PO-Revision-Date: 2016-03-26 19:10+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -18,12 +18,12 @@ msgstr "" "X-Poedit-SearchPath-2: controllers\n" #: controllers/CharactergroupsachievementsController.inc:175 -#: views/html/charactergroups/groupsgroup.tpl:50 +#: views/html/charactergroups/groupsgroup.tpl:52 #, php-format msgid "%s-Achievements" 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/html/characters/index.tpl:45 views/html/characters/manage.tpl:33 #: views/html/characters/manage.tpl:48 views/html/characters/manage.tpl:56 @@ -33,7 +33,7 @@ msgstr "%sachievements" msgid "Admin" 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/html/characters/index.tpl:46 views/html/characters/manage.tpl:34 #: views/html/characters/manage.tpl:49 views/html/characters/manage.tpl:57 @@ -43,7 +43,7 @@ msgstr "Administrator" msgid "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/html/characters/index.tpl:47 views/html/characters/manage.tpl:35 #: views/html/characters/manage.tpl:51 views/html/characters/manage.tpl:59 @@ -514,20 +514,20 @@ msgid "Questtype textinput" msgstr "Texteingabe" #: 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:85 #: views/html/charactergroupsquests/quest.tpl:21 #: views/html/charactergroupsquests/quest.tpl:167 -#: views/html/characters/character.tpl:81 -#: views/html/characters/character.tpl:83 -#: views/html/characters/character.tpl:95 -#: views/html/characters/character.tpl:97 -#: views/html/characters/character.tpl:107 -#: views/html/characters/character.tpl:109 -#: views/html/characters/character.tpl:125 views/html/quests/index.tpl:71 -#: views/html/seminaries/index.tpl:27 views/html/seminarybar/index.tpl:11 -#: views/html/seminarybar/index.tpl:49 views/html/seminarybar/index.tpl:51 +#: views/html/characters/character.tpl:90 +#: views/html/characters/character.tpl:92 +#: views/html/characters/character.tpl:110 +#: views/html/characters/character.tpl:112 +#: views/html/characters/character.tpl:128 +#: views/html/characters/character.tpl:130 +#: views/html/characters/character.tpl:146 views/html/quests/index.tpl:71 +#: views/html/seminaries/index.tpl:27 views/html/seminarybar/index.tpl:14 +#: views/html/seminarybar/index.tpl:57 views/html/seminarybar/index.tpl:59 #, php-format msgid "%d XPs" msgstr "%d XP" @@ -545,7 +545,7 @@ msgstr "Fehler" #: views/html/achievements/conditions.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/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 msgid "Achievements" msgstr "Achievements" @@ -628,8 +628,8 @@ msgid "Group by" msgstr "Gruppiert über" #: views/html/achievements/conditions.tpl:65 -#: views/html/achievements/conditions.tpl:136 views/html/html.tpl:82 -#: views/html/html.tpl:94 +#: views/html/achievements/conditions.tpl:136 views/html/html.tpl:85 +#: views/html/html.tpl:97 msgid "Achievement" msgstr "Achievement" @@ -808,8 +808,8 @@ msgstr "Erhalten" #: views/html/charactergroupsachievements/edit.tpl:65 #: views/html/charactergroupsquests/create.tpl:70 #: views/html/charactergroupsquests/create.tpl:71 -#: views/html/charactergroupsquests/edit.tpl:71 -#: views/html/charactergroupsquests/edit.tpl:72 +#: views/html/charactergroupsquests/edit.tpl:73 +#: views/html/charactergroupsquests/edit.tpl:74 #: views/html/charactergroupsqueststations/create.tpl:83 #: views/html/charactergroupsqueststations/create.tpl:84 #: views/html/charactergroupsqueststations/edit.tpl:83 @@ -836,8 +836,8 @@ msgstr "Titel" #: views/html/charactergroupsachievements/edit.tpl:66 #: views/html/charactergroupsquests/create.tpl:80 #: views/html/charactergroupsquests/create.tpl:81 -#: views/html/charactergroupsquests/edit.tpl:81 -#: views/html/charactergroupsquests/edit.tpl:82 +#: views/html/charactergroupsquests/edit.tpl:83 +#: views/html/charactergroupsquests/edit.tpl:84 #: views/html/charactergroupsquests/quest.tpl:41 #: views/html/seminaries/copy.tpl:69 views/html/seminaries/copy.tpl:70 #: 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/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" msgstr "Platz" @@ -989,8 +989,8 @@ msgstr "Platz" msgid "You achieved %d of %d Achievements so far" msgstr "Du hast bislang %d von insgesamt %d Achievements erreicht" -#: views/html/achievements/index.tpl:68 views/html/charactergroups/group.tpl:79 -#: views/html/seminarybar/index.tpl:33 +#: views/html/achievements/index.tpl:68 views/html/charactergroups/group.tpl:86 +#: views/html/seminarybar/index.tpl:36 #, php-format msgid "achieved at: %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/editgroupsgroup.tpl:46 #: 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/characters/edit.tpl:131 views/html/charactertitles/index.tpl:17 #: 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/station.tpl:4 #: 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 msgid "Character Groups" msgstr "Gruppen" @@ -1267,17 +1267,17 @@ msgstr "Mitglied" msgid "Characters" msgstr "Charaktere" -#: views/html/charactergroups/group.tpl:49 +#: views/html/charactergroups/group.tpl:56 #: views/html/charactergroups/groupsgroup.tpl:32 #, php-format msgid "%s-Quests" 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:73 -#: views/html/charactergroupsquests/edit.tpl:73 -#: views/html/charactergroupsquests/edit.tpl:74 +#: views/html/charactergroupsquests/edit.tpl:75 +#: views/html/charactergroupsquests/edit.tpl:76 #: 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/quests/create.tpl:68 views/html/quests/create.tpl:69 @@ -1286,8 +1286,8 @@ msgstr "%squests" msgid "XPs" msgstr "XP" -#: views/html/charactergroups/group.tpl:68 -#: views/html/charactergroups/groupsgroup.tpl:53 +#: views/html/charactergroups/group.tpl:75 +#: views/html/charactergroups/groupsgroup.tpl:55 #: views/html/charactergroupsachievements/manage.tpl:11 #, php-format msgid "Manage %s-Achievements" @@ -1303,7 +1303,7 @@ msgstr "Neue %s-Gruppe" msgid "Create new %s-Quest" msgstr "Neue %s-Quest erstellen" -#: views/html/charactergroups/groupsgroup.tpl:52 +#: views/html/charactergroups/groupsgroup.tpl:54 #: views/html/charactergroupsachievements/manage.tpl:8 #, php-format msgid "Create new %s-Achievement" @@ -1393,30 +1393,30 @@ msgid "XPs invalid" msgstr "Die XP-Angabe ist ungültig" #: 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 msgid "Questgroup" msgstr "Questgruppe" #: views/html/charactergroupsquests/create.tpl:82 #: views/html/charactergroupsquests/create.tpl:83 -#: views/html/charactergroupsquests/edit.tpl:83 -#: views/html/charactergroupsquests/edit.tpl:84 +#: views/html/charactergroupsquests/edit.tpl:85 +#: views/html/charactergroupsquests/edit.tpl:86 #: views/html/charactergroupsquests/quest.tpl:46 msgid "Rules" msgstr "Regeln" #: views/html/charactergroupsquests/create.tpl:84 #: views/html/charactergroupsquests/create.tpl:85 -#: views/html/charactergroupsquests/edit.tpl:85 -#: views/html/charactergroupsquests/edit.tpl:86 +#: views/html/charactergroupsquests/edit.tpl:87 +#: views/html/charactergroupsquests/edit.tpl:88 msgid "Won-text" msgstr "Gewonnentext" #: views/html/charactergroupsquests/create.tpl:86 #: views/html/charactergroupsquests/create.tpl:87 -#: views/html/charactergroupsquests/edit.tpl:87 -#: views/html/charactergroupsquests/edit.tpl:88 +#: views/html/charactergroupsquests/edit.tpl:89 +#: views/html/charactergroupsquests/edit.tpl:90 msgid "Lost-text" msgstr "Verlorentext" @@ -1437,6 +1437,10 @@ msgstr "Soll die %s-Quest „%s“ wirklich gelöscht werden?" msgid "Edit %s-Quest" msgstr "%s-Quest bearbeiten" +#: views/html/charactergroupsquests/edit.tpl:72 +msgid "public" +msgstr "öffentlich" + #: views/html/charactergroupsquests/manage.tpl:22 #: views/html/charactergroupsquests/quest.tpl:27 #: views/html/seminaries/copy.tpl:77 @@ -1611,40 +1615,40 @@ msgstr "gescheitert um %s" msgid "Back to overview" 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" 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" msgstr "Charakter löschen" -#: views/html/characters/character.tpl:30 +#: views/html/characters/character.tpl:33 msgid "Total progress" msgstr "Fortschritt" -#: views/html/characters/character.tpl:35 -#: views/html/characters/character.tpl:81 -#: views/html/characters/character.tpl:95 -#: views/html/characters/character.tpl:107 -#: views/html/charactertypes/edit.tpl:111 views/html/seminarybar/index.tpl:49 +#: views/html/characters/character.tpl:38 +#: views/html/characters/character.tpl:90 +#: views/html/characters/character.tpl:110 +#: views/html/characters/character.tpl:128 +#: views/html/charactertypes/edit.tpl:111 views/html/seminarybar/index.tpl:57 #: views/html/users/user.tpl:42 views/html/xplevels/manage.tpl:37 msgid "Level" msgstr "Level" -#: views/html/characters/character.tpl:46 +#: views/html/characters/character.tpl:49 msgid "Milestones" msgstr "Meilensteine" -#: views/html/characters/character.tpl:73 +#: views/html/characters/character.tpl:76 msgid "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" msgstr "Letzter Speicherpunkt" -#: views/html/characters/character.tpl:140 +#: views/html/characters/character.tpl:161 msgid "Topic progress" msgstr "Thematischer Fortschritt" @@ -1711,7 +1715,7 @@ msgstr "männlich" msgid "Display settings" msgstr "Anzeigeeinstellungen" -#: views/html/characters/edit.tpl:90 +#: views/html/characters/edit.tpl:90 views/html/html.tpl:106 msgid "Charactertitle" msgstr "Charaktertitel" @@ -1990,11 +1994,11 @@ msgstr "oder" msgid "register yourself" msgstr "registriere dich" -#: views/html/html.tpl:104 +#: views/html/html.tpl:112 msgid "Level-up" msgstr "Levelaufstieg" -#: views/html/html.tpl:106 views/html/html.tpl:108 +#: views/html/html.tpl:114 views/html/html.tpl:116 #, php-format msgid "You have reached level %d" msgstr "Du hast Level %d erreicht" @@ -2516,11 +2520,11 @@ msgstr "Quests anzeigen" msgid "Recalculate XPs" msgstr "XP neuberechnen" -#: views/html/seminarybar/index.tpl:26 +#: views/html/seminarybar/index.tpl:29 msgid "Last Achievement" msgstr "Letztes Achievement" -#: views/html/seminarybar/index.tpl:57 +#: views/html/seminarybar/index.tpl:65 #, php-format msgid "Show %s-Profile" msgstr "%s-Profil anzeigen" diff --git a/models/CharactergroupsquestsModel.inc b/models/CharactergroupsquestsModel.inc index bc60896a..f3f144fe 100644 --- a/models/CharactergroupsquestsModel.inc +++ b/models/CharactergroupsquestsModel.inc @@ -50,7 +50,7 @@ public function getQuestsForCharactergroupsgroup($groupsgroupId) { 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 '. 'WHERE charactergroupsgroup_id = ? '. 'ORDER BY created ASC', @@ -71,7 +71,7 @@ public function getQuestByUrl($groupsgroupId, $questUrl) { $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 '. 'WHERE charactergroupsgroup_id = ? AND url = ?', 'is', @@ -97,7 +97,7 @@ public function getQuestById($questId) { $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 '. 'WHERE id = ?', 'i', @@ -322,9 +322,9 @@ { $this->db->query( '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 '. - '(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', + '(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0)', 'iiisssdsss', $userId, $groupsgroupId, @@ -346,23 +346,24 @@ /** * Edit a Character groups Quest. * - * @param int $questId ID of Character groups Quest to edit - * @param int $groupsgroupId ID of Character groups-group - * @param int $questgroupId ID of Quest group - * @param string $title Title of new Quest + * @param int $questId ID of Character groups Quest to edit + * @param int $groupsgroupId ID of Character groups-group + * @param int $questgroupId ID of Quest group + * @param string $title Title of new Quest * @param string $description Description of new Quset - * @param int $xps Amount of XPs for new Quest - * @param string $rules Rules of new Quest - * @param string $wonText Won-text of new Quset - * @param string $lostText Lost-text of new Quest + * @param int $xps Amount of XPs for new Quest + * @param string $rules Rules of new Quest + * @param string $wonText Won-text of new Quset + * @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( '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 = ?', - 'iisssdsssi', + 'iisssdsssii', $groupsgroupId, $questgroupId, $title, @@ -372,6 +373,7 @@ $rules, $wonText, $lostText, + $public, $questId ); } @@ -400,8 +402,8 @@ // Copy Quest $this->db->query( 'INSERT INTO charactergroupsquests '. - '(created_user_id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text) '. - 'SELECT ?, ?, ?, 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, public '. 'FROM charactergroupsquests '. 'WHERE id = ?', 'iiii', diff --git a/views/html/charactergroups/groupsgroup.tpl b/views/html/charactergroups/groupsgroup.tpl index 96c99a0a..3c2761f5 100644 --- a/views/html/charactergroups/groupsgroup.tpl +++ b/views/html/charactergroups/groupsgroup.tpl @@ -38,10 +38,12 @@
    + 0) : ?>

    • +
diff --git a/views/html/charactergroupsquests/edit.tpl b/views/html/charactergroupsquests/edit.tpl index 37899249..c8f2a743 100644 --- a/views/html/charactergroupsquests/edit.tpl +++ b/views/html/charactergroupsquests/edit.tpl @@ -68,6 +68,8 @@
+ checked="checked" /> + />