diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/conv_item.tpl | 20 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 18 |
2 files changed, 13 insertions, 25 deletions
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index add80885b..79c22b4c1 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -4,8 +4,8 @@ </div> <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> {{/if}} - <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}}"> - <a name="{{$item.id}}" ></a> + <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}"> + <a name="item_{{$item.id}}" ></a> <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;"> {{if $item.photo}} @@ -94,35 +94,35 @@ <div class="btn-group dropdown"> {{if $item.like}} <button type="button" title="{{$item.like.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false;"> - <i class="fa fa-thumbs-o-up" ></i> + <i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i> </button> {{/if}} {{if $item.dislike}} <button type="button" title="{{$item.dislike.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;"> - <i class="fa fa-thumbs-o-down" ></i> + <i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i> </button> {{/if}} {{if $item.isevent}} <button type="button" title="{{$item.attend.0}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;"> - <i class="fa fa-check" ></i> + <i class="fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> </button> <button type="button" title="{{$item.attend.1}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'attendno'); return false;"> - <i class="fa fa-times" ></i> + <i class="fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> </button> <button type="button" title="{{$item.attend.2}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;"> - <i class="fa fa-question" ></i> + <i class="fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> </button> {{/if}} {{if $item.canvote}} <button type="button" title="{{$item.conlabels.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'agree'); return false;"> - <i class="fa fa-check" ></i> + <i class="fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> </button> <button type="button" title="{{$item.conlabels.1}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'disagree'); return false;"> - <i class="fa fa-times" ></i> + <i class="fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> </button> <button type="button" title="{{$item.conlabels.2}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'abstain'); return false;"> - <i class="fa fa-question" ></i> + <i class="fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> </button> {{/if}} <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index fee4f17a3..646c68564 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -1,7 +1,7 @@ <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' /> <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script> <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script> -<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/lang-all.js"></script> +<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/locale-all.js"></script> <script> function showEvent(eventid) { @@ -154,9 +154,9 @@ }); // ACL - $('#id_share').change(function() { + $('#id_distr').change(function() { - if ($('#id_share').is(':checked')) { + if ($('#id_distr').is(':checked')) { $('#dbtn-acl').show(); } else { @@ -164,18 +164,6 @@ } }).trigger('change'); - $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { - var selstr; - $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { - selstr = $(this).text(); - $('#jot-public').hide(); - }); - if(selstr == null) { - $('#jot-public').show(); - } - - }).trigger('change'); - }); </script> |