Merge branch 'patch-5' into 'dev'

save admin page values

See merge request hubzilla/core!1282

7 files changed, 24 insertions, 16 deletions

diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl
index 8d500589a..3329c0025 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}}
 
 
-<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+<input type="submit" name="submit" class="btn btn-primary" value="{{$submit}}" />
 
 </form>
diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl
index d963ac30f..2dd56c8dc 100755
--- a/view/tpl/admin_accounts.tpl
+++ b/view/tpl/admin_accounts.tpl
@@ -42,8 +42,8 @@
 			</table>
 			<div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></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>
+                <input type="submit" name="page_accounts_deny" class="btn btn-primary" value="{{$deny}}" /> 
+                <input type="submit" name="page_accounts_approve" class="btn btn-primary" value="{{$approve}}" />
             </div>
 		{{else}}
 			<p>{{$no_pending}}</p>
@@ -85,8 +85,8 @@
 			</table>
 			<div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></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>
+                <input type="submit" name="page_accounts_block" class="btn btn-primary" value="{{$block}}/{{$unblock}}" /> 
+                <input type="submit" name="page_accounts_delete" class="btn btn-primary" onclick="return confirm_delete_multi()" value="{{$delete}}" />
             </div>
 		{{else}}
 			NO USERS?!?
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index e00c6273a..f8584c84a 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -44,9 +44,9 @@
 			</table>
 			<div class='selectall'><a href='#' onclick="return selectall('channels_ckbx');">{{$select_all}}</a></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>
+                <input type="submit" name="page_channels_block" class="btn btn-primary" value="{{$block}}/{{$unblock}}" /> 
+                <input type="submit" name="page_channels_code" class="btn btn-primary" value="{{$code}}/{{$uncode}}" /> 
+                <input type="submit" name="page_channels_delete" class="btn btn-primary" onclick="return confirm_delete_multi()" value="{{$delete}}" />
             </div>						
 		{{else}}
 			NO CHANNELS?!?
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
index 844c487ee..5643bb42f 100755
--- a/view/tpl/admin_logs.tpl
+++ b/view/tpl/admin_logs.tpl
@@ -2,13 +2,15 @@
 	<h1>{{$title}} - {{$page}}</h1>
 	
 	<form action="{{$baseurl}}/admin/logs" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
 
 	{{include file="field_checkbox.tpl" field=$debugging}}
 	{{include file="field_input.tpl" field=$logfile}}
 	{{include file="field_select.tpl" field=$loglevel}}
 	
-	<div class="submit"><button type="submit" name="page_logs" class="btn btn-primary">{{$submit}}</button></div>
+	<div class="submit">
+	    <input type="submit" name="page_logs" class="btn btn-primary" value="{{$submit}}" />
+	</div>
 	
 	</form>
 	
diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl
index 0f00e0db5..b3bb687c0 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}}
 
-<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+<input type="submit" name="submit" class="btn btn-primary" value="{{$submit}}" />
 
 </form>
 
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
index 2c3811d22..9a99c7456 100755
--- a/view/tpl/admin_security.tpl
+++ b/view/tpl/admin_security.tpl
@@ -27,7 +27,7 @@
 
 
 	<div class="admin-submit-wrapper">
-		<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+		<input type="submit" name="submit" class="btn btn-primary" value="{{$submit}}" />
 	</div>
 
 	</form>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 6c86c5a79..c3f8177c2 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -64,7 +64,9 @@
 		{{include file="field_select.tpl" field=$directory_server}}
 	{{/if}}
 	
-	<div class="submit"><button type="submit" name="page_site" class="btn btn-primary">{{$submit}}</button></div>
+	<div class="submit">
+	    <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" />
+    </div>
 	
 	<h3>{{$registration}}</h3>
 	{{include file="field_input.tpl" field=$register_text}}
@@ -77,7 +79,9 @@
 	{{include file="field_input.tpl" field=$sellpage}}
 	{{include file="field_input.tpl" field=$first_page}}
 
-	<div class="submit"><button type="submit" name="page_site" class="btn btn-primary">{{$submit}}</button></div>
+	<div class="submit">
+	    <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" />
+    </div>
 
 	<h3>{{$corporate}}</h3>
 	{{include file="field_checkbox.tpl" field=$verify_email}}
@@ -89,7 +93,9 @@
 	{{include file="field_textarea.tpl" field=$incl}}
 	{{include file="field_textarea.tpl" field=$excl}}
 	
-	<div class="submit"><button type="submit" name="page_site" class="btn btn-primary">{{$submit}}</button></div>
+	<div class="submit">
+        <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" /></div>
+    </div>
 	
 	<h3>{{$advanced}}</h3>
 	{{include file="field_input.tpl" field=$imagick_path}}
@@ -107,7 +113,7 @@
 	{{include file="field_input.tpl" field=$active_expire_days}}
 	
 	<div class="submit">
-        <button type="submit" name="page_site" class="btn btn-primary">{{$submit}}</button>
+        <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" />
     </div>
 	
 	</form>