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

7 files changed, 28 insertions, 15 deletions

diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl
index 239d9084a..8d500589a 100644
--- a/view/tpl/admin_account_edit.tpl
+++ b/view/tpl/admin_account_edit.tpl
@@ -13,6 +13,6 @@
 {{include file="field_input.tpl" field=$service_class}}
 
 
-<input type="submit" name="submit" value="{{$submit}}" />
+<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 
 </form>
diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl
index d6c9591fd..d963ac30f 100755
--- a/view/tpl/admin_accounts.tpl
+++ b/view/tpl/admin_accounts.tpl
@@ -33,15 +33,18 @@
 					<td class="email">{{$u.account_email}}</td>
 					<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
 					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
 					</td>
 				</tr>
 			{{/foreach}}
 				</tbody>
 			</table>
 			<div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_accounts_deny" value="{{$deny}}"> <input type="submit" name="page_accounts_approve" value="{{$approve}}"></div>
+			<div class="submit">
+                <button type="submit" name="page_accounts_deny" class="btn btn-primary">{{$deny}}</button> 
+                <button type="submit" name="page_accounts_approve" class="btn btn-primary">{{$approve}}"></button>
+            </div>
 		{{else}}
 			<p>{{$no_pending}}</p>
 		{{/if}}
@@ -73,14 +76,18 @@
 						<td class="service_class">{{$u.account_service_class}}</td>
 						<td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
 						<td class="tools">
-							<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}"  class="btn btn-outline-secondary btn-sm" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
+							<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a>
+							<a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
 						</td>
 					</tr>
 				{{/foreach}}
 				</tbody>
 			</table>
 			<div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_accounts_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_accounts_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div>
+			<div class="submit">
+                <button type="submit" name="page_accounts_block" class="btn btn-primary">{{$block}}/{{$unblock}}</button> 
+                <button type="submit" name="page_accounts_delete" class="btn btn-primary" onclick="return confirm_delete_multi()">{{$delete}}</button>
+            </div>
 		{{else}}
 			NO USERS?!?
 		{{/if}}
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index 452e0eeec..e00c6273a 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -43,7 +43,11 @@
 				</tbody>
 			</table>
 			<div class='selectall'><a href='#' onclick="return selectall('channels_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_channels_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_channels_code" value="{{$code}}/{{$uncode}}" /> <input type="submit" name="page_channels_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+			<div class="submit">
+                <button type="submit" name="page_channels_block" class="btn btn-primary">{{$block}}/{{$unblock}}</button> 
+                <button type="submit" name="page_channels_code" class="btn btn-primary">{{$code}}/{{$uncode}}</button> 
+                <button type="submit" name="page_channels_delete" class="btn btn-primary" onclick="return confirm_delete_multi()">{{$delete}}</button>
+            </div>						
 		{{else}}
 			NO CHANNELS?!?
 		{{/if}}
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
index 6d2d7834c..844c487ee 100755
--- a/view/tpl/admin_logs.tpl
+++ b/view/tpl/admin_logs.tpl
@@ -8,7 +8,7 @@
 	{{include file="field_input.tpl" field=$logfile}}
 	{{include file="field_select.tpl" field=$loglevel}}
 	
-	<div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
+	<div class="submit"><button type="submit" name="page_logs" class="btn btn-primary">{{$submit}}</button></div>
 	
 	</form>
 	
diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl
index e3a08449c..0f00e0db5 100644
--- a/view/tpl/admin_profiles.tpl
+++ b/view/tpl/admin_profiles.tpl
@@ -15,7 +15,7 @@
 {{include file="field_textarea.tpl" field=$basic}}
 {{include file="field_textarea.tpl" field=$advanced}}
 
-<input type="submit" name="submit" value="{{$submit}}" />
+<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 
 </form>
 
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
index 493707a7a..2c3811d22 100755
--- a/view/tpl/admin_security.tpl
+++ b/view/tpl/admin_security.tpl
@@ -26,8 +26,8 @@
 	{{include file="field_textarea.tpl" field=$embed_deny}}
 
 
-	<div class="admin-submit-wrapper" >
-		<input type="submit" name="submit" class="admin-submit" value="{{$submit}}" />
+	<div class="admin-submit-wrapper">
+		<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 	</div>
 
 	</form>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 3288c2988..6c86c5a79 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -64,7 +64,7 @@
 		{{include file="field_select.tpl" field=$directory_server}}
 	{{/if}}
 	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	<div class="submit"><button type="submit" name="page_site" class="btn btn-primary">{{$submit}}</button></div>
 	
 	<h3>{{$registration}}</h3>
 	{{include file="field_input.tpl" field=$register_text}}
@@ -77,7 +77,7 @@
 	{{include file="field_input.tpl" field=$sellpage}}
 	{{include file="field_input.tpl" field=$first_page}}
 
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	<div class="submit"><button type="submit" name="page_site" class="btn btn-primary">{{$submit}}</button></div>
 
 	<h3>{{$corporate}}</h3>
 	{{include file="field_checkbox.tpl" field=$verify_email}}
@@ -89,7 +89,7 @@
 	{{include file="field_textarea.tpl" field=$incl}}
 	{{include file="field_textarea.tpl" field=$excl}}
 	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	<div class="submit"><button type="submit" name="page_site" class="btn btn-primary">{{$submit}}</button></div>
 	
 	<h3>{{$advanced}}</h3>
 	{{include file="field_input.tpl" field=$imagick_path}}
@@ -106,7 +106,9 @@
 	{{include file="field_input.tpl" field=$default_expire_days}}
 	{{include file="field_input.tpl" field=$active_expire_days}}
 	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	<div class="submit">
+        <button type="submit" name="page_site" class="btn btn-primary">{{$submit}}</button>
+    </div>
 	
 	</form>
 </div>