From dde0a50e040e05aeb884fecbdd920c7c8e36081a Mon Sep 17 00:00:00 2001 From: coderkun Date: Sun, 4 May 2014 01:41:54 +0200 Subject: [PATCH] add a meaningful title to HTML-pages (Issue #185) --- app/controllers/IntermediateController.inc | 56 +++++++++++++++++ configs/AppConfig.inc | 3 +- controllers/AchievementsController.inc | 4 ++ controllers/CharactergroupsController.inc | 46 ++++++++++++++ .../CharactergroupsquestsController.inc | 25 +++++++- controllers/CharactersController.inc | 26 ++++++++ controllers/HtmlController.inc | 43 +++++++++++++ controllers/LibraryController.inc | 9 +++ controllers/QuestgroupsController.inc | 13 ++++ controllers/QuestsController.inc | 22 +++++++ controllers/SeminariesController.inc | 16 +++++ controllers/UsersController.inc | 25 ++++++++ locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 13703 -> 13865 bytes locale/de_DE/LC_MESSAGES/The Legend of Z.po | 57 ++++++++++-------- questtypes/submit/html/quest.tpl | 2 +- views/html/characters/manage.tpl | 2 +- views/html/html.tpl | 2 +- views/html/quests/submissions.tpl | 2 +- views/html/seminaries/create.tpl | 6 +- views/html/seminaries/delete.tpl | 6 +- views/html/seminaries/edit.tpl | 6 +- views/html/users/manage.tpl | 2 +- 22 files changed, 334 insertions(+), 39 deletions(-) diff --git a/app/controllers/IntermediateController.inc b/app/controllers/IntermediateController.inc index 19647d7e..e2f8c75d 100644 --- a/app/controllers/IntermediateController.inc +++ b/app/controllers/IntermediateController.inc @@ -31,6 +31,12 @@ * @var array */ public static $user = null; + /** + * Title information + * + * @var array + */ + private $title = array(); @@ -92,6 +98,56 @@ } + /** + * Return current title information. + * + * @return string Title information + */ + public function getTitle() + { + return $this->title; + } + + + + + /** + * Add a piece of information to the current title. + * + * @param string $title Title information + */ + protected function addTitle($title) + { + $this->title[] = $title; + } + + + /** + * Add a piece of information to the current title and localize + * it. + * + * @param string $title Title information + */ + protected function addTitleLocalized($title) + { + $title = gettext($title); + + $args = func_get_args(); + if(count($args) > 0) { + $title = call_user_func_array( + 'sprintf', + array_merge( + array($title), + array_slice($args, 1) + ) + ); + } + + + $this->title[] = $title; + } + + /** diff --git a/configs/AppConfig.inc b/configs/AppConfig.inc index 150e69bc..5e1c96fe 100644 --- a/configs/AppConfig.inc +++ b/configs/AppConfig.inc @@ -113,7 +113,8 @@ */ public static $misc = array( 'ranking_range' => 2, - 'achievements_range' => 3 + 'achievements_range' => 3, + 'title_delimiter' => ' – ' ); diff --git a/controllers/AchievementsController.inc b/controllers/AchievementsController.inc index 89b3f703..9450321b 100644 --- a/controllers/AchievementsController.inc +++ b/controllers/AchievementsController.inc @@ -158,6 +158,10 @@ $character['rank'] = $this->Achievements->getCountRank($seminary['id'], count($achievedAchievements)); + // Set title + $this->addTitleLocalized('Achievements'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('character', $character); diff --git a/controllers/CharactergroupsController.inc b/controllers/CharactergroupsController.inc index e82d1fae..5e9ba675 100644 --- a/controllers/CharactergroupsController.inc +++ b/controllers/CharactergroupsController.inc @@ -86,6 +86,10 @@ $groupsgroups = $this->Charactergroups->getGroupsroupsForSeminary($seminary['id']); + // Set titile + $this->addTitleLocalized('Character Groups'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroups', $groupsgroups); @@ -117,6 +121,11 @@ $quests = $this->Charactergroupsquests->getQuestsForCharactergroupsgroup($groupsgroup['id']); + // Set titile + $this->addTitle($groupsgroup['name']); + $this->addTitleLocalized('Character Groups'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroup', $groupsgroup); @@ -178,6 +187,10 @@ } + // Set titile + $this->addTitleLocalized('New Character groups-group'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('charactergroupsgroupname', $charactergroupsgroupname); @@ -243,6 +256,10 @@ } + // Set titile + $this->addTitleLocalized('Edit Character groups-group'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('charactergroupsgroupname', $charactergroupsgroupname); @@ -287,6 +304,10 @@ } + // Set titile + $this->addTitleLocalized('Delete Character groups-group'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroup', $groupsgroup); @@ -330,6 +351,11 @@ $quests = $this->Charactergroupsquests->getQuestsForGroup($group['id']); + // Set titile + $this->addTitle($group['name']); + $this->addTitle($groupsgroup['name']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroup', $groupsgroup); @@ -411,6 +437,11 @@ } + // Set titile + $this->addTitle($group['name']); + $this->addTitle($groupsgroup['name']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroup', $groupsgroup); @@ -478,6 +509,11 @@ } + // Set title + $this->addTitleLocalized('New %s Character group', $groupsgroup['name']); + $this->addTitle($groupsgroup['name']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroup', $groupsgroup); @@ -549,6 +585,11 @@ } + // Set title + $this->addTitleLocalized('Edit %s Character group', $groupsgroup['name']); + $this->addTitle($groupsgroup['name']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroup', $groupsgroup); @@ -599,6 +640,11 @@ } + // Set title + $this->addTitleLocalized('Delete %s Character group', $groupsgroup['name']); + $this->addTitle($groupsgroup['name']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroup', $groupsgroup); diff --git a/controllers/CharactergroupsquestsController.inc b/controllers/CharactergroupsquestsController.inc index 09a0da0d..a68b15f9 100644 --- a/controllers/CharactergroupsquestsController.inc +++ b/controllers/CharactergroupsquestsController.inc @@ -94,6 +94,11 @@ } + // Set title + $this->addTitle($quest['title']); + $this->addTitle($groupsgroup['name']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroup', $groupsgroup); @@ -226,7 +231,10 @@ } - + // Set title + $this->addTitle($quest['title']); + $this->addTitle($groupsgroup['name']); + $this->addTitle($seminary['title']); // Pass data to view $this->set('seminary', $seminary); @@ -327,6 +335,11 @@ } + // Set title + $this->addTitleLocalized('New %s-Quest', $groupsgroup['name']); + $this->addTitle($groupsgroup['name']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroup', $groupsgroup); @@ -436,6 +449,11 @@ } + // Set title + $this->addTitleLocalized('Edit %s-Quest', $groupsgroup['name']); + $this->addTitle($groupsgroup['name']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroup', $groupsgroup); @@ -492,6 +510,11 @@ } + // Set title + $this->addTitleLocalized('Delete %s-Quest', $groupsgroup['name']); + $this->addTitle($groupsgroup['name']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('groupsgroup', $groupsgroup); diff --git a/controllers/CharactersController.inc b/controllers/CharactersController.inc index c0303da4..6f98b3ca 100644 --- a/controllers/CharactersController.inc +++ b/controllers/CharactersController.inc @@ -108,6 +108,10 @@ } + // Set titile + $this->addTitleLocalized('Characters'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('characters', $characters); @@ -180,6 +184,11 @@ } + // Set titile + $this->addTitle($character['name']); + $this->addTitleLocalized('Characters'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('character', $character); @@ -294,6 +303,10 @@ $xplevels = $this->Characters->getXPLevelsForSeminary($seminary['id']); + // Set titile + $this->addTitleLocalized('Create Character'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('types', $types); @@ -421,6 +434,10 @@ } + // Set titile + $this->addTitleLocalized('Manage Characters'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('characters', $characters); @@ -546,6 +563,11 @@ // Get XP-levels $xplevels = $this->Characters->getXPLevelsForSeminary($seminary['id']); + + // Set titile + $this->addTitleLocalized('Edit Character'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('types', $types); @@ -595,6 +617,10 @@ } + // Set titile + $this->addTitleLocalized('Delete Character'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('character', $character); diff --git a/controllers/HtmlController.inc b/controllers/HtmlController.inc index 4c85e074..bf79a7db 100644 --- a/controllers/HtmlController.inc +++ b/controllers/HtmlController.inc @@ -44,6 +44,19 @@ } + /** + * Postfilter that is executed after running the Controller. + * + * @param Request $request Current request + * @param Response $response Current response + */ + public function postFilter(\nre\core\Request $request, \nre\core\Response $response) + { + // Get title + $this->set('title', $this->getTitle()); + } + + /** * Action: index. * @@ -63,6 +76,36 @@ $this->set('notifications', $this->Notification->getNotifications()); } + + + + /** + * Get title information from IntermediateController if possible + * and create a title. + * + * @return string Title for the current page + */ + private function getTitle() + { + $title = array(); + + // Get title of IntermediateController + $intermediateController = $this->agent->getIntermediateAgent()->controller; + if($intermediateController instanceof \hhu\z\controllers\IntermediateController) { + $title = $intermediateController->getTitle(); + } + if(!is_array($title)) { + $title = array($title); + } + + // Add application name + $title[] = \nre\configs\AppConfig::$app['name']; + + + // Return title with delimiter + return implode(\nre\configs\AppConfig::$misc['title_delimiter'], $title); + } + } ?> diff --git a/controllers/LibraryController.inc b/controllers/LibraryController.inc index 9cbfb24e..a82387e6 100644 --- a/controllers/LibraryController.inc +++ b/controllers/LibraryController.inc @@ -77,6 +77,10 @@ } + // Set title + $this->addTitleLocalized('Library'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('totalQuestcount', $totalQuestcount); @@ -124,6 +128,11 @@ } + // Set title + $this->addTitle($questtopic['title']); + $this->addTitleLocalized('Library'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('questtopic', $questtopic); diff --git a/controllers/QuestgroupsController.inc b/controllers/QuestgroupsController.inc index 8e4d01c4..3d24a678 100644 --- a/controllers/QuestgroupsController.inc +++ b/controllers/QuestgroupsController.inc @@ -185,6 +185,15 @@ } + // Set titile + if(!is_null($questgroup['hierarchy'])) { + $this->addTitle(sprintf('%s %d: %s', $questgroup['hierarchy']['title_singular'], $questgroup['hierarchy']['questgroup_pos'], $questgroup['title'])); + } + else { + $this->addTitle($questgroup['title']); + } + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('questgroup', $questgroup); @@ -229,6 +238,10 @@ } + // Set titile + $this->addTitleLocalized('Create Questgroup'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); } diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc index fff85c44..9c02d16a 100644 --- a/controllers/QuestsController.inc +++ b/controllers/QuestsController.inc @@ -107,6 +107,10 @@ } + // Set titile + $this->addTitleLocalized('Quests'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('quests', $quests); @@ -285,6 +289,10 @@ } + // Set titile + $this->addTitle($quest['title']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('questgroup', $questgroup); @@ -340,6 +348,11 @@ $solvedSubmissionCharacters = $this->Characters->getCharactersSolvedQuest($quest['id']); + // Set titile + $this->addTitleLocalized('Submissions'); + $this->addTitle($quest['title']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('questgroup', $questgroup); @@ -391,6 +404,11 @@ $output = $this->renderTaskSubmission($questtype['classname'], $seminary, $questgroup, $quest, $character); + // Set titile + $this->addTitleLocalized('Submission of %s', $character['name']); + $this->addTitle($quest['title']); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('questgroup', $questgroup); @@ -510,6 +528,10 @@ } + // Set titile + $this->addTitleLocalized('Create Quest'); + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('questgroups', $questgroups); diff --git a/controllers/SeminariesController.inc b/controllers/SeminariesController.inc index 13259c75..c4e72dd6 100644 --- a/controllers/SeminariesController.inc +++ b/controllers/SeminariesController.inc @@ -80,6 +80,9 @@ } + // Set titile + $this->addTitleLocalized('Seminaries'); + // Pass data to view $this->set('seminaries', $seminaries); } @@ -147,6 +150,9 @@ } + // Set titile + $this->addTitle($seminary['title']); + // Pass data to view $this->set('seminary', $seminary); $this->set('questgroupshierarchy', $questgroupshierarchy); @@ -172,6 +178,10 @@ $user = $this->Seminaries->getSeminaryById($seminaryId); $this->redirect($this->linker->link(array($seminary['url']), 1)); } + + + // Set titile + $this->addTitleLocalized('New seminary'); } @@ -208,6 +218,9 @@ } + // Set titile + $this->addTitleLocalized('Edit seminary'); + // Pass data to view $this->set('seminary', $seminary); } @@ -244,6 +257,9 @@ } + // Set titile + $this->addTitleLocalized('Delete seminary'); + // Show confirmation $this->set('seminary', $seminary); } diff --git a/controllers/UsersController.inc b/controllers/UsersController.inc index d7d5bd45..5a32ab51 100644 --- a/controllers/UsersController.inc +++ b/controllers/UsersController.inc @@ -56,6 +56,9 @@ $users = $this->Users->getUsers(); + // Set titile + $this->addTitleLocalized('Users'); + // Pass data to view $this->set('users', $users); } @@ -103,6 +106,10 @@ } + // Set titile + $this->addTitleLocalized($user['username']); + $this->addTitleLocalized('Users'); + // Pass data to view $this->set('user', $user); $this->set('characters', $characters); @@ -144,6 +151,9 @@ } + // Set titile + $this->addTitleLocalized('Login'); + // Pass data to view $this->set('username', $username); $this->set('referrer', $referrer); @@ -213,6 +223,9 @@ } + // Set titile + $this->addTitleLocalized('Registration'); + // Pass data to view $this->set('username', $username); $this->set('prename', $prename); @@ -326,6 +339,9 @@ } + // Set titile + $this->addTitleLocalized('Manage users'); + // Pass data to view $this->set('users', $users); $this->set('selectedUsers', $selectedUsers); @@ -388,6 +404,9 @@ } + // Set titile + $this->addTitleLocalized('New user'); + // Pass data to view $this->set('username', $username); $this->set('prename', $prename); @@ -476,6 +495,9 @@ } + // Set titile + $this->addTitleLocalized('Edit user'); + // Pass data to view $this->set('username', $username); $this->set('prename', $prename); @@ -517,6 +539,9 @@ } + // Set titile + $this->addTitleLocalized('Delete user'); + // Show confirmation $this->set('user', $user); } 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 021da61d770c527e10e72d132f152bae9ed1edd1..bd93aeec4bdc6f348eb150239d33d7b7cfec25b0 100644 GIT binary patch delta 4712 zcmZA33s6?*8f*{IEP>c``T7syE8R2ntCZ;rG;kdoy;cEO06cXNvA2Tar*wwUNla7?yt{Uo4xm1>%Z4N-kPHI zbDS?b1TQxn$4DaC(#Du;f{e+F&{<F15j{YHx#}n8Sf5!IMrGqh% zn2x%CFoxhTgerQMcIh`?z@y!4lD&=tNSX4=;qTWIUsshz`E!Nrd8&R*M z5w+6&sFfZ?mHGtgm7YWm{0Amu1ZC@tz0uJOhttr7`KXo8N3Hy6)P<{24}9DHeJARH z2T%i_u%1R;_Y>-!|AH#{71YGruqyq%D{7pycUmpH&)bdKV@;^*&!Q@OE}r`99bV={Feb8Gz1tM@V1Lv= z_t^dn)b-WKqRcw`_eRtJAKCsHR0S^B{_jZjO&F`u`6N^YQ&s=#Xbi&ZaSH0f1<0Jt zD%6TLV>jH6szkHxpGVyv!|1BO0MrVzQ3K?nDlrbV$EKkwScJOXnNLF{szz1dS=4}a zsF}Wmsz5#J#?7b)?M0RFFzUW$)WBa`ze9aBKcXrc#0JnrI-(ZfLB?@RCXK7A#r3Ea9zlKI$5DIX9I6tLNp3$8yVB1=eYOSGd8k+FpvGB=Vfy}8 z+dnj*Cenyn!PmBb5w$lu^YLl|IjEK1ih4zNp-MX*TjO-(7Bdr7p@r63>_LAGY9jkF z@co~pk;REisDXQV+!AG@HpwXKIMlnGWc$Ual~kZ6@QCd{XoY2g|slVQ3BI+|tM{SlNNO8<)jVDp}MezQ#xqDlupngA|acF3!^{5AKM6Gz6y-B{EE zr=cEHX8Vg!6Iz2B*l+*77xkRu*apwII_4Y=mGB~JQ$(e?pO43yiz?MjkV0;<1iyM&rWp<$|bOw2Q<_~MPUhZDF16BHos0GYIO`sATZI&t;nt3g1x7K4A z?n4c92w8;r&Kk?s*7Z5akDnQXp;(NXXeH`%U5gacY`1=cszgMFyTG^%>aS8IaH1Xd z!S;9)YNjJmH%vfHXd0?Avrz;3P}f&r1TH|midu}s2GsMnpziw+^}NH@Pcx{$E@`yQ54AjhKh3Pz^@mix`a?Y=0+4(rRurgnmYq_%ibAX+m${-v>-b{Ub9TDVnLUHlXhNKWgR8sQb^O z_QYjug>n4?d&4pDG*tSb*a4@Y{{O%{)I>I*Zrp>+!F*x+QM?BY&;wP$!PZ>tNPiS+ zA~R6CeU7!#p0C1SegBIC4gQrvJ!m;b<64ZtP4@gA)aE&eTG27o0H;uu`yREBUr_Hh zW`O&55Aw5OJ|uo}3(V50bWF8>H$PA*5sUw$6B<~UD9{zKLj3+u?b1@68^%z2S5N*7xk2~lrA!S#cTw&W< z*amVx*+UkP?nK8x(wZF7`k$q-o%l%0!6r7hlDmk0U~VRB$zxfYc zRJU}jFXJ)tyzPHr4aaqX`qLOnrrJOJ7t=@;sUiO(#YD%uE`d)@%|+w|d+zV7v?r!x zwr%HN5;;t2bxvj4O&ZkU=tI_!kH`U{PxBdaFZnl_OQOg=Qc2z*{~<4tmSZ-Jj^tI+ z!JgDNugyD$%p%&rIvh6VU&kx7Vn_uUY0tieDdeA|j`Sq4q!$@N4w83>hhz}_Q#_As zBkAN3(sIPp=t0Jk68EGN_}2NcGY^r??n$#08_B>^vqV)6-jiYz1gDSnaMN!})<K-!geP6 z=f->*(xt#xFw5)7on25;Fr&;{QffxIXUa?I_=mVEX3w6y)5Ql_>|4m_)fXL&sp-jd3KIb~j-8Rqqsmp$w)@l^PW g(vOF<&D*=RwA?q#>+?^_>=j%$EHmM?ntnll0x-$eDgXcg delta 4559 zcmYk<36Rd`0mt#jTDu$8v70zT$h#K7I@cmJON%8T8b?%vYN9lP#?d$$$1A8M36h}d z7E~e^v656;f~KKq9GNyGGYuvqGf7OMGo7R{Q_=7D{Xb^%jNg8q|M{H%H|_2zm6Oxw z3bWS+%4u>7*_0DP{c6-}dp3k=1tH|&bi4r{jmJx{7RM{FA+E;~d=>NYW2}Q;pwC~y z8kkiW0{=oDe`q2dnow!Xi8go>_QQI3AGX3t=!>4lrnn8;;vsB+pU2~HW72^V^gSc7 zCQd=d6lP;CEh7MSSed6(WtjqBn z3EpPO-WJpTsz{$uESKJ+~8hi|Ajl{xhj3(+ZUhOR<4bO!oi6C57TPeqqxK04A$ zbfnLqQ@tKt(yeI2f5uz!1UAAiF>McXm`86+p;J?ij(i|`;~4aXGvoES=nI#j4X=;x zMDN>!uK8=|lpjJn{!YC93EIwQ4VZs>{52*_tX^h{z`NvSD;I_5wr1NL+0PLJj#g_o82X~|=oC&v zA6$Soyg0fX{YqA$GrAq^$m{3;j-c(lk3H}s?CAG@BRiv<6MeBiK89Qf$FUQBi@u-@ zJJgQ!h*qE@8H$d4bUZ%=ZDmau z@`Z*u=w4WX&cvR0d=Q&+d>;KwvzjFqpi7!UXY6)#hRfsm{@B9re=HS8u-Fs02HhM7 z&<>nONBSxHg3IXCev8$yIv+LFkc-Yxt7s{<;kXytk%`E*2n(?kH(=VSIYGtE@p1Gb zx`vnH@ilY=IjN-KTIg|uXcNrhIE8k!7~MPV(Sh|w?;nB=XaqV_qf_zwpTr3toR0Qz zE;`b+(JgqmS_sdfFPO-Dd;MW_CT61}Uxe@BN@Rb9(QE)W^DOl9U5s{Y1GdvZq_pNzPr%(j6*-q zS?CNbkH_ha@rGB>ksXaUoJOba6ZD0b(HCX&X?WZS?NEEP;lAkg;plrF#2lO%orlig zVsuYzMOG;t_9m6^4|FEJLH>o>t&@>;MSDIN`BKCE=v2-}*L)e;@EWv3&!hJr!W#HK z+M%=PbDv@!d+Fbq>#YA3z7f~%8rtJq+a@Dwh0Z`XbglZL4Gl&ccmTcs5zNE6SQD3^ z&#gkA+k}pM7uunt=#m}B+h{*rppuPwCCRR>jqIDy8l92B$n1yl(I?Qg--nLu2)YEP zuqK|5*S|nJdIcR|e!HZj?a;5IE2e2X456ZP(Fb-RKW5V3^DvqQx+CVRK z$_Ah#7>=&#)OdXX^81k~?vc6V$Ap#3l=}R2GddfVpCyDLcz3K1!-J%$-@oN)GAdK! ze@KBCMf--s@Irflc$ zVe&%ei2t*Iza;Kf%N8<)yiJ}Zzao}(WCVGQEGN!X1$ls2W+a4(QP=*5#LYa8_QM`3 z`^oKO0x2YK63c4Rm#iT_A-^W8$W*eDyhlcoBgEntbUIUG8PSdGQd)jW7895B_hb@j z>H52SEk7d9lb4A*^{?bzGL!tBv>_+R9P$=J zFA_@`?PqrF>zTvkN66}v zD#_?fjd#95Ky!y3?TQ#3(_an2Y&BdXX+hEbF!Q4CHIon#IlJjAcs7lY|H#j{@d|ttV=ht zl`PB5DU~~k*x zkUXboy+@Q;WNg*T1!rnhZEyH^UR8OjakbnosnXJ(Wt~=!Eh>uj&Q(i`#@ T>bhMUS6%E>lD(r%*J}R 0) : ?> -

+

    &$submission) : ?>
  1. diff --git a/views/html/characters/manage.tpl b/views/html/characters/manage.tpl index c86cd26b..727adeb8 100644 --- a/views/html/characters/manage.tpl +++ b/views/html/characters/manage.tpl @@ -7,7 +7,7 @@
    4. -

    +

    diff --git a/views/html/html.tpl b/views/html/html.tpl index af8499bc..c05a92a7 100644 --- a/views/html/html.tpl +++ b/views/html/html.tpl @@ -3,7 +3,7 @@ - <?=\nre\configs\AppConfig::$app['name']?> + <?=(isset($title)) ? $title : \nre\configs\AppConfig::$app['name']?> diff --git a/views/html/quests/submissions.tpl b/views/html/quests/submissions.tpl index 37699e48..760d0c9b 100644 --- a/views/html/quests/submissions.tpl +++ b/views/html/quests/submissions.tpl @@ -4,7 +4,7 @@ -

    +

    ()

    diff --git a/views/html/seminaries/create.tpl b/views/html/seminaries/create.tpl index 45637e02..425f2367 100644 --- a/views/html/seminaries/create.tpl +++ b/views/html/seminaries/create.tpl @@ -1,9 +1,11 @@
    -

    -

    +
      +
      • +
    +

    diff --git a/views/html/seminaries/delete.tpl b/views/html/seminaries/delete.tpl index 49387278..a79d009a 100644 --- a/views/html/seminaries/delete.tpl +++ b/views/html/seminaries/delete.tpl @@ -3,9 +3,11 @@ -

    -

    +
      +
      • +
    +

    diff --git a/views/html/seminaries/edit.tpl b/views/html/seminaries/edit.tpl index 70cd86a9..f94b1916 100644 --- a/views/html/seminaries/edit.tpl +++ b/views/html/seminaries/edit.tpl @@ -3,9 +3,11 @@ -

    -

    +
      +
      • +
    +

    diff --git a/views/html/users/manage.tpl b/views/html/users/manage.tpl index 8d4a1495..5debb913 100644 --- a/views/html/users/manage.tpl +++ b/views/html/users/manage.tpl @@ -5,7 +5,7 @@
    5. -

    +