Merge https://github.com/redmatrix/hubzilla into pending_merge

4 files changed, 17 insertions, 11 deletions

diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index 857b5e984..6c1bc87a4 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -31,14 +31,12 @@
 		{{include file="field_select_grouped.tpl" field=$role}}
 		<div id="newchannel-role-end"  class="newchannel-field-end"></div>
 		{{/if}}
-
-		<div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
-
 		<label for="newchannel-name" id="label-newchannel-name" class="register-label" >{{$label_name}}</label>
 		<input type="text" name="name" id="newchannel-name" class="register-input" value="{{$name}}" />
 		<div id="name-spinner"></div>
 		<div id="newchannel-name-feedback" class="register-feedback"></div>
 		<div id="newchannel-name-end"  class="register-field-end"></div>
+		<div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
 
 
 	{{/if}}
@@ -62,13 +60,13 @@
 	<div id="register-password2-end"  class="register-field-end"></div>
 
 	{{if $auto_create}}
-		<div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div>
 		<label for="newchannel-nickname" id="label-newchannel-nickname" class="register-label" >{{$label_nick}}</label>
 		<input type="text" name="nickname" id="newchannel-nickname" class="register-input" value="{{$nickname}}" />
 		<div id="nick-spinner"></div>
-		<div id="newchannel-nick-desc" class="descriptive-paragraph" style="text-align: right;">{{$nick_hub}}</div>
+		<div id="newchannel-nick-desc" style="text-align: right;">{{$nick_hub}}</div>
 		<div id="newchannel-nickname-feedback" class="register-feedback"></div>
 		<div id="newchannel-nickname-end"  class="register-field-end"></div>
+		<div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div>
 
 	{{/if}}
 
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 820ffd711..6f50f820a 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,6 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
+		{{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>{{/if}}
 		<h2>{{$ptitle}}</h2>
 		<div class="clear"></div>
 	</div>
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
index 20e8f458f..94d76028a 100755
--- a/view/tpl/settings_oauth.tpl
+++ b/view/tpl/settings_oauth.tpl
@@ -1,7 +1,9 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
-
+<div class="generic-content-wrapper">
+<div class="section-title-wrapper">
+	<h2>{{$title}}</h2>
+</div>
 
+<div class="section-content-tools-wrapper">
 <form action="settings/oauth" method="post" autocomplete="off">
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
@@ -31,3 +33,4 @@
 
 </form>
 </div>
+</div>
diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl
index bf805363c..b94dec48a 100755
--- a/view/tpl/settings_oauth_edit.tpl
+++ b/view/tpl/settings_oauth_edit.tpl
@@ -1,5 +1,8 @@
-<h1>{{$title}}</h1>
-
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+<div class="section-content-tools-wrapper">
 <form method="POST">
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
@@ -15,3 +18,5 @@
 </div>
 
 </form>
+</div>
+</div>