Merge pull request #2936 from tobiasd/20161119-issue844

Additional info in registration request
2016-11-19 21:40:02 +01:00
parent ba24b1b651 b95bf00e89
commit a7a6a1a378
9 changed files with 37 additions and 9 deletions
--- a/view/global.css
+++ b/view/global.css
@@ -464,3 +464,12 @@ td.federation-data {
 #settings-form .pageflags {
    margin: 0 0 20px 30px;
 }
+
+/* admin pending user notes */
+td.pendingnote {
+	padding-left: 20px;
+	padding-right: 20px;
+}
+td.pendingnote > p > span {
+	font-weight: bold;
+}
--- a/view/templates/admin_users.tpl
+++ b/view/templates/admin_users.tpl
@@ -39,6 +39,9 @@
 						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
 					</td>
 				</tr>
+				<tr>
+					<td class="pendingnote"><p><span>{{$pendingnotetext}}:</span> {{$u.note}}</p></td>
+				</tr>
 			{{/foreach}}
 				</tbody>
 			</table>
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -57,6 +57,10 @@
 	</div>
 	<div id="register-nickname-end" ></div>

+{{if $permonly}}
+    {{include file="field_textarea.tpl" field=$permonlybox}}
+{{/if}}
+
 	{{$publish}}

 	<div id="register-submit-wrapper">