From d268d2afcf9a0cb258ede2d449f101a0233d7752 Mon Sep 17 00:00:00 2001
From: oliver <coderkun@users.noreply.github.com>
Date: Sun, 19 Apr 2015 14:20:10 +0200
Subject: [PATCH] ask for confirmation for moving Questgroups (issue #88)

---
 agents/intermediate/QuestgroupsAgent.inc    |  24 +++++
 controllers/QuestgroupsController.inc       | 100 ++++++++++++++------
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 25673 -> 25931 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po |  48 ++++++----
 views/html/questgroups/movedown.tpl         |  19 ++++
 views/html/questgroups/moveup.tpl           |  19 ++++
 6 files changed, 165 insertions(+), 45 deletions(-)

diff --git a/agents/intermediate/QuestgroupsAgent.inc b/agents/intermediate/QuestgroupsAgent.inc
index 2d2a4996..7f71eafa 100644
--- a/agents/intermediate/QuestgroupsAgent.inc
+++ b/agents/intermediate/QuestgroupsAgent.inc
@@ -59,6 +59,30 @@
 		}
 		
 
+		/**
+		 * Action: moveup.
+		 * 
+		 * @param	\nre\core\Request	$request	Current request
+		 * @param	\nre\core\Response	$response	Current response
+		 */
+		public function moveup(\nre\core\Request $request, \nre\core\Response $response)
+		{
+			$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4));
+		}
+
+
+		/**
+		 * Action: movedown.
+		 * 
+		 * @param	\nre\core\Request	$request	Current request
+		 * @param	\nre\core\Response	$response	Current response
+		 */
+		public function movedown(\nre\core\Request $request, \nre\core\Response $response)
+		{
+			$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4));
+		}
+
+
 		/**
 		 * Action: delete.
 		 * 
diff --git a/controllers/QuestgroupsController.inc b/controllers/QuestgroupsController.inc
index 0f601060..08f32132 100644
--- a/controllers/QuestgroupsController.inc
+++ b/controllers/QuestgroupsController.inc
@@ -580,22 +580,44 @@
 			$questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl);
 			$questgroup['hierarchy'] = $this->Questgroupshierarchy->getHierarchyForQuestgroup($questgroup['id']);
 			
-			// Set position
-			$this->Questgroups->moveQuestgroup($questgroup, true);
-
-
-			// Redirect
-			$referer = $this->request->getGetParam('referer');
-			if(!is_null($referer))
+			// Check request method
+			if($this->request->getRequestMethod() == 'POST')
 			{
-				try {
-					$questgroup = $this->Questgroups->getQuestgroupById($referer);
-					$this->redirect($this->linker->link(array('questgroups', 'questgroup', $seminary['url'], $questgroup['url'])));
-				}
-				catch(IdNotFoundException $e) {
-				}
+				// Check confirmation
+				if(!is_null($this->request->getPostParam('move')))
+				{
+                    // Set position
+                    $this->Questgroups->moveQuestgroup($questgroup, true);
+                }
+
+                // Redirect
+                $referer = $this->request->getGetParam('referer');
+                if(!is_null($referer))
+                {
+                    try {
+                        $questgroup = $this->Questgroups->getQuestgroupById($referer);
+                        $this->redirect($this->linker->link(array('questgroups', 'questgroup', $seminary['url'], $questgroup['url'])));
+                    }
+                    catch(IdNotFoundException $e) {
+                    }
+                }
+                $this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url'])));
+            }
+
+			// Media
+			$picture = null;
+			if(!is_null($questgroup['questgroupspicture_id'])) {
+				$picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
 			}
-			$this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url'])));
+			
+			
+			// Set titile
+			$this->addTitleLocalized('Move Questgroup');
+			
+			// Show confirmation
+			$this->set('seminary', $seminary);
+			$this->set('questgroup', $questgroup);
+			$this->set('picture', $picture);
 		}
 
 
@@ -617,22 +639,44 @@
 			$questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl);
 			$questgroup['hierarchy'] = $this->Questgroupshierarchy->getHierarchyForQuestgroup($questgroup['id']);
 			
-			// Set position
-			$this->Questgroups->moveQuestgroup($questgroup, false);
-
-
-			// Redirect
-			$referer = $this->request->getGetParam('referer');
-			if(!is_null($referer))
+			// Check request method
+			if($this->request->getRequestMethod() == 'POST')
 			{
-				try {
-					$questgroup = $this->Questgroups->getQuestgroupById($referer);
-					$this->redirect($this->linker->link(array('questgroups', 'questgroup', $seminary['url'], $questgroup['url'])));
-				}
-				catch(IdNotFoundException $e) {
-				}
+				// Check confirmation
+				if(!is_null($this->request->getPostParam('move')))
+				{
+                    // Set position
+                    $this->Questgroups->moveQuestgroup($questgroup, false);
+                }
+
+                // Redirect
+                $referer = $this->request->getGetParam('referer');
+                if(!is_null($referer))
+                {
+                    try {
+                        $questgroup = $this->Questgroups->getQuestgroupById($referer);
+                        $this->redirect($this->linker->link(array('questgroups', 'questgroup', $seminary['url'], $questgroup['url'])));
+                    }
+                    catch(IdNotFoundException $e) {
+                    }
+                }
+                $this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url'])));
+            }
+
+			// Media
+			$picture = null;
+			if(!is_null($questgroup['questgroupspicture_id'])) {
+				$picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
 			}
-			$this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url'])));
+			
+			
+			// Set titile
+			$this->addTitleLocalized('Move Questgroup');
+			
+			// Show confirmation
+			$this->set('seminary', $seminary);
+			$this->set('questgroup', $questgroup);
+			$this->set('picture', $picture);
 		}
 
 
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 4bf816844a5f090441e10674ae733bd87e91aaf1..2f802ca9b240c043c37c77d5b775d9306eeb3d96 100644
GIT binary patch
delta 8477
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
L4^}uiJoys<?~r-H

delta 8301
zcmX?oit*$L#`=3gEK?a67#Qjp85m?37#MhX7#RLCGBErR2Z=H;e2`~g;9y{2_$bf7
zz{$YC@C(XkQD9(@V_;z5Re;FrC@?T^GcYiiDljl8F)%PVDljl8FfcHrC_v0@RbXI{
zW?*1gq`<%cGJ2l^1A{gLLp{Sa1qKEl1_lNuMFs{w1_lOxMTkXmP+CKgfkB9Yfx$=-
zVvwsMM17JX#NvEK1_o9J28If#{yM1oUPT555e5c^1&Ry|8Vn2!TNN1?G#MBe?kO@b
z@G>wka40b_NHNqiFo-EZ6dEcqFt9N&Ft{l}T<WU?@nNPC#9<vu3=Ap^3=Gqi7#P$U
z7#Q{_L45K=iGhKgfq~(V5(9%J0|Nt#GQ<OR$_xww3=9k&$`Eyt$_xyu3=9l~$_xx@
zAaj%%82IWL7#Q{`Gcd?9Ffg1|W?;}_U|@Ky%)lVVz`!7;0^#ebfP;!5LIvW`78Qv4
znJNqni3|)3+f^7CxEL51Bvl~}RZ)egGggK8+(Q-O^FmdK&u6PbJi1bqfuSDc@(rpG
z7w=Go7<5P#;-j;wkf6S*%D`a6z`*cGm4ShUfq_9(4Pua#8YDzC)EF2P85kIR)gV!k
zuLiN8R1M;w8Z}6o=vIS7<vKM;$Q)E-s0YXWB{c>HK?Vkf`)ZJ&{|Hscs}Aw0f;t0(
zFaraFojN3Bg47`vW~wtVNHQ=mbgMHkNH8!kELDdXybsDhug<_A%D}+z0;>NXlorxp
zVBlw9U{KSjhxo`$0}^D`8jwU4paC&BQUhXOF_hl|)i_TB>JzB^K@EsQFG0=upaBUv
zR!xY<gft-@Q-SgwG$9TMs@H^Mn<OZmrwK_cRhp0>o}>wJzyhcN8#N(8dKSvRqX}`y
z4^2qaace;g7Sn?0Q-ku&wICtkt_AT}tQI6h>&u}Ey0st%&(?xiyh;n2CbS?Sa!3ne
z!D%f>++Ndy#PwY*NN#wn1<5Vk+K_Cj1*P4!85rb2<p7j!(T1d%CE8#I)-#-hO5D<h
z#NjV(h{3`-5Q`*rATCzWff#J10}0x29Z1lo=s*%{nGQsMoesp|({&)`EYyK`U^$fD
zpaY5WonUk885s6K4ZZ<2_$$<6CS8a{oVs9_GKlFyLO>l#8|gwUu+@cF;H(RAh>tEL
zu0x>m1yFO!bRiyUhU)LqWnkb0<^QR=kT{$VRj^4H;^UpVkhr|83yG`8x)2|K*M-C-
zryhhauLp6Up&rD+PI?Rs%nS?+{(2Ax2J1mAj?{xVFhLLEkqkWshI&w$UJR9})q@0a
zs~#lI7U@A8a7YhSR5CDJf*SZ%50XYc>p`+1qdp`^mGvPG)zF8O{Wkg#2gO49S^5z5
z-TIJhyjCBY|BvWHEVu}z-{?c)lHCAepn?H}Z(;yRq`n3a2gDdaEXXo|L_xU$BxD+(
z;?oQu7A}U0ABC#BZ2$?eCkFM9)cDl^QZ`E&LM(DHgcuZQ2nn)$LrBP!8$v>6iXkLq
zwirUP>k+8@9jN-Bh71hK3=9m6Mi6zXMi9QK5yZYoBZ#?m^+u4mX)}WOpw|czXVZ)z
zE}UZoiL13nkaA*&5u~6x0#$$02$BXK89`G07pQsvpnO(ihy(bIAt5Pm4DpyTlwa=&
zWyBgod|qe_vA7E=KHC@)x9g1|F5Ut)aE~!03eFfq9Dd6f5*3e)ArATgRmWrkak!8P
z#36Df5cBj*z#gq<ForM~EKMM}z}^Jn(jXIv&(ok93r!#nXf%OTvz;ak4EhWV42Ml1
zmD6Vv1_oPDnQqF!;07viOc@wV7#J8<n=&xyFfcGYFlAsc1T|R97#OS>7#Qr$K>T_J
zhH5j2L2Jzz7z`K~819-uT*_w-ak-p1#D`i?zOgwZsO`-mA>aw+hePQ^b4ZkCn?pjf
z2&%8y9O8j~b4Xg4ZqC5K56b_$p#rDPA&KL?IV6ZgEFjrP(gMP_vVb%k>@6TgZkh!+
z2pRe;Ah}|S1*8&MYyrt$2Q47&hZ`1<_5-se#6kL&kVNcY$-qz#sx}iWAwg7W$-tn?
zz`(G~5|YTSSVFSTOG}7Pxve04Nh?TwZfymzI1WnZT0wF{jTI#7rdUB7KHmxwB}=Rz
zA^94r?u!*eJ-A85V-0bcp*17~oU9?)G2I&C!(J#o*%}h`Gp!*8Ew+YOv<51^-5OHz
z9khm2Mn|n7QTPN(f3SwMg#JM7QM0LsxY*kUQsgGvKoV1}4Ff|U0|Ubb8;HZ0Y$0hv
z*cM`evMnTz)omd@)PwSkZ6S%*3d;9`>I;RcONH{YY#|=0s<(wCiWXalPkNvVr$gyE
zwh#v_v}IsmVqjp{1l73J7Lv{OL**|*)jzU@WaH<ykdR}rgG3RV9mK(+b`XnY>>wVl
zSF?jCbg+X2sT)+GKa?M4$H4HIk%1u|s?ON~qR!I+;@}_$NR-7w#hV-;LEh~E39;!8
z5DS+(K<wEFrMEjUFq{Fk|MxmT%Kk1#NCC3c5t4d0IYNAR(h(8@w;drx@Eb>ndQK;Z
zyb6>ybAlvN4=0HFFegY!m+k}!ky<B6+)snj2b@3-tY=_&<pjwNzn}`GoFPGF><md8
zR?d)uB*+<JP`fik{Q_qO1{($jh6B!!Z2H$35|wf;(1OSX;`0<2h<Kh0#DQflkoG}~
z3j>1;DE}{jO6+xk6bz?bAldM}3&bK>S4aV63#D^iAt5x^6%rC#Tp1XO7#JANyF#MG
z$qnQ)1_oa@h{IytAO%|;lwJ>&f8Yjf|9^0Uxbz2<W^#wbA&)!6KnZt<h05*>4CV|B
z3|8)txGZvq_^84iQhv0#Lma-@9pdAM?vUK^5~}~5JEQ<(^?*c;jt4_MxLxn$0da8{
zR3gm-l8tISAVEIC1CokYdO)INhX*7GFF^IZ@qm<kf1tFKC!_$g@PveruP4O93{Qx8
zbx`@~p7jucHJ%V39rc7*d>YEX?+HnCPdy<HWb%SkQbJyk#HZ>7vB(@M?&Af~AMXWm
zXt5W>;oVSmv!L?pq2h<@y&yq&32NX2FGw!<1l8~#szJmX5(OIGkRsUL8)9*yH^gUU
z-jMv<;|)pu%e)~D*bbFH57qzF8xnGVpyKrsJ`jWTd>|TKeIPyv^MUv{3(BwZf#mx>
zABcme`#^HZQYgK~2U6K=_JPz5_k180G5SIhp{y@N-p&^iC7Hh9O01rt#TR1n8efRU
zy-@mrFC_6W`#~(?@Pjy%-w&*jLCp{1Lq9)Al%zq`Rr*1qticbGsOS1Y67h0Bh=(@$
zK|FHE4`hBl1H)-QNDyA|gOvTxpcYB`Lo7D%hvWuxe@MtU`$N=+`$H_w^@pUL27gG%
zwE06UoZ`>Gz`@ACFdr(vA^?(|*9Ab#Jr@A2|E~r>;{0g<BxpVbKwQon2(eH+5Mq&b
zAS49r0wHl98VHH=tU!p*TA=EtK<VXy5QpswgjjeW5aRRWfe;5?2xMTW2MxX44un|v
zA`s$(Pl1r?lOYIF!pR3gTpkkyiPM@Oh`}?0AW<+c2ofdRf<Qsaz;G`J;*rNekh<Yt
z5X9li!I1oK1*H>%8S24fJ{`dji>C)ee6lncV$s%Mhy@peAqKpJ$}@yOqC_ABlD%X?
zAU@KD^36gZ4sZ>Dgj_-hByAOkKs+)n1QHV4Lh2z3_lH1I=PfAB8Vb>15DGCMI27Wu
zv`|RgXNN+3(ijSH*osg{0kl69QWD+`g_M9?VUUm!3WG$IRT!ia3W3sf^<fZ~tO$d|
z(MBkLM;IiC4~9YF`gj<`$9KXYY2`&2#K&Ku>KMWyA;%UDF-Hta%Z5YDR|$uNux>a+
zpLIAS<m%nRA=xi99FhjopavB{H8g}nEba@3IA~Tl#Agej>Q;n9;&?|m#9?=#`d)=Y
z67LVFI-UrKg)$Kk4{1k$&8uf{h=91*4NCh$6@)}U(m*CeAwz2f#O2))5Fbs8fK*2F
zBN!M=85kI@M=&s0fZF$w5OKFi1_p1?z-A<*y?-halD*lYAc@*C3Z$-{fuSr4BC#$C
z)FEJCco@aNV8y_|ARG;ed%tK%&?ZJhg0L_e5@PjGdO|eBM+>3qwnal6dMp~^v5V0V
zpWldvgz)odhzCAKGcbV0pBR2cLlU8K3?vcSLFvpGNKj9Sfz<zVVjzj|Obn!*a4`l_
zw0?~N2PK18EW{$2SV)v;$3o--Vj=Z^A(UPe3-Q3^SO$iA&`9KySV(H;j)R1R9+Xau
zgG9lUI7oARLmVVKUW<dI>UU6DEFMye+QmcCN_ad(U2;6cLDlgPA9uwwfQl4`$?=f1
z@+_XA9z0n5IUbU2#1bF{k8=V8gB}9|LlTspm;f>0KmsHLP9{L2<Xi&8pnD0B?DaYU
z62z>Dkk&GPA|$&BB|<!6lL(2@h(t&qGCQ#z(qdVf2yyY{M5sZDkdR<aVqoxMU|_IF
zf`~UKK`fq|1aZjPB#4EZk{}M;1LYr0f|L{Iq2f=IAQrz%f}{<`WJtNeQ=bfxP)>#z
zV3rI~U=QVcB||I<PKKnB2q?ce8DeooG9)gWk|7O}$x!j7$&fU#J{gh-uOvf4>NeEe
z7s-&Qs{fb_37Wsjkkl=i0*N#A6o>_8DG-M_q%bfrGB7ZBGBPkc29587IFKm<hHOR#
zhL=z_h>~VxV7Sb{z+lVB!0-<w0L6zH7#P+uFfc@d%wb?)C<C?sLBXrZ$iPs=$iQ%f
zfq_Ark%3_%0|P@X1H>U9y<rRt4Br?S7%D*=D7J(;0MrDB3Ng%MU|<k|iu*A@a)~x*
zBpp-^Kow<yhUB4ako}+@5||5`0Rb}@Aj9e<j0_Cd7#J8nK?SQBAc^T00|UcT21w|D
zhTTDv3m_#y3=9l285kIH7$Dhg5(5K6KLZ1U03)Ow;16}!Vg?3=8juDC28Jo1_P-AU
z149!iNEsLy<})xbL@_Wh>|<bHXoo5SHMv2|P(}uZSqu!Iq8`Krk7776FfgPsGBA`g
zGBBtyLQ2361_p*~1_p*0Mh1p_Mg|6PMg|66Mh1p5Mo8xsl(WDFFfcIG=Yxhupu7ku
z?FV%!l*<syz`(%G2ub;$85kIjLnT_FbTlIaLox#c!y70cL?uAYr~q*o7#QL}QNzH%
zpuxz%kix*gFc~5a@;?K^Tm}XPGX@3*Yeq;B43gUgA{ZDLwt!|vKn`GFU}%7ffv8ms
z44`HJh{+(z$iN`Q$iU#wz`$U`$iN^EwY-^ufgzoNfkBp$fx(`Ef#D(pr1cEy+MfdJ
ztcMg7AZH{nFfe#AGBDf&OE563W`LA>AZ`Hz1A_yI!N9<<6iTN;X)8uZ@yiaibPi~i
z3o2*8$iU#s$iQ#|%D)ftC?f;I8qfq30|NtdJycUM$TCI-26w1J(8SSJDEkViGJ>kp
zVq{>DU}RuO1x?XG<%<~^7$QOPAPkzAf{HsZGBEsrvOyDD-3$y2JE43Yki$Un51R99
zfeLnlQYO?8CPoH^<qQlAw;3219x^a6Y-C_yXoIR-%fP_!1<D3Zzr-;zFgyoE2O|Rm
z3sgU7t}ljxfnhUL9UmhD!y(Xg9Fz~DxEMk6Zww3!RUjUyyk}%!NM~eVNMc}MaA#y-
z@L*(MaARa(h=3XjRR*T)85tP<GB7acF)}dhW?*0_VPIg$V_;y|3(6skkkYV_fq@|&
zs#gJ&OTaoA7-ldqFq~#!V0Z_zKLe^@83Uv)xC2!*0W_t?2r0*NplU!;r62;-?+0Z)
z1_p*`C?C|41`RY`0GR_-9{{C6N<dw7BSr=W6GjGxFh&N30FWRk;RS=T4<iFZBdGPl
zz`)?d$iN`P$iUzVnk-~wU{HY?@)gv_2WetpVE758s~H&>t}`$&1T!!&Y-3<xU}c2V
zpi-bz&%nU&mVtqxfRTaWHv@RMg&~R&Qgws0TQD*()ZYb7oiZ{oOk-eR$Yf+-_|Cw<
z;L6Cr;KInj;LXUu@Q8td!5O3)icc^wFqASfFuY)3U@&Hc)RG{nTt-M^1=JK%WP~(4
zK=Z(Yj0_AtprRY(Fh&N3K&WRxQ@VMe_;-d1+yt2d#TytH7+e?_82T6(7<Mo~+Uy`H
zB~WO9rdUB7&}bMaei<NDH&h5raWXP6EMb7u@x}}c3|AQ#7`j090V4xLEU2VpfHYXZ
z<^Mtk28NShZ43-Y85kJOF)%Q^Vqjp%Vq{?GWq>rv7#SHDa-nKIf(Dlv85lwt7#NN*
zFfcrUii4;X3=9k_K@0{42GF$nbkKY<l>eTAfgyu|f#CxKWIX8-NE{UZL7+HcWMB|u
zWMH@j5(GsB0|SE$G-N<RK8y?uwTzG^^=t+P26L#KAtM9BYX$~}^$ZLQ&p-;Hm>((+
z;_5ImFxW9d+K?cA5mXK|TCS_l$iQIA$iTqH$iQ%r0n%jt52^v7ia;%4kf!Yn3=I1>
z`zo06Z=S4g$Ugau7T4x~X3p%J-Ru|{S&XbqEGK*0tFRbZnHp>^wigiDJS%u1`{vT<
Ln;es)Qa%CzeZx>W

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 fe0defe3..b8f9924c 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-19 12:49+0100\n"
-"PO-Revision-Date: 2015-04-19 12:50+0100\n"
+"POT-Creation-Date: 2015-04-19 14:15+0100\n"
+"PO-Revision-Date: 2015-04-19 14:16+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -104,7 +104,7 @@ msgstr ""
 #: questtypes/multiplechoice/html/edittask.tpl:79
 #: questtypes/textinput/html/edittask.tpl:44
 #: views/html/achievements/conditions.tpl:151
-#: views/html/achievements/edit.tpl:112 views/html/charactertypes/edit.tpl:124
+#: views/html/achievements/edit.tpl:112 views/html/charactertypes/edit.tpl:142
 #: views/html/library/edit.tpl:46 views/html/library/edit.tpl:86
 #: views/html/quests/edit.tpl:114 views/html/users/edit.tpl:109
 #: views/html/xplevels/manage.tpl:49
@@ -258,7 +258,7 @@ msgstr "Fehler beim Dateiupload: %s"
 #: views/html/charactergroupsquests/create.tpl:66
 #: views/html/charactergroupsquests/edit.tpl:67
 #: views/html/charactergroupsquests/manage.tpl:72
-#: views/html/charactertypes/edit.tpl:117 views/html/questgroups/create.tpl:65
+#: views/html/charactertypes/edit.tpl:135 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
 #: views/html/seminaries/edit.tpl:62
@@ -272,7 +272,7 @@ msgstr "Erlaubte Dateiformate"
 #: views/html/charactergroupsquests/create.tpl:69
 #: views/html/charactergroupsquests/edit.tpl:70
 #: views/html/charactergroupsquests/manage.tpl:72
-#: views/html/charactertypes/edit.tpl:120 views/html/questgroups/create.tpl:68
+#: views/html/charactertypes/edit.tpl:138 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
 #: views/html/seminaries/edit.tpl:65
@@ -287,7 +287,7 @@ msgstr "%s-Dateien"
 #: views/html/charactergroupsquests/create.tpl:69
 #: views/html/charactergroupsquests/edit.tpl:70
 #: views/html/charactergroupsquests/manage.tpl:72
-#: views/html/charactertypes/edit.tpl:120 views/html/questgroups/create.tpl:68
+#: views/html/charactertypes/edit.tpl:138 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
 #: views/html/seminaries/edit.tpl:65
@@ -742,6 +742,7 @@ msgstr "Soll das Achievement „%s“ wirklich gelöscht werden?"
 #: views/html/charactergroupsquests/delete.tpl:16
 #: views/html/characters/delete.tpl:18 views/html/charactertypes/delete.tpl:15
 #: views/html/library/delete.tpl:15 views/html/questgroups/delete.tpl:18
+#: views/html/questgroups/movedown.tpl:18 views/html/questgroups/moveup.tpl:18
 #: views/html/questgroupshierarchy/delete.tpl:15
 #: views/html/quests/delete.tpl:12 views/html/seminaries/delete.tpl:14
 #: views/html/users/delete.tpl:12
@@ -1241,7 +1242,7 @@ msgstr "Fortschritt"
 #: views/html/characters/character.tpl:83
 #: views/html/characters/character.tpl:97
 #: views/html/characters/character.tpl:109
-#: views/html/charactertypes/edit.tpl:103 views/html/seminarybar/index.tpl:49
+#: views/html/charactertypes/edit.tpl:115 views/html/seminarybar/index.tpl:49
 #: views/html/users/user.tpl:42 views/html/xplevels/manage.tpl:41
 msgid "Level"
 msgstr "Level"
@@ -1405,47 +1406,47 @@ msgstr "Characterrasse bearbeiten"
 msgid "Avatars"
 msgstr "Avatare"
 
-#: views/html/charactertypes/edit.tpl:60
+#: views/html/charactertypes/edit.tpl:69
 #, php-format
 msgid "Error during avatar portrait upload: %s"
 msgstr "Fehler beim Upload des Avatarportraits: %s"
 
-#: views/html/charactertypes/edit.tpl:62
+#: views/html/charactertypes/edit.tpl:71
 #, php-format
 msgid "Avatar portrait has wrong type “%s”"
 msgstr "Der Dateityp „%s“ ist für Avatarportraits nicht erlaubt"
 
-#: views/html/charactertypes/edit.tpl:64
+#: views/html/charactertypes/edit.tpl:73
 msgid "Avatar portrait exceeds size maximum"
 msgstr "Das Avatarportrait ist zu groß"
 
-#: views/html/charactertypes/edit.tpl:66
+#: views/html/charactertypes/edit.tpl:75
 msgid "Avatar portrait invalid"
 msgstr "Das Avatarportrait ist ungültig"
 
-#: views/html/charactertypes/edit.tpl:85
+#: views/html/charactertypes/edit.tpl:95
 #, php-format
 msgid "Error during avatar upload: %s"
 msgstr "Fehler beim Upload des Avatars: %s"
 
-#: views/html/charactertypes/edit.tpl:87
+#: views/html/charactertypes/edit.tpl:97
 #, php-format
 msgid "Avatar has wrong type “%s”"
 msgstr "Der Dateityp „%s“ ist für Avatare nicht erlaubt"
 
-#: views/html/charactertypes/edit.tpl:89
+#: views/html/charactertypes/edit.tpl:99
 msgid "Avatar exceeds size maximum"
 msgstr "Der Avatar ist zu groß"
 
-#: views/html/charactertypes/edit.tpl:91
+#: views/html/charactertypes/edit.tpl:101
 msgid "Avatar invalid"
 msgstr "Der Avatar ist ungültig"
 
-#: views/html/charactertypes/edit.tpl:107
+#: views/html/charactertypes/edit.tpl:118
 msgid "Protrait"
 msgstr "Portrait"
 
-#: views/html/charactertypes/edit.tpl:112
+#: views/html/charactertypes/edit.tpl:125
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1660,6 +1661,19 @@ msgstr "Questgruppetexte bearbeiten"
 msgid "New Questgroup text"
 msgstr "Neuer Questgruppentext"
 
+#: views/html/questgroups/movedown.tpl:14 views/html/questgroups/moveup.tpl:14
+msgid "Move Questgroup"
+msgstr "Questgroup verschieben"
+
+#: views/html/questgroups/movedown.tpl:15 views/html/questgroups/moveup.tpl:15
+#, php-format
+msgid "Should the Questgroup “%s” really be moved?"
+msgstr "Soll die Questgruppe „%s“ wirklich verschoben werden?"
+
+#: views/html/questgroups/movedown.tpl:17 views/html/questgroups/moveup.tpl:17
+msgid "move"
+msgstr "verschieben"
+
 #: views/html/questgroups/questgroup.tpl:22
 msgid "Create new Quest"
 msgstr "Neue Quest erstellen"
diff --git a/views/html/questgroups/movedown.tpl b/views/html/questgroups/movedown.tpl
index e69de29b..4d265c95 100644
--- a/views/html/questgroups/movedown.tpl
+++ b/views/html/questgroups/movedown.tpl
@@ -0,0 +1,19 @@
+<?php if(!is_null($picture)) : ?>
+<div class="moodpic">
+	<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$picture['url']))?>" />
+</div>
+<?php endif ?>
+<?=$questgroupshierarchypath?>
+
+<?php if(!is_null($questgroup['hierarchy'])) : ?>
+<h1><?=$questgroup['hierarchy']['title_singular']?> <?=$questgroup['hierarchy']['questgroup_pos']?>: <?=$questgroup['title']?></h1>
+<?php else : ?>
+<h1><?=$questgroup['title']?></h1>
+<?php endif ?>
+
+<h1><?=_('Move Questgroup')?></h1>
+<?=sprintf(_('Should the Questgroup “%s” really be moved?'), $questgroup['title'])?>
+<form method="post">
+	<input type="submit" name="move" value="<?=_('move')?>" />
+	<input type="submit" name="not-move" value="<?=_('cancel')?>" />
+</form>
diff --git a/views/html/questgroups/moveup.tpl b/views/html/questgroups/moveup.tpl
index e69de29b..4d265c95 100644
--- a/views/html/questgroups/moveup.tpl
+++ b/views/html/questgroups/moveup.tpl
@@ -0,0 +1,19 @@
+<?php if(!is_null($picture)) : ?>
+<div class="moodpic">
+	<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$picture['url']))?>" />
+</div>
+<?php endif ?>
+<?=$questgroupshierarchypath?>
+
+<?php if(!is_null($questgroup['hierarchy'])) : ?>
+<h1><?=$questgroup['hierarchy']['title_singular']?> <?=$questgroup['hierarchy']['questgroup_pos']?>: <?=$questgroup['title']?></h1>
+<?php else : ?>
+<h1><?=$questgroup['title']?></h1>
+<?php endif ?>
+
+<h1><?=_('Move Questgroup')?></h1>
+<?=sprintf(_('Should the Questgroup “%s” really be moved?'), $questgroup['title'])?>
+<form method="post">
+	<input type="submit" name="move" value="<?=_('move')?>" />
+	<input type="submit" name="not-move" value="<?=_('cancel')?>" />
+</form>