aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/admin_account_edit.tpl2
-rwxr-xr-xview/tpl/admin_accounts.tpl17
-rwxr-xr-xview/tpl/admin_channels.tpl6
-rwxr-xr-xview/tpl/admin_logs.tpl6
-rw-r--r--view/tpl/admin_profiles.tpl2
-rwxr-xr-xview/tpl/admin_security.tpl4
-rwxr-xr-xview/tpl/admin_site.tpl16
-rw-r--r--view/tpl/app.tpl2
-rwxr-xr-xview/tpl/jot-header.tpl4
-rwxr-xr-xview/tpl/jot.tpl13
-rwxr-xr-xview/tpl/navbar_default.tpl4
-rwxr-xr-xview/tpl/settings_module.tpl3
12 files changed, 53 insertions, 26 deletions
diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl
index 239d9084a..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}}
-<input type="submit" name="submit" value="{{$submit}}" />
+<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 d6c9591fd..2dd56c8dc 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">
+ <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>
{{/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">
+ <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?!?
{{/if}}
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index 452e0eeec..f8584c84a 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">
+ <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?!?
{{/if}}
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
index 6d2d7834c..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"><input type="submit" name="page_logs" value="{{$submit}}" /></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 e3a08449c..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}}
-<input type="submit" name="submit" value="{{$submit}}" />
+<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 493707a7a..9a99c7456 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">
+ <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 3288c2988..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"><input type="submit" name="page_site" value="{{$submit}}" /></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"><input type="submit" name="page_site" value="{{$submit}}" /></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"><input type="submit" name="page_site" value="{{$submit}}" /></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}}
@@ -106,7 +112,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">
+ <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" />
+ </div>
</form>
</div>
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 042f48704..6013f9548 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -20,7 +20,7 @@
{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-fw fa-trash-o drop-icons"></i></button>{{/if}}
{{if $feature}}<button type="submit" name="feature" value="nav_featured_app" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-fw fa-star{{if $featured}} text-warning{{/if}}"></i></button>{{/if}}
{{if $pin}}<button type="submit" name="pin" value="nav_pinned_app" class="btn btn-outline-secondary btn-sm" title="{{if $pinned}}{{$remove_nav}}{{else}}{{$add_nav}}{{/if}}"><i class="fa fa-fw fa-thumb-tack{{if $pinned}} text-success{{/if}}"></i></button>{{/if}}
- {{if $settings_url}}<a href="{{$settings_url}}" class="btn btn-outline-secondary btn-sm"><i class="fa fa-fw fa-cog"></i></a>{{/if}}
+ {{if $settings_url}}<a href="{{$settings_url}}/?f=&rpath={{$rpath}}" class="btn btn-outline-secondary btn-sm"><i class="fa fa-fw fa-cog"></i></a>{{/if}}
</form>
</div>
{{/if}}
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index dd64c3454..be09fbebf 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -7,7 +7,7 @@ var pretext = '{{$pretext}}';
function initEditor(cb){
if(editor == false){
$("#profile-jot-text-loading").show();
- $("#profile-jot-reset").removeClass('d-none');
+ $("#profile-jot-tools").removeClass('d-none');
{{$geotag}}
if(plaintext == 'none') {
$("#profile-jot-text-loading").hide();
@@ -308,7 +308,7 @@ var activeCommentText = '';
{{if $reset}}
$(".jothidden").hide();
$("#profile-jot-text").removeClass('jot-expanded');
- $("#profile-jot-reset").addClass('d-none');
+ $("#profile-jot-tools").addClass('d-none');
$("#jot-preview-content").html('').hide();
editor = false;
{{else}}
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 0d1b4bd0d..2137baf9b 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -42,11 +42,14 @@
</div>
{{/if}}
<div id="jot-text-wrap">
- {{if $reset}}
- <button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm d-none border-0" title="{{$reset}}" onclick="itemCancel(); return false;">
- <i class="fa fa-close"></i>
- </button>
- {{/if}}
+ <div id="profile-jot-tools" class="btn-group d-none">
+ <a id="profile-jot-settings" class="btn btn-outline-secondary btn-sm border-0" href="/settings/editor/?f=&rpath=/{{$return_path}}"><i class="fa fa-cog"></i></a>
+ {{if $reset}}
+ <button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm border-0" title="{{$reset}}" onclick="itemCancel(); return false;">
+ <i class="fa fa-close"></i>
+ </button>
+ {{/if}}
+ </div>
<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea>
</div>
{{if $attachment}}
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index a11b9b5ea..0c8be512d 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -63,7 +63,7 @@
{{/if}}
</div>
{{if $sel.name}}
-<div id="nav-app-link-wrapper" class="navbar-nav mr-auto">
+<div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation || ! $settings_url}} has_location mr-auto{{/if}}">
<a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate">
{{$sel.name}}
{{if $sitelocation}}
@@ -74,7 +74,7 @@
</div>
{{if $settings_url}}
<div id="nav-app-settings-link-wrapper" class="navbar-nav mr-auto">
- <a id="nav-app-settings-link" href="{{$settings_url}}" class="nav-link">
+ <a id="nav-app-settings-link" href="{{$settings_url}}/?f=&rpath={{$url}}" class="nav-link">
<i class="fa fa-fw fa-cog"></i>
</a>
</div>
diff --git a/view/tpl/settings_module.tpl b/view/tpl/settings_module.tpl
index b2ac5462f..cabefc3e5 100755
--- a/view/tpl/settings_module.tpl
+++ b/view/tpl/settings_module.tpl
@@ -5,6 +5,9 @@
<div class="section-content-wrapper">
<form action="{{$action_url}}" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+ {{if $rpath}}
+ <input type='hidden' name='rpath' value='{{$rpath}}'>
+ {{/if}}
{{foreach $features as $feature}}
{{include file="field_checkbox.tpl" field=$feature}}
{{/foreach}}