Merge branch 'master' of github.com:hainatravel/information-system

application/models/infoMetas_model.php

@@ -4,7 +4,7 @@ class InfoMetas_model extends CI_Model {
 
     function __construct() {
         parent::__construct();
-        $this->HT = $this->load->database('HT', TRUE);
+        $this->HT = $this->load->database('INFORMATION', TRUE);
     }
 
     function add($im_ic_id, $im_key, $im_value) {

application/views/mobile_first/chinatravel-zodiac-calc.php

@@ -7,14 +7,14 @@
 </div>
 
 <div class="zodiac-search" style="display: none;" id="zodiac-search">
-<p class="font24">Your Chinese zodiac sign is the <strong class="orange" id="sign1">Ox</strong>.</p>
+<p class="font24">Your Chinese zodiac sign is the <strong class="orange" id="sign1"></strong></p>
 
-<p>People born in the Year of the <sapn id="sign2">Ox</sapn> are <strong id="character">honest, patient, and reliable</strong>.</p>
+<p>People born in the Year of the <sapn id="sign2">Ox</sapn> are <strong id="character"></strong></p>
 
 <ul class="common">
-	<li><strong>Five Elements:</strong> <span id="WuXing">Earth</span></li>
-	<li><strong>Lucky Numbers:</strong> <span id="Luky-Numbers">1, 4, 9</span></li>
-	<li><strong>Lucky Colors:</strong> <span id="Luky-Colors">green, white</span></li>
+	<li><strong>Five Elements:</strong> <span id="WuXing"></span></li>
+	<li><strong>Lucky Numbers:</strong> <span id="Luky-Numbers"></span></li>
+	<li><strong>Lucky Colors:</strong> <span id="Luky-Colors"></span></li>
 </ul>
 </div>
 </div>