From 33c34984e647f48452d53b93b635f6f517a0f392 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Thu, 18 Feb 2016 19:48:11 +0100
Subject: h1>h2 (thanks to Mario) and help text below label on register page
 (like on new channel).

---
 view/css/mod_register.css        | 5 +++++
 view/tpl/register.tpl            | 8 +++-----
 view/tpl/settings_oauth.tpl      | 2 +-
 view/tpl/settings_oauth_edit.tpl | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'view')

diff --git a/view/css/mod_register.css b/view/css/mod_register.css
index 890a3f76b..68ccac131 100644
--- a/view/css/mod_register.css
+++ b/view/css/mod_register.css
@@ -79,3 +79,8 @@ h2 {
 	clear: both;
 	margin-bottom: 20px;
 }
+
+.descriptive-paragraph {
+	margin-left: 20px;
+	margin-bottom: 25px;
+}
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_oauth.tpl b/view/tpl/settings_oauth.tpl
index 5d77fe3ec..94d76028a 100755
--- a/view/tpl/settings_oauth.tpl
+++ b/view/tpl/settings_oauth.tpl
@@ -1,6 +1,6 @@
 <div class="generic-content-wrapper">
 <div class="section-title-wrapper">
-	<h1>{{$title}}</h1>
+	<h2>{{$title}}</h2>
 </div>
 
 <div class="section-content-tools-wrapper">
diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl
index 417378cb9..b94dec48a 100755
--- a/view/tpl/settings_oauth_edit.tpl
+++ b/view/tpl/settings_oauth_edit.tpl
@@ -1,6 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		<h1>{{$title}}</h1>
+		<h2>{{$title}}</h2>
 	</div>
 <div class="section-content-tools-wrapper">
 <form method="POST">
-- 
cgit v1.2.3