From ef94747e5eb4d8b2e3566835280c31b848fc28e6 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Thu, 1 Jan 2015 14:36:17 +0100
Subject: Add field template for grouped selects

---
 view/tpl/field_select_grouped.tpl | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 view/tpl/field_select_grouped.tpl

(limited to 'view')

diff --git a/view/tpl/field_select_grouped.tpl b/view/tpl/field_select_grouped.tpl
new file mode 100644
index 000000000..c7fb4f322
--- /dev/null
+++ b/view/tpl/field_select_grouped.tpl
@@ -0,0 +1,12 @@
+	<div class='field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select name='{{$field.0}}' id='id_{{$field.0}}'>
+			{{foreach $field.4 as $group=>$opts}}
+				<optgroup label='{{$group}}'>
+				{{foreach $opts as $opt=>$val}}
+					<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+				{{/foreach}}
+				</optgroup>
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
-- 
cgit v1.2.3


From 686b6ee1182c09969e2817b53825a78975c75bf5 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Thu, 1 Jan 2015 14:44:50 +0100
Subject: Use grouped select field for timezone selection

---
 view/tpl/install_settings.tpl | 2 +-
 view/tpl/settings.tpl         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
index f4fd82fdb..62dcbb8b3 100755
--- a/view/tpl/install_settings.tpl
+++ b/view/tpl/install_settings.tpl
@@ -20,7 +20,7 @@
 {{include file="field_input.tpl" field=$adminmail}}
 {{include file="field_input.tpl" field=$siteurl}}
 
-{{$timezone}}
+{{include file="field_select_grouped.tpl" field=$timezone}}
 
 <input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
 
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 47d85d8e4..83da4f87e 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -9,7 +9,7 @@
 <h3 class="settings-heading">{{$h_basic}}</h3>
 
 {{include file="field_input.tpl" field=$username}}
-{{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_select_grouped.tpl" field=$timezone}}
 {{include file="field_input.tpl" field=$defloc}}
 {{include file="field_checkbox.tpl" field=$allowloc}}
 
-- 
cgit v1.2.3


From 85e76773a04995884e798a89cc285f48377bcb62 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Thu, 1 Jan 2015 15:54:16 +0100
Subject: Use grouped select field for role selection

---
 view/js/mod_new_channel.js   |  2 +-
 view/js/mod_settings.js      |  4 ++--
 view/tpl/new_channel.tpl     |  5 +----
 view/tpl/select_timezone.tpl | 11 +++++++++++
 view/tpl/settings.tpl        |  5 +----
 5 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 view/tpl/select_timezone.tpl

(limited to 'view')

diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js
index 492267ff9..c4d5408f2 100644
--- a/view/js/mod_new_channel.js
+++ b/view/js/mod_new_channel.js
@@ -1,5 +1,5 @@
 	$(document).ready(function() {
-//		$("#privacy-role-select").sSelect();
+//		$("#id_permissions_role").sSelect();
 		$("#newchannel-name").blur(function() {
 			$("#name-spinner").spin('small');
 			var zreg_name = $("#newchannel-name").val();
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 87c8c3a2b..90e17afc4 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -8,8 +8,8 @@ $(document).ready(function() {
 		'transition' : 'elastic' 
 	});
 
-	$("#privacy-role-select").change(function() {
-		var role = $("#privacy-role-select").val();
+	$("#id_permissions_role").change(function() {
+		var role = $("#id_permissions_role").val();
 		if(role == 'custom')
 			$('#advanced-perm').show();
 		else
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 241846eb4..ff2011181 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -5,10 +5,7 @@
 	<div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div>
 
 	<div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div>
-
-	<label for="newchannel-role" id="label-newchannel-role" class="newchannel-label" >{{$label_role}}</label>
-	{{$role_select}}
-	<div class="newchannel-role-morehelp"><a href="help/roles" title="{{$what_is_role}}" target="_blank">{{$questionmark}}</a></div>
+	{{include file="field_select_grouped.tpl" field=$role}}
 	<div id="newchannel-role-end"  class="newchannel-field-end"></div>
 
 
diff --git a/view/tpl/select_timezone.tpl b/view/tpl/select_timezone.tpl
new file mode 100644
index 000000000..2820a54f4
--- /dev/null
+++ b/view/tpl/select_timezone.tpl
@@ -0,0 +1,11 @@
+{{* TODO: Make id configurabel *}}
+<select id='timezone_select' name='timezone'>
+{{foreach $continents as $continent => $cities}}
+<optgroup label="{{$continent}}">
+{{foreach $cities as $city => $value}}
+<option value='{{$value}}' {{if $value == $selected}}selected='selected'{{/if}}>{{$city}}</option>
+{{/foreach}}
+</optgroup>
+{{/foreach}}
+</select>
+
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 83da4f87e..53f08e24f 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -22,10 +22,7 @@
 
 <h3 class="settings-heading">{{$h_prv}}</h3>
 
-<div class="field custom">
-<label for="privacy-role-select">{{$role_lbl}}</label>
-{{$role_select}}
-</div>
+{{include file="field_select_grouped.tpl" field=$role}}
 
 <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};">
 {{include file="field_checkbox.tpl" field=$hide_presence}}
-- 
cgit v1.2.3