From 131be981ce26297c8648f1dc1d5ba53d89b3d2e3 Mon Sep 17 00:00:00 2001
From: SirCotare <SirCotare@localhost>
Date: Sun, 3 Jun 2012 23:03:33 +0200
Subject: [PATCH] #1470 minor bugfixes with app rendering; added Tieable
 interface

---
 .../class/AchCategory_class.php                |  2 +-
 .../class/AchSummary_class.php                 | 18 +++++++++++++++++-
 .../include/ach_render_web.php                 |  8 +++++---
 code/web/app/app_achievements/index.php        |  1 +
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/code/web/app/app_achievements/class/AchCategory_class.php b/code/web/app/app_achievements/class/AchCategory_class.php
index a513a738d..392c2c085 100644
--- a/code/web/app/app_achievements/class/AchCategory_class.php
+++ b/code/web/app/app_achievements/class/AchCategory_class.php
@@ -1,5 +1,5 @@
 <?php
-	class AchCategory extends AchList {
+	class AchCategory extends AchList implements Tieable {
 		private $id = false;
 		private $ties_cult;
 		private $ties_civ;
diff --git a/code/web/app/app_achievements/class/AchSummary_class.php b/code/web/app/app_achievements/class/AchSummary_class.php
index 5a4c5b5b9..a89df0823 100644
--- a/code/web/app/app_achievements/class/AchSummary_class.php
+++ b/code/web/app/app_achievements/class/AchSummary_class.php
@@ -1,5 +1,5 @@
 <?php
-	class AchSummary extends AchList {
+	class AchSummary extends AchList implements Tieable {
 		private $menu;
 		private $stats;
 
@@ -65,5 +65,21 @@
 			return array($done,$total);
 
 		}
+
+		function isTiedCult() {
+			return false;
+		}
+
+		function isTiedCiv() {
+			return false;
+		}
+
+		function getCurrentCiv() {
+			return "c_neutral";
+		}
+
+		function getCurrentCult() {
+			return "c_neutral";
+		}
 	}
 ?>
\ No newline at end of file
diff --git a/code/web/app/app_achievements/include/ach_render_web.php b/code/web/app/app_achievements/include/ach_render_web.php
index 2718bfbc0..7ab64ecd5 100644
--- a/code/web/app/app_achievements/include/ach_render_web.php
+++ b/code/web/app/app_achievements/include/ach_render_web.php
@@ -233,10 +233,12 @@
 		$perk_list = $ach->getOpen();
 
 		$perk = $ach->getChild($perk_list[0]);
-
-		$html .= "<span style='color:#999999;font-weight:bold;'>".$perk->getName()."</span>";
+		
+		if($perk->getName() != null) {
+			$html .= "<span style='color:#999999;font-weight:bold;display:block;'>".$perk->getName()."</span>";
+		}
 		if($perk->objDrawable()) {
-			$html .= "<br>".ach_render_obj_list($perk->getChildren());
+			$html .= ach_render_obj_list($perk->getChildren());
 		}
 
 		return $html;
diff --git a/code/web/app/app_achievements/index.php b/code/web/app/app_achievements/index.php
index 583932ad1..6837c0cc6 100644
--- a/code/web/app/app_achievements/index.php
+++ b/code/web/app/app_achievements/index.php
@@ -34,6 +34,7 @@ require_once("include/ach_render_common.php");
 
 require_once("class/RenderNodeIteraor_abstract.php");
 require_once("class/AchList_abstract.php");
+require_once("class/Tieable_inter.php");
 
 require_once("class/AchMenu_class.php");
 require_once("class/AchSummary_class.php");