From de7e5e05cb877cece5476bd0a225e62f4c29ef1d Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Mon, 14 Apr 2014 15:35:57 +0200
Subject: [PATCH] sort Achievements by position and hide title and description
 of secret Achievements

---
 models/AchievementsModel.inc      | 11 ++++++-----
 views/html/achievements/index.tpl |  9 +++++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/models/AchievementsModel.inc b/models/AchievementsModel.inc
index a426efa2..f25689b3 100644
--- a/models/AchievementsModel.inc
+++ b/models/AchievementsModel.inc
@@ -66,15 +66,16 @@
 		 * @param	int	$seminaryId	ID of Seminary to get Achievements of
 		 * @return	array			Achievements data
 		 */
-		public function getAchievementsForSeminary($seminaryId, $includeHidden=false)
+		public function getAchievementsForSeminary($seminaryId)
 		{
 			return $this->db->query(
-				'SELECT achievements.id, achievementconditions.condition, title, url, description, progress, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '.
+				'SELECT achievements.id, achievementconditions.condition, title, url, description, progress, hidden, unachieved_achievementsmedia_id, achieved_achievementsmedia_id '.
 				'FROM achievements '.
 				'LEFT JOIN achievementconditions ON achievementconditions.id = achievements.achievementcondition_id '.
-				'WHERE seminary_id = ? AND hidden <= ?',
-				'ii',
-				$seminaryId, $includeHidden
+				'WHERE seminary_id = ? '.
+				'ORDER BY achievements.pos ASC',
+				'i',
+				$seminaryId
 			);
 		}
 		
diff --git a/views/html/achievements/index.tpl b/views/html/achievements/index.tpl
index 62c99c1a..fdaf2d7c 100644
--- a/views/html/achievements/index.tpl
+++ b/views/html/achievements/index.tpl
@@ -12,8 +12,13 @@
 		<?php if(!is_null($achievement[$achievement['media_index']])) : ?>
 		<img src="<?=$linker->link(array('media','achievement',$seminary['url'],$achievement['url']))?>" />
 		<?php endif ?>
-		<h3><?=$achievement['title']?></h3>
-		<?=\hhu\z\Utils::t($achievement['description'])?><br />
+		<h3><?=(!$achievement['hidden']) ? $achievement['title'] : _('Secret Achievement')?></h3>
+		<?php if(!$achievement['hidden']) : ?>
+		<?=\hhu\z\Utils::t($achievement['description'])?>
+		<?php else : ?>
+		<?=_('Continue playing to unlock this secret Achievement')?>
+		<?php endif ?>
+		<br />
 		
 		<?php if(array_key_exists('characterProgress', $achievement)) : ?>
 		<div class="cf">