diff options
Diffstat (limited to 'view/tpl')
54 files changed, 580 insertions, 108 deletions
diff --git a/view/tpl/achievements.tpl b/view/tpl/achievements.tpl new file mode 100644 index 000000000..2b80b9e80 --- /dev/null +++ b/view/tpl/achievements.tpl @@ -0,0 +1,9 @@ +<div class="generic-content-wrapper"> +<p>{{$newmembertext}}</p> + +{{if $profilebadge}}<div id="profile-badge" class="badges"><img src="images/smiley-thumbsup.gif"></div>{{/if}} +{{if $contactbadge}}<div id="contact-badge" class="badges"><img src="images/smiley-thumbsup.gif"></div>{{/if}} +{{if $keywordsbadge}}<div id="keywords-badge" class="badges"><img src="images/smiley-thumbsup.gif"></div>{{/if}} +{{if $channelsbadge}}<div id="channels-badge" class="badges"><img src="images/smiley-thumbsup.gif"></div>{{/if}} + +</div> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index c6c15cec4..788fef457 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -65,6 +65,9 @@ <h3>{{$corporate}}</h3> {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$verify_email}} + {{include file="field_checkbox.tpl" field=$diaspora_enabled}} + {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$disable_discover_tab}} diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl index 2c8024d47..9e5b5a5be 100755 --- a/view/tpl/atom_feed.tpl +++ b/view/tpl/atom_feed.tpl @@ -15,6 +15,7 @@ <title>{{$feed_title}}</title> <generator uri="http://getzot.com" version="{{$version}}">{{$red}}</generator> <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" /> + <link rel="alternate" type="text/html" href="{{$profile_page}}" /> {{if $hub}} {{$hub}} {{/if}} diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 1ed2fbd2c..55b122d9b 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -7,6 +7,8 @@ {{/if}} {{/if}} <a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a> +<div class="channels-notifications-wrapper">{{if $channel.mail != 0}}<span style="color:#c60032;"><i class="icon-envelope"></i> {{$channel.mail}}</span>{{else}}<i class="icon-envelope"></i> {{/if}} {{if $channel.intros != 0}}<span style="color:#c60032;"><i class="icon-user"></i> {{$channel.intros}}</span>{{else}}<i class="icon-user"></i> {{/if}}</div> <a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a> </div> + <div class="channel-selection-end"></div> diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 44866c323..7aef7f2e1 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -4,6 +4,6 @@ </div> <div class="contact-entry-photo-end" ></div> <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a> - <div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$edit}}</a></div> + <div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$contact.edit}}</a></div> <div class="contact-entry-end" ></div> </div> diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index c69dcde50..1429576b1 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -13,13 +13,16 @@ {{$tabs}} - +<div id="connections-wrapper"> {{foreach $contacts as $contact}} {{include file="connection_template.tpl"}} {{/foreach}} +<div id="page-end"></div> +</div> <div id="contact-edit-end"></div> +<script>$(document).ready(function() { loadingPage = false;});</script> +<div id="page-spinner"></div> -{{$paginate}} diff --git a/view/tpl/contactsajax.tpl b/view/tpl/contactsajax.tpl new file mode 100644 index 000000000..1cce0f105 --- /dev/null +++ b/view/tpl/contactsajax.tpl @@ -0,0 +1,3 @@ +{{foreach $contacts as $contact}} + {{include file="connection_template.tpl"}} +{{/foreach}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index be7789e6b..8607b8ee8 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -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.editedtime}} <i class="icon-pencil"></i>{{/if}} {{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> diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl new file mode 100644 index 000000000..27ec3dffc --- /dev/null +++ b/view/tpl/diaspora_comment.tpl @@ -0,0 +1,11 @@ +<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 new file mode 100644 index 000000000..37a9e88b3 --- /dev/null +++ b/view/tpl/diaspora_comment_relay.tpl @@ -0,0 +1,12 @@ +<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_conversation.tpl b/view/tpl/diaspora_conversation.tpl new file mode 100644 index 000000000..dc4482e4b --- /dev/null +++ b/view/tpl/diaspora_conversation.tpl @@ -0,0 +1,29 @@ +<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 new file mode 100644 index 000000000..a27e92240 --- /dev/null +++ b/view/tpl/diaspora_like.tpl @@ -0,0 +1,12 @@ +<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 new file mode 100644 index 000000000..8209540c5 --- /dev/null +++ b/view/tpl/diaspora_like_relay.tpl @@ -0,0 +1,13 @@ +<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 new file mode 100644 index 000000000..3413d79b0 --- /dev/null +++ b/view/tpl/diaspora_message.tpl @@ -0,0 +1,13 @@ +<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 new file mode 100644 index 000000000..256459d8d --- /dev/null +++ b/view/tpl/diaspora_photo.tpl @@ -0,0 +1,13 @@ +<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 new file mode 100644 index 000000000..2fe916e00 --- /dev/null +++ b/view/tpl/diaspora_post.tpl @@ -0,0 +1,12 @@ +<XML> + <post> + <status_message> + <raw_message>{{$body}}</raw_message> + <guid>{{$guid}}</guid> + <diaspora_handle>{{$handle}}</diaspora_handle> + <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_profile.tpl b/view/tpl/diaspora_profile.tpl new file mode 100644 index 000000000..cf53f51c0 --- /dev/null +++ b/view/tpl/diaspora_profile.tpl @@ -0,0 +1,16 @@ +<XML> + <post><profile> + <diaspora_handle>{{$handle}}</diaspora_handle> + <first_name>{{$first}}</first_name> + <last_name>{{$last}}</last_name> + <image_url>{{$large}}</image_url> + <image_url_medium>{{$medium}}</image_url_medium> + <image_url_small>{{$small}}</image_url_small> + <birthday>{{$dob}}</birthday> + <gender>{{$gender}}</gender> + <bio>{{$about}}</bio> + <location>{{$location}}</location> + <searchable>{{$searchable}}</searchable> + <tag_string>{{$tags}}</tag_string> + </profile></post> +</XML> diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl new file mode 100644 index 000000000..5e7aed41f --- /dev/null +++ b/view/tpl/diaspora_relay_retraction.tpl @@ -0,0 +1,10 @@ +<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 new file mode 100644 index 000000000..4e3ff3243 --- /dev/null +++ b/view/tpl/diaspora_relayable_retraction.tpl @@ -0,0 +1,11 @@ +<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 new file mode 100644 index 000000000..963bb9e12 --- /dev/null +++ b/view/tpl/diaspora_reshare.tpl @@ -0,0 +1,13 @@ +<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 new file mode 100644 index 000000000..9df066d38 --- /dev/null +++ b/view/tpl/diaspora_retract.tpl @@ -0,0 +1,9 @@ +<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 new file mode 100644 index 000000000..59eb06124 --- /dev/null +++ b/view/tpl/diaspora_share.tpl @@ -0,0 +1,8 @@ +<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 new file mode 100644 index 000000000..f0f346da8 --- /dev/null +++ b/view/tpl/diaspora_signed_retract.tpl @@ -0,0 +1,10 @@ +<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/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl new file mode 100644 index 000000000..f9dac9306 --- /dev/null +++ b/view/tpl/diaspora_vcard.tpl @@ -0,0 +1,57 @@ +<div style="display:none;"> + <dl class='entity_nickname'> + <dt>Nickname</dt> + <dd> + <a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.fullname}}</a> + </dd> + </dl> + <dl class='entity_fn'> + <dt>Full name</dt> + <dd> + <span class='fn'>{{$diaspora.fullname}}</span> + </dd> + </dl> + + <dl class='entity_given_name'> + <dt>First name</dt> + <dd> + <span class='given_name'>{{$diaspora.firstname}}</span> + </dd> + </dl> + <dl class='entity_family_name'> + <dt>Family name</dt> + <dd> + <span class='family_name'>{{$diaspora.lastname}}</span> + </dd> + </dl> + <dl class="entity_url"> + <dt>URL</dt> + <dd> + <a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a> + </dd> + </dl> + <dl class="entity_photo"> + <dt>Photo</dt> + <dd> + <img class="photo avatar" height="300" width="300" src="{{$diaspora.photo300}}"> + </dd> + </dl> + <dl class="entity_photo_medium"> + <dt>Photo</dt> + <dd> + <img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}"> + </dd> + </dl> + <dl class="entity_photo_small"> + <dt>Photo</dt> + <dd> + <img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}"> + </dd> + </dl> + <dl class="entity_searchable"> + <dt>Searchable</dt> + <dd> + <span class="searchable">{{$diaspora.searchable}}</span> + </dd> + </dl> +</div> diff --git a/view/tpl/directajax.tpl b/view/tpl/directajax.tpl new file mode 100644 index 000000000..8faec4222 --- /dev/null +++ b/view/tpl/directajax.tpl @@ -0,0 +1,4 @@ +{{foreach $entries as $entry}} +{{include file="direntry.tpl"}} +{{/foreach}} + diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 5d703e2dd..01356597e 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -5,12 +5,12 @@ {{/if}} {{foreach $entries as $entry}} - {{include file="direntry.tpl"}} - {{/foreach}} - +<div id="page-end"></div> <div class="directory-end"></div> +<script>$(document).ready(function() { loadingPage = false;});</script> +<div id="page-spinner"></div> diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index bfdf4d0b6..af10e6c73 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,7 +1,8 @@ <h3>{{$title}}</h3> <p> -{{$desc}} +{{if ! $bootstrap}} +{{$format_desc}} {{/if}}{{$desc}} </p> <form action="{{$post}}" method="post" > @@ -10,18 +11,30 @@ <input type="hidden" name="xchan" value="{{$xchan}}" /> <input type="hidden" name="mid" value="{{$mid}}" /> +<div id="event-summary-text">{{$t_text}}</div> +<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" /> + <div id="event-start-text">{{$s_text}}</div> +{{if $bootstrap}} +<i class="icon-calendar btn btn-default" onclick="eventGetStart(); return false;" /></i> <input type="text" name="start_text" id="start-text" value="{{$stext}}" /> +{{else}} {{$s_dsel}} {{$s_tsel}} +{{/if}} <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> +<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} onclick="showHideFinishDate(); return true;" /> <div id="event-nofinish-text">{{$n_text}}</div> <div id="event-nofinish-break"></div> - +<div id="event-finish-wrapper"> <div id="event-finish-text">{{$f_text}}</div> +{{if $bootstrap}} +<i class="icon-calendar btn btn-default" onclick="eventGetFinish(); return false;" /></i> <input type="text" name="finish_text" id="finish-text" value="{{$ftext}}" /> +{{else}} {{$f_dsel}} {{$f_tsel}} +{{/if}} +</div> <div id="event-datetime-break"></div> @@ -30,8 +43,14 @@ <div id="event-adjust-break"></div> -<div id="event-summary-text">{{$t_text}}</div> -<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" /> + + +{{if $catsenabled}} +<div id="event-category-wrap"> + <input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" /> +</div> +{{/if}} + <div id="event-desc-text">{{$d_text}}</div> @@ -51,4 +70,81 @@ <input id="event-submit" type="submit" name="submit" value="{{$submit}}" /> </form> +<!-- Modal for item expiry--> +<div class="modal" id="startModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> + <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" id="startModalLabel">{{$s_text}}</h4> + </div> + <!-- <div class="modal-body"> --> + <div class="modal-body form-group" style="width:90%"> + <div class="input-group input-group-sm date" id="datetimepickerstart"> + <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> --> + <span class="icon-calendar"></span> + </span> + <input id="start-date" value='{{$stext}}' type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/> + </div> + </div> + <!-- </div> --> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$ModalCANCEL}}</button> + <button id="start-modal-OKButton" type="button" class="btn btn-primary">{{$ModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> +</div><!-- /.modal --> +<script type="text/javascript"> + $(function() { + $('#datetimepickerstart').datetimepicker({ + language: 'us', + icons: { + time: "icon-time", + date: "icon-calendar", + up: "icon-arrow-up", + down: "icon-arrow-down" + } + }); + }); +</script> + +<!-- Modal for item expiry--> +<div class="modal" id="finishModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> + <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" id="finishModalLabel">{{$s_text}}</h4> + </div> + <!-- <div class="modal-body"> --> + <div class="modal-body form-group" style="width:90%"> + <div class="input-group input-group-sm date" id="datetimepickerfinish"> + <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> --> + <span class="icon-calendar"></span> + </span> + <input id="finish-date" value='{{$ftext}}' type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/> + </div> + </div> + <!-- </div> --> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$ModalCANCEL}}</button> + <button id="finish-modal-OKButton" type="button" class="btn btn-primary">{{$ModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> +</div><!-- /.modal --> +<script type="text/javascript"> + $(function() { + $('#datetimepickerfinish').datetimepicker({ + language: 'us', + icons: { + time: "icon-time", + date: "icon-calendar", + up: "icon-arrow-up", + down: "icon-arrow-down" + } + }); + }); +</script> diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 342491ded..89de170b7 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -6,7 +6,7 @@ <input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> </td> <td class="abook-me"> - <input type="checkbox" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> + <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> </td> <td> {{if $field.5}}<span class="permission-inherited">{{$inherited}}</span> {{/if}} diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 8c5d3927d..8680a3db0 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -9,7 +9,7 @@ {{if $group.cid}} <input type="checkbox" class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" - onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;" + onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}');return true;" {{if $group.ismember}}checked="checked"{{/if}} /> {{/if}} diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index d64731ee3..9c9e7b970 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,6 +1,6 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <base href="{{$baseurl}}/" /> -<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1" /> +<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" /> <meta name="generator" content="{{$generator}}" /> <!--[if IE]> @@ -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/message_side.tpl b/view/tpl/message_side.tpl index 4db427fa7..723a64019 100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -1,6 +1,6 @@ <div id="message-sidebar" class="widget"> - <div id="message-check"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div> - <div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div> + <div id="message-check" class="btn btn-default"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div> + <div id="message-new" class="btn btn-default"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div> <ul class="message-ul"> {{foreach $tabs as $t}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 0602c72af..2953f3b41 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -20,8 +20,13 @@ {{/foreach}} <li role="presentation" class="divider"></li> {{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem">{{$nav.profiles.1}}</a></li>{{/if}} - {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem">{{$nav.manage.1}}</a></li>{{/if}} {{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem">{{$nav.settings.1}}</a></li>{{/if}} + {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem">{{$nav.manage.1}}</a></li>{{/if}} + {{if $nav.channels}} + {{foreach $nav.channels as $chan}} + <li role="presentation" class="nav-channel-select"><a href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a></li> + {{/foreach}} + {{/if}} {{if $nav.admin}} <li role="presentation" class="divider"></li> <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem">{{$nav.admin.1}}</a></li> diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index ae87c8ec8..285efbae0 100755 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -1,6 +1,6 @@ <h1>{{$notif_header}}</h1> {{if $notifications_available}} -<a href="#" onclick="markRead('notify');">{{$notif_link_mark_seen}}</a> +<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a> {{/if}} <div class="notif-network-wrapper"> {{$notif_content}} diff --git a/view/tpl/notifications_comments_item.tpl b/view/tpl/notifications_comments_item.tpl index 856955424..d3c79be82 100755 --- a/view/tpl/notifications_comments_item.tpl +++ b/view/tpl/notifications_comments_item.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> + <a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div> diff --git a/view/tpl/notifications_dislikes_item.tpl b/view/tpl/notifications_dislikes_item.tpl index 856955424..d3c79be82 100755 --- a/view/tpl/notifications_dislikes_item.tpl +++ b/view/tpl/notifications_dislikes_item.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> + <a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div> diff --git a/view/tpl/notifications_friends_item.tpl b/view/tpl/notifications_friends_item.tpl index 856955424..d3c79be82 100755 --- a/view/tpl/notifications_friends_item.tpl +++ b/view/tpl/notifications_friends_item.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> + <a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div> diff --git a/view/tpl/notifications_likes_item.tpl b/view/tpl/notifications_likes_item.tpl index b2ba4024b..d3c79be82 100755 --- a/view/tpl/notifications_likes_item.tpl +++ b/view/tpl/notifications_likes_item.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> + <a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div> diff --git a/view/tpl/notifications_posts_item.tpl b/view/tpl/notifications_posts_item.tpl index 856955424..d3c79be82 100755 --- a/view/tpl/notifications_posts_item.tpl +++ b/view/tpl/notifications_posts_item.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> + <a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div> diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl index 856955424..d3c79be82 100755 --- a/view/tpl/notify.tpl +++ b/view/tpl/notify.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> + <a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index a63bff78c..b5ea14c14 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,7 +1,3 @@ -<div class="photo-album-image-wrapper{{$twist}}" id="photo-album-image-wrapper-{{$id}}"> - <a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}"> - <img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize" id="photo-album-photo-{{$id}}" /> - <p class='caption'>{{$desc}}</p> - </a> -</div> -<div class="photo-album-image-wrapper-end"></div> +<a href="{{$photolink}}" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}"> + <img src="{{$imgsrc}}" alt="{{if $desc}}{{$desc}}{{else}}{{$imgalt}}{{/if}}" title="{{$phototitle}}" id="photo-album-photo-{{$id}}" /> +</a> diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index 944928f85..4a106c30d 100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,7 +1,4 @@ -<div class="photo-top-image-wrapper lframe {{$photo.twist}}" id="photo-top-image-wrapper-{{$photo.id}}"> - <a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> - <img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo" id="photo-top-photo-{{$photo.id}}" /> - </a> - <div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div> -</div> +<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> + <img src="{{$photo.src}}" alt="{{$photo.album.name}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" /> +</a> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 43a22a017..0f86a635d 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -3,9 +3,14 @@ <a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> {{/if}} -<div class="photos"> +<div id="photo-album-contents-{{$page}}"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} + </div> +<script>justifyPhotos({{$page}});</script> +<div id="page-end"></div> <div class="photos-end"></div> +<script>$(document).ready(function() { loadingPage = false;});</script> +<div id="page-spinner"></div> diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl new file mode 100755 index 000000000..a9a9605d0 --- /dev/null +++ b/view/tpl/photosajax.tpl @@ -0,0 +1,7 @@ +<!-- --> +<div id="photo-album-contents-{{$page}}"> +{{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} +{{/foreach}} +</div> +<script>justifyPhotos({{$page}});</script> diff --git a/view/tpl/profdef_edit.tpl b/view/tpl/profdef_edit.tpl new file mode 100644 index 000000000..bfe85314d --- /dev/null +++ b/view/tpl/profdef_edit.tpl @@ -0,0 +1,16 @@ +<h3>{{$header}}</h3> + +<form action="admin/profs" method="post" > + +{{if $id}} +<input type="hidden" name="id" value="{{$id}}" /> +{{/if}} + +{{include file="field_input.tpl" field=$field_name}} +{{include file="field_input.tpl" field=$field_type}} +{{include file="field_input.tpl" field=$field_desc}} +{{include file="field_input.tpl" field=$field_help}} + +<input name="submit" type="submit" value="{{$submit}}" /> + +</form> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 73033fe40..cbb078710 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -193,6 +193,16 @@ </dl> {{/if}} +{{foreach $profile.extra_fields as $f}} +{{if $profile.$f}} +<dl id="aprofile-{{$f}}" class="aprofile"> + <dt>{{$profile.$f.0}}</dt> + <dd>{{$profile.$f.1}}</dd> +</dl> +{{/if}} +{{/foreach}} + + {{if $things}} {{foreach $things as $key => $items}} <b>{{$profile.fullname.1}} {{$key}}</b> diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 46548e316..b453b1cfa 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,24 +1,27 @@ -{{$default}} +{{if $is_default}} +<p id="profile-edit-default-desc">{{$default}}</p> +{{/if}} <h1>{{$banner}}</h1> -<div id="profile-edit-links"> -<ul> -<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li> -<li><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li> -{{if ! $default}}<li><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></li>{{/if}} -{{if $profile_clone_link}}<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>{{/if}} -<li></li> -{{if ! $default}}<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>{{/if}} +<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" > -</ul> +<div id="profile-edit-links"> +<span class="btn btn-default"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></span> +<span class="btn btn-default"><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></span> +{{if ! $is_default}}<span class="btn btn-default"><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></span>{{/if}} +{{if $profile_clone_link}}<span class="btn btn-default"><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></span>{{/if}} +{{if $exportable}}<br /><span class="btn btn-default"><a href="profiles/export/{{$profile_id}}" target="_blank">{{$lbl_export}}</a></span> +<span class="btn btn-default profile-import"><b>{{$lbl_import}}</b> <input type="file" name="userfile" class="profile-import" ></span> +{{/if}} +{{if ! $is_default}}<span class="btn btn-danger"><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();" {{$disabled}} >{{$del_prof}}</a></span>{{/if}} </div> + <div id="profile-edit-links-end"></div> <div id="profile-edit-wrapper" > -<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" > <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div id="profile-edit-profile-name-wrapper" > @@ -33,13 +36,16 @@ </div> <div id="profile-edit-name-end"></div> + +{{if $fields.pdesc}} <div id="profile-edit-pdesc-wrapper" > <label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label> <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" /> </div> <div id="profile-edit-pdesc-end"></div> +{{/if}} - +{{if $fields.gender}} <div id="profile-edit-gender-wrapper" > <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label> {{if $advanced}} @@ -49,7 +55,9 @@ {{/if}} </div> <div id="profile-edit-gender-end"></div> +{{/if}} +{{if $fields.dob}} <div id="profile-edit-dob-wrapper" > <label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label> <div id="profile-edit-dob" > @@ -57,6 +65,7 @@ </div> </div> <div id="profile-edit-dob-end"></div> +{{/if}} {{$hide_friends}} @@ -65,50 +74,60 @@ </div> <div class="profile-edit-submit-end"></div> - +{{if $fields.address}} <div id="profile-edit-address-wrapper" > <label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label> <input type="text" size="32" name="address" id="profile-edit-address" value="{{$address}}" /> </div> <div id="profile-edit-address-end"></div> +{{/if}} +{{if $fields.locality}} <div id="profile-edit-locality-wrapper" > <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label> <input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality}}" /> </div> <div id="profile-edit-locality-end"></div> +{{/if}} - +{{if $fields.postal_code}} <div id="profile-edit-postal-code-wrapper" > <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label> <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" /> </div> <div id="profile-edit-postal-code-end"></div> +{{/if}} - +{{if $fields.region}} <div id="profile-edit-region-wrapper" > <label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label> <input type="text" size="32" name="region" id="profile-edit-region" value="{{$region}}" /> </div> <div id="profile-edit-region-end"></div> +{{/if}} +{{if $fields.country_name}} <div id="profile-edit-country-name-wrapper" > <label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label> <input type="text" size="32" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" /> </div> <div id="profile-edit-country-name-end"></div> +{{/if}} +{{if $fields.hometown}} <div id="profile-edit-hometown-wrapper" > <label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label> <input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" /> </div> <div id="profile-edit-hometown-end"></div> +{{/if}} <div class="profile-edit-submit-wrapper" > <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> </div> <div class="profile-edit-submit-end"></div> +{{if $fields.marital }} <div id="profile-edit-marital-wrapper" > <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label> {{if $advanced}} @@ -118,59 +137,61 @@ {{/if}} </div> <div class="clear"></div> +{{if $fields.with}} <label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label> <input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" /> <div class="clear"></div> +{{/if}} +{{if $fields.howlong}} <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label> <input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" /> - +<div class="clear"></div> +{{/if}} <div id="profile-edit-marital-end"></div> - -<div id="profile-edit-sexual-wrapper" > -<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label> -{{if $advanced}} -{{$sexual}} -{{else}} -{{$sexual_min}} {{/if}} -</div> -<div id="profile-edit-sexual-end"></div> - - +{{if $fields.homepage}} <div id="profile-edit-homepage-wrapper" > <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label> <input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" /> </div> <div id="profile-edit-homepage-end"></div> +{{/if}} -{{if $advanced}} +{{if $fields.sexual}} +<div id="profile-edit-sexual-wrapper" > +<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label> +{{$sexual}} +</div> +<div id="profile-edit-sexual-end"></div> +{{/if}} +{{if $fields.politic}} <div id="profile-edit-politic-wrapper" > <label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label> <input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" /> </div> <div id="profile-edit-politic-end"></div> +{{/if}} +{{if $fields.religion}} <div id="profile-edit-religion-wrapper" > <label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label> <input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" /> </div> <div id="profile-edit-religion-end"></div> - {{/if}} +{{if $fields.keywords}} <div id="profile-edit-pubkeywords-wrapper" > <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label> <input type="text" size="32" name="keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$keywords}}" /> </div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div> <div id="profile-edit-pubkeywords-end"></div> +{{/if}} -<div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> -</div> -<div class="profile-edit-submit-end"></div> +{{if $fields.about}} <div id="about-jot-wrapper" > <p id="about-jot-desc" > {{$lbl_about}} @@ -180,9 +201,9 @@ </div> <div id="about-jot-end"></div> +{{/if}} - - +{{if $fields.contact}} <div id="contact-jot-wrapper" > <p id="contact-jot-desc" > {{$lbl_social}} @@ -192,9 +213,10 @@ </div> <div id="contact-jot-end"></div> +{{/if}} -{{if $advanced}} +{{if $fields.interest}} <div id="interest-jot-wrapper" > <p id="interest-jot-desc" > {{$lbl_hobbies}} @@ -204,8 +226,9 @@ </div> <div id="interest-jot-end"></div> +{{/if}} - +{{if $fields.likes}} <div id="likes-jot-wrapper" > <p id="likes-jot-desc" > {{$lbl_likes}} @@ -215,8 +238,9 @@ </div> <div id="likes-jot-end"></div> +{{/if}} - +{{if $fields.dislikes}} <div id="dislikes-jot-wrapper" > <p id="dislikes-jot-desc" > {{$lbl_dislikes}} @@ -226,8 +250,9 @@ </div> <div id="dislikes-jot-end"></div> +{{/if}} - +{{if $fields.channels}} <div id="channels-jot-wrapper" > <p id="channels-jot-desc" > {{$lbl_channels}} @@ -237,13 +262,9 @@ </div> <div id="channels-jot-end"></div> +{{/if}} -<div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> -</div> -<div class="profile-edit-submit-end"></div> - - +{{if $fields.music}} <div id="music-jot-wrapper" > <p id="music-jot-desc" > {{$lbl_music}} @@ -253,7 +274,9 @@ </div> <div id="music-jot-end"></div> +{{/if}} +{{if $fields.book}} <div id="book-jot-wrapper" > <p id="book-jot-desc" > {{$lbl_book}} @@ -263,9 +286,9 @@ </div> <div id="book-jot-end"></div> +{{/if}} - - +{{if $fields.tv}} <div id="tv-jot-wrapper" > <p id="tv-jot-desc" > {{$lbl_tv}} @@ -275,9 +298,9 @@ </div> <div id="tv-jot-end"></div> +{{/if}} - - +{{if $fields.film}} <div id="film-jot-wrapper" > <p id="film-jot-desc" > {{$lbl_film}} @@ -287,14 +310,10 @@ </div> <div id="film-jot-end"></div> +{{/if}} -<div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> -</div> -<div class="profile-edit-submit-end"></div> - - +{{if $fields.romance}} <div id="romance-jot-wrapper" > <p id="romance-jot-desc" > {{$lbl_love}} @@ -304,9 +323,9 @@ </div> <div id="romance-jot-end"></div> +{{/if}} - - +{{if $fields.work}} <div id="work-jot-wrapper" > <p id="work-jot-desc" > {{$lbl_work}} @@ -316,9 +335,9 @@ </div> <div id="work-jot-end"></div> +{{/if}} - - +{{if $fields.education}} <div id="education-jot-wrapper" > <p id="education-jot-desc" > {{$lbl_school}} @@ -328,7 +347,12 @@ </div> <div id="education-jot-end"></div> +{{/if}} +{{if $extra_fields}} +{{foreach $extra_fields as $field }} +{{include file="field_input.tpl" field=$field}} +{{/foreach}} {{/if}} <div class="profile-edit-submit-wrapper" > diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index 856d689f1..c4bc367ba 100755 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -1,11 +1,11 @@ <h1>{{$header}}</h1> -<p id="profile-listing-desc" class="button" > +<p id="profile-listing-desc" class="btn btn-default" > <a href="profile_photo" >{{$chg_photo}}</a> </p> -<p id="profile-stuff-link" class="button"> +<p id="profile-stuff-link" class="btn btn-default"> <a href="thing" title="{{$stuff_desc}}">{{$addstuff}}</a> </p> -<p id="profile-listing-new-link-wrapper" class="button" > +<p id="profile-listing-new-link-wrapper" class="btn btn-default" > <a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a> </div> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index a653dca7d..3c83cd685 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -2,7 +2,7 @@ {{if $profile.edit}} <div class="dropdown"> - <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil btn btn-default btn-xs" title="{{$profile.edit.1}}" ></i></a> + <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> <ul class="dropdown-menu" role="menu"> {{foreach $profile.menu.entries as $e}} <li> @@ -15,7 +15,7 @@ </div> {{/if}} - <div class="fn label">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> + <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> @@ -43,6 +43,9 @@ {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" >{{$profile.homepage}}</a></dd></dl>{{/if}} + {{if $diaspora}} + {{include file="diaspora_vcard.tpl"}} + {{/if}} {{if $connect}} <a href="{{$connect_url}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a> diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl new file mode 100644 index 000000000..b7378806b --- /dev/null +++ b/view/tpl/removeaccount.tpl @@ -0,0 +1,22 @@ +<h1>{{$title}}</h1> + +<div id="remove-account-wrapper"> + +<div id="remove-account-desc">{{$desc}}</div> + +<form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" > +<input type="hidden" name="verify" value="{{$hash}}" /> + +<div id="remove-account-pass-wrapper"> +<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> +<input type="password" id="remove-account-pass" name="qxz_password" /> +</div> +<div id="remove-account-pass-end"></div> + +{{include file="field_checkbox.tpl" field=$global}} + +<input type="submit" name="submit" value="{{$submit}}" /> + +</form> +</div> + diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index f86ee0202..6719f2e75 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -20,7 +20,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.editedtime}} <i class="icon-pencil"></i>{{/if}} {{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> diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 169516f08..1e28d8b84 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -2,9 +2,6 @@ <h1>{{$title}}</h1> - - - <form action="settings/account" id="settings-account-form" method="post" autocomplete="off" > <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> @@ -23,4 +20,9 @@ {{$account_settings}} +<div id="settings-remove-account-link"> +<h3 class="settings-heading">{{$removeme}}</h3> +<div id="settings-remove-account-desc">{{$removeaccount}}</div> +<button title="{{$permanent}}" class="btn btn-danger" type="submit" formaction="removeaccount">{{$removeme}}</button> +</div> </div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index a2038b930..6eda6a6ec 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -6,6 +6,9 @@ {{include file="field_themeselect.tpl" field=$theme}} {{include file="field_themeselect.tpl" field=$mobile_theme}} +{{if $expert}} +{{include file="field_checkbox.tpl" field=$user_scalable}} +{{/if}} {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} {{include file="field_checkbox.tpl" field=$nosmile}} diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl new file mode 100644 index 000000000..aa0d8c740 --- /dev/null +++ b/view/tpl/xrd_diaspora.tpl @@ -0,0 +1,3 @@ + <Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" /> + <Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" /> + <Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" /> diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 20d438dd5..631ed3f18 100755 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -14,5 +14,13 @@ <Link rel="http://webfinger.net/rel/avatar" type="image/jpeg" href="{{$photo}}" /> - + <Link rel="http://microformats.org/profile/hcard" + type="text/html" + href="{{$hcard_url}}" /> + + <Link rel="magic-public-key" + href="{{$modexp}}" /> + + {{$dspr}} + </XRD> |