diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/conv_item.tpl | 38 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 11 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/settings_oauth.tpl | 4 |
4 files changed, 35 insertions, 23 deletions
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index dc4148d84..f9be3b077 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -51,7 +51,7 @@ {{/if}} </div> </div> - <div class="wall-item-tools"> + <div class="wall-item-tools"> <div class="wall-item-tools-right btn-group pull-right"> {{if $item.like}} <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false"> @@ -63,30 +63,30 @@ <i class="icon-thumbs-down-alt" title="{{$item.dislike.0}}"></i> </button> {{/if}} - <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> + <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> <i class="icon-caret-down"></i> </button> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> {{if $item.share}} - <li><a href="#" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li> + <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li> {{/if}} {{if $item.plink}} - <li><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="icon-external-link"></i> {{$item.plink.title}}</a></li> + <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="icon-external-link"></i> {{$item.plink.title}}</a></li> {{/if}} {{if $item.edpost}} - <li><a href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost icon-pencil"></i> {{$item.edpost.1}}</a></li> + <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost icon-pencil"></i> {{$item.edpost.1}}</a></li> {{/if}} {{if $item.tagger}} - <li><a href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="icon-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li> + <li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="icon-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li> {{/if}} {{if $item.filer}} - <li><a href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="icon-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li> + <li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="icon-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li> {{/if}} {{if $item.bookmark}} - <li><a href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="icon-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li> + <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.star}} - <li><a 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> + <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}} {{if $item.item_photo_menu}} <li role="presentation" class="divider"></li> @@ -94,17 +94,23 @@ {{/if}} {{if $item.drop.dropping}} <li role="presentation" class="divider"></li> - <li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove"></i> {{$item.drop.delete}}</a></li> + <li role="presentation"><a role="menuitem" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove"></i> {{$item.drop.delete}}</a></li> {{/if}} </ul> </div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> - <div class="wall-item-tools-left btn-group pull-left"> - {{if $item.showlike}} - <div class="btn btn-default btn-sm wall-item-like pull-left" id="wall-item-like-{{$item.id}}">{{$item.showlike}}</div> + <div class="wall-item-tools-left{{if $item.like_count && $item.dislike_count}} btn-group{{/if}}"> + {{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> + <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> + </div> {{/if}} - {{if $item.showdislike}} - <div class="btn btn-default btn-sm wall-item-dislike pull-left" id="wall-item-dislike-{{$item.id}}">{{$item.showdislike}}</div> + {{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> + <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> + </div> {{/if}} </div> </div> diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index da4dda82e..bfdf4d0b6 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -13,14 +13,18 @@ <div id="event-start-text">{{$s_text}}</div> {{$s_dsel}} {{$s_tsel}} +<div class="clear"></div><br /> + +<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div> + +<div id="event-nofinish-break"></div> + + <div id="event-finish-text">{{$f_text}}</div> {{$f_dsel}} {{$f_tsel}} <div id="event-datetime-break"></div> -<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div> - -<div id="event-nofinish-break"></div> <input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div> @@ -36,6 +40,7 @@ <div id="event-location-text">{{$l_text}}</div> <textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea> +<br /> <input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div> <div id="event-share-break"></div> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index b55025f65..e698c8c97 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -73,7 +73,7 @@ }); </script> - +{{if $editselect != 'none'}} <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> @@ -81,7 +81,7 @@ tinyMCE.init({ theme : "advanced", - mode : "textareas", + mode : "{{$editselect}}", plugins : "bbcode,paste", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", @@ -107,6 +107,7 @@ }); + {{/if}} $(document).ready(function() { 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}} |