From 5bdfc2f64780abd36d889dc0bbe52026b768631b Mon Sep 17 00:00:00 2001
From: Alexandre Hannud Abdo <abdo@member.fsf.org>
Date: Tue, 16 Sep 2014 18:56:34 -0300
Subject: Fix name attribute of button elements so jquery '.submit()' doesn't
 break

According to "Additional notes" in:

http://api.jquery.com/submit/

Not fixing buttons created with 'input' tags.
---
 view/tpl/comment_item.tpl | 2 +-
 view/tpl/jot.tpl          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 351cc8e14..e68314797 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -58,7 +58,7 @@
 							<i class="icon-eye-open comment-icon" ></i>
 						</button>
 						{{/if}}
-						<button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button>
+						<button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button>
 					</div>
 				</div>
 				<div class="clear"></div>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index c4fdba0f5..c51dc02a5 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -85,7 +85,7 @@
 					<i class="icon-eye-open jot-icons" ></i>
 				</button>
 				{{/if}}
-				<button class="btn btn-primary btn-sm" type="submit" name="submit">{{$share}}</button>
+				<button class="btn btn-primary btn-sm" type="submit" name="button-submit">{{$share}}</button>
 			</div>
 			<div id="profile-jot-perms-end"></div>
 			<div id="profile-jot-plugin-wrapper">
-- 
cgit v1.2.3


From 51d9f0d97a186e32aeacc42e3b2d2001d04b5dd2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 17 Sep 2014 21:16:15 -0700
Subject: channel permission roles

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

(limited to 'view/tpl')

diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 261f965da..b6562f707 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -4,6 +4,13 @@
 
 	<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 id="newchannel-role-end"  class="newchannel-field-end"></div>
+
+
 	<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="newchannel-name-feedback" class="newchannel-feedback"></div>
-- 
cgit v1.2.3


From 22aa5aca14cce46727e15bd061cb6900a21b46b8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 17 Sep 2014 21:27:02 -0700
Subject: add a spinner or two to the new channel page so folks have a clue
 that we're doing something in the background - trying to complete the nick
 field for them (and then check it before they submit).

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

(limited to 'view/tpl')

diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index b6562f707..b28810236 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -13,6 +13,7 @@
 
 	<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>
 
@@ -20,6 +21,7 @@
 
 	<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-nickname-feedback" class="newchannel-feedback"></div>
 	<div id="newchannel-nickname-end"  class="newchannel-field-end"></div>
 
-- 
cgit v1.2.3