diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_oauth2testvehicle.css | 4 | ||||
| -rw-r--r-- | view/js/autocomplete.js | 4 | ||||
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/navbar_tucson.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/oauth2testvehicle.tpl | 21 | ||||
| -rwxr-xr-x | view/tpl/oauth_authorize.tpl | 18 | ||||
| -rwxr-xr-x | view/tpl/settings_nick_set.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 1 |
8 files changed, 47 insertions, 15 deletions
diff --git a/view/css/mod_oauth2testvehicle.css b/view/css/mod_oauth2testvehicle.css new file mode 100644 index 000000000..0ef2896b5 --- /dev/null +++ b/view/css/mod_oauth2testvehicle.css @@ -0,0 +1,4 @@ +.oath2test-form-box { + border: #ccc thin solid; + padding: 1em; +}
\ No newline at end of file diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index f7570523e..07b9bc449 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -198,7 +198,7 @@ function string2bb(element) { // Autocomplete forums forums = { - match: /(^|\s)(\!)([^ \n]+)$/, + match: /(^|\s)(\!\!*)([^ \n]+)$/, index: 3, search: function(term, callback) { contact_search(term, callback, backend_url, 'f', extra_channels, spinelement=false); }, replace: editor_replace, @@ -210,7 +210,7 @@ function string2bb(element) { tags = { match: /(^|\s)(\#)([^ \n]{2,})$/, index: 3, - search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); }, + search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.toLowerCase().indexOf(term.toLowerCase()) === 0 ? entry : null; })); }); }, replace: function(item) { return "$1$2" + item.text + ' '; }, context: function(text) { return text.toLowerCase(); }, template: tag_format diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 92b067bcb..532e10f22 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -91,7 +91,7 @@ <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="navbar-nav mr-auto"> {{if $nav.login && !$userinfo}} - <li class="nav-item d-none d-xl-flex"> + <li class="nav-item d-lg-flex"> {{if $nav.loginmenu.1.4}} <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login"> {{$nav.loginmenu.1.1}} @@ -104,12 +104,12 @@ </li> {{/if}} {{if $nav.register}} - <li class="nav-item {{$nav.register.2}} d-none d-xl-flex"> + <li class="nav-item {{$nav.register.2}} d-lg-flex"> <a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a> </li> {{/if}} {{if $nav.alogout}} - <li class="nav-item {{$nav.alogout.2}} d-none d-xl-flex"> + <li class="nav-item {{$nav.alogout.2}} d-lg-flex"> <a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a> </li> {{/if}} diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index 92b067bcb..800f863dd 100755 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.tpl @@ -91,7 +91,7 @@ <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="navbar-nav mr-auto"> {{if $nav.login && !$userinfo}} - <li class="nav-item d-none d-xl-flex"> + <li class="nav-item d-lg-flex"> {{if $nav.loginmenu.1.4}} <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login"> {{$nav.loginmenu.1.1}} @@ -104,12 +104,12 @@ </li> {{/if}} {{if $nav.register}} - <li class="nav-item {{$nav.register.2}} d-none d-xl-flex"> + <li class="nav-item {{$nav.register.2}} d-lg-flex"> <a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a> </li> {{/if}} {{if $nav.alogout}} - <li class="nav-item {{$nav.alogout.2}} d-none d-xl-flex"> + <li class="nav-item {{$nav.alogout.2}} d-none d-lg-flex"> <a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a> </li> {{/if}} diff --git a/view/tpl/oauth2testvehicle.tpl b/view/tpl/oauth2testvehicle.tpl new file mode 100644 index 000000000..ce46b58c0 --- /dev/null +++ b/view/tpl/oauth2testvehicle.tpl @@ -0,0 +1,21 @@ +<h1>OAuth 2.0 Test Vehicle</h1> + +{{foreach $endpoints as $ept}} +<div class="oath2test-form-box"> +<form action="{{$baseurl}}/{{$ept.0}}/" method="{{$ept.4}}"> + <h3>{{$ept.3}}</h3> + {{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />{{/foreach}} + <br> + <button type="submit" name="{{$ept.2}}_submit" value="submit" class="btn btn-med" title="">Submit</button> + <span style="display: {{if $ept.5}}inline{{else}}none{{/if}}; font-size: 2em;"> <i class="fa fa-check"></i></span> +</form> + </div> +{{/foreach}} +<div> + <h3>API response</h3> + <pre style="display: inline-block; overflow-x: auto; white-space: nowrap; width: 100%;"> + <code> + {{$api_response}} + </code> + </pre> +</div>
\ No newline at end of file diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl index 2b7afa80e..72701ce52 100755 --- a/view/tpl/oauth_authorize.tpl +++ b/view/tpl/oauth_authorize.tpl @@ -2,9 +2,15 @@ <div class='oauthapp'> <img src='{{$app.icon}}'> - <h4>{{$app.name}}</h4> -</div> -<h3>{{$authorize}}</h3> -<form method="POST"> -<div class="settings-submit-wrapper"><input class="settings-submit" type="submit" name="oauth_yes" value="{{$yes}}" /></div> -</form> + <h3>{{$app.name}}</h3> + <p class="descriptive-paragraph">{{$authorize}}</p> + <form method="POST"> + <div class="settings-submit-wrapper"> + <input type="hidden" name="client_id" value="{{$client_id}}" /> + <input type="hidden" name="redirect_uri" value="{{$redirect_uri}}" /> + <input type="hidden" name="state" value="{{$state}}" /> + <button class="btn btn-lg btn-danger" name="authorize" value="deny" type="submit">{{$no}}</button> + <button class="btn btn-lg btn-success" name="authorize" value="allow" type="submit">{{$yes}}</button> + </div> + </form> +</div>
\ No newline at end of file diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl index 76fe7cd8d..4dbe58d82 100755 --- a/view/tpl/settings_nick_set.tpl +++ b/view/tpl/settings_nick_set.tpl @@ -1,5 +1,5 @@ <div id="settings-nick-wrapper" class="section-content-info-wrapper"> -<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong></div> +<div id="settings-nickname-desc">{{$desc}} <strong>{{$nickname}}</strong></div> {{if $davpath}} <br> <div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 2be323deb..6ca4b0c77 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -15,6 +15,7 @@ </div> </div> {{/if}} + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$sharePage}}" onclick="window.location.href='rpost?f=&body={{$shareLink}}';"><i class="fa fa-fw fa-share"></i></button> <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button> <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button> </div> |