Version 1.0.3: Minor changes/fix, 3rd upgrade

moneymanagerex · Dec 31, 2015 · 1a22cb3 · 1a22cb3
1 parent e0307e5
commit 1a22cb3
Show file tree

Hide file tree

Showing 34 changed files with 560 additions and 385 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.htaccess
 MMEX_New_Transaction.db
 configuration_user.php
 /WebApp/attachments/Transaction*.*
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,12 @@
+Version 1.0.3
+- iOS WebApp openend links in native browser instead of the App
+- Autofocus (HTML5) to username on login screen
+- New transaction: Account was not disabled in ToAccount (Transfer)
+- Changed links to other pages from button into href
+- Added validation all required fields are valid, this prevents the option to submit form in non-Chrome browser
+- Empty Payee value when changing type to Transfer
+- Upgrade 3rd part dependencies
+
 Version 1.0.2
 - Added return to menu buttons
 - Added functionality to disable the same (To)Account when adding new transactions, prevent a transaction to be moved from account A to A

diff --git a/WebApp/about.php b/WebApp/about.php
@@ -9,21 +9,24 @@
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1" />
-        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-title" content="MMEX">
+		<meta name="apple-mobile-web-app-capable" content="yes" />
 
         <title>Money Manager EX</title>
         <link rel="icon" href="res/favicon.ico" />
-        <link rel="apple-touch-icon" href="res/apple-touch-icon.png" />
+        <link rel="apple-touch-icon" href="res/mmex.png" />
 
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.2.0.min.css" />
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.2.0.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.3.6.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.3.6.min.css" />
         <link rel="stylesheet" type="text/css" href="res/style_global-0.9.9.css" />
+
+		<script src="res/jquery-2.1.4.min.js" type="text/javascript"></script>
     </head>
 
     <body>
         <div class="container text_align_center">
             <br />
-            <img src="res/mmex.ico" alt="Money Manager Ex Logo" height="150" width="150"/>
+            <img src="res/mmex.png" alt="Money Manager Ex Logo" height="150" width="150"/>
             <br />
             <h2><strong>Money Manager Ex - Web App</strong></h2>
             <?php
@@ -32,26 +35,27 @@
             ?>
             <br />
             <h4> Developer: Gabriele [Gabriele-V]</h4>
-            <a href="/moneymanagerex/web-money-manager-ex"><h4> GitHub WebPage</h4></a>
+            <a href="/moneymanagerex/web-money-manager-ex" target="_blank"><h4> GitHub WebPage</h4></a>
             <br />
             <p>
                 Used components:
                 <br />
-                <a href="http://getbootstrap.com/">Bootstrap</a>
+                <a href="http://getbootstrap.com/" target="_blank">Bootstrap</a>
                 <br />
-                <a href="http://jquery.com//">jQuery</a>
+                <a href="http://jquery.com//" target="_blank">jQuery</a>
                 <br />
-                <a href="http://modernizr.com/">Modernizr</a>
+                <a href="http://modernizr.com/" target="_blank">Modernizr</a>
                 <br />
-                <a href="http://www.sqlite.org/">SQLite</a>
+                <a href="http://www.sqlite.org/" target="_blank">SQLite</a>
             </p>
             <img src="res/html5.png" alt="HTML5 Logo" height="100" width="100"/>
             <br />
             <br />
-            <input type="button" class="btn btn-lg btn-success btn-block" value="Return to menu" onclick="top.location.href = 'landing.php'" />
+            <a href="landing.php" class="btn btn-lg btn-success btn-block">Return to menu</a>
             <br />
             <br />
         </div>
-    </body>
-
+
+		<script src="res/app/base-1.0.3.js" type="text/javascript"></script>
+	</body>
 </html>
diff --git a/WebApp/configuration_system.php b/WebApp/configuration_system.php
@@ -4,7 +4,7 @@
 ##         don't touch              ##
 ######################################
 $dbpath = "MMEX_New_Transaction.db";
-$app_version = "1.0.2";
+$app_version = "1.0.3";
 $api_version = "1.0.1";
 $tr_default_status = "R";
 $tr_default_type = "Withdrawal";

diff --git a/WebApp/error.php b/WebApp/error.php
@@ -9,29 +9,30 @@
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1" />
-        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-title" content="MMEX">
+		<meta name="apple-mobile-web-app-capable" content="yes" />
 
         <title>Money Manager EX</title>
         <link rel="icon" href="res/favicon.ico" />
-        <link rel="apple-touch-icon" href="res/apple-touch-icon.png" />
+        <link rel="apple-touch-icon" href="res/mmex.png" />
 
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.2.0.min.css" />
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.2.0.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.3.6.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.3.6.min.css" />
         <link rel="stylesheet" type="text/css" href="res/style_global-0.9.9.css" />
     </head>
 
     <body>
         <div class="container text_align_center">
             <br />
-            <img src="res/mmex.ico" alt="Money Manager Ex Logo" height="150" width="150"/>
+            <img src="res/mmex.png" alt="Money Manager Ex Logo" height="150" width="150"/>
             <br />
             <h3><strong>Internal Error</strong></h3>
             <?php
 	           echo "<h4> Version ".costant::app_version()."</h4>";
             ?>
             <br />
             <h4> Please contact developer Gabriele [Gabriele-V]</h4>
-            <a href="/moneymanagerex/web-money-manager-ex"><h4> on GitHub WebPage</h4></a>
+            <a href="/moneymanagerex/web-money-manager-ex" target="_blank"><h4> on GitHub WebPage</h4></a>
             <br />
             <br />
         </div>

diff --git a/WebApp/functions.php b/WebApp/functions.php
@@ -898,6 +898,9 @@ public static function upgrade_db ()
                                 break;
                             case "1.0.1":
                                 db_upgrade::upgrade_version("1.0.2");
+                                break;
+							case "1.0.2":
+                                db_upgrade::upgrade_version("1.0.3");
                                 break;
                             case $app_version;
                                 break;
@@ -996,7 +999,7 @@ class various
 {
     public static function send_alert_and_redirect ($AlertMessage, $AlertRedirect)
         {
-            echo "<script src='res/functions-1.0.1.js' type='text/javascript'></script>";
+            echo "<script src='res/app/functions-1.0.3.js' type='text/javascript'></script>";
             echo "<script language='javascript'>";
             if ($AlertRedirect <> "None")
                 {echo "send_alert_and_redirect ('${AlertMessage}','${AlertRedirect}')";}

diff --git a/WebApp/guide.php b/WebApp/guide.php
@@ -9,15 +9,18 @@
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1" />
-        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-title" content="MMEX">
+		<meta name="apple-mobile-web-app-capable" content="yes" />
 
         <title>Money Manager EX</title>
         <link rel="icon" href="res/favicon.ico" />
-        <link rel="apple-touch-icon" href="res/apple-touch-icon.png" />
+        <link rel="apple-touch-icon" href="res/mmex.png" />
 
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.2.0.min.css" />
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.2.0.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.3.6.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.3.6.min.css" />
         <link rel="stylesheet" type="text/css" href="res/style_global-0.9.9.css" />
+
+		<script src="res/jquery-2.1.4.min.js" type="text/javascript"></script>
     </head>
 
     <body>
@@ -47,9 +50,11 @@
             &nbsp;&nbsp;
             <input type="button" class="btn btn-default" value="Copy GUID" />
             -->
-            <input type="button" class="btn btn-lg btn-success btn-block" value="Return to menu" onclick="top.location.href = 'landing.php'" />
+            <a href="landing.php" class="btn btn-lg btn-success btn-block">Return to menu</a>
             <br />
             <br />
         </div>
+
+		<script src="res/app/base-1.0.3.js" type="text/javascript"></script>
     </body>
 </html>
diff --git a/WebApp/index.php b/WebApp/index.php
@@ -67,28 +67,29 @@
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1" />
         <meta name="apple-mobile-web-app-capable" content="yes" />
+		<meta name="apple-mobile-web-app-title" content="MMEX">
 
         <title>Money Manager EX</title>
         <link rel="shortcuticon" href="res/favicon.ico" />
-        <link rel="apple-touch-icon" href="res/apple-touch-icon.png" />
+        <link rel="apple-touch-icon" href="res/mmex.png" />
 
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.2.0.min.css" />
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.2.0.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.3.6.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.3.6.min.css" />
         <link rel="stylesheet" type="text/css" href="res/style_global-0.9.9.css" />
     </head>
 
     <body>
         <div class="container text_align_center">
             <h2><strong>Money Manager EX</strong></h2>
             <br />
-            <img src="res/mmex.ico" alt="Money Manager EX Logo" height="150" width="150"/>
+            <img src="res/mmex.png" alt="Money Manager EX Logo" height="150" width="150"/>
             <br />
             <br />
             <br />
             <form id="login" method="post">
                 <div class="form-group">
                     <label for="Username">Username</label>
-                    <input id="Username" type="text" name="Username" class="form-control" placeholder="Insert Username" required />
+                    <input id="Username" type="text" name="Username" class="form-control" placeholder="Insert Username" autofocus required />
                     <span class="help-block"></span>
                 </div>
                 <div class="form-group">

diff --git a/WebApp/insert.php b/WebApp/insert.php
@@ -9,15 +9,18 @@
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1" />
-        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-title" content="MMEX">
+		<meta name="apple-mobile-web-app-capable" content="yes" />
 
         <title>Insert Transaction</title>
         <link rel="icon" href="res/favicon.ico" />
-        <link rel="apple-touch-icon" href="res/apple-touch-icon.png" />
+        <link rel="apple-touch-icon" href="res/mmex.png" />
 
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.2.0.min.css" />
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.2.0.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.3.6.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.3.6.min.css" />
         <link rel="stylesheet" type="text/css" href="res/style_global-0.9.9.css" />
+
+		<script src="res/jquery-2.1.4.min.js" type="text/javascript"></script>
     </head>
 
     <body>
@@ -77,14 +80,15 @@
             <h3>Transaction inserted successfully</h3>
             <br />
             <br />
-            <input type="button" class="btn btn-lg btn-success btn-block" value="Insert new" onclick="top.location.href = 'new_transaction.php'" />
+            <a href="new_transaction.php" class="btn btn-lg btn-success btn-block">Insert new</a>
             <br />
-            <input type="button" class="btn btn-lg btn-success btn-block" value="Show transaction" onclick="top.location.href = 'show.php'" />
+            <a href="show.php" class="btn btn-lg btn-success btn-block">Show transaction</a>
             <br />
-            <input type="button" class="btn btn-lg btn-success btn-block" value="Return to menu" onclick="top.location.href = 'landing.php'" />
+            <a href="landing.php" class="btn btn-lg btn-success btn-block">Return to menu</a>
             <br />
             <br />
         </div>
+
+		<script src="res/app/base-1.0.3.js" type="text/javascript"></script>
     </body>
-
 </html>
diff --git a/WebApp/landing.php b/WebApp/landing.php
@@ -9,38 +9,42 @@
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1" />
-        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-title" content="MMEX">
+		<meta name="apple-mobile-web-app-capable" content="yes" />
 
         <title>Money Manager EX</title>
         <link rel="icon" href="res/favicon.ico" />
-        <link rel="apple-touch-icon" href="res/apple-touch-icon.png" />
+        <link rel="apple-touch-icon" href="res/mmex.png" />
 
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.2.0.min.css" />
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.2.0.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.3.6.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.3.6.min.css" />
         <link rel="stylesheet" type="text/css" href="res/style_global-0.9.9.css" />
+
+		<script src="res/jquery-2.1.4.min.js" type="text/javascript"></script>
     </head>
 
     <body>
         <div class="container text_align_center">
             <h2><strong>Money Manager EX</strong></h2>
             <br />
-            <img src="res/mmex.ico" alt="Money Manager EX Logo" height="150" width="150"/>
+            <img src="res/mmex.png" alt="Money Manager EX Logo" height="150" width="150"/>
             <br />
             <br />
             <br />
-            <input type="button" class="btn btn-lg btn-success btn-block" value="New transaction" onclick="top.location.href = 'new_transaction.php'" />
+            <a href="new_transaction.php" class="btn btn-lg btn-success btn-block">New transaction</a>
             <br />
-            <input type="button" class="btn btn-lg btn-success btn-block" value="Show transaction" onclick="top.location.href = 'show.php'" />
+            <a href="show.php" class="btn btn-lg btn-success btn-block">Show transaction</a>
             <br />
-            <input type="button" class="btn btn-lg btn-success btn-block" value="Edit settings" onclick="top.location.href = 'settings.php'" />
+            <a href="settings.php" class="btn btn-lg btn-success btn-block">Edit settings</a>
             <br />
-            <input type="button" class="btn btn-lg btn-success btn-block" value="Guide" onclick="top.location.href = 'guide.php'" />
+            <a href="guide.php" class="btn btn-lg btn-success btn-block">Guide</a>
             <br />
-            <input type="button" class="btn btn-lg btn-success btn-block" value="About" onclick="top.location.href = 'about.php'" />
+            <a href="about.php" class="btn btn-lg btn-success btn-block">About</a>
             <br />
-            <input type="button" class="btn btn-lg btn-success btn-block" value="Logout" onclick="top.location.href = 'logout.php'" />
+            <a href="logout.php" class="btn btn-lg btn-success btn-block">Logout</a>
             <br />
         </div>
+
+		<script src="res/app/base-1.0.3.js" type="text/javascript"></script>
     </body>
-
 </html>
diff --git a/WebApp/new_transaction.php b/WebApp/new_transaction.php
@@ -9,22 +9,23 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-title" content="MMEX">
+	<meta name="apple-mobile-web-app-capable" content="yes" />
 
     <title>Transaction</title>
     <link rel="icon" href="res/favicon.ico" />
-    <link rel="apple-touch-icon" href="res/apple-touch-icon.png" />
+    <link rel="apple-touch-icon" href="res/mmex.png" />
 
-    <link rel="stylesheet" type="text/css" href="res/bootstrap-3.2.0.min.css" />
-    <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.2.0.min.css" />
+    <link rel="stylesheet" type="text/css" href="res/bootstrap-3.3.6.min.css" />
+    <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.3.6.min.css" />
     <link rel="stylesheet" type="text/css" href="res/typeahead-bootstrap-0.9.9.css" />
     <link rel="stylesheet" type="text/css" href="res/style_global-0.9.9.css" />
 
-    <script src="res/modernizr-2.8.3.js" type="text/javascript"></script>
-    <script src="res/jquery-2.1.1.min.js" type="text/javascript"></script>
+    <script src="res/modernizr-3.2.0.js" type="text/javascript"></script>
+    <script src="res/jquery-2.1.4.min.js" type="text/javascript"></script>
     <script src="res/typeahead.bundle-0.10.2.min.js" type="text/javascript"></script>
-    <script src="res/functions-1.0.1.js" type="text/javascript"></script>
-    <script src="res/app/new_transaction.js" type="text/javascript"></script>
+    <script src="res/app/functions-1.0.3.js" type="text/javascript"></script>
+    <script src="res/app/new_transaction-1.0.3.js" type="text/javascript"></script>
 </head>
 
 <body>
@@ -81,8 +82,8 @@
     if (sizeof($resultarray) > 0 || $FlagNew == True)
         {
             echo "<div class='container'>";
-                echo "<form id='Transaction' class='form-transaction' method='post' action = 'insert.php'
-                onsubmit='return confirm_if_not_present_in_datalist(\"Payee\",\"PayeeList\",\"Do you want to add the new payee\")'>";
+                echo "<form id='Transaction' class='form-transaction' method='post' action='insert.php'>";
+                //onsubmit='return confirm_if_not_present_in_datalist(\"Payee\",\"PayeeList\",\"Do you want to add the new payee\")'>";
 
                     echo "<h3 class='text_align_center'>${TransactionHeaderText}</h3>";
                     echo "<br />";
@@ -174,5 +175,7 @@
             echo "</div>\n";
         }
     ?>
+
+	<script src="res/app/base-1.0.3.js" type="text/javascript"></script>
 </body>
 </html>