diff options
Diffstat (limited to 'view/tpl')
34 files changed, 110 insertions, 239 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 4add59a0d..0e65dfa69 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -58,6 +58,7 @@ <h3>{{$registration}}</h3> {{include file="field_input.tpl" field=$register_text}} {{include file="field_select.tpl" field=$register_policy}} + {{include file="field_checkbox.tpl" field=$invite_only}} {{include file="field_select.tpl" field=$access_policy}} {{include file="field_textarea.tpl" field=$allowed_email}} {{include file="field_textarea.tpl" field=$not_allowed_email}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 5257b3ed6..08f0d4fbe 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -13,6 +13,11 @@ {{$item.photo}} </div> {{/if}} + {{if $item.event}} + <div class="wall-event-item" id="wall-event-item-{{$item.id}}"> + {{$item.event}} + </div> + {{/if}} <div class="wall-item-head"> <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}}"> @@ -178,7 +183,7 @@ <h4 class="modal-title">{{$response.title}}</h4> </div> <div class="modal-body response-list"> - <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + <ul class="nav nav-pills nav-stacked">{{foreach $response.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> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 53f65bc78..cf1310ea6 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -13,6 +13,11 @@ {{$item.photo}} </div> {{/if}} + {{if $item.event}} + <div class="wall-event-item" id="wall-event-item-{{$item.id}}"> + {{$item.event}} + </div> + {{/if}} <div class="wall-item-head"> <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}}"> diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl deleted file mode 100644 index 27ec3dffc..000000000 --- a/view/tpl/diaspora_comment.tpl +++ /dev/null @@ -1,11 +0,0 @@ -<XML> - <post> - <comment> - <guid>{{$guid}}</guid> - <parent_guid>{{$parent_guid}}</parent_guid> - <author_signature>{{$authorsig}}</author_signature> - <text>{{$body}}</text> - <diaspora_handle>{{$handle}}</diaspora_handle> - </comment> - </post> -</XML>
\ No newline at end of file diff --git a/view/tpl/diaspora_comment_relay.tpl b/view/tpl/diaspora_comment_relay.tpl deleted file mode 100644 index 37a9e88b3..000000000 --- a/view/tpl/diaspora_comment_relay.tpl +++ /dev/null @@ -1,12 +0,0 @@ -<XML> - <post> - <comment> - <guid>{{$guid}}</guid> - <parent_guid>{{$parent_guid}}</parent_guid> - <parent_author_signature>{{$parentsig}}</parent_author_signature> - <author_signature>{{$authorsig}}</author_signature> - <text>{{$body}}</text> - <diaspora_handle>{{$handle}}</diaspora_handle> - </comment> - </post> -</XML>
\ No newline at end of file diff --git a/view/tpl/diaspora_consensus.tpl b/view/tpl/diaspora_consensus.tpl deleted file mode 100644 index b6b7cf13d..000000000 --- a/view/tpl/diaspora_consensus.tpl +++ /dev/null @@ -1,17 +0,0 @@ -<poll> -<guid>{{$guid_q}}</guid> -<question>{{$question}}</question> -<poll_answer> - <guid>{{$guid_y}}</guid> - <answer>{{$agree}}</answer> -</poll_answer> -<poll_answer> - <guid>{{$guid_n}}</guid> - <answer>{{$disagree}}</answer> -</poll_answer> -<poll_answer> - <guid>{{$guid_a}}</guid> - <answer>{{$abstain}}</answer> -</poll_answer> -</poll> - diff --git a/view/tpl/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl deleted file mode 100644 index dc4482e4b..000000000 --- a/view/tpl/diaspora_conversation.tpl +++ /dev/null @@ -1,29 +0,0 @@ -<XML> - <post> - <conversation> - <guid>{{$conv.guid}}</guid> - <subject>{{$conv.subject}}</subject> - <created_at>{{$conv.created_at}}</created_at> - - {{foreach $conv.messages as $msg}} - - <message> - <guid>{{$msg.guid}}</guid> - <parent_guid>{{$msg.parent_guid}}</parent_guid> - {{if $msg.parent_author_signature}} - <parent_author_signature>{{$msg.parent_author_signature}}</parent_author_signature> - {{/if}} - <author_signature>{{$msg.author_signature}}</author_signature> - <text>{{$msg.text}}</text> - <created_at>{{$msg.created_at}}</created_at> - <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle> - <conversation_guid>{{$msg.conversation_guid}}</conversation_guid> - </message> - - {{/foreach}} - - <diaspora_handle>{{$conv.diaspora_handle}}</diaspora_handle> - <participant_handles>{{$conv.participant_handles}}</participant_handles> - </conversation> - </post> -</XML> diff --git a/view/tpl/diaspora_like.tpl b/view/tpl/diaspora_like.tpl deleted file mode 100644 index a27e92240..000000000 --- a/view/tpl/diaspora_like.tpl +++ /dev/null @@ -1,12 +0,0 @@ -<XML> - <post> - <like> - <positive>{{$positive}}</positive> - <guid>{{$guid}}</guid> - <target_type>{{$target_type}}</target_type> - <parent_guid>{{$parent_guid}}</parent_guid> - <author_signature>{{$authorsig}}</author_signature> - <diaspora_handle>{{$handle}}</diaspora_handle> - </like> - </post> -</XML> diff --git a/view/tpl/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl deleted file mode 100644 index 8209540c5..000000000 --- a/view/tpl/diaspora_like_relay.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<XML> - <post> - <like> - <positive>{{$positive}}</positive> - <guid>{{$guid}}</guid> - <target_type>{{$target_type}}</target_type> - <parent_guid>{{$parent_guid}}</parent_guid> - <parent_author_signature>{{$parentsig}}</parent_author_signature> - <author_signature>{{$authorsig}}</author_signature> - <diaspora_handle>{{$handle}}</diaspora_handle> - </like> - </post> -</XML> diff --git a/view/tpl/diaspora_message.tpl b/view/tpl/diaspora_message.tpl deleted file mode 100644 index 3413d79b0..000000000 --- a/view/tpl/diaspora_message.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<XML> - <post> - <message> - <guid>{{$msg.guid}}</guid> - <parent_guid>{{$msg.parent_guid}}</parent_guid> - <author_signature>{{$msg.author_signature}}</author_signature> - <text>{{$msg.text}}</text> - <created_at>{{$msg.created_at}}</created_at> - <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle> - <conversation_guid>{{$msg.conversation_guid}}</conversation_guid> - </message> - </post> -</XML> diff --git a/view/tpl/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl deleted file mode 100644 index 256459d8d..000000000 --- a/view/tpl/diaspora_photo.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<XML> - <post> - <photo> - <guid>{{$guid}}</guid> - <diaspora_handle>{{$handle}}</diaspora_handle> - <public>{{$public}}</public> - <created_at>{{$created_at}}</created_at> - <remote_photo_path>{{$path}}</remote_photo_path> - <remote_photo_name>{{$filename}}</remote_photo_name> - <status_message_guid>{{$msg_guid}}</status_message_guid> - </photo> - </post> -</XML> diff --git a/view/tpl/diaspora_post.tpl b/view/tpl/diaspora_post.tpl deleted file mode 100644 index ebfe9e5b7..000000000 --- a/view/tpl/diaspora_post.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<XML> - <post> - <status_message> - <raw_message>{{$body}}</raw_message> - <guid>{{$guid}}</guid> - <diaspora_handle>{{$handle}}</diaspora_handle> - {{$poll}} - <public>{{$public}}</public> - <created_at>{{$created}}</created_at> - <provider_display_name>{{$provider}}</provider_display_name> - </status_message> - </post> -</XML> diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl deleted file mode 100644 index 5e7aed41f..000000000 --- a/view/tpl/diaspora_relay_retraction.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<XML> - <post> - <relayable_retraction> - <target_type>{{$type}}</target_type> - <target_guid>{{$guid}}</target_guid> - <target_author_signature>{{$signature}}</target_author_signature> - <sender_handle>{{$handle}}</sender_handle> - </relayable_retraction> - </post> -</XML> diff --git a/view/tpl/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl deleted file mode 100644 index 4e3ff3243..000000000 --- a/view/tpl/diaspora_relayable_retraction.tpl +++ /dev/null @@ -1,11 +0,0 @@ -<XML> - <post> - <relayable_retraction> - <parent_author_signature>{{$parentsig}}</parent_author_signature> - <target_guid>{{$guid}}</target_guid> - <target_type>{{$target_type}}</target_type> - <sender_handle>{{$handle}}</sender_handle> - <target_author_signature>{{$authorsig}}</target_author_signature> - </relayable_retraction> - </post> -</XML> diff --git a/view/tpl/diaspora_reshare.tpl b/view/tpl/diaspora_reshare.tpl deleted file mode 100644 index 963bb9e12..000000000 --- a/view/tpl/diaspora_reshare.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<XML> - <post> - <reshare> - <root_diaspora_id>{{$root_handle}}</root_diaspora_id> - <root_guid>{{$root_guid}}</root_guid> - <guid>{{$guid}}</guid> - <diaspora_handle>{{$handle}}</diaspora_handle> - <public>{{$public}}</public> - <created_at>{{$created}}</created_at> - <provider_display_name>{{$provider}}</provider_display_name> - </reshare> - </post> -</XML> diff --git a/view/tpl/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl deleted file mode 100644 index 9df066d38..000000000 --- a/view/tpl/diaspora_retract.tpl +++ /dev/null @@ -1,9 +0,0 @@ -<XML> - <post> - <retraction> - <post_guid>{{$guid}}</post_guid> - <diaspora_handle>{{$handle}}</diaspora_handle> - <type>{{$type}}</type> - </retraction> - </post> -</XML> diff --git a/view/tpl/diaspora_share.tpl b/view/tpl/diaspora_share.tpl deleted file mode 100644 index 59eb06124..000000000 --- a/view/tpl/diaspora_share.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<XML> - <post> - <request> - <sender_handle>{{$sender}}</sender_handle> - <recipient_handle>{{$recipient}}</recipient_handle> - </request> - </post> -</XML>
\ No newline at end of file diff --git a/view/tpl/diaspora_signed_retract.tpl b/view/tpl/diaspora_signed_retract.tpl deleted file mode 100644 index f0f346da8..000000000 --- a/view/tpl/diaspora_signed_retract.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<XML> - <post> - <signed_retraction> - <target_guid>{{$guid}}</target_guid> - <target_type>{{$type}}</target_type> - <sender_handle>{{$handle}}</sender_handle> - <target_author_signature>{{$signature}}</target_author_signature> - </signed_retraction> - </post> -</XML> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 6407f1edd..ecc38beb9 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -14,7 +14,7 @@ </div> <h3>{{if $entry.public_forum}}<i class="icon-comments-alt" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i> {{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3> </div> - <div class="section-content-wrapper directory-collapse"> + <div class="section-content-tools-wrapper directory-collapse"> <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" > <div class="contact-photo" id="directory-photo-{{$entry.hash}}" > <a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.hash}}" > diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl index c1793c3e7..3fc2063ef 100755 --- a/view/tpl/event.tpl +++ b/view/tpl/event.tpl @@ -2,7 +2,7 @@ <div class="event-wrapper"> <div class="event"> <div class="event-owner"> - {{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="64" width="64" />{{$event.item.author.xchan_name}}</a>{{/if}} + {{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}} </div> {{$event.html}} <div class="event-buttons"> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index d193696b7..dc98d14b3 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -55,7 +55,11 @@ showEvent(calEvent.id); }, loading: function(isLoading, view) { + $('#events-spinner').spin('tiny'); + $('#events-spinner > i').css('color', 'transparent'); if(!isLoading) { + $('#events-spinner').spin(false); + $('#events-spinner > i').css('color', ''); $('td.fc-day').dblclick(function() { openMenu('form'); //window.location.href='/events/new?start='+$(this).data('date'); @@ -64,40 +68,45 @@ }, eventRender: function(event, element, view) { + //console.log(view.name); if (event.item['author']['xchan_name']==null) return; switch(view.name){ case "month": - element.find(".fc-event-title").html( - "<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format( + element.find(".fc-title").html( + "<img src='{0}' style='height:12px;width:12px;' title='{1}'> <span title='{3}{4}'>{2}</span>".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], - event.title + event.title, + event.item.description ? event.item.description + "\r\n\r\n" : '', + event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : '' )); break; case "agendaWeek": - element.find(".fc-event-title").html( - "<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format( + element.find(".fc-title").html( + "<img src='{0}' style='height:12px;width:12px;'> {1}: <span title='{3}{4}'>{2}</span>".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], - event.item.desc, - event.item.location + event.title, + event.item.description ? event.item.description + "\r\n\r\n" : '', + event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : '' )); break; case "agendaDay": - element.find(".fc-event-title").html( - "<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format( + element.find(".fc-title").html( + "<img src='{0}' style='height:12px;width:12px;'> {1}: <span title='{3}{4}'>{2}</span>".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], - event.item.desc, - event.item.location + event.title, + event.item.description ? event.item.description + "\r\n\r\n" : '', + event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : '' )); break; } } - }) + }); // center on date var args=location.href.replace(baseurl,"").split("/"); @@ -113,6 +122,20 @@ var view = $('#events-calendar').fullCalendar('getView'); $('#title').text(view.title); + // shift the finish time date on start time date change automagically + var origsval = $('#id_start_text').val(); + $('#id_start_text').change(function() { + var origfval = $('#id_finish_text').val(); + if(origfval) { + var sval = $('#id_start_text').val(); + var diff = moment(sval).diff(origsval); + var fval = moment(origfval).add(diff, 'millisecond').format("YYYY-MM-DD HH:mm"); + $('#id_finish_text').val(fval); + origsval = sval; + } + }); + + // ACL $('#id_share').change(function() { if ($('#id_share').is(':checked')) { @@ -123,7 +146,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() { diff --git a/view/tpl/event_item_content.tpl b/view/tpl/event_item_content.tpl new file mode 100644 index 000000000..76e0f4616 --- /dev/null +++ b/view/tpl/event_item_content.tpl @@ -0,0 +1,10 @@ +{{if $description}} +<div class="event-item-description"> + {{$description}} +</div> +{{/if}} +{{if $location}} +<div class="event-item-location"> + <span class="event-item-label">{{$location_label}}</span> <span class="event-item-location">{{$location}}</span> +</div> +{{/if}} diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl new file mode 100755 index 000000000..9547676e9 --- /dev/null +++ b/view/tpl/event_item_header.tpl @@ -0,0 +1,11 @@ +<div class="event-item-title"> + <h3><i class="icon-calendar"></i> {{$title}}</h3> +</div> +<div class="event-item-start"> + <span class="event-item-label">{{$dtstart_label}}</span> <span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span> +</div> +{{if $finish}} +<div class="event-item-start"> + <span class="event-item-label">{{$dtend_label}}</span> <span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span> +</div> +{{/if}} diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index b2de90da1..08c8aa64a 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,12 +1,10 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> - <button class="btn btn-default btn-xs" onclick="openClose('event-tools'); closeMenu('form');"><i class="icon-cog"></i></button> <button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button> - <div class="btn-group"> <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button> - <button class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button> + <button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button> <button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button> </div> </div> @@ -16,19 +14,6 @@ <div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}> {{$form}} </div> - <div id="event-tools" class="section-content-tools-wrapper" style="display:none;"> - <div class="form-group"> - <button class="btn btn-primary btn-xs" onclick="exportDate(); return false;"><i class="icon-download"></i> {{$export.1}}</button> - <button class="btn btn-primary btn-xs" onclick="openClose('event-upload-form');"><i class="icon-upload"></i> {{$upload}}</button> - </div> - <div id="event-upload-form" style="display:none;"> - <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form"> - <button id="dbtn-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" >{{$submit}}</button> - <input id="event-upload-choose" type="file" name="userfile" /> - - </form> - </div> - </div> <div class="clear"></div> <div class="section-content-wrapper-np"> <div id="events-calendar"></div> diff --git a/view/tpl/events_side.tpl b/view/tpl/events_menu_side.tpl index b9a9062b1..b9a9062b1 100755 --- a/view/tpl/events_side.tpl +++ b/view/tpl/events_menu_side.tpl diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl new file mode 100755 index 000000000..5e20511fc --- /dev/null +++ b/view/tpl/events_tools_side.tpl @@ -0,0 +1,15 @@ +<div class="widget"> + <h3>{{$title}}</h3> + <ul class="nav nav-pills nav-stacked"> + <li><a href="#" onclick="exportDate(); return false;"><i class="icon-download"></i> {{$export}}</a></li> + <li><a href="#" onclick="openClose('event-upload-form'); return false;"><i class="icon-upload"></i> {{$import}}</a></li> + </ul> + <div id="event-upload-form" style="display: none;"> + <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form"> + <div class="form-group"> + <input id="event-upload-choose" type="file" name="userfile" /> + </div> + <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit" >{{$submit}}</button> + </form> + </div> +</div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index e7edb7e64..32a08a9b3 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -118,8 +118,6 @@ <li class="divider visible-xs"></li> {{if $writefiles}}<li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i> {{$attach}}</a></li>{{/if}} <li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i> {{$weblink}}</a></li> - <!--li class="visible-xs"><a href="#" onclick="jotVideoURL(); return false;"><i class="icon-facetime-video"></i> {{$video}}</a></li--> - <!--li class="visible-xs"><a href="#" onclick="jotAudioURL(); return false;"><i class="icon-volume-up"></i> {{$audio}}</a></li--> {{/if}} <li class="divider visible-xs"></li> <li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i> {{$setloc}}</a></li> diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 38cf8edbd..4243c2ea5 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -22,6 +22,7 @@ 'submit' : "{{$submit}}", 'linkurl' : "{{$linkurl}}", 'leavethispage' : "{{$leavethispage}}", + 'location' : "{{$location}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index 4f54f1a6a..5e5d9808d 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -13,6 +13,12 @@ {{$mail.body}} <div class="clear"></div> </div> + {{if $mail.attachments}} + <div class="dropdown pull-left"> + <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button> + <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</ul> + </div> + {{/if}} <div class="pull-right dropdown"> <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}"> <i class="icon-caret-down"></i> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index bbcdcefc1..95169164a 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -21,7 +21,7 @@ {{$upload_form}} {{$album_edit.1}} <div class="section-content-wrapper-np"> - <div id="photo-album-contents"> + <div id="photo-album-contents-{{$album_id}}"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} @@ -30,5 +30,5 @@ </div> </div> <div class="photos-end"></div> -<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> +<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script> <div id="page-spinner"></div> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 46ac65e87..f3131117c 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -8,7 +8,7 @@ </div> {{$upload_form}} <div class="section-content-wrapper-np"> - <div id="photo-album-contents"> + <div id="photo-album-contents-{{$album_id}}"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} @@ -17,5 +17,5 @@ </div> </div> <div class="photos-end"></div> -<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> +<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script> <div id="page-spinner"></div> diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl index 705cb6c75..45191db85 100755 --- a/view/tpl/photosajax.tpl +++ b/view/tpl/photosajax.tpl @@ -1,4 +1,4 @@ {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} -<script>justifyPhotosAjax()</script> +<script>justifyPhotosAjax('photo-album-contents-{{$album_id}}')</script> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index b44e1c39e..24e1b97d5 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -7,6 +7,11 @@ {{$item.photo}} </div> {{/if}} + {{if $item.event}} + <div class="wall-event-item" id="wall-event-item-{{$item.id}}"> + {{$item.event}} + </div> + {{/if}} <div class="wall-item-head"> <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}}"> @@ -60,11 +65,6 @@ <span class="tag">{{$item.folders}}</span> </div> {{/if}} - {{if $item.attachments}} - <div class="body-tags" id="item-attachments"> - <span class='tag'>{{$item.attachments}}</span> - </div> - {{/if}} <div class="clear"></div> </div> {{/if}} @@ -83,6 +83,12 @@ {{/if}} </ul> </div> + {{if $item.attachments}} + <div class="wall-item-tools-left btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button> + <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul> + </div> + {{/if}} <div class="clear"></div> </div> <div class="clear"></div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 2c71c64fb..af5f222fe 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -159,12 +159,12 @@ {{/foreach}} </select> </div> + {{/if}} {{include file="field_checkbox.tpl" field=$cal_first_day}} <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> </div> - {{/if}} </div> </div> </div> |