Merge pull request #23 from magicbug/dev

Dev

application/config/migration.php

@@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
 |
 */
 
-$config['migration_version'] = 151;
+$config['migration_version'] = 152;
 
 /*
 |--------------------------------------------------------------------------

application/migrations/152_tag_2_5_1.php

@@ -0,0 +1,24 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+*   Tag Cloudlog as 2.5.1
+*/
+
+class Migration_tag_2_5_1 extends CI_Migration {
+
+    public function up()
+    {
+    
+        // Tag Cloudlog 2.5.1
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.5.1'));
+    }
+
+    public function down()
+    {
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.5.0'));
+    }
+}

application/views/interface_assets/footer.php

@@ -1000,37 +1000,6 @@ $(document).on('keypress',function(e) {
 					}
 				);
 			});
-			$('#reset_time').click(function() {
-				var now = new Date();
-				var localTime = now.getTime();
-				var utc = localTime + (now.getTimezoneOffset() * 60000);
-				$('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2));
-				$("[id='start_time']").each(function() {
-					$(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2));
-				});
-			});
-			$('#reset_start_time').click(function() {
-				var now = new Date();
-				var localTime = now.getTime();
-				var utc = localTime + (now.getTimezoneOffset() * 60000);
-				$('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2));
-				$("[id='start_time']").each(function() {
-					$(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2));
-				});
-				$('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2));
-				$("[id='end_time']").each(function() {
-					$(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2));
-				});
-			});
-			$('#reset_end_time').click(function() {
-				var now = new Date();
-				var localTime = now.getTime();
-				var utc = localTime + (now.getTimezoneOffset() * 60000);
-				$('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2));
-				$("[id='end_time']").each(function() {
-					$(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2));
-				});
-			});
 		});
 	</script>
 

assets/js/sections/qso.js

@@ -1,12 +1,43 @@
 $( document ).ready(function() {
 	setTimeout(function() {
 		var callsignValue = localStorage.getItem("quicklogCallsign");
-		if (callsignValue !== "") {
+		if (callsignValue !== null && callsignValue !== undefined) {
 		  $("#callsign").val(callsignValue);
 		  $("#mode").focus();
 		  localStorage.removeItem("quicklogCallsign");
 		}
-	  }, 100);
+	}, 100);
+	$('#reset_time').click(function() {
+		var now = new Date();
+		var localTime = now.getTime();
+		var utc = localTime + (now.getTimezoneOffset() * 60000);
+		$('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2));
+		$("[id='start_time']").each(function() {
+			$(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2));
+		});
+	});
+	$('#reset_start_time').click(function() {
+		var now = new Date();
+		var localTime = now.getTime();
+		var utc = localTime + (now.getTimezoneOffset() * 60000);
+		$('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2));
+		$("[id='start_time']").each(function() {
+			$(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2));
+		});
+		$('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2));
+		$("[id='end_time']").each(function() {
+			$(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2));
+		});
+	});
+	$('#reset_end_time').click(function() {
+		var now = new Date();
+		var localTime = now.getTime();
+		var utc = localTime + (now.getTimezoneOffset() * 60000);
+		$('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2));
+		$("[id='end_time']").each(function() {
+			$(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2));
+		});
+	});
 var favs={};
 	get_fav();