From 92be8a8c9544bb6af54b43010d342a1be664f800 Mon Sep 17 00:00:00 2001
From: Ricsi <tricsusz@gmail.com>
Date: Sat, 14 Jan 2017 21:23:13 +0100
Subject: [PATCH] default view page set to diary nav header modified on mobile
 view data order changed in user_data_edit

---
 _class/class_page.php                 |  2 +-
 _class/class_training.php             |  2 ++
 _css/default.css                      |  4 ++++
 _css/default_view.css                 |  2 +-
 _css/nav.css                          | 12 ++++++++++++
 template/templates/nav.tpl            | 13 ++++++-------
 template/templates/user_data_edit.tpl | 16 ++++++++--------
 7 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/_class/class_page.php b/_class/class_page.php
index d54af1c..6c318de 100755
--- a/_class/class_page.php
+++ b/_class/class_page.php
@@ -189,7 +189,7 @@ class page {
 								include('include_diary.php');								
 								break;
 							default:
-								include('include_overview.php');
+								include('include_diary.php');
 								break;
 						}
 						break;
diff --git a/_class/class_training.php b/_class/class_training.php
index 4759074..09b1cd8 100755
--- a/_class/class_training.php
+++ b/_class/class_training.php
@@ -52,6 +52,8 @@ class training {
 	}
 
 	public function get_tr_date_day() {
+		$day = date("d", strtotime($this->tr_date));
+		if (substr($day, 0, 1) == '0') return substr($day, 1, 1); 
 		return date("d", strtotime($this->tr_date));
 	}
 
diff --git a/_css/default.css b/_css/default.css
index 70eb468..dcf9036 100644
--- a/_css/default.css
+++ b/_css/default.css
@@ -48,6 +48,10 @@ main #main_content {
 	font-weight: bold;
 }
 
+ul.topnav span {
+	color: #f2f2f2;
+}
+
 .list .list_item .size20 {
 	font-size: 20px;
 }
diff --git a/_css/default_view.css b/_css/default_view.css
index add3a59..1f1559c 100644
--- a/_css/default_view.css
+++ b/_css/default_view.css
@@ -10,7 +10,7 @@ ul.topnav {
 	background-color: #FD9500;
 }
 
-ul.topnav li a {
+ul.topnav li a, ul.topnav span {
   	color: #002E4C;
 }
 
diff --git a/_css/nav.css b/_css/nav.css
index d9d86e0..25013c3 100644
--- a/_css/nav.css
+++ b/_css/nav.css
@@ -51,6 +51,10 @@ li.logout_mobile {
   display: none;
 }
 
+ul.topnav span.mobile_logout {
+  display: none;
+}
+
 @media screen and (max-width:680px) {
   ul.topnav li {display: none;}
   ul.topnav li.login {display: inline-block;}
@@ -82,6 +86,14 @@ ul.topnav li.logout {
   display: none;
 }
 
+ul.topnav span.mobile_logout {
+  display: block;
+  position: absolute;
+  top: 15px;
+  right: 15px;
+  font-size: 16px;
+}
+
 
 ul.topnav li.logout {float:none;}
 }
\ No newline at end of file
diff --git a/template/templates/nav.tpl b/template/templates/nav.tpl
index 3ad5f4b..14c1b95 100755
--- a/template/templates/nav.tpl
+++ b/template/templates/nav.tpl
@@ -1,18 +1,17 @@
 <ul class="topnav" id="myTopnav">
   {if $can_logout}
   <li class="icon">
-    <a href="javascript:void(0);" style="font-size:15px;" onclick="myFunction()">
-      {if $user_login}
+    <a href="javascript:void(0);" onclick="myFunction()">
+      Menü
+      ☰
+    </a>
+    <span class="mobile_logout">
         {if $page == 'admin'}
           {$user_login->get_ua_name()}
         {else}
           {$user_login->get_uk_name()}
         {/if}
-      {else}
-        Menü 
-      {/if}
-      ☰
-    </a>
+    </span>
   </li>
   {foreach $menus as $menu}
     <li><a href="/{$page}/{$menu.spage_url}">
diff --git a/template/templates/user_data_edit.tpl b/template/templates/user_data_edit.tpl
index 4174425..7fac18e 100755
--- a/template/templates/user_data_edit.tpl
+++ b/template/templates/user_data_edit.tpl
@@ -201,15 +201,15 @@
 			<div><input type="text" name="parent_1_email" id="parent_1_email"></div>
 		</div>
 
+		<div>
+			<label class="desc" for="parent_1_phone">Telefonszám:</label>
+			<div><input type="text" name="parent_1_phone" id="parent_1_phone"></div>
+		</div>
 		<div>
 			<label class="desc" for="parent_1_facebook">Facebook:</label>
 			<div><input type="text" name="parent_1_facebook" id="parent_1_facebook"></div>
 		</div>
 
-		<div>
-			<label class="desc" for="parent_1_phone">Telefonszám:</label>
-			<div><input type="text" name="parent_1_phone" id="parent_1_phone"></div>
-		</div>
 
 		
 
@@ -236,16 +236,16 @@
 			<label class="desc" id="title2" for="parent_2_email">E-mail cím:</label>
 			<div><input type="text" name="parent_2_email" id="parent_2_email"></div>
 		</div>
+		<div>
+			<label class="desc" id="title2" for="parent_2_phone">Telefonszám:</label>
+			<div><input type="text" name="parent_2_phone" id="parent_2_phone"></div>
+		</div>
 
 		<div>
 			<label class="desc" id="title2" for="parent_2_facebook">Facebook:</label>
 			<div><input type="text" name="parent_2_facebook" id="parent_2_facebook"></div>
 		</div>
 
-		<div>
-			<label class="desc" id="title2" for="parent_2_phone">Telefonszám:</label>
-			<div><input type="text" name="parent_2_phone" id="parent_2_phone"></div>
-		</div>