diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/app.tpl | 17 | ||||
| -rw-r--r-- | view/tpl/app_create.tpl | 30 | ||||
| -rw-r--r-- | view/tpl/app_select.tpl | 11 | ||||
| -rwxr-xr-x | view/tpl/apps.tpl | 14 | ||||
| -rwxr-xr-x | view/tpl/comment_item.tpl | 92 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 57 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/field_textarea.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_themeselect.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/js_strings.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/mitemlist.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/myapps.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings_display.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/settings_oauth.tpl | 4 |
20 files changed, 194 insertions, 75 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 722d541ed..4babf5669 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -23,7 +23,7 @@ {{$jotnets}} {{/if}} </div> - <div class="modal-footer"> + <div class="modal-footer clear"> <button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button> </div> </div><!-- /.modal-content --> diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl new file mode 100644 index 000000000..967ccc67c --- /dev/null +++ b/view/tpl/app.tpl @@ -0,0 +1,17 @@ +<div class="app-container"> +<a href="{{if $app.alt_url}}{{$app.alt_url}}{{else}}{{$app.url}}{{/if}}" {{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" /> +<div class="app-name">{{$app.name}}</div> +</a> +{{if $purchase}} +<a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="icon-external"></i></a> +{{/if}} +{{if $install || $update || $delete }} +<form action="appman" method="post"> +<input type="hidden" name="papp" value="{{$app.papp}}" /> +{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="icon-download-alt" ></i></button>{{/if}} +{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default" title="{{$edit}}" ><i class="icon-pencil" ></i></button>{{/if}} +{{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></button>{{/if}} +</form> +{{/if}} +</div> + diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl new file mode 100644 index 000000000..ff28e0598 --- /dev/null +++ b/view/tpl/app_create.tpl @@ -0,0 +1,30 @@ +<h2>{{$banner}}</h2> + + +<form action="appman" method="post"> +{{if $guid}} +<input type="hidden" name="guid" value="{{$guid}}" /> +{{/if}} +{{if $author}} +<input type="hidden" name="author" value="{{$author}}" /> +{{/if}} +{{if $addr}} +<input type="hidden" name="addr" value="{{$addr}}" /> +{{/if}} + +{{include file="field_input.tpl" field=$name}} +{{include file="field_input.tpl" field=$url}} +{{include file="field_textarea.tpl" field=$desc}} +{{include file="field_input.tpl" field=$photo}} +{{include file="field_input.tpl" field=$version}} +{{include file="field_input.tpl" field=$price}} +{{include file="field_input.tpl" field=$page}} + +{{if $embed}} +{{include file="field_textarea.tpl" field=$embed}} +{{/if}} + +<input type="submit" name="submit" value="{{$submit}}" /> + +</form> + diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl new file mode 100644 index 000000000..4cd945388 --- /dev/null +++ b/view/tpl/app_select.tpl @@ -0,0 +1,11 @@ +<div class="widget"> +<h3>{{$title}}</h3> +<ul> +<li><a href="apps">{{$system}}</a></li> +<li><a href="apps/personal">{{$personal}}</a></li> +<br /> +<li><a href="appman">{{$new}}</a></li> +<li><a href="apps/personal/edit">{{$edit}}</a></li> +</ul> +</div> + diff --git a/view/tpl/apps.tpl b/view/tpl/apps.tpl index 335e0ca97..d8e538cb7 100755 --- a/view/tpl/apps.tpl +++ b/view/tpl/apps.tpl @@ -1,7 +1,11 @@ <h3>{{$title}}</h3> -<ul> - {{foreach $apps as $ap}} - <li>{{$ap}}</li> - {{/foreach}} -</ul> +{{foreach $apps as $ap}} +<div class="app-container"> +<a href="{{$ap.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $ap.hover}}title="{{$ap.hover}}"{{/if}}><img src="{{$ap.photo}}" width="80" height="80" /> +<div class="app-name">{{$ap.name}}</div> +</a> +</div> +{{/foreach}} +<div class="clear"></div> + diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 1ea619774..13c827b77 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -10,44 +10,7 @@ <input type="hidden" name="return" value="{{$return_path}}" /> <input type="hidden" name="jsreload" value="{{$jsreload}}" /> <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> - - <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" > - <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a> - </div> - <div class="comment-edit-photo-end"></div> - <ul class="comment-edit-bb-{{$id}}"> - <li><i class="icon-bold shadow comment-icon" - style="cursor: pointer;" title="{{$edbold}}" - onclick="insertbbcomment('{{$comment}}','b', {{$id}});"></i></li> - <li><i class="icon-italic shadow comment-icon" - style="cursor: pointer;" title="{{$editalic}}" - onclick="insertbbcomment('{{$comment}}','i', {{$id}});"></i></li> - <li><i class="icon-underline shadow comment-icon" - style="cursor: pointer;" title="{{$eduline}}" - onclick="insertbbcomment('{{$comment}}','u', {{$id}});"></i></li> - <li><i class="icon-quote-left shadow comment-icon" - style="cursor: pointer;" title="{{$edquote}}" - onclick="insertbbcomment('{{$comment}}','quote', {{$id}});"></i></li> - <li><i class="icon-terminal shadow comment-icon" - style="cursor: pointer;" title="{{$edcode}}" - onclick="insertbbcomment('{{$comment}}','code', {{$id}});"></i></li> - <li><i class="icon-camera shadow comment-icon" - style="cursor: pointer;" title="{{$edimg}}" - onclick="insertbbcomment('{{$comment}}','img', {{$id}});"></i></li> - <li><i class="icon-link shadow comment-icon" - style="cursor: pointer;" title="{{$edurl}}" - onclick="insertbbcomment('{{$comment}}','url', {{$id}});"></i></li> - <li><i class="icon-facetime-video shadow comment-icon" - style="cursor: pointer;" title="{{$edvideo}}" - onclick="insertbbcomment('{{$comment}}','video', {{$id}});"></i></li> - {{if $feature_encrypt}} - <li><i class="icon-key shadow comment-icon" - style="cursor: pointer;" title="{{$encrypt}}" - onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"></i></li> - {{/if}} - </ul> - <div class="comment-edit-bb-end"></div> - <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea> + <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenRedbasic(this,{{$id}});" onBlur="commentCloseRedbasic(this,{{$id}});" >{{$comment}}</textarea> {{if $qcomment}} <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" > <option value=""></option> @@ -56,17 +19,48 @@ {{/foreach}} </select> {{/if}} - - <div class="comment-edit-text-end"></div> - <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" > - <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" /> - {{if $preview}} - <span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink"><i class="icon-eye-open comment-icon comment-preview-icon" title="{{$preview}}"></i></span> - <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div> - {{/if}} + <div class="clear"></div> + <div id="comment-tools-{{$id}}" class="comment-tools"> + <div id="comment-edit-bb-{{$id}}" class="btn-group pull-left"> + <button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;"> + <i class="icon-bold comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;"> + <i class="icon-italic comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;"> + <i class="icon-underline comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;"> + <i class="icon-quote-left comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> + <i class="icon-terminal comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$comment}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> + <i class="icon-camera comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('{{$comment}}','url', {{$id}}); return false;"> + <i class="icon-link comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;"> + <i class="icon-facetime-video comment-icon"></i> + </button> + {{if $feature_encrypt}} + <button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"> + <i class="icon-key comment-icon"></i> + </button> + {{/if}} + </div> + <div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}"> + {{if $preview}} + <button id="comment-edit-submit-{{$id}}" class="btn btn-default btn-xs" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}"> + <i class="icon-eye-open comment-icon" ></i> + </button> + {{/if}} + <button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button> + </div> </div> - - <div class="comment-edit-end"></div> + <div class="clear"></div> </form> - </div> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index f9be3b077..828b47a05 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -6,9 +6,9 @@ {{/if}} <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}"> <a name="{{$item.id}}" ></a> - <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" > + <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> - <div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}" > + <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> </div> @@ -26,7 +26,7 @@ <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}} </div> <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> - {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span> {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-title-end"></div> @@ -85,6 +85,9 @@ {{if $item.bookmark}} <li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="icon-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li> {{/if}} + {{if $item.addtocal}} + <li role="presentation"><a role="menuitem" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="icon-calendar" title="{{$item.addtocal}}"></i> {{$item.addtocal}}</a></li> + {{/if}} {{if $item.star}} <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li> {{/if}} @@ -103,16 +106,60 @@ {{if $item.like_count}} <div class="btn-group"> <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-like-{{$item.id}}">{{$item.like_count}} {{$item.like_button_label}}</button> + {{if $item.like_list_part}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $item.like_list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + {{else}} <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $item.like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + {{/if}} </div> {{/if}} {{if $item.dislike_count}} <div class="btn-group"> <button type="button" class="btn btn-default btn-sm wall-item-dislike dropdown-toggle" data-toggle="dropdown" id="wall-item-dislike-{{$item.id}}">{{$item.dislike_count}} {{$item.dislike_button_label}}</button> + {{if $item.dislike_list_part}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$item.id}}">{{foreach $item.dislike_list_part as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + {{else}} <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$item.id}}">{{foreach $item.dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + {{/if}} </div> {{/if}} </div> + {{if $item.like_list_part}} + <div class="modal" id="likeModal-{{$item.id}}"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title">{{$item.like_modal_title}}</h4> + </div> + <div class="modal-body"> + <ul>{{foreach $item.like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + </div> + <div class="modal-footer clear"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} + {{if $item.dislike_list_part}} + <div class="modal" id="dislikeModal-{{$item.id}}"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title">{{$item.dislike_modal_title}}</h4> + </div> + <div class="modal-body"> + <ul>{{foreach $item.dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + </div> + <div class="modal-footer clear"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} </div> {{* we dont' use this do we? {{if $item.drop.pagedrop}} @@ -130,9 +177,11 @@ {{/foreach}} {{/if}} {{if $item.comment}} - <div class="wall-item-comment-wrapper" > + <div class="wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" > {{$item.comment}} </div> + <div id="comment-edit-preview-{{$item.id}}" class="comment-edit-preview"></div> + <div class="clear"></div> {{/if}} </div> {{if $item.comment_lastcollapsed}} diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index e698c8c97..d6b34b33e 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -106,7 +106,8 @@ } }); - + {{else}} + <script language="javascript" type="text/javascript"> {{/if}} $(document).ready(function() { diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index 98be8f138..b454045c0 100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,5 +1,5 @@ <div class='field textarea'> <label for='id_{{$field.0}}'>{{$field.1}}</label> - <textarea name='{{$field.0}}' id='id_{{$field.0}}'>{{$field.2}}</textarea> + <textarea name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl index c02eee328..a0e454bf5 100755 --- a/view/tpl/field_themeselect.tpl +++ b/view/tpl/field_themeselect.tpl @@ -1,4 +1,4 @@ - <script>$(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script> + <script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script> <div class='field select'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} > diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index e7b41523f..a212fd486 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -7,6 +7,9 @@ <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> +<script>(function(w){var dpr=((w.devicePixelRatio===undefined)?1:w.devicePixelRatio);if(!!w.navigator.standalone){var r=new XMLHttpRequest();r.open('GET','/retinaimages.php?devicePixelRatio='+dpr,false);r.send()}else{document.cookie='devicePixelRatio='+dpr+'; path=/'}})(window)</script> +<noscript><style id="devicePixelRatio" media="only screen and (-moz-min-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2)">html{background-image:url("/retinaimages.php?devicePixelRatio=2")}</style></noscript> + {{$head_css}} {{$js_strings}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 27b081b57..abf446ba9 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -300,6 +300,12 @@ function enableOnUser(){ timer = setTimeout(NavUpdate,1000); } + function itemAddToCal(id) { + $.get('{{$baseurl}}/events/add/' + id); + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,1000); + } + function jotClearLocation() { $('#jot-coord').val(''); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 2fd24d5ff..c4fdba0f5 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -81,7 +81,7 @@ </button> {{/if}} {{if $preview}} - <button class="btn btn-default btn-sm btn-preview" onclick="preview_post();return false;" title="{{$preview}}"> + <button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}"> <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index cac5be65b..515e3107f 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -14,6 +14,7 @@ 'passphrase' : "{{$passphrase}}", 'passhint' : "{{$passhint}}", 'permschange' : "{{$permschange}}", + 'closeAll' : "{{$closeAll}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 421b610f1..2c1ded6cc 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -10,7 +10,7 @@ {{if $mlist }} <ul id="mitemlist" class="menu-item-list"> {{foreach $mlist as $m }} -<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil mitem-edit"></i></a><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}><i class="icon-remove"></i></a> <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li> +<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil mitem-edit btn btn-default"></i></a><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}><i class="icon-remove btn btn-default"></i></a> <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li> {{/foreach}} </ul> {{/if}} diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl new file mode 100755 index 000000000..1a591f9f8 --- /dev/null +++ b/view/tpl/myapps.tpl @@ -0,0 +1,9 @@ +<h3>{{$title}}</h3> + +{{foreach $apps as $ap}} +<div class="app-container"> +{{$ap}} +</div> +{{/foreach}} +<div class="clear"></div> + diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 5aa3b0f01..6b76ff5b6 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -157,13 +157,8 @@ {{/if}} {{if $nav.apps}} - <li class="{{$sel.apps}} hidden-xs"> - <a class="{{$nav.apps.2}} dropdown-toggle" data-toggle="dropdown" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> - <ul class="dropdown-menu"> - {{foreach $apps as $ap}} - <li role="presentation">{{$ap}}</li> - {{/foreach}} - </ul> + <li class="{{$sel.apps}}"> + <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> </li> {{/if}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 01f135522..b34f3fcf5 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -9,7 +9,7 @@ </div> {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}} -<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;" ><img src="{{$photo.src}}" /></a></div> +<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;" ><img style="max-width: 100%;" src="{{$photo.src}}" /></a></div> {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}} <div id="photo-photo-end"></div> <div id="photo-caption">{{$desc}}</div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 924b4b33f..a2038b930 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -9,7 +9,6 @@ {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} {{include file="field_checkbox.tpl" field=$nosmile}} -{{include file="field_checkbox.tpl" field=$chanview_full}} <div class="settings-submit-wrapper" > diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index 8b76e9eec..9be0035ff 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -23,8 +23,8 @@ {{/if}} {{/if}} {{if $app.my}} - <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="icon-pencil"></i></a> - <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="icon-remove"></i></a> + <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="icon-pencil btn btn-default"></i></a> + <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="icon-remove btn btn-default"></i></a> {{/if}} </div> {{/foreach}} |