From: Michael Andreen <harv@ruin.nu>
Date: Fri, 2 Jan 2009 20:41:39 +0000 (+0100)
Subject: Possible to edit timezone manually
X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=commitdiff_plain;h=7782222a680e2752239bd7f9a853630412d47c74

Possible to edit timezone manually
---

diff --git a/lib/NDWeb/Controller/Settings.pm b/lib/NDWeb/Controller/Settings.pm
index d6743fb..4a60ebe 100644
--- a/lib/NDWeb/Controller/Settings.pm
+++ b/lib/NDWeb/Controller/Settings.pm
@@ -92,8 +92,7 @@ sub changeTimezone : Local {
 	my ( $self, $c ) = @_;
 	my $dbh = $c->model;
 
-	my $timezone = $c->req->param('category');
-	$timezone .= '/' . $c->req->param('country') if $c->req->param('country');
+	my $timezone = $c->req->param('timezone');
 	my $query = $dbh->prepare(q{UPDATE users SET timezone = $2 WHERE uid = $1});
 	eval{
 		$dbh->selectrow_array(q{SELECT NOW() AT TIME ZONE $1},undef,$timezone);
diff --git a/root/src/settings/index.tt2 b/root/src/settings/index.tt2
index 6291e33..c2a88ce 100644
--- a/root/src/settings/index.tt2
+++ b/root/src/settings/index.tt2
@@ -23,7 +23,7 @@
 	</p>
 </fieldset>
 </form>
-<form action="[% c.uri_for('changeTimezone') %]" method="post"><fieldset> <legend>Timezone</legend>
+<fieldset> <legend>Timezone</legend>
 	<select name="category" id="tzcategory">
 [% FOR cat IN tzcategories %]
 		<option value="[% cat %]" [% IF cat == timezone.0 %]selected[% END %]>[% cat %]</option>
@@ -34,9 +34,11 @@
 		<option value="[% country %]" [% IF country == timezone.1 %]selected[% END %]>[% country %]</option>
 [% END %]
 	</select>
-	<br><input type="submit" value="Change">
+<form action="[% c.uri_for('changeTimezone') %]" method="post">
+	<p><input type="text" name="timezone" value="[% timezone.join("/") %]" id="timezone">
+	<input type="submit" value="Change"></p>
 	<p>Remember that GMT stays the same all year, so if you're in the UK you should pick Europe/London.</p>
-</fieldset></form>
+</form></fieldset>
 [%- site.stylesheets = ['ui/ui.datepicker.css'] %]
 <script type="text/javascript" src="/static/ui/ui.core.min.js"></script>
 <script type="text/javascript" src="/static/ui/ui.datepicker.min.js"></script>
@@ -50,12 +52,22 @@ $(document).ready(function(){
 		showOn: "both"
 	});
 	$("#tzcategory").change(function(){
-		$.get("/jsrpc/tzcountries/" + $(this).val(),function(xml){
+		if ($(this).val() == 'GMT'){
+			$("#timezone").val($(this).val());
 			$("#tzcountry").empty();
-			$("country",xml).each(function(i){
-				$("#tzcountry").append('<option value="'+$(this).text()+'">'+$(this).text()+'</option>');
+		}else{
+			$.get("/jsrpc/tzcountries/" + $(this).val(),function(xml){
+				$("#tzcountry").empty();
+				$("country",xml).each(function(i){
+					var opt = $('<option>');
+					$("#tzcountry").append(opt);
+					opt.attr('value',$(this).text()).text($(this).text());
+				});
 			});
-		});
+		}
+	});
+	$("#tzcountry").change(function(){
+		$("#timezone").val($("#tzcategory").val() + '/' + $(this).val());
 	});
 });
 </script>