diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/comment_item.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/js_strings.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/new_channel.tpl | 11 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/photosajax.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/settings_display.tpl | 2 |
11 files changed, 22 insertions, 16 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 788fef457..56485dff6 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -47,7 +47,6 @@ {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} {{include file="field_select.tpl" field=$theme_accessibility}} - {{include file="field_input.tpl" field=$site_channel}} {{include file="field_checkbox.tpl" field=$no_login_on_homepage}} diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 351cc8e14..e68314797 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -58,7 +58,7 @@ <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> + <button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button> </div> </div> <div class="clear"></div> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index bfa62f1b7..ff69fd379 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -15,7 +15,9 @@ <div class="wall-item-photo-end" style="clear:both"></div> </div> {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3>{{$item.title}}</h3></div> + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> + </div> {{/if}} {{if $item.lock}} <div class="wall-item-lock dropdown"> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 703b08547..9c9e7b970 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -25,6 +25,7 @@ var updateInterval = {{$update_interval}}; var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; + var justifiedGalleryActive = false; </script> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c4fdba0f5..c51dc02a5 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -85,7 +85,7 @@ <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} - <button class="btn btn-primary btn-sm" type="submit" name="submit">{{$share}}</button> + <button class="btn btn-primary btn-sm" type="submit" name="button-submit">{{$share}}</button> </div> <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 515e3107f..eb78c669f 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -15,6 +15,7 @@ 'passhint' : "{{$passhint}}", 'permschange' : "{{$permschange}}", 'closeAll' : "{{$closeAll}}", + 'nothingnew' : "{{$nothingnew}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index 261f965da..ee07ce1df 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -1,11 +1,19 @@ <h2>{{$title}}</h2> -<form action="new_channel" method="post" id="newchannel-form"> +<form action="new_channel" method="post" id="newchannel-form" class="stylish-select"> <div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div> + <div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div> + + <label for="newchannel-role" id="label-newchannel-role" class="newchannel-label" >{{$label_role}}</label> + {{$role_select}} + <div id="newchannel-role-end" class="newchannel-field-end"></div> + + <label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >{{$label_name}}</label> <input type="text" name="name" id="newchannel-name" class="newchannel-input" value="{{$name}}" /> + <div id="name-spinner"></div> <div id="newchannel-name-feedback" class="newchannel-feedback"></div> <div id="newchannel-name-end" class="newchannel-field-end"></div> @@ -13,6 +21,7 @@ <label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label> <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> + <div id="nick-spinner"></div> <div id="newchannel-nickname-feedback" class="newchannel-feedback"></div> <div id="newchannel-nickname-end" class="newchannel-field-end"></div> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 0f86a635d..fce518cfe 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -3,14 +3,12 @@ <a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> {{/if}} -<div id="photo-album-contents-{{$page}}"> +<div id="photo-album-contents"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} - -</div> -<script>justifyPhotos({{$page}});</script> <div id="page-end"></div> +</div> <div class="photos-end"></div> -<script>$(document).ready(function() { loadingPage = false;});</script> +<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> <div id="page-spinner"></div> diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl index a9a9605d0..632aab2b3 100755 --- a/view/tpl/photosajax.tpl +++ b/view/tpl/photosajax.tpl @@ -1,7 +1,4 @@ -<!-- --> -<div id="photo-album-contents-{{$page}}"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} -</div> -<script>justifyPhotos({{$page}});</script> +<script>justifyPhotosAjax()</script> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 443e63696..4dba1f23e 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -24,7 +24,6 @@ {{include file="field_checkbox.tpl" field=$hide_presence}} - <h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3> <ul id="settings-privacy-macros"> <li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 6eda6a6ec..f10f2e1c2 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -12,7 +12,7 @@ {{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=$title_tosource}} <div class="settings-submit-wrapper" > <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> |