diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_security.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 11 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 12 |
3 files changed, 6 insertions, 20 deletions
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl index 691db2d88..3823d8235 100755 --- a/view/tpl/admin_security.tpl +++ b/view/tpl/admin_security.tpl @@ -15,9 +15,6 @@ {{include file="field_textarea.tpl" field=$whitelisted_channels}} {{include file="field_textarea.tpl" field=$blacklisted_channels}} - - {{include file="field_checkbox.tpl" field=$embed_coop}} - {{include file="field_textarea.tpl" field=$embed_allow}} {{include file="field_textarea.tpl" field=$embed_deny}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 085710f55..bdcca71ac 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -1,7 +1,6 @@ <script language="javascript" type="text/javascript"> var editor = false; -var textlen = 0; var plaintext = '{{$editselect}}'; var pretext = '{{$pretext}}'; @@ -75,14 +74,6 @@ function initEditor(cb){ else { if(cPopup !== null) { cPopup.close(); cPopup = null; } } - - textlen = txt.length; - if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) { - $('#profile-jot-desc').html(ispublic); - } - else { - $('#profile-jot-desc').html(' '); - } }); ed.onInit.add(function(ed) { @@ -109,8 +100,6 @@ function enableOnUser(){ </script> <script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script> <script> - var ispublic = '{{$ispublic}}'; - $(document).ready(function() { /* enable tinymce on focus and click */ $("#profile-jot-text").focus(enableOnUser); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 9c5ddc620..106181ab5 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -86,8 +86,8 @@ <i id="profile-location" class="icon-globe jot-icons"></i> </button> {{/if}} - {{if $noloc}} - <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$noloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> + {{if $clearloc}} + <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i> </button> {{/if}} @@ -115,7 +115,7 @@ </button> {{/if}} </div> - {{if $writefiles || $weblink || $setloc || $noloc || $feature_expire || $feature_encrypt || $feature_voting}} + {{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}} <div class="btn-group visible-xs visible-sm"> <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <i id="more-tools-icon" class="icon-caret-down jot-icons"></i> @@ -128,11 +128,11 @@ {{if $weblink}} <li><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i> {{$weblink}}</a></li> {{/if}} -i {{if $setloc}} + {{if $setloc}} <li><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i> {{$setloc}}</a></li> {{/if}} - {{if $noloc}} - <li><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i> {{$noloc}}</a></li> + {{if $clearloc}} + <li><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i> {{$clearloc}}</a></li> {{/if}} {{/if}} {{if $feature_expire}} |