Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

4 files changed, 53 insertions, 50 deletions

diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl
index ed4cf5a4b..f4865f7a0 100644
--- a/view/tpl/admin_accounts.tpl
+++ b/view/tpl/admin_accounts.tpl
@@ -7,50 +7,50 @@
 		<h3>{{$h_pending}}</h3>
 		{{if $debug}}<div>{{$debug}}</div>{{/if}}
 		{{if $pending}}
-			<table id="pending">
-				<thead>
-				<tr>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
+		<table id="pending">
+			<thead>
+			<tr>
+				{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+				<th></th>
+				<th></th>
+			</tr>
+			</thead>
+			<tbody>
 			{{foreach $pending as $n => $u}}
-				<tr class="">
-					<td class="created">{{$u.reg_created}}</td>
-					<td class="email">{{$u.reg_did2}}</td>
-					<td class="email">{{$u.reg_email}}</td>
-					<td class="email">{{$u.reg_atip}}</td>
-					<td class="">{{$u.reg_atip_n}}</td>
-					<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$n}}" name="pending[]" value="{{$n}}"></td>
-					<td class="tools">
-						<a id="zara_{{$n}}" {{* href="{{$baseurl}}/regmod/allow/{{$n}}" *}} class="zar2s zara btn btn-default btn-xs" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
-						<a id="zard_{{$n}}" {{* href="{{$baseurl}}/regmod/deny/{{$n}}" *}} class="zar2s zard btn btn-default btn-xs" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
-						<span id="zarreax_{{$n}}" class="zarreax"></span>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="7"><strong>{{$msg}}:</strong> {{$u.msg}}</td>
-				</tr>
+			<tr title="{{$u.status.0}}" class="{{$u.status.1}}">
+				<td class="text-nowrap">{{$u.reg_created}}</td>
+				<td class="text-nowrap">{{$u.reg_did2}}</td>
+				<td class="text-break">{{$u.reg_email}}</td>
+				<td class="">{{$u.reg_atip}}</td>
+				<td class="">{{$u.reg_atip_n}}</td>
+				<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$n}}" name="pending[]" value="{{$n}}"></td>
+				<td class="tools">
+					<a id="zara_{{$n}}" {{* href="{{$baseurl}}/regmod/allow/{{$n}}" *}} class="zar2s zara btn btn-default btn-xs" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
+					<a id="zard_{{$n}}" {{* href="{{$baseurl}}/regmod/deny/{{$n}}" *}} class="zar2s zard btn btn-default btn-xs" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
+					<span id="zarreax_{{$n}}" class="zarreax"></span>
+				</td>
+			</tr>
+			<tr title="{{$u.status.0}}" class="{{$u.status.1}}">
+				<td colspan="7"><strong>{{$msg}}:</strong> {{$u.msg}}</td>
+			</tr>
 			{{/foreach}}
-				</tbody>
-			</table>
-			{{* before, alternate:
-				*
-				<a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a>
-				*
-			*}}
-			<div class="selectall">
-				<a id="zar2sat" class="btn btn-sm btn-primary" href="javascript:;">{{$sel_tall}}</a>
-				<a id="zar2aas" class="zar2xas btn btn-sm btn-success" href="javascript:;"><i class="fa fa-check"></i> {{$sel_aprv}}</a>
-				<a id="zar2das" class="zar2xas btn btn-sm btn-danger" href="javascript:;"><i class="fa fa-close"></i> {{$sel_deny}}</a>
-			</div>
+			</tbody>
+		</table>
+		<div class="float-right">
+			<a id="zar2sat" class="btn btn-sm btn-primary" href="javascript:;">{{$sel_tall}}</a>
+			<a id="zar2aas" class="zar2xas btn btn-sm btn-success" href="javascript:;"><i class="fa fa-check"></i> {{$sel_aprv}}</a>
+			<a id="zar2das" class="zar2xas btn btn-sm btn-danger" href="javascript:;"><i class="fa fa-close"></i> {{$sel_deny}}</a>
+		</div>
 		{{else}}
-			<p>{{$no_pending}}</p>
+		<div class="text-muted">
+		{{$no_pending}}
+		</div>
 		{{/if}}
-
-
+		<div class="float-left">
+			<a class="btn btn-sm btn-link" href="{{$get_all_link}}">{{$get_all}}</a>
+		</div>
+		<div class="clearfix"></div>
+		<br><br>
 		<h3>{{$h_users}}</h3>
 		{{if $users}}
 			<table id="users">
diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl
index 2712cfee4..e51e8e87b 100644
--- a/view/tpl/invite.tpl
+++ b/view/tpl/invite.tpl
@@ -10,7 +10,7 @@
       <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
       <pre>{{$ihave}}<br>{{$wehave}}</pre>
- 
+
       <div id="zai-re" style="visibility: hidden;">
         <div class="zai_h0 fa"></div>
         <pre id="zai-remsg"></pre>
@@ -25,13 +25,13 @@
         <a id="zai-ax" href="javascript:;" class="zai_ax zai_b">check</a><br>
 
         <hr>
-        {{$inv_expire}}         
+        {{$inv_expire}}
       </div>
 
       <hr>
 
       <div class="">
-        <div class="zai_h0">{{$subject_label}} 
+        <div class="zai_h0">{{$subject_label}}
           <span id="zai-subject">{{$subject}}</span>
         </div>
 
@@ -48,7 +48,7 @@
       <pre id="zai-due">
       {{$due}}
       </pre>
-      
+
       <div id="invite-submit-wrapper" class="form-group">
         <button class="btn btn-primary btn-sm" type="submit" id="invite-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
       </div>
@@ -110,13 +110,13 @@
     if (tao.zai.c2s.to=='') { return false; };
     // tao.zai.c2s.lcc=$('.zai_lcc.zai_hi').text();
     $.ajax({
-      type: 'POST', url: 'invite', 
+      type: 'POST', url: 'invite',
       data: {
         zaito: tao.zai.c2s.to,
         zailcc: tao.zai.lccmy,
         zaidurn: $('#zaiexpiren').val(),
         zaidurq: $('input[name="zaiexpire"]:checked').val(),
-        form_security_token: $("input[name='form_security_token']").val() 
+        form_security_token: $("input[name='form_security_token']").val()
       }
     }).done( function(r) {
       tao.zai.r = JSON.parse(r);
@@ -133,10 +133,10 @@
     $('#zai-reon').val(JSON.stringify(tao.zai.reon));
   });
   function zaitx() {
-    typeof(tao.zai.s[tao.zai.lccmy][tao.zai.itpl]) !== 'undefined'
+    typeof(tao.zai.s[tao.zai.lccmy]) !== 'undefined' && typeof(tao.zai.s[tao.zai.lccmy][tao.zai.itpl]) !== 'undefined'
     ? $('#zai-subject').text(decodeURIComponent(tao.zai.s[tao.zai.lccmy][tao.zai.itpl]))
     : $('#zai-subject').text('Invitation');
-    typeof(tao.zai.t[tao.zai.lccmy][tao.zai.itpl]) !== 'undefined'
+    typeof(tao.zai.t[tao.zai.lccmy]) !== 'undefined' && typeof(tao.zai.t[tao.zai.lccmy][tao.zai.itpl]) !== 'undefined'
     ? $('#zai-ims').text(decodeURIComponent(tao.zai.t[tao.zai.lccmy][tao.zai.itpl]))
     : $('#zai-ims').text(' ');
   }
diff --git a/view/tpl/regate.tpl b/view/tpl/regate.tpl
index b9239ee46..57ca2c1b3 100644
--- a/view/tpl/regate.tpl
+++ b/view/tpl/regate.tpl
@@ -11,6 +11,8 @@
 		<div class="section-content-info-wrapper">
 			{{$desc}} {{$id}}
 			<div class="h3">{{$pin}}</div>
+			{{if $email_extra}}<b>{{$email_extra}}</b>{{/if}}
+
 		</div>
 
 		<form action="regate/{{$did2}}" method="post">
diff --git a/view/tpl/regate_pre.tpl b/view/tpl/regate_pre.tpl
index 7596f6846..790dec4b9 100644
--- a/view/tpl/regate_pre.tpl
+++ b/view/tpl/regate_pre.tpl
@@ -15,13 +15,14 @@
 		<div class="section-content-info-wrapper">
 			{{$strings.1}} {{$id}}
 			<div class="h3">{{$pin}}</div>
+			{{if $strings.2}}<b>{{$strings.2}}</b>{{/if}}
 		</div>
 		<div class="d-none">
-			{{$strings.2}}<br>
+			{{$strings.3}}<br>
 			<span id="register_start" data-utc="{{$regdelay}}" class="register_date">
 				{{$regdelay}}
 			</span>
-			&nbsp;&dash;&nbsp; 
+			&nbsp;&dash;&nbsp;
 			<span data-utc="{{$regexpire}}" class="register_date">
 				{{$regexpire}}
 			</span>