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/tpl/new_channel.tpl     |  5 +----
 view/tpl/select_timezone.tpl | 11 +++++++++++
 view/tpl/settings.tpl        |  5 +----
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 view/tpl/select_timezone.tpl

(limited to 'view/tpl')

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