diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/head.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 19 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/login.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 50 | ||||
| -rw-r--r-- | view/tpl/pdledit.tpl | 3 |
6 files changed, 61 insertions, 18 deletions
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index ba883c1f0..7984723b3 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,6 +1,7 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <base href="{{$baseurl}}/" /> <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" /> +<noscript><meta http-equiv="refresh" content="0; url=nojs.php&redir={{$query}}"></noscript> {{$metas}} <!--[if IE]> <script src="{{$baseurl}}/library/html5.js"></script> @@ -16,7 +17,7 @@ <link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" - title="Search in the Hubzilla" /> + title="{{$osearch}}" /> <script> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 84fccc105..b8618ab69 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -11,10 +11,15 @@ function initEditor(cb){ if(plaintext == 'none') { $("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); + {{if $bbco_autocomplete}} + $("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode + {{/if}} + {{if $editor_autocomplete}} if(typeof channelId === 'undefined') $("#profile-jot-text").editor_autocomplete(baseurl+"/acl"); else $("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections + {{/if}} editor = true; $("a#jot-perms-icon").colorbox({ 'inline' : true, @@ -213,20 +218,6 @@ function enableOnUser(){ } } - function jotVideoURL() { - reply = prompt("{{$vidurl}}"); - if(reply && reply.length) { - addeditortext('[video]' + reply + '[/video]'); - } - } - - function jotAudioURL() { - reply = prompt("{{$audurl}}"); - if(reply && reply.length) { - addeditortext('[audio]' + reply + '[/audio]'); - } - } - function jotGetLocation() { reply = prompt("{{$whereareu}}", $('#jot-location').val()); if(reply && reply.length) { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index dea75efa9..026c586a0 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -48,6 +48,7 @@ {{/if}} <div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-jot-submit-left" class="btn-toolbar pull-left"> + {{if $bbcode}} <div class="btn-group"> <button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;"> <i class="icon-bold jot-icons"></i> @@ -65,6 +66,7 @@ <i class="icon-terminal jot-icons"></i> </button> </div> + {{/if}} {{if $visitor}} <div class="btn-group hidden-xs"> {{if $writefiles}} diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index da38f3571..d56c8f272 100755 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -5,7 +5,7 @@ <div id="login-input" class="form-group"> {{include file="field_input.tpl" field=$lname}} {{include file="field_password.tpl" field=$lpassword}} - {{include file="field_checkbox.tpl" field=$remember}} + {{include file="field_checkbox.tpl" field=$remember_me}} <button type="submit" name="submit" class="btn btn-block btn-primary">{{$login}}</button> </div> <div id="login-extra-links"> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 3d6809c22..886f73947 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,4 +1,45 @@ - <div class="container-fluid"> +<script> + $(document).mouseup(function (e) + { + var container = $("#help-content"); + + if (!container.is(e.target) // if the target of the click isn't the container... + && container.has(e.target).length === 0 // ... nor a descendant of the container + && container.hasClass('help-content-open')) + { + container.removeClass('help-content-open'); + } + }); +</script> +<style> +.help-content { + background: rgba(255, 255, 255, 0.9); + color: #333333; + position: fixed; + top: 50px; + left: -80%; + width: 80%; + height: 60%; + padding: 20px; + transition: left 300ms cubic-bezier(0.17, 0.04, 0.03, 0.94); + box-sizing: border-box; + border: #CCC thin solid; + overflow: auto; +} + +.help-content-open { + left: 0px; + -moz-box-shadow: 3px 3px 3px #ccc; + -webkit-box-shadow: 3px 3px 3px #ccc; + box-shadow: 3px 3px 3px #ccc; +} + +.help-content dd { + margin-bottom: 1em; +} +</style> + +<div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> <span class="icon-bar"></span> @@ -189,8 +230,13 @@ {{if $nav.help}} <li class="{{$sel.help}}"> - <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"><i class="icon-question"></i></a> + <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="$('#help-content').toggleClass('help-content-open'); return false;"><i class="icon-question"></i></a> </li> + + <div id="help-content" class="help-content"> + {{$nav.help.5}} + <p class="pull-right"><a href="{{$nav.help.0}}">Click here for more documentation...</a></p> + </div> {{/if}} </ul> </div> diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl index af8e37602..3e1f5a3fc 100644 --- a/view/tpl/pdledit.tpl +++ b/view/tpl/pdledit.tpl @@ -18,4 +18,7 @@ <input type="submit" name="submit" value="{{$submit}}" /> </form> +<script> + $('textarea').bbco_autocomplete('comanche'); +</script> </div> |