From c65c55ddfb659a553f79550525d73e6068cab707 Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Wed, 1 Feb 2012 08:11:49 +0000
Subject: improved mobile footer

---
 h-source/Application/Controllers/BaseController.php    |  1 +
 h-source/Application/Controllers/ContactController.php |  2 +-
 h-source/Application/Controllers/CreditsController.php |  2 +-
 h-source/Application/Controllers/ProjectController.php |  2 ++
 h-source/Application/Include/languages.php             |  3 +++
 h-source/Application/Views/Desktop/footer.php          |  4 ++--
 h-source/Application/Views/Mobile/footer.php           | 18 +++++++++++++-----
 h-source/Public/Css/main.css                           |  3 ++-
 h-source/Public/Css/mobile.css                         |  4 ++--
 9 files changed, 27 insertions(+), 12 deletions(-)

(limited to 'h-source')

diff --git a/h-source/Application/Controllers/BaseController.php b/h-source/Application/Controllers/BaseController.php
index 7bd8027..9287cee 100644
--- a/h-source/Application/Controllers/BaseController.php
+++ b/h-source/Application/Controllers/BaseController.php
@@ -44,6 +44,7 @@ class BaseController extends Controller
 		"download"		=>	null,
 		"help"			=>	null,
 		"wiki"			=>	null,
+		"project"		=>	null,
 	);
 	
 	public function __construct($model, $controller, $queryString) {
diff --git a/h-source/Application/Controllers/ContactController.php b/h-source/Application/Controllers/ContactController.php
index ddbbe43..197ec9a 100644
--- a/h-source/Application/Controllers/ContactController.php
+++ b/h-source/Application/Controllers/ContactController.php
@@ -26,7 +26,7 @@ class ContactController extends BaseController
 	public function __construct($model, $controller, $queryString)
 	{
 		
-		$this->_topMenuClasses['contact'] = " class='currentitem'";
+		$this->_topMenuClasses['contact'] = " class='currentitem ui-btn-active'";
 		
 		parent::__construct($model, $controller, $queryString);
 		
diff --git a/h-source/Application/Controllers/CreditsController.php b/h-source/Application/Controllers/CreditsController.php
index c8c01fb..4dbcc4a 100644
--- a/h-source/Application/Controllers/CreditsController.php
+++ b/h-source/Application/Controllers/CreditsController.php
@@ -26,7 +26,7 @@ class CreditsController extends BaseController
 	public function __construct($model, $controller, $queryString)
 	{
    
-		$this->_topMenuClasses['credits'] = " class='currentitem'";
+		$this->_topMenuClasses['credits'] = " class='currentitem ui-btn-active'";
 		
 		parent::__construct($model, $controller, $queryString);
 		
diff --git a/h-source/Application/Controllers/ProjectController.php b/h-source/Application/Controllers/ProjectController.php
index 8be77a1..234fb59 100644
--- a/h-source/Application/Controllers/ProjectController.php
+++ b/h-source/Application/Controllers/ProjectController.php
@@ -25,6 +25,8 @@ class ProjectController extends BaseController
 
 	public function __construct($model, $controller, $queryString)
 	{
+		$this->_topMenuClasses['project'] = " class='currentitem ui-btn-active'";
+		
 		parent::__construct($model, $controller, $queryString);
 		
 		$data['title'] = 'project - '.Website::$generalName;
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index aedbdae..0de0d51 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -376,6 +376,9 @@ class Lang
 				/*0316*/"next"	=>	"successivi",
 				/*0317*/"previous"	=>	"precedenti",
 				/*0318*/"type"	=>	"tipo",
+				/*0319*/"contact us"	=>	"contattaci",
+				/*0320*/"credits"	=>	"crediti",
+				/*0321*/"desktop version"	=>	"versione desktop",
 			),
 		'es'	=>	array
 			(
diff --git a/h-source/Application/Views/Desktop/footer.php b/h-source/Application/Views/Desktop/footer.php
index 56dbcda..1eafcc6 100644
--- a/h-source/Application/Views/Desktop/footer.php
+++ b/h-source/Application/Views/Desktop/footer.php
@@ -26,11 +26,11 @@
 		</div>
 		
 		<div class="footer_credits_box">
-			<a href="<?php echo $this->baseUrl."/credits/index/$lang";?>">credits</a>
+			<a href="<?php echo $this->baseUrl."/credits/index/$lang";?>"><?php echo gtext("credits");?></a>
 		</div>
 		
 		<div class="footer_credits_box">
-			<a href="<?php echo $this->baseUrl."/contact/index/$lang";?>">contact</a>
+			<a href="<?php echo $this->baseUrl."/contact/index/$lang";?>"><?php echo gtext("contact us");?></a>
 		</div>
 	</div> <!--fine footer-->
 
diff --git a/h-source/Application/Views/Mobile/footer.php b/h-source/Application/Views/Mobile/footer.php
index 830f2bd..489f53a 100644
--- a/h-source/Application/Views/Mobile/footer.php
+++ b/h-source/Application/Views/Mobile/footer.php
@@ -21,11 +21,19 @@
 ?>
 
 	<div id="footer" data-role="footer">
-		<div class="ui-grid-b">
-			<div class="ui-block-a"><a rel='external' href="<?php echo $this->baseUrl."/contact/index/$lang";?>">contact</a></div>
-			<div class="ui-block-b"><a rel='external' href="<?php echo $this->baseUrl."/credits/index/$lang";?>">credits</a></div>
-			<div class="ui-block-c">The <a rel='external' href="<?php echo $this->baseUrl."/project/index/$lang";?>"><?php echo Website::$projectName;?></a> Project</div>
-		</div><!-- /grid-b -->
+
+		<div data-theme='b' data-role="navbar">
+			<ul>
+				<li><a <?php echo $tm['contact']; ?> rel='external' href="<?php echo $this->baseUrl."/contact/index/$lang";?>"><?php echo gtext("contact us");?></a></li>
+				<li><a <?php echo $tm['credits']; ?> rel='external' href="<?php echo $this->baseUrl."/credits/index/$lang";?>"><?php echo gtext("credits");?></a></li>
+				<li><a <?php echo $tm['project']; ?> rel='external' href="<?php echo $this->baseUrl."/project/index/$lang";?>">The <?php echo Website::$projectName;?> Project</a></li>
+			</ul>
+		</div><!-- /navbar -->
+		<div data-role="navbar">
+			<ul>
+				<li><a href="<?php echo $this->baseUrl."/home/index/$lang?version=desktop";?>"><?php echo gtext("desktop version");?></a></li>
+			</ul>
+		</div><!-- /navbar -->
 	</div> <!--fine footer-->
 
 </div> <!--fine page-->
diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css
index 5039afd..ede2d4d 100644
--- a/h-source/Public/Css/main.css
+++ b/h-source/Public/Css/main.css
@@ -1043,6 +1043,7 @@ ins
 
 .copyright_notice_box, .footer_credits_box
 {
+	text-align:center;
 	width:120px;
 	float:right;
 	font: normal 12px/1 sans-serif,arial;
@@ -1051,7 +1052,7 @@ ins
 }
 .footer_credits_box
 {
-	width:40px;
+	width:60px;
 	border-left:3px solid #FFF;
 }
 .home_objectives_description
diff --git a/h-source/Public/Css/mobile.css b/h-source/Public/Css/mobile.css
index 2550056..78bd288 100644
--- a/h-source/Public/Css/mobile.css
+++ b/h-source/Public/Css/mobile.css
@@ -19,8 +19,8 @@ img
 
 #footer
 {
-	padding-bottom:5px;
-	padding-top:5px;
+	/*padding-bottom:5px;
+	padding-top:5px;*/
 }
 #footer div
 {
-- 
cgit v1.2.3