From 5b0a17359d6b5b3e27219c9e56117f1017996175 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Sat, 2 Jan 2016 23:39:57 -0800
Subject: Provide the ability for a hub admin to specify a default permissions
 role for the first channel created by a new account. This simplifies channel
 creation by restricting the available options at registration time. The
 restriction is not applied to any additional channels created under the same
 account; and in any event can be changed immediately after channel creation,
 if desired.

---
 view/tpl/new_channel.tpl | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'view/tpl/new_channel.tpl')

diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index f78a3fc2d..46b32b8a9 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -5,10 +5,13 @@
 
 	<div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div>
 
-	<div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div>
-	{{include file="field_select_grouped.tpl" field=$role}}
-	<div id="newchannel-role-end"  class="newchannel-field-end"></div>
-
+	{{if $default_role}}
+		<input type="hidden" name="permissions_role" value="{{$default_role}}" />
+	{{else}}
+		<div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div>
+		{{include file="field_select_grouped.tpl" field=$role}}
+		<div id="newchannel-role-end"  class="newchannel-field-end"></div>
+	{{/if}}
 
 	<label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >{{$label_name}}</label>
 	<input type="text" name="name" id="newchannel-name" class="newchannel-input" value="{{$name}}" />
-- 
cgit v1.2.3


From 68030d12cfefa8982774cca9714b0c1eed7b9537 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Wed, 27 Jan 2016 00:24:05 +0100
Subject: Linking new connection notification to pending connections (see
 Channel 1) and improved email notifications about new connections. Could not
 find a way to do this also for the generic notifications. Added hub domain of
 channel address on the new channel page. A few people on my hub didn't
 understood. This example will make it more clear. Some minor bits.

---
 view/tpl/new_channel.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'view/tpl/new_channel.tpl')

diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 46b32b8a9..156b5ec2f 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -22,8 +22,9 @@
 	<div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
 
 	<label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label>
-	<input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" />
+	<input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> 
 	<div id="nick-spinner"></div>
+	<div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_hub}}</div>
 	<div id="newchannel-nickname-feedback" class="newchannel-feedback"></div>
 	<div id="newchannel-nickname-end"  class="newchannel-field-end"></div>
 
-- 
cgit v1.2.3


From 02e82e496e3ec8dbd8264248ad8550dd5e335cba Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 19 Feb 2016 22:28:21 +0100
Subject: pimp up mod new_channel

---
 view/tpl/new_channel.tpl | 76 ++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 41 deletions(-)

(limited to 'view/tpl/new_channel.tpl')

diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 156b5ec2f..9383e0902 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -1,42 +1,36 @@
-<div class="generic-content-wrapper-styled">
-<h2>{{$title}}</h2>
-
-<form action="new_channel" method="post" id="newchannel-form" class="stylish-select">
-
-	<div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div>
-
-	{{if $default_role}}
-		<input type="hidden" name="permissions_role" value="{{$default_role}}" />
-	{{else}}
-		<div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div>
-		{{include file="field_select_grouped.tpl" field=$role}}
-		<div id="newchannel-role-end"  class="newchannel-field-end"></div>
-	{{/if}}
-
-	<label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >{{$label_name}}</label>
-	<input type="text" name="name" id="newchannel-name" class="newchannel-input" value="{{$name}}" />
-	<div id="name-spinner"></div>
-	<div id="newchannel-name-feedback" class="newchannel-feedback"></div>
-	<div id="newchannel-name-end"  class="newchannel-field-end"></div>
-
-	<div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
-
-	<label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label>
-	<input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> 
-	<div id="nick-spinner"></div>
-	<div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_hub}}</div>
-	<div id="newchannel-nickname-feedback" class="newchannel-feedback"></div>
-	<div id="newchannel-nickname-end"  class="newchannel-field-end"></div>
-
-	<div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div>
-
-
-	<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
-
-	<div id="newchannel-import-end" class="newchannel-field-end"></div>
-
-	<input type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" />
-	<div id="newchannel-submit-end" class="newchannel-field-end"></div>
-
-</form>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		<div class="section-content-info-wrapper">
+			{{$desc}}
+		</div>
+		{{if $channel_usage_message}}
+		<div class="section-content-warning-wrapper">
+			{{$channel_usage_message}}
+		</div>
+		{{/if}}
+		<form action="new_channel" method="post" id="newchannel-form">
+			{{if $default_role}}
+				<input type="hidden" name="permissions_role" value="{{$default_role}}" />
+			{{else}}
+				{{include file="field_select_grouped.tpl" field=$role}}
+			{{/if}}
+
+			{{include file="field_input.tpl" field=$name}}
+			<div id="newchannel-name-feedback" class="newchannel-feedback"></div>
+			<div id="name-spinner"></div>
+
+			{{include file="field_input.tpl" field=$nickname}}
+			<div id="newchannel-nickname-feedback" class="newchannel-feedback"></div>
+			<div id="nick-spinner"></div>
+
+			<input type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" />
+			<div id="newchannel-submit-end" class="clear"></div>
+
+			<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
+			<div id="newchannel-import-end" class="clear"></div>
+		</form>
+	</div>
 </div>
-- 
cgit v1.2.3


From 22f172d69730d3c9c6f078ec206f90b1e91eee69 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 20 Feb 2016 14:01:20 +0100
Subject: grid->network, whitespace and bootstrapify create button

---
 view/tpl/new_channel.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/new_channel.tpl')

diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 9383e0902..f5e97ff27 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -26,7 +26,7 @@
 			<div id="newchannel-nickname-feedback" class="newchannel-feedback"></div>
 			<div id="nick-spinner"></div>
 
-			<input type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" />
+			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
 			<div id="newchannel-submit-end" class="clear"></div>
 
 			<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
-- 
cgit v1.2.3


From dd6e3d873d2ff04cb2549530fa838ad58b06cdbc Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 22 Feb 2016 13:04:48 +0100
Subject: some work on mod/register

---
 view/tpl/new_channel.tpl | 2 --
 1 file changed, 2 deletions(-)

(limited to 'view/tpl/new_channel.tpl')

diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index f5e97ff27..cc1983ac4 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -19,11 +19,9 @@
 			{{/if}}
 
 			{{include file="field_input.tpl" field=$name}}
-			<div id="newchannel-name-feedback" class="newchannel-feedback"></div>
 			<div id="name-spinner"></div>
 
 			{{include file="field_input.tpl" field=$nickname}}
-			<div id="newchannel-nickname-feedback" class="newchannel-feedback"></div>
 			<div id="nick-spinner"></div>
 
 			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
-- 
cgit v1.2.3