Merge branch 'dev' of https://github.com/MathieuNls/tw into dev

Toolwatchapp · Feb 3, 2016 · b9f1525 · b9f1525
2 parents 008d70f + df7b5db
commit b9f1525
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/application/controllers/Home.php b/application/controllers/Home.php
@@ -93,6 +93,9 @@ function resetPassword($resetToken = '') {
 	function about() {
 		$this->_headerData['headerClass'] = 'blue';
 		$this->_headerData['title']       = 'About Toolwatch';
+		$this->_headerData['meta_description'] = 'Toolwatch is where
+		watch aficionados measure the accuracy and precision of their watch.
+		More than 5000 people use Toolwatch to take care of their watch.';
 		$this->load->view('header', $this->_headerData);
 		$this->load->view('about');
 		$this->load->view('footer');
@@ -101,6 +104,10 @@ function about() {
 	function contact() {
 		$this->_headerData['headerClass'] = 'blue';
 		$this->_headerData['title']       = 'Contact';
+		$this->_headerData['meta_description'] = 'Contact the Toolwatch
+		Team. We are here to answer questions about watch accuracy,
+		precision, maintenance for watches and lots of other
+		interesting topics.';
 		$this->load->view('header', $this->_headerData);
 		$this->load->view('contact');
 		$this->load->view('footer');

diff --git a/application/views/header.php b/application/views/header.php
@@ -8,18 +8,18 @@
 
 ?></title>
     <meta name="keywords" content="toolwatch, toolwatchapp, accuracy, precision, measure, mechanical watch, manual winding, automatic winding">
-    <meta name="description" content="Toolwatch makes it super easy to measure the accuracy of any mechanical watch. Keep your watch’s accuracy at its best with Toolwatch.">
-
-    <meta property="og:title" content="<?php if (isset($title)) {echo $title;
+    <meta name="description" content="<?php if (isset($meta_description)) {echo $meta_description;
 } else {
-	echo 'Easily measure and track the accuracy of your mechanical watch';
+	echo 'Toolwatch makes it super easy to measure the accuracy of a mechanical watch. Keep your watch\'s accuracy at its best and know if you should service your watch';
 }
 ?>" />
-    <meta property="og:description" content="<?php if (isset($meta_description)) {echo $meta_description;
+
+    <meta property="og:title" content="<?php if (isset($title)) {echo $title;
 } else {
-	echo 'Toolwatch makes it super easy to measure the accuracy of any mechanical watch. Keep your watch’s accuracy at its best with Toolwatch.';
+	echo 'Easily measure and track the accuracy of your mechanical watch';
 }
 ?>" />
+    <meta property="og:description" content="<?php echo 'Toolwatch makes it super easy to measure the accuracy of a mechanical watch. Keep your watch\'s accuracy at its best and know if you should service your watch' ?>" />
     <meta property="og:image" content="<?php if (isset($meta_img)) {echo $meta_img;
 } else {
 	echo img_url('share.png');