Merge pull request #473 from hemberger/turns-color

SmrPlayer: add method getTurnsColor
smrealms · Apr 30, 2018 · a4e970f · a4e970f
2 parents 170a6f7 + bf75f7d
commit a4e970f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 26 deletions.
diff --git a/lib/Default/SmrPlayer.class.inc b/lib/Default/SmrPlayer.class.inc
@@ -1637,6 +1637,23 @@ class SmrPlayer extends AbstractSmrPlayer {
 		return 'HIGH';
 	}
 
+	/**
+	 * Returns the CSS class color to use when displaying the player's turns
+	 */
+	public function getTurnsColor() {
+		switch($this->getTurnsLevel()) {
+			case 'NONE':
+			case 'LOW':
+				return 'red';
+			break;
+			case 'MEDIUM':
+				return 'yellow';
+			break;
+			default:
+				return 'green';
+		}
+	}
+
 	public function update() {
 		$this->save();
 	}

diff --git a/templates/Default/engine/Default/includes/RightPanelPlayer.inc b/templates/Default/engine/Default/includes/RightPanelPlayer.inc
@@ -10,19 +10,7 @@ if(isset($GameID)) { ?>
 	<br />
 	Race : <a href="<?php echo Globals::getCouncilHREF($ThisPlayer->getRaceID()); ?>"><?php echo $ThisPlayer->getColouredRaceName($ThisPlayer->getRaceID()); ?></a><br />
 	Turns : <span id="turns">
-		<span class="<?php
-			switch($ThisPlayer->getTurnsLevel()) {
-				case 'NONE':
-				case 'LOW':
-					echo 'red';
-				break;
-				case 'MEDIUM':
-					echo 'yellow';
-				break;
-				default:
-					echo 'green';
-			}
-			?>"><?php
+		<span class="<?php echo $ThisPlayer->getTurnsColor(); ?>"><?php
 				echo $ThisPlayer->getTurns() .'/'.$ThisPlayer->getMaxTurns();
 			?></span>
 		</span><br />

diff --git a/templates/Freon22/engine/Default/skeleton.php b/templates/Freon22/engine/Default/skeleton.php
@@ -30,19 +30,7 @@
 												Race: <a href="<?php echo Globals::getCouncilHREF($ThisPlayer->getRaceID()); ?>"><?php echo $ThisPlayer->getColouredRaceName($ThisPlayer->getRaceID()); ?></a><br />
 
 												Turns : <span id="turns">
-													<span class="<?php
-														switch($ThisPlayer->getTurnsLevel()) {
-															case 'NONE':
-															case 'LOW':
-																echo 'red';
-															break;
-															case 'MEDIUM':
-																echo 'yellow';
-															break;
-															default:
-																echo 'green';
-														}
-														?>"><?php
+													<span class="<?php echo $ThisPlayer->getTurnsColor(); ?>"><?php
 															echo $ThisPlayer->getTurns() .'/'.$ThisPlayer->getMaxTurns();
 														?></span>
 													</span><br />