diff options
Diffstat (limited to 'view/tpl')
68 files changed, 1443 insertions, 824 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 1ed3baafa..4fa810cb4 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -73,25 +73,6 @@ </div> </div> </div> - <div class="modal" id="abook-pending-modal" tabindex="-1" role="dialog"> - <div class="modal-dialog" role="document"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 class="modal-title" id="myModalLabel">{{$pending_modal_title}}</h4> - </div> - <div class="modal-body"> - <strong>{{$name}}</strong> {{$pending_modal_body}} - </div> - <div class="modal-footer"> - <button class="btn btn-sm btn-danger pull-left" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</button> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$pending_modal_dismiss}}</button> - <button type="submit" class="btn btn-primary" name="pending" value="1">{{$pending_modal_approve}}</button> - </div> - </div> - </div> - </div> - <script>$('#abook-pending-modal').modal('show');</script> {{/if}} {{if $affinity }} @@ -177,6 +158,7 @@ {{/if}} + {{if ! $is_pending}} <div class="panel"> {{if $notself}} <div class="section-subtitle-wrapper" role="tab" id="perms-tool"> @@ -222,6 +204,7 @@ </div> </div> </div> + {{/if}} </div> </form> </div> diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 013f3f296..88df7481a 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -15,14 +15,11 @@ <div class="clear"></div> </div> {{/if}} - <div id="acl-wrapper"> <button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button> <input type="text" id="acl-search" placeholder=""> - <div id="acl-list"> <div id="acl-list-content"></div> - </div> <span id="acl-fields"></span> </div> diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index 58d645dbf..70e1677af 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -5,7 +5,7 @@ $("nav").bind('nav-update', function(e,data){ var elm = $('#pending-update'); var register = $(data).find('register').text(); - if (register=="0") { reigster=""; elm.hide();} else { elm.show(); } + if (register=="0") { register=""; elm.hide();} else { elm.show(); } elm.html(register); }); }); @@ -13,29 +13,25 @@ <div class="widget"> <h3>{{$admtxt}}</h3> <ul class="nav nav-pills nav-stacked"> - <li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li> - <li><a href='{{$admin.users.0}}'>{{$admin.users.1}}<span id='pending-update' title='{{$h_pending}}'></span></a></li> - <li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li> - <li><a href='{{$admin.queue.0}}'>{{$admin.queue.1}}</a></li> - <li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> - <li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> - <li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> + {{foreach $admin as $link}} + <li><a href='{{$link.0}}'>{{$link.1}}{{if $link.3}}<span id='{{$link.3}}' title='{{$link.4}}'></span>{{/if}}</a></li> + {{/foreach}} </ul> </div> {{if $admin.update}} <ul class="nav nav-pills nav-stacked"> <li><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li> - <li><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li> + <li><a href=''>Important Changes</a></li> </ul> {{/if}} -{{if $admin.plugins_admin}} +{{if $plugins}} <div class="widget"> <h3>{{$plugadmtxt}}</h3> <ul class="nav nav-pills nav-stacked"> - {{foreach $admin.plugins_admin as $l}} + {{foreach $plugins as $l}} <li><a href='{{$l.0}}'>{{$l.1}}</a></li> {{/foreach}} </ul> @@ -45,6 +41,6 @@ <div class="widget"> <h3>{{$logtxt}}</h3> <ul class="nav nav-pills nav-stacked"> - <li><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li> + <li><a href='{{$logs.0}}'>{{$logs.1}}</a></li> </ul> </div> diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 0f76cc4fe..0da214c17 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -4,8 +4,12 @@ <ul id='pluginslist'> {{foreach $plugins as $p}} <li class='plugin {{$p.1}}'> + {{if ! $p.2.disabled}} <a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><i class='{{if $p.1==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i></a> - <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span> + {{else}} + <i class='icon-stop admin-icons'></i> + {{/if}} + <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>{{if $p.2.disabled}} {{$disabled}}{{/if}} {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}} <div class='desc'>{{$p.2.description}}</div> diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index bdcc82c08..5d9e233f9 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -1,20 +1,39 @@ <div class = "generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> - - <p><i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&t={{$form_security_token}}">{{$action}}</a></p> + + <p>{{if ! $info.disabled}}<i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i>{{else}}<i class='icon-stop admin-icons'></i>{{/if}} {{$info.name}} - {{$info.version}}{{if ! $info.disabled}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&t={{$form_security_token}}">{{$action}}</a>{{/if}}</p> + + {{if $info.disabled}} + <p>{{$disabled}}</p> + {{/if}} + <p>{{$info.description}}</p> - <p class="author">{{$str_author}} {{foreach $info.author as $a}} - {{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}}, - {{/foreach}} + <p class="author">{{$str_author}} + {{$a.name}}{{if $a.link}} {{$a.link}}{{/if}} </p> + {{/foreach}} + + {{if $info.minversion}} + <p class="versionlimit">{{$str_minversion}}{{$info.minversion}}</p> + {{/if}} + {{if $info.maxversion}} + <p class="versionlimit">{{$str_maxversion}}{{$info.maxversion}}</p> + {{/if}} + {{if $info.minphpversion}} + <p class="versionlimit">{{$str_minphpversion}}{{$info.minphpversion}}</p> + {{/if}} + {{if $info.requires}} + <p class="versionlimit">{{$str_requires}}{{$info.requires}}</p> + {{/if}} + - <p class="maintainer">{{$str_maintainer}} {{foreach $info.maintainer as $a}} - {{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}}, - {{/foreach}} + <p class="maintainer">{{$str_maintainer}} + {{$a.name}}{{if $a.link}} {{$a.link}}{{/if}} </p> + {{/foreach}} {{if $screenshot}} <a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a> diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl new file mode 100644 index 000000000..dd7250df0 --- /dev/null +++ b/view/tpl/admin_profiles.tpl @@ -0,0 +1,38 @@ +<div class="generic-content-wrapper"> +<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-xs pull-right" href="admin/profs/new"><i class="icon-plus-sign"></i> {{$new}}</a><h2>{{$title}}</h2> +<div class="clear"></div> +</div> + +<div class="section-content-tools-wrapper"> + +<div class="section-content-info-wrapper">{{$all_desc}} +<br /><br /> +{{$all}} +</div> + +<form action="admin/profs" method="post"> + +{{include file="field_textarea.tpl" field=$basic}} +{{include file="field_textarea.tpl" field=$advanced}} + +<input type="submit" name="submit" value="{{$submit}}" /> + +</form> + + + +{{if $cust_fields}} +<br /><br /> +<div><strong>{{$cust_field_desc}}</strong></div> +<br /> + +<table width="100%"> +{{foreach $cust_fields as $field}} +<tr><td>{{$field.field_name}}</td><td>{{$field.field_desc}}</td><td><a class="btn btn-danger btn-xs" href="admin/profs/drop/{{$field.id}}" title="{{$drop}}"><i class="icon-trash"></i> {{$drop}}</a> <a class="btn btn-xs" title="{{$edit}}" href="admin/profs/{{$field.id}}" ><i class="icon-pencil"></i></a></td></tr> +{{/foreach}} +</table> +{{/if}} + +</div> + +</div> diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl new file mode 100755 index 000000000..691db2d88 --- /dev/null +++ b/view/tpl/admin_security.tpl @@ -0,0 +1,31 @@ +<div class="generic-content-wrapper-styled" id='adminpage'> + <h1>{{$title}} - {{$page}}</h1> + + <form action="{{$baseurl}}/admin/security" method="post"> + + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + + + {{include file="field_checkbox.tpl" field=$block_public}} + + + {{include file="field_textarea.tpl" field=$whitelisted_sites}} + {{include file="field_textarea.tpl" field=$blacklisted_sites}} + + {{include file="field_textarea.tpl" field=$whitelisted_channels}} + {{include file="field_textarea.tpl" field=$blacklisted_channels}} + + + {{include file="field_checkbox.tpl" field=$embed_coop}} + + {{include file="field_textarea.tpl" field=$embed_allow}} + {{include file="field_textarea.tpl" field=$embed_deny}} + + + <div class="admin-submit-wrapper" > + <input type="submit" name="submit" class="admin-submit" value="{{$submit}}" /> + </div> + + </form> + +</div> diff --git a/view/tpl/admin_settings_features.tpl b/view/tpl/admin_settings_features.tpl new file mode 100644 index 000000000..2d5cf7e0b --- /dev/null +++ b/view/tpl/admin_settings_features.tpl @@ -0,0 +1,31 @@ +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <form action="admin/features" method="post" autocomplete="off"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <div class="panel-group" id="settings" role="tablist" aria-multiselectable="true"> + {{foreach $features as $g => $f}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title"> + <h3> + <a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse"> + {{$f.0}} + </a> + </h3> + </div> + <div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} in{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title"> + <div class="section-content-tools-wrapper"> + {{foreach $f.1 as $fcat}} + {{include file="field_checkbox.tpl" field=$fcat.0}} + {{include file="field_checkbox.tpl" field=$fcat.1}} + {{/foreach}} + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + {{/foreach}} + </div> +</div> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 0e65dfa69..54f625e0b 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -68,7 +68,6 @@ {{include file="field_input.tpl" field=$maximagesize}} <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=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index af80e7b4d..17713aef4 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,12 +1,53 @@ -<div class='channel-selection {{if $selected == $channel.channel_id}}selected-channel{{/if}}'> -{{if $channel.default_links}} -{{if $channel.default}} -<div class="channel-selection-default default"><i class="icon-check"></i> {{$msg_default}}</div> -{{else}} -<div class="channel-selection-default"><a href="manage/{{$channel.channel_id}}/default"><i class="icon-check-empty" title="{{$msg_make_default}}"></i></a></div> -{{/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"><a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a> <a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a></div> -<a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a> +<div class="section-subtitle-wrapper"> + <div class="pull-right"> + {{if $channel.default_links}} + {{if $channel.default}} + <div> + <i class="icon-check"></i> {{$msg_default}} + </div> + {{else}} + <a href="manage/{{$channel.channel_id}}/default" class="make-default-link"> + <i class="icon-check-empty"></i> {{$msg_make_default}} + </a> + {{/if}} + {{/if}} + {{if $channel.delegate}} + {{$delegated_desc}} + {{/if}} + </div> + <h3> + {{if $selected == $channel.channel_id}} + <i class="selected-channel icon-circle" title="{{$msg_selected}}"></i> + {{/if}} + {{if $channel.delegate}} + <i class="icon-circle-arrow-right" title="{{$delegated_desc}}"></i> + {{/if}} + {{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" title="{{$channel.channel_name}}">{{/if}} + {{$channel.channel_name}} + {{if $selected != $channel.channel_id}}</a>{{/if}} + </h3> + <div class="clear"></div> +</div> +<div class="section-content-wrapper"> + <div class="channel-photo-wrapper"> + {{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}">{{/if}} + <img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /> + {{if $selected != $channel.channel_id}}</a>{{/if}} + </div> + <div class="channel-notifications-wrapper"> + {{if !$channel.delegate}} + <div class="channel-notification"> + <i class="icon-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i> + {{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}} + </div> + <div class="channel-notification"> + <i class="icon-user{{if $channel.intros != 0}} new-notification{{/if}}"></i> + {{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}} + </div> + <div class="channel-link"> + <i class="icon-map-marker"></i> + <a href="manage/{{$channel.channel_id}}/locs">{{$locs}}</a> + </div> + {{/if}} + </div> </div> diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 44daa0a3e..1a6012926 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,38 +1,24 @@ -<div class="generic-content-wrapper-styled"> -<h3>{{$header}}</h3> - -{{if $links}} -{{foreach $links as $l}} -<a class="channels-links" href="{{$l.0}}" title="{{$l.1}}">{{$l.2}}</a> -{{/foreach}} -{{/if}} -<div class="channels-break"></div> - -{{if $channel_usage_message}} -<div id="channel-usage-message" class="usage-message"> -{{$channel_usage_message}} -</div> -{{/if}} -<div id="channels-desc" class="descriptive-text">{{$desc}}</div> - -<div id="all-channels"> -{{foreach $all_channels as $chn}} -{{include file="channel.tpl" channel=$chn}} -{{/foreach}} -</div> - -<div class="channels-end all"></div> - -{{if $delegates}} -<hr /> -<h3>{{$delegate_header}}</h3> -<div id="delegated-channels"> -{{foreach $delegates as $chn}} -{{include file="channel.tpl" channel=$chn}} -{{/foreach}} -</div> - -<div class="channels-end all"></div> -{{/if}} - +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <a class="btn btn-success btn-xs pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="icon-plus-sign"></i> {{$create.2}}</a> + <h2>{{$header}}</h2> + </div> + <div class="section-content-wrapper-np"> + {{if $channel_usage_message}} + <div id="channel-usage-message" class="section-content-warning-wrapper"> + {{$channel_usage_message}} + </div> + {{/if}} + <div id="channels-desc" class="section-content-info-wrapper"> + {{$desc}} + </div> + {{foreach $all_channels as $chn}} + {{include file="channel.tpl" channel=$chn}} + {{/foreach}} + {{if $delegates}} + {{foreach $delegates as $chn}} + {{include file="channel.tpl" channel=$chn}} + {{/foreach}} + {{/if}} + </div> </div> diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 49c6af764..0c0cb984c 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -57,6 +57,7 @@ </button> </div> {{/if}} + {{$comment_buttons}} </div> <div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}"> {{if $preview}} diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 35e97f3e9..e2a14d9a2 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -1,10 +1,48 @@ -<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" > - <div class="contact-entry-photo-wrapper" > - <a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="contact-block-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> +<div id="contact-entry-wrapper-{{$contact.id}}"> + <div class="section-subtitle-wrapper"> + <div class="pull-right"> + {{if $contact.approve && $contact.ignore}} + <form action="connedit/{{$contact.id}}" method="post" > + <button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="icon-ok"></i> {{$contact.approve}}</button> + + <a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-xs" title="{{$contact.ignore_hover}}"><i class="icon-ban-circle"></i> {{$contact.ignore}}</a> + + {{/if}} + <a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a> + <a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a> + {{if $contact.approve}} + </form> + {{/if}} + </div> + <h3>{{if $contact.public_forum}}<i class="icon-comments-alt"></i> {{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3> + </div> + <div class="section-content-tools-wrapper"> + <div class="contact-photo-wrapper" > + <a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> + </div> + <div class="contact-info"> + {{if $contact.status}} + <div class="contact-info-element"> + <span class="contact-info-label">{{$contact.status_label}}:</span> {{$contact.status}} + </div> + {{/if}} + {{if $contact.connected}} + <div class="contact-info-element"> + <span class="contact-info-label">{{$contact.connected_label}}:</span> <span class="autotime" title="{{$contact.connected}}"></span> + </div> + {{/if}} + {{if $contact.webbie}} + <div class="contact-info-element"> + <span class="contact-info-label">{{$contact.webbie_label}}:</span> {{$contact.webbie}} + </div> + {{/if}} + {{if $contact.network}} + <div class="contact-info-element"> + <span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a> + </div> + {{/if}} + </div> + </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-name-end" ></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 8e5266978..fdd269602 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,27 +1,38 @@ -<div class="generic-content-wrapper-styled"> - -<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1> - -{{if $finding}}<h4>{{$finding}}</h4>{{/if}} - -<div id="contacts-search-wrapper"> -<form id="contacts-search-form" action="{{$cmd}}" method="get" > -<span class="contacts-search-desc">{{$desc}}</span> -<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" /> -<input type="submit" name="submit" id="contacts-search-submit" class="btn btn-default" value="{{$submit}}" /> -</form> -</div> -<div id="contacts-search-end"></div> - -{{$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> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <div class="dropdown pull-right"> + <button type="button" class="btn btn-primary btn-xs" onclick="openClose('contacts-search-form');"> + <i class="icon-search"></i> {{$label}} + </button> + <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> + <i class="icon-sort"></i> + </button> + <ul class="dropdown-menu"> + {{foreach $tabs as $menu}} + <li><a href="{{$menu.url}}">{{$menu.label}}</a></li> + {{/foreach}} + </ul> + </div> + {{if $finding}}<h2>{{$finding}}</h2>{{else}}<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>{{/if}} + </div> + <div id="contacts-search-form" class="section-content-tools-wrapper"> + <form action="{{$cmd}}" method="get" > + <div class="form-group"> + <div class="input-group"> + <input type="text" name="search" id="contacts-search" class="widget-input" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> + <div class="input-group-btn"> + <button id="contacts-search-submit" class="btn btn-default btn-sm" type="submit" name="submit" value="{{$submit}}"><i class="icon-search"></i></button> + </div> + </div> + </div> + </form> + </div> + <div id="connections-wrapper"> + {{foreach $contacts as $contact}} + {{include file="connection_template.tpl"}} + {{/foreach}} + <div id="page-end"></div> + </div> </div> <script>$(document).ready(function() { loadingPage = false;});</script> <div id="page-spinner"></div> diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl index d1ce5ca67..a32437212 100755 --- a/view/tpl/contact_block.tpl +++ b/view/tpl/contact_block.tpl @@ -1,7 +1,9 @@ -<div id="contact-block"> -<div id="contact-block-numcontacts">{{$contacts}}</div> +<div id="contact-block" class="widget"> +<h3>{{$contacts}}</h3> {{if $micropro}} + {{if $viewconnections}} <a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a> + {{/if}} <div class='contact-block-content'> {{foreach $micropro as $m}} {{$m}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 08f0d4fbe..553bc3146 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -26,7 +26,7 @@ <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}}"> + <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}"> <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}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index cf1310ea6..e7ce22043 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -26,7 +26,7 @@ <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}}"> + <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}"> <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}} diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl new file mode 100755 index 000000000..4352501ae --- /dev/null +++ b/view/tpl/cover_photo.tpl @@ -0,0 +1,29 @@ +<div id="profile-photo-content" class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> + + <form enctype="multipart/form-data" action="cover_photo" method="post"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + + <div id="profile-photo-upload-wrapper"> + + <label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label> + <input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" /> + <div class="clear"></div> + <br /> + <br /> + <div id="profile-photo-submit-wrapper"> + <input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}"> + </div> + </div> + + </form> + <br /> + <br /> + <div id="profile-photo-link-select-wrapper"> + {{$select}} + </div> + </div> +</div> diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl new file mode 100755 index 000000000..8254fc87d --- /dev/null +++ b/view/tpl/cover_photo_widget.tpl @@ -0,0 +1,53 @@ +<script> + $(document).ready(function() { + if($('#cover-photo').length && $(window).width() > 755) { + $('.navbar-fixed-top').css('position', 'relative'); + $('aside, section').css('padding-top', 0 + 'px'); + $('main').css('opacity', 0); + $('header').hide(); + } + else { + $('#cover-photo').remove(); + } + }); + + $(window).scroll(function () { + if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) { + $('header').fadeIn(); + $('main').css('opacity', 1); + $('aside, section').css('padding-top', $('nav').outerHeight(true) + 'px'); + $(window).scrollTop($(window).scrollTop() - $('#cover-photo').height()) + $('.navbar-fixed-top').css('position', 'fixed'); + $('#cover-photo').remove(); + } + if($('#cover-photo').length) { + $('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1)); + } + }); + + $(window).resize(function () { + if($('#cover-photo').length && $(window).width() < 755) { + $('main').css('opacity', 1); + $('aside, section').css('padding-top', $('nav').outerHeight(true) + 'px'); + $('.navbar-fixed-top').css('position', 'fixed'); + $('#cover-photo').remove(); + } + + }); + + function slideUpCover() { + $('html, body').animate({scrollTop: $('#cover-photo').height() + 'px'}); + } +</script> + +<div id="cover-photo" onclick="slideUpCover();" title="{{$hovertitle}}"> + {{$photo_html}} + <div id="cover-photo-caption"> + <div class="cover-photo-title"> + {{$title}} + </div> + <div class="cover-photo-subtitle"> + {{$subtitle}} + </div> + </div> +</div> diff --git a/view/tpl/cropcover.tpl b/view/tpl/cropcover.tpl new file mode 100755 index 000000000..68c948889 --- /dev/null +++ b/view/tpl/cropcover.tpl @@ -0,0 +1,58 @@ +<h1>{{$title}}</h1> +<p id="cropimage-desc"> +{{$desc}} +</p> +<div id="cropimage-wrapper"> +<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" /> +</div> +<div id="cropimage-preview-wrapper" > +<div id="previewWrap" ></div> +</div> + +<script type="text/javascript" language="javascript"> + + function onEndCrop( coords, dimensions ) { + $( 'x1' ).value = coords.x1; + $( 'y1' ).value = coords.y1; + $( 'x2' ).value = coords.x2; + $( 'y2' ).value = coords.y2; + $( 'width' ).value = dimensions.width; + $( 'height' ).value = dimensions.height; + } + + Event.observe( window, 'load', function() { + new Cropper.ImgWithPreview( + 'croppa', + { + previewWrap: 'previewWrap', + minWidth: 240, + minHeight: 87, + maxWidth: 320, + maxHeight: 320, + ratioDim: { x: 100, y:36 }, + displayOnInit: true, + onEndCrop: onEndCrop + } + ); + } + ); + +</script> + +<form action="cover_photo/{{$resource}}" id="crop-image-form" method="post" /> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + +<input type='hidden' name='profile' value='{{$profile}}'> +<input type="hidden" name="cropfinal" value="1" /> +<input type="hidden" name="xstart" id="x1" /> +<input type="hidden" name="ystart" id="y1" /> +<input type="hidden" name="xfinal" id="x2" /> +<input type="hidden" name="yfinal" id="y2" /> +<input type="hidden" name="height" id="height" /> +<input type="hidden" name="width" id="width" /> + +<div id="crop-image-submit-wrapper" > +<input type="submit" name="submit" value="{{$done}}" /> +</div> + +</form> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index ecc38beb9..7c2a45473 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -2,7 +2,6 @@ <div class="section-subtitle-wrapper"> <div class="pull-right"> {{if $entry.viewrate}} - {{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" > *</span></button>{{/if}} {{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-default btn-xs">{{$entry.total_ratings}}</a>{{/if}} {{/if}} {{if $entry.ignlink}} @@ -11,6 +10,9 @@ {{if $entry.connect}} <a class="btn btn-success btn-xs" href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a> {{/if}} + {{if $entry.viewrate}} + {{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" > *</span></button>{{/if}} + {{/if}} </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> diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index a2159c885..5b4954c8e 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -7,7 +7,7 @@ <body> <table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;"> <tbody> - <tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/hz-white-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> + <tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src="{{$notify_icon}}"><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> <tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr> @@ -18,7 +18,7 @@ <tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr> <tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr> <tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr> - <tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr> + <tr><td style="padding:11px 0;" colspan="2">{{$hitemlink}}</td></tr> <tr><td></td><td>{{$thanks}}</td></tr> <tr><td></td><td>{{$site_admin}}</td></tr> </tbody> diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl index bdab4c273..56925c18b 100755 --- a/view/tpl/email_notify_text.tpl +++ b/view/tpl/email_notify_text.tpl @@ -5,6 +5,7 @@ {{$textversion}} {{$tsitelink}} + {{$titemlink}} {{$thanks}} diff --git a/view/tpl/event_cal.tpl b/view/tpl/event_cal.tpl new file mode 100755 index 000000000..61458b263 --- /dev/null +++ b/view/tpl/event_cal.tpl @@ -0,0 +1,14 @@ +{{foreach $events as $event}} + <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}}">{{$event.item.author.xchan_name}}</a>{{/if}} + </div> + {{$event.html}} + <div class="event-buttons"> + {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="icon-external-link btn btn-default" ></i></a>{{/if}} + </div> + <div class="clear"></div> + </div> + </div> +{{/foreach}} diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index dc98d14b3..5083c5835 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -6,7 +6,7 @@ <script> function showEvent(eventid) { $.get( - '{{$baseurl}}/events/?id='+eventid, + '{{$baseurl}}{{$module_url}}/?id='+eventid, function(data){ $.colorbox({ scrolling: false, html: data, onComplete: function() { $.colorbox.resize(); }}); } @@ -36,7 +36,7 @@ $(document).ready(function() { $('#events-calendar').fullCalendar({ - events: '{{$baseurl}}/events/json', + events: '{{$baseurl}}{{$module_url}}/json', header: false, lang: '{{$lang}}', firstDay: {{$first_day}}, @@ -109,10 +109,17 @@ }); // center on date + // @fixme does not work for cal/$nick module_url var args=location.href.replace(baseurl,"").split("/"); + {{if $modparams == 2}} + if (args.length>=5) { + $("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1); + } + {{else}} if (args.length>=4) { $("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1); - } + } + {{/if}} // show event popup var hash = location.hash.split("-") diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 08c8aa64a..c29d80347 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> - <button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button> + <button class="btn btn-success btn-xs" onclick="openClose('form');">{{$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 id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button> diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl new file mode 100755 index 000000000..bc8a3aa31 --- /dev/null +++ b/view/tpl/events_cal-js.tpl @@ -0,0 +1,18 @@ +{{$tabs}} +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <div class="pull-right"> + <div class="btn-group"> + <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></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> + <h2 id="title"></h2> + <div class="clear"></div> + </div> + <div class="clear"></div> + <div class="section-content-wrapper-np"> + <div id="events-calendar"></div> + </div> +</div> diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index e99128bbb..d85c234f1 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -13,6 +13,7 @@ <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> {{/if}} {{if $notself && $field.5}} + <input type="hidden" name='{{$field.0}}' value="{{if $field.7}}1{{else}}0{{/if}}" /> {{if $field.3}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}} {{/if}} </td> diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index 128bbfbe1..d6a7f56b2 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,4 +1,4 @@ - <div class='form-group field input'> + <div id="id_{{$field.0}}_wrapper" class='form-group field input'> <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> <input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index d19bc9414..1643fa855 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@ <div class='form-group field password'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <input class="form-control" type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} - <span class='help-block'>{{$field.3}}</span> + <span id="help_{{$field.0}}" class="help-block">{{$field.3}}</span> </div> diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index 0c808b9a5..8c1f8d4ca 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -1,9 +1,14 @@ <div id="follow-sidebar" class="widget"> <h3>{{$connect}}</h3> - <div id="connect-desc">{{$desc}}</div> <form action="follow" method="post" /> - <input id="side-follow-url" type="text" name="url" title="{{$hint}}" /> - <input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" /> + <div class="form-group"> + <div class="input-group"> + <input class="widget-input" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" /> + <div class="input-group-btn"> + <button class="btn btn-default btn-sm" type="submit" name="submit" value="{{$follow}}"><i class="icon-plus"></i></button> + </div> + </div> + </div> </form> {{if $abook_usage_message}} <div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div> diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl index eb658624c..d9412a6f7 100755 --- a/view/tpl/group_edit.tpl +++ b/view/tpl/group_edit.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h2>{{$title}}</h2> @@ -22,3 +23,4 @@ </div> {{/if}} {{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}} +</div> diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 952757076..af6014359 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -16,7 +16,7 @@ </li> {{/foreach}} <li> - <a href="group/new" title="{{$createtext}}" >{{$createtext}}</a> + <a href="group/new" title="{{$createtext}}" ><i class="icon-plus-sign"></i> {{$createtext}}</a> </li> </ul> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 8a007232e..ba883c1f0 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,8 +1,7 @@ <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, user-scalable={{$user_scalable}}" /> -<meta name="generator" content="{{$generator}}" /> - +{{$metas}} <!--[if IE]> <script src="{{$baseurl}}/library/html5.js"></script> <![endif]--> @@ -28,6 +27,7 @@ var justifiedGalleryActive = false; {{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}} {{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}} + var preloadImages = {{$preload_images}}; </script> diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl index 62dcbb8b3..5ecd3243b 100755 --- a/view/tpl/install_settings.tpl +++ b/view/tpl/install_settings.tpl @@ -19,6 +19,7 @@ {{include file="field_input.tpl" field=$adminmail}} {{include file="field_input.tpl" field=$siteurl}} +{{include file="field_checkbox.tpl" field=$advanced}} {{include file="field_select_grouped.tpl" field=$timezone}} diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl index c39e044bc..440e1e02b 100755 --- a/view/tpl/invite.tpl +++ b/view/tpl/invite.tpl @@ -1,32 +1,28 @@ -<div class="generic-content-wrapper-styled"> -<form action="invite" method="post" id="invite-form" > +<div id="invite" class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$invite}}</h2> + </div> + <div class="section-content-wrapper"> -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <form action="invite" method="post" id="invite-form" > -<div id="invite-wrapper"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> -<h3>{{$invite}}</h3> + <div id="invite-recipient-textarea" class="form-group field custom"> + <label for="recipients">{{$addr_text}}</label> + <textarea id="invite-recipients" name="recipients" rows="6" class="form-control"></textarea> + </div> -<div id="invite-recipient-text"> -{{$addr_text}} -</div> - -<div id="invite-recipient-textarea"> -<textarea id="invite-recipients" name="recipients" rows="8" cols="32" ></textarea> -</div> - -<div id="invite-message-text"> -{{$msg_text}} -</div> + <div id="invite-message-textarea" class="form-group field custom"> + <label for="message">{{$msg_text}}</label> + <textarea id="invite-message" name="message" rows="12" class="form-control">{{$default_message}}</textarea> + </div> -<div id="invite-message-textarea"> -<textarea id="invite-message" name="message" rows="10" cols="72" >{{$default_message}}</textarea> -</div> + <div id="invite-submit-wrapper" class="form-group"> + <button class="btn btn-primary btn-sm" type="submit" id="invite-submit" name="submit" value="{{$submit}}">{{$submit}}</button> + </div> -<div id="invite-submit-wrapper"> -<input type="submit" name="submit" value="{{$submit}}" /> -</div> + </form> -</div> -</form> + </div> </div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 32a08a9b3..dea75efa9 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,5 +1,12 @@ -<div id="profile-jot-wrapper"> - <form id="profile-jot-form" action="{{$action}}" method="post"> +<form id="profile-jot-form" action="{{$action}}" method="post"> + {{$mimeselect}} + {{$layoutselect}} + {{if $id_select}} + <div class="channel-id-select-div"> + <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}} + </div> + {{/if}} + <div id="profile-jot-wrapper"> {{if $parent}} <input type="hidden" name="parent" value="{{$parent}}" /> {{/if}} @@ -17,13 +24,7 @@ <input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" /> {{if $showacl}}{{$acl}}{{/if}} - {{$mimeselect}} - {{$layoutselect}} - {{if $id_select}} - <div class="channel-id-select-div"> - <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}} - </div> - {{/if}} + {{if $webpage}} <div id="jot-pagetitle-wrap" class="jothidden"> <input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}"> @@ -159,9 +160,10 @@ </div> <div id="profile-jot-text-loading"></div> <div id="profile-jot-end" class="clear"></div> - <div id="jot-preview-content" style="display:none;"></div> - </form> -</div> + </div> +</form> + +<div id="jot-preview-content" style="display:none;"></div> <!-- Modal for item expiry--> <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl index b512c759b..1324442f3 100755 --- a/view/tpl/lang_selector.tpl +++ b/view/tpl/lang_selector.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> <br /> <div id="language-selector" > @@ -9,3 +10,4 @@ </select> </form> </div> +</div> diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl index 63eaa2d8d..315ee4c8a 100755 --- a/view/tpl/mood_content.tpl +++ b/view/tpl/mood_content.tpl @@ -1,20 +1,33 @@ -<h3>{{$title}}</h3> -<div id="mood-desc">{{$desc}}</div> +<div id="mood-content" class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> -<form action="mood" method="get"> -<br /> -<br /> + <div id="mood-desc">{{$desc}}</div> -<input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" /> + <br /> + <br /> -<select name="verb" id="mood-verb-select" > -{{foreach $verbs as $v}} -<option value="{{$v.0}}">{{$v.1}}</option> -{{/foreach}} -</select> -<br /> -<br /> -<input type="submit" name="submit" value="{{$submit}}" /> -</form> + <form action="mood" method="get"> + <br /> + <br /> + + <input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" /> + + <div class="form-group field custom"> + <select name="verb" id="mood-verb-select" class="form-control" > + {{foreach $verbs as $v}} + <option value="{{$v.0}}">{{$v.1}}</option> + {{/foreach}} + </select> + </div> + <br /> + <br /> + + <input type="submit" name="submit" value="{{$submit}}" /> + </form> + </div> +</div> diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index f78a3fc2d..cc1983ac4 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -1,38 +1,34 @@ -<div class="generic-content-wrapper-styled"> -<h2>{{$title}}</h2> - -<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> - {{include file="field_select_grouped.tpl" field=$role}} - <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> - - <div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div> - - <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> - - <div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div> - - - <div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div> - - <div id="newchannel-import-end" class="newchannel-field-end"></div> - - <input type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" /> - <div id="newchannel-submit-end" class="newchannel-field-end"></div> - -</form> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> + <div class="section-content-info-wrapper"> + {{$desc}} + </div> + {{if $channel_usage_message}} + <div class="section-content-warning-wrapper"> + {{$channel_usage_message}} + </div> + {{/if}} + <form action="new_channel" method="post" id="newchannel-form"> + {{if $default_role}} + <input type="hidden" name="permissions_role" value="{{$default_role}}" /> + {{else}} + {{include file="field_select_grouped.tpl" field=$role}} + {{/if}} + + {{include file="field_input.tpl" field=$name}} + <div id="name-spinner"></div> + + {{include file="field_input.tpl" field=$nickname}} + <div id="nick-spinner"></div> + + <button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button> + <div id="newchannel-submit-end" class="clear"></div> + + <div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div> + <div id="newchannel-import-end" class="clear"></div> + </form> + </div> </div> diff --git a/view/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl index 74ef22874..e865e07d9 100755 --- a/view/tpl/oexchange_xrd.tpl +++ b/view/tpl/oexchange_xrd.tpl @@ -4,23 +4,23 @@ <Subject>{{$base}}</Subject> <Property - type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property> + type="http://www.oexchange.org/spec/0.8/prop/vendor">Zotlabs</Property> <Property - type="http://www.oexchange.org/spec/0.8/prop/title">Friendika Social Network</Property> + type="http://www.oexchange.org/spec/0.8/prop/title">Hubzilla</Property> <Property - type="http://www.oexchange.org/spec/0.8/prop/name">Friendika</Property> + type="http://www.oexchange.org/spec/0.8/prop/name">Hubzilla</Property> <Property - type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendika</Property> + type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Hubzilla</Property> <Link rel="icon" - href="{{$base}}/images/friendika-16.png" + href="{{$base}}/images/hz-16.png" type="image/png" /> <Link rel="icon32" - href="{{$base}}/images/friendika-32.png" + href="{{$base}}/images/hz-32.png" type="image/png" /> diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl index 9df93e4c6..af8e37602 100644 --- a/view/tpl/pdledit.tpl +++ b/view/tpl/pdledit.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$header}}</h1> <h2>{{$mname}} {{$module}}</h2> @@ -17,5 +18,4 @@ <input type="submit" name="submit" value="{{$submit}}" /> </form> - - +</div> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 5d68cb2d8..d7d48cfd2 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -5,7 +5,7 @@ <div class="form-group"> <div class="input-group"> <input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> - <div class="input-group-btn"> + <div class="input-group-btn"> <button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button> </div> </div> diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl index 31b654374..24aff0209 100755 --- a/view/tpl/photo_drop.tpl +++ b/view/tpl/photo_drop.tpl @@ -1,4 +1,3 @@ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" > - <a href="item/drop/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></a> + <a class="btn btn-default btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="icon-trash"></i></a> </div> -<div class="wall-item-delete-end"></div> diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl index 2ea7aa9f3..ec643c4a9 100755 --- a/view/tpl/photo_item.tpl +++ b/view/tpl/photo_item.tpl @@ -1,27 +1,34 @@ -<div class="wall-item-outside-wrapper {{$indent}}" id="wall-item-outside-wrapper-{{$id}}" > - <div class="wall-item-content-wrapper {{$indent}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;"> - <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > - <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" > - <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}"> - <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a> +<div class="wall-item-outside-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-outside-wrapper-{{$id}}" > + <div class="wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;"> + <div class="wall-item-head"> + <div class="wall-item-info" id="wall-item-info-{{$id}}" > + <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" > + <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}"> + <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a> + </div> </div> - </div> - <div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" > - <div class="wall-item-author"> - <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a> + <div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" > + <div class="wall-item-author"> + <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a> + </div> + <div class="wall-item-ago" id="wall-item-ago-{{$id}}">{{$ago}}</div> </div> - <div class="wall-item-ago" id="wall-item-ago-{{$id}}">{{$ago}}</div> </div> <div class="wall-item-content" id="wall-item-content-{{$id}}" > <div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div> <div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div> - </div> - {{$drop}} - <div class="wall-item-wrapper-end"></div> + </div> + {{if $drop}} + <div class="wall-item-tools" id="wall-item-tools-{{$id}}" > + <div class="wall-item-tools-right pull-right"> + {{$drop}} + </div> + <div class="clear"></div> + </div> + {{/if}} + <div class="clear"></div> {{$comment}} - - <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 867a1e87b..254733622 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -2,23 +2,41 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> - {{if $tools}} - <a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a> - {{/if}} - {{if $map}} - <div class="btn-group btn-group"> - <i class="icon-globe btn btn-default btn-xs" title="{{$map_text}}" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); }" ></i> + {{if $tools || $map || $edit}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> + <i class="icon-caret-down"></i> + </button> + <ul class="dropdown-menu"> + {{if $tools}} + <li class="nav-item"> + <a class="nav-link" href="{{$tools.profile.0}}"><i class="icon-user"></i> {{$tools.profile.1}}</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{$tools.cover.0}}"><i class="icon-picture"></i> {{$tools.cover.1}}</a> + </li> + {{/if}} + {{if $map}} + <li class="nav-item"> + <a class="nav-link" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="icon-globe"></i> {{$map_text}}</a> + </li> + {{/if}} + {{if $edit}} + <li class="nav-item"> + <a class="nav-link" href="#" title="" onclick="openClose('photo-edit'); return false;"><i class="icon-pencil"></i> {{$edit.edit}}</a> + </li> + {{/if}} + </ul> </div> {{/if}} - <div class="btn-group btn-group dropdown"> - {{if $edit}} - <i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i> - {{/if}} - {{if $lock}} - <i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> - {{/if}} + {{if $lock}} + <div class="btn-group"> + <button id="lockview" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="icon-lock"></i></button> + <ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> </div> - <div class="btn-group btn-group"> + {{/if}} + {{if $prevlink || $nextlink}} + <div class="btn-group"> {{if $prevlink}} <a href="{{$prevlink.0}}" class="btn btn-default btn-xs" title="{{$prevlink.1}}"><i class="icon-backward"></i></a> {{/if}} @@ -26,6 +44,7 @@ <a href="{{$nextlink.0}}" class="btn btn-default btn-xs" title="{{$nextlink.1}}"><i class="icon-forward"></i></a> {{/if}} </div> + {{/if}} </div> <h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2> <div class="clear"></div> @@ -36,6 +55,7 @@ <div id="photo-edit" class="section-content-tools-wrapper"> <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form"> <input type="hidden" name="item_id" value="{{$edit.item_id}}" /> + {{* album renaming is not supported atm. <div class="form-group"> <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum_label}}</label> <input id="photo-edit-albumname" class="form-control" type="text" name="albname" value="{{$edit.album}}" placeholder="{{$edit.newalbum_placeholder}}" list="dl-albums" /> @@ -49,6 +69,7 @@ </datalist> {{/if}} </div> + *}} <div class="form-group"> <label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label> <input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" /> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 11a08204d..5bcef5dc1 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -26,7 +26,7 @@ <div id="body-textarea"> {{include file="field_textarea.tpl" field=$body}} </div> - <div class="pull-right btn-group form-group"> + <div class="pull-right btn-group"> <div class="btn-group"> {{if $lockstate}} <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl index 22a0b291f..f368cb024 100755 --- a/view/tpl/poke_content.tpl +++ b/view/tpl/poke_content.tpl @@ -1,32 +1,48 @@ -<h3>{{$title}}</h3> -<div id="poke-desc">{{$desc}}</div> +<div id="poke-content" class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> -<form action="poke" method="get"> -<br /> -<br /> + <div id="poke-desc">{{$desc}}</div> -<div id="poke-recip-label">{{$clabel}}</div> -<br /> -<input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name}}" name="pokename" autocomplete="off" /> -<input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" /> -<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" /> -<br /> -<br /> -<div id="poke-action-label">{{$choice}}</div> -<br /> -<br /> -<select name="verb" id="poke-verb-select" > -{{foreach $verbs as $v}} -<option value="{{$v.0}}">{{$v.1}}</option> -{{/foreach}} -</select> -<br /> -<br /> -<div id="poke-private-desc">{{$prv_desc}}</div> -<input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" /> <br /> <br /> + + +<form action="poke" method="get"> + + +<div class="form-group field input"> + <label id="poke-recip-label" for="poke-recip">{{$clabel}}</label> + <input class="form-control" id="poke-recip" type="text" value="{{$name}}" name="pokename" autocomplete="off" /> +</div> + + <input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" /> + <input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" /> + + +{{if $poke_basic}} +<input type="hidden" name="verb" value="poke" /> +{{else}} +<div class="form-group field custom"> + <label for="poke-verb-select" id="poke-verb-lbl">{{$choice}}</label> + <select class="form-control" name="verb" id="poke-verb-select" > + {{foreach $verbs as $v}} + <option value="{{$v.0}}">{{$v.1}}</option> + {{/foreach}} + </select> +</div> +{{/if}} + +{{if ! $parent}} +{{include file="field_checkbox.tpl" field=$private}} +{{/if}} + <input type="submit" name="submit" value="{{$submit}}" /> </form> + + </div> +</div> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index a4413e536..f928aa3ee 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -4,7 +4,7 @@ {{if $profile.like_count}} <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button> {{if $profile.likers}} - <ul class="dropdown-menu" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}">{{$liker.name}}</a></li>{{/foreach}}</ul> + <ul class="dropdown-menu" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul> {{/if}} {{/if}} {{if $profile.canlike}} @@ -12,191 +12,260 @@ <i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i> </button> {{/if}} + {{if $editmenu.multi}} + <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#" ><i class="icon-pencil"></i> {{$editmenu.edit.3}}</a> + <ul class="dropdown-menu" role="menu"> + {{foreach $editmenu.menu.entries as $e}} + <li> + <a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a> + </li> + {{/foreach}} + <li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li> + {{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}} + </ul> + {{elseif $editmenu}} + <a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="icon-pencil"></i> {{$editmenu.edit.3}}</a> + {{/if}} </div> <h2>{{$title}}</h2> <div class="clear"></div> </div> <div class="section-content-wrapper"> - <dl id="aprofile-fullname" class="aprofile"> - <dt>{{$profile.fullname.0}}</dt> - <dd>{{$profile.fullname.1}}</dd> - </dl> + {{foreach $fields as $f}} + {{if $f == 'name'}} + <dl id="aprofile-fullname" class="aprofile"> + <dt>{{$profile.fullname.0}}</dt> + <dd>{{$profile.fullname.1}}</dd> + </dl> + {{/if}} + + {{if $f == 'gender'}} {{if $profile.gender}} <dl id="aprofile-gender" class="aprofile"> <dt>{{$profile.gender.0}}</dt> <dd>{{$profile.gender.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'birthday'}} {{if $profile.birthday}} <dl id="aprofile-birthday" class="aprofile"> <dt>{{$profile.birthday.0}}</dt> <dd>{{$profile.birthday.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'age'}} {{if $profile.age}} <dl id="aprofile-age" class="aprofile"> <dt>{{$profile.age.0}}</dt> <dd>{{$profile.age.1}}</dd> </dl> {{/if}} + {{/if}} + + {{if $f == 'marital'}} {{if $profile.marital}} <dl id="aprofile-marital" class="aprofile"> - <dt><span class="heart">♥</span> {{$profile.marital.0}}</dt> - <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd> + <dt><span class="heart"><i class="icon-heart"></i> </span>{{$profile.marital.0}}</dt> + <dd>{{$profile.marital.1}}{{if in_array('with',$fields)}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'sexual'}} {{if $profile.sexual}} <dl id="aprofile-sexual" class="aprofile"> <dt>{{$profile.sexual.0}}</dt> <dd>{{$profile.sexual.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'keywords'}} {{if $profile.keywords}} <dl id="aprofile-tags" class="aprofile"> <dt>{{$profile.keywords.0}}</dt> <dd>{{$profile.keywords.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'homepage'}} {{if $profile.homepage}} <dl id="aprofile-homepage" class="aprofile"> <dt>{{$profile.homepage.0}}</dt> <dd>{{$profile.homepage.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'hometown'}} {{if $profile.hometown}} <dl id="aprofile-hometown" class="aprofile"> <dt>{{$profile.hometown.0}}</dt> <dd>{{$profile.hometown.1}}</dd> </dl> {{/if}} + {{/if}} + + {{if $f == 'politic'}} {{if $profile.politic}} <dl id="aprofile-politic" class="aprofile"> <dt>{{$profile.politic.0}}</dt> <dd>{{$profile.politic.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'religion'}} {{if $profile.religion}} <dl id="aprofile-religion" class="aprofile"> <dt>{{$profile.religion.0}}</dt> <dd>{{$profile.religion.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'about'}} {{if $profile.about}} <dl id="aprofile-about" class="aprofile"> <dt>{{$profile.about.0}}</dt> <dd>{{$profile.about.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'interest'}} {{if $profile.interest}} <dl id="aprofile-interest" class="aprofile"> <dt>{{$profile.interest.0}}</dt> <dd>{{$profile.interest.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'likes'}} {{if $profile.likes}} <dl id="aprofile-likes" class="aprofile"> <dt>{{$profile.likes.0}}</dt> <dd>{{$profile.likes.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'dislikes'}} {{if $profile.dislikes}} <dl id="aprofile-dislikes" class="aprofile"> <dt>{{$profile.dislikes.0}}</dt> <dd>{{$profile.dislikes.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'contact'}} {{if $profile.contact}} <dl id="aprofile-contact" class="aprofile"> <dt>{{$profile.contact.0}}</dt> <dd>{{$profile.contact.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'channels'}} {{if $profile.channels}} <dl id="aprofile-channels" class="aprofile"> <dt>{{$profile.channels.0}}</dt> <dd>{{$profile.channels.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'music'}} {{if $profile.music}} <dl id="aprofile-music" class="aprofile"> <dt>{{$profile.music.0}}</dt> <dd>{{$profile.music.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'book'}} {{if $profile.book}} <dl id="aprofile-book" class="aprofile"> <dt>{{$profile.book.0}}</dt> <dd>{{$profile.book.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'tv'}} {{if $profile.tv}} <dl id="aprofile-tv" class="aprofile"> <dt>{{$profile.tv.0}}</dt> <dd>{{$profile.tv.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'film'}} {{if $profile.film}} <dl id="aprofile-film" class="aprofile"> <dt>{{$profile.film.0}}</dt> <dd>{{$profile.film.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'romance'}} {{if $profile.romance}} <dl id="aprofile-romance" class="aprofile"> <dt>{{$profile.romance.0}}</dt> <dd>{{$profile.romance.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'work'}} {{if $profile.work}} <dl id="aprofile-work" class="aprofile"> <dt>{{$profile.work.0}}</dt> <dd>{{$profile.work.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'education'}} {{if $profile.education}} <dl id="aprofile-education" class="aprofile"> <dt>{{$profile.education.0}}</dt> <dd>{{$profile.education.1}}</dd> </dl> {{/if}} + {{/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> + {{foreach $profile.extra_fields as $fld}} + {{if $f == $fld}} + {{if $profile.$fld}} + <dl id="aprofile-{{$fld}}" class="aprofile"> + <dt>{{$profile.$fld.0}}</dt> + <dd>{{$profile.$fld.1}}</dd> </dl> {{/if}} + {{/if}} {{/foreach}} + {{/foreach}} {{if $things}} @@ -215,7 +284,7 @@ <div class="btn-group"> <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button> {{if $item.likes}} - <ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}">{{$liker.xchan_name}}</a></li>{{/foreach}}</ul> + <ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}"><img class="dropdown-menu-img-xs" src="{{$liker.xchan_photo_s}}" alt="{{$liker.name}}" /> {{$liker.xchan_name}}</a></li>{{/foreach}}</ul> {{/if}} </div> {{/if}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 535aa19dd..a02323e45 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,367 +1,296 @@ -<div class="generic-content-wrapper-styled">{{if $is_default}} -<p id="profile-edit-default-desc">{{$default}}</p> -{{/if}} - -<h1>{{$banner}}</h1> - -<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" > - -<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" > -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - -<div id="profile-edit-profile-name-wrapper" > -<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label> -<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div> -</div> -<div id="profile-edit-profile-name-end"></div> - -<div id="profile-edit-name-wrapper" > -<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label> -<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name}}" /> -</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}} -{{$gender}} -{{else}} -{{$gender_min}} -{{/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" > -{{$dob}} {{$age}} -</div> -</div> -<div id="profile-edit-dob-end"></div> -{{/if}} - -{{$hide_friends}} - -<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.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}} -{{$marital}} -{{else}} -{{$marital_min}} -{{/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> -{{/if}} - -{{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 $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}} - - -{{if $fields.about}} -<div id="about-jot-wrapper" > -<p id="about-jot-desc" > -{{$lbl_about}} -</p> - -<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea> - -</div> -<div id="about-jot-end"></div> -{{/if}} - -{{if $fields.contact}} -<div id="contact-jot-wrapper" > -<p id="contact-jot-desc" > -{{$lbl_social}} -</p> - -<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea> - -</div> -<div id="contact-jot-end"></div> -{{/if}} - - -{{if $fields.interest}} -<div id="interest-jot-wrapper" > -<p id="interest-jot-desc" > -{{$lbl_hobbies}} -</p> - -<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest}}</textarea> - -</div> -<div id="interest-jot-end"></div> -{{/if}} - -{{if $fields.likes}} -<div id="likes-jot-wrapper" > -<p id="likes-jot-desc" > -{{$lbl_likes}} -</p> - -<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes}}</textarea> - -</div> -<div id="likes-jot-end"></div> -{{/if}} - -{{if $fields.dislikes}} -<div id="dislikes-jot-wrapper" > -<p id="dislikes-jot-desc" > -{{$lbl_dislikes}} -</p> - -<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes}}</textarea> - -</div> -<div id="dislikes-jot-end"></div> -{{/if}} - -{{if $fields.channels}} -<div id="channels-jot-wrapper" > -<p id="channels-jot-desc" > -{{$lbl_channels}} -</p> - -<textarea rows="10" cols="72" id="channels-jot-text" name="channels" >{{$channels}}</textarea> - -</div> -<div id="channels-jot-end"></div> -{{/if}} - -{{if $fields.music}} -<div id="music-jot-wrapper" > -<p id="music-jot-desc" > -{{$lbl_music}} -</p> - -<textarea rows="10" cols="72" id="music-jot-text" name="music" >{{$music}}</textarea> - -</div> -<div id="music-jot-end"></div> -{{/if}} - -{{if $fields.book}} -<div id="book-jot-wrapper" > -<p id="book-jot-desc" > -{{$lbl_book}} -</p> - -<textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book}}</textarea> - -</div> -<div id="book-jot-end"></div> -{{/if}} - -{{if $fields.tv}} -<div id="tv-jot-wrapper" > -<p id="tv-jot-desc" > -{{$lbl_tv}} -</p> - -<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv}}</textarea> - -</div> -<div id="tv-jot-end"></div> -{{/if}} - -{{if $fields.film}} -<div id="film-jot-wrapper" > -<p id="film-jot-desc" > -{{$lbl_film}} -</p> - -<textarea rows="10" cols="72" id="film-jot-text" name="film" >{{$film}}</textarea> - -</div> -<div id="film-jot-end"></div> -{{/if}} - - -{{if $fields.romance}} -<div id="romance-jot-wrapper" > -<p id="romance-jot-desc" > -{{$lbl_love}} -</p> - -<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance}}</textarea> - -</div> -<div id="romance-jot-end"></div> -{{/if}} - -{{if $fields.work}} -<div id="work-jot-wrapper" > -<p id="work-jot-desc" > -{{$lbl_work}} -</p> - -<textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work}}</textarea> - -</div> -<div id="work-jot-end"></div> -{{/if}} - -{{if $fields.education}} -<div id="education-jot-wrapper" > -<p id="education-jot-desc" > -{{$lbl_school}} -</p> - -<textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education}}</textarea> - -</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" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> -</div> -<div class="profile-edit-submit-end"></div> - - -</form> -</div> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <div class="dropdown pull-right" id="profile-edit-links"> + <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <i class="icon-caret-down"></i> + </button> + <ul class="dropdown-menu"> + <li class="nav-item"> + <a class="nav-link" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="icon-user"></i> {{$profpic}}</a> + </li> + {{if $is_default}} + <li class="nav-item"> + <a href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="icon-picture"></i> {{$coverpic}}</a> + </li> + {{/if}} + {{if ! $is_default}} + <li class="nav-item"> + <a href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="icon-pencil"></i> {{$editvis}}</a> + </li> + {{/if}} + <li class="nav-item"> + <a href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="icon-plus-sign"></i> {{$addthing}}</a> + </li> + <li class="divider"></li> + <li class="nav-item"> + <a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a> + </li> + + {{if $profile_clone_link}} + <li class="divider"></li> + <li class="nav-item"> + <a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a> + </li> + {{/if}} + {{if $exportable}} + <li class="divider"></li> + <li class="nav-item"> + <a href="profiles/export/{{$profile_id}}">{{$lbl_export}}</a> + </li> + <li class="nav-item"> + <a href="#" onClick="openClose('profile-upload-form'); return false;">{{$lbl_import}}</a> + </li> + {{/if}} + {{if ! $is_default}} + <li class="divider"></li> + <li class="nav-item"> + <a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$del_prof}}</a> + </li> + {{/if}} + <ul> + </div> + <h2>{{$banner}}</h2> + <div class="clear"></div> + </div> + <div class="section-content-tools-wrapper" id="profile-upload-form"> + <label id="profile-upload-choose-label" for="profile-upload-choose" >{{$lbl_import}}</label> + <input id="profile-upload-choose" type="file" name="userfile"> + </div> + + <form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" > + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + + {{if $is_default}} + <div class="section-content-info-wrapper">{{$default}}</div> + {{/if}} + + <div class="panel-group" id="profile-edit-wrapper" role="tablist" aria-multiselectable="true"> + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="personal"> + <h3> + <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#personal-collapse" aria-expanded="true" aria-controls="personal-collapse"> + {{$personal}} + </a> + </h3> + </div> + <div id="personal-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="personal"> + <div class="section-content-tools-wrapper"> + {{include file="field_input.tpl" field=$profile_name}} + + {{include file="field_input.tpl" field=$name}} + + {{if $fields.pdesc}} + {{include file="field_input.tpl" field=$pdesc}} + {{/if}} + + {{if $fields.gender}} + <div id="profile-edit-gender-wrapper" class="form-group field select" > + <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}}</label> + {{if $advanced}} + {{$gender}} + {{else}} + {{$gender_min}} + {{/if}} + </div> + <div class="clear"></div> + {{/if}} + + {{if $fields.dob}} + {{$dob}} + {{/if}} + + {{include file="field_checkbox.tpl" field=$hide_friends}} + + <div class="form-group" > + <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> + </div> + <div class="clear"></div> + </div> + </div> + </div> + {{if $fields.address || $fields.locality || $fields.postal_code || $fields.region || $fields.country_name || $fields.hometown}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="location"> + <h3> + <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#location-collapse" aria-expanded="true" aria-controls="location-collapse"> + {{$location}} + </a> + </h3> + </div> + <div id="location-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="location"> + <div class="section-content-tools-wrapper"> + {{if $fields.address}} + {{include file="field_input.tpl" field=$address}} + {{/if}} + + {{if $fields.locality}} + {{include file="field_input.tpl" field=$locality}} + {{/if}} + + {{if $fields.postal_code}} + {{include file="field_input.tpl" field=$postal_code}} + {{/if}} + + {{if $fields.region}} + {{include file="field_input.tpl" field=$region}} + {{/if}} + + {{if $fields.country_name}} + {{include file="field_input.tpl" field=$country_name}} + {{/if}} + + {{if $fields.hometown}} + {{include file="field_input.tpl" field=$hometown}} + {{/if}} + + <div class="form-group" > + <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> + </div> + <div class="clear"></div> + </div> + </div> + </div> + {{/if}} + {{if $fields.marital || $fields.sexual}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="relation"> + <h3> + <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#relation-collapse" aria-expanded="true" aria-controls="relation-collapse"> + {{$relation}} + </a> + </h3> + </div> + <div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation"> + <div class="section-content-tools-wrapper"> + {{if $fields.marital }} + <div id="profile-edit-marital-wrapper" class="form-group field" > + <label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart"><i class="icon-heart"></i> </span>{{$lbl_marital}}</label> + {{if $advanced}} + {{$marital}} + {{else}} + {{$marital_min}} + {{/if}} + </div> + <div class="clear"></div> + + {{if $fields.with}} + {{include file="field_input.tpl" field=$with}} + {{/if}} + + {{if $fields.howlong}} + {{include file="field_input.tpl" field=$howlong}} + {{/if}} + {{/if}} + + {{if $fields.sexual}} + <div id="profile-edit-sexual-wrapper" class="form-group field" > + <label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label> + {{$sexual}} + </div> + <div class="clear"></div> + {{/if}} + + <div class="form-group" > + <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> + </div> + <div class="clear"></div> + </div> + </div> + </div> + {{/if}} + {{if $fields.keywords || $fields.politic || $fields.religion || $fields.about || $fields.contact || $fields.homepage || $fields.interest || $fields.likes || $fields.dislikes || $fields.channels || $fields.music || $fields.book || $fields.tv || $fields.romance || $fields.education || $extra_fields}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="miscellaneous"> + <h3> + <a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="true" aria-controls="miscellaneous-collapse"> + {{$miscellaneous}} + </a> + </h3> + </div> + <div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous"> + <div class="section-content-tools-wrapper"> + {{if $fields.homepage}} + {{include file="field_input.tpl" field=$homepage}} + {{/if}} + + {{if $fields.keywords}} + {{include file="field_input.tpl" field=$keywords}} + {{/if}} + + {{if $fields.politic}} + {{include file="field_input.tpl" field=$politic}} + {{/if}} + + {{if $fields.religion}} + {{include file="field_input.tpl" field=$religion}} + {{/if}} + + {{if $fields.about}} + {{include file="field_textarea.tpl" field=$about}} + {{/if}} + + {{if $fields.contact}} + {{include file="field_textarea.tpl" field=$contact}} + {{/if}} + + {{if $fields.interest}} + {{include file="field_textarea.tpl" field=$interest}} + {{/if}} + + {{if $fields.likes}} + {{include file="field_textarea.tpl" field=$likes}} + {{/if}} + + {{if $fields.dislikes}} + {{include file="field_textarea.tpl" field=$dislikes}} + {{/if}} + + {{if $fields.channels}} + {{include file="field_textarea.tpl" field=$channels}} + {{/if}} + + {{if $fields.music}} + {{include file="field_textarea.tpl" field=$music}} + {{/if}} + + {{if $fields.book}} + {{include file="field_textarea.tpl" field=$book}} + {{/if}} + + {{if $fields.tv}} + {{include file="field_textarea.tpl" field=$tv}} + {{/if}} + + {{if $fields.film}} + {{include file="field_textarea.tpl" field=$film}} + {{/if}} + + {{if $fields.romance}} + {{include file="field_textarea.tpl" field=$romance}} + {{/if}} + + {{if $fields.work}} + {{include file="field_textarea.tpl" field=$work}} + {{/if}} + + {{if $fields.education}} + {{include file="field_textarea.tpl" field=$education}} + {{/if}} + + {{if $extra_fields}} + {{foreach $extra_fields as $field }} + {{include file="field_input.tpl" field=$field}} + {{/foreach}} + {{/if}} + <div class="form-group" > + <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> + </div> + <div class="clear"></div> + </div> + </div> + </div> + {{/if}} + </div> + </form> </div> diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl index ab81a7fbc..9ae870738 100755 --- a/view/tpl/profile_entry.tpl +++ b/view/tpl/profile_entry.tpl @@ -1,11 +1,11 @@ -<div class="generic-content-wrapper-styled"> -<div class="profile-listing" > -<div class="profile-listing-photo-wrapper" > -<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a> -</div> -<div class="profile-listing-photo-end"></div> -<div class="profile-listing-name" id="profile-listing-name-{{$id}}"><a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a></div> -<div class="profile-listing-visible">{{$visible}}</div> -</div> -<div class="profile-listing-end"></div> +<div class="profile-listing-row"> + <div class="profile-listing-cell" > + <a href="profiles/{{$id}}"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a> + </div> + <div class="profile-listing-cell" id="profile-listing-name-{{$id}}"> + <a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a> + </div> + <div class="profile-listing-cell"> + {{$visible}} + </div> </div> diff --git a/view/tpl/profile_hide_friends.tpl b/view/tpl/profile_hide_friends.tpl deleted file mode 100644 index 4ed6782bb..000000000 --- a/view/tpl/profile_hide_friends.tpl +++ /dev/null @@ -1,20 +0,0 @@ -{{include file="field_checkbox.tpl"}} - -{{* -<p id="hide-friends-text"> -{{$desc}} -</p> - <div id="hide-friends-yes-wrapper"> - <label id="hide-friends-yes-label" for="hide-friends-yes">{{$yes_str}}</label> - <input type="radio" name="hide-friends" id="hide-friends-yes" {{$yes_selected}} value="1" /> - - <div id="hide-friends-break" ></div> - </div> - - <div id="hide-friends-no-wrapper"> - <label id="hide-friends-no-label" for="hide-friends-no">{{$no_str}}</label> - <input type="radio" name="hide-friends" id="hide-friends-no" {{$no_selected}} value="0" /> - - <div id="hide-friends-end"></div> - </div> -*}} diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index 09d00f982..2f39f0903 100755 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -1,11 +1,12 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$header}}</h1> -<p id="profile-listing-desc" class="btn btn-default" > -<a href="profile_photo" >{{$chg_photo}}</a> -</p> -<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="btn btn-default" > -<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <a class="btn btn-success btn-xs pull-right" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="icon-plus-sign"></i> {{$cr_new}}</a> + <h2>{{$header}}</h2> + </div> + <div class="section-content-wrapper"> + <div class="profile-listing-table"> + {{$profiles}} + </div> + </div> + </div> diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index fbed32606..88e17407b 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -1,31 +1,43 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> +<div id="profile-photo-content" class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> -<form enctype="multipart/form-data" action="profile_photo" method="post"> -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <form enctype="multipart/form-data" action="profile_photo" method="post"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> -<div id="profile-photo-upload-wrapper"> + <div id="profile-photo-upload-wrapper"> -<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label> -<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" /> -<div class="clear"></div> + <label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label> + <input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" /> + <div class="clear"></div> -<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label> -<select name="profile" id="profile-photo-profiles" class="form-input" > -{{foreach $profiles as $p}} -<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option> -{{/foreach}} -</select> -<div class="clear"></div> + {{if $single}} + <input type="hidden" name="profile" value="{{$profile0.id}}" /> + {{else}} -<div id="profile-photo-submit-wrapper"> -<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}"> -</div> -</div> + <label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label> + <select name="profile" id="profile-photo-profiles" class="form-control" > + {{foreach $profiles as $p}} + <option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option> + {{/foreach}} + </select> + <div class="clear"></div> + <br /> + <br /> + {{/if}} -</form> + <div id="profile-photo-submit-wrapper"> + <input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}"> + </div> + </div> -<div id="profile-photo-link-select-wrapper"> -{{$select}} -</div> + </form> + <br /> + <br /> + <div id="profile-photo-link-select-wrapper"> + {{$select}} + </div> + </div> </div> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index c52c2cd81..cff1e4e14 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,26 +1,34 @@ <div class="vcard"> + {{if ! $zcard}} <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> - {{if $profile.edit}} + {{/if}} + {{if $connect}} + <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div> + {{/if}} + {{if ! $zcard}} + {{if $editmenu.multi}} <div class="dropdown"> - <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> + <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" href="#" ><i class="icon-pencil" title="{{$editmenu.edit.1}}"></i></a> <ul class="dropdown-menu" role="menu"> - {{foreach $profile.menu.entries as $e}} + {{foreach $editmenu.menu.entries as $e}} <li> - <a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a> + <a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}</a> </li> {{/foreach}} - <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li> - {{if $profile.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>{{/if}} + <li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li> + {{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}} </ul> </div> + {{elseif $editmenu}} + <a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="icon-pencil" title="{{$editmenu.edit.1}}"></i></a> + {{/if}} {{/if}} + {{if ! $zcard}} <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> {{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}} + {{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} - - - {{if $location}} <dl class="location"><dt class="location-label">{{$location}}</dt> <dd class="adr"> @@ -36,25 +44,18 @@ {{/if}} {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}} - - {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}} + {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="icon-heart"></i> </span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</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> -{{/if}} - -{{$rating}} - </div> -<div id="vcard-end"></div> +<div id="clear"></div> +{{$rating}} {{$chanmenu}} diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl new file mode 100755 index 000000000..d3762d950 --- /dev/null +++ b/view/tpl/profile_vcard_short.tpl @@ -0,0 +1,42 @@ +{{$contact_block}} + + {{if $connect}} + <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div> + {{/if}} + + +{{$rating}} + + {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} + + {{if $location}} + <dl class="location"><dt class="location-label">{{$location}}</dt> + <dd class="adr"> + {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}} + <span class="city-state-zip"> + <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}} + <span class="region">{{$profile.region}}</span> + <span class="postal-code">{{$profile.postal_code}}</span> + </span> + {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}} + </dd> + </dl> + {{/if}} + + {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}} + + + {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="icon-heart"></i> </span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}} + + {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}} + + {{if $diaspora}} + {{include file="diaspora_vcard.tpl"}} + {{/if}} + +<div id="clear"></div> + +{{$chanmenu}} + + + diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 005b122cf..4a827ca16 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -1,53 +1,58 @@ -<div class="generic-content-wrapper-styled"> -<h2>{{$title}}</h2> - -<form action="register" method="post" id="register-form"> - - - -{{if $reg_is}} -<div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div> -{{/if}} -{{if $registertext}}<div id="register-text" class="descriptive-paragraph">{{$registertext}}</div> -{{/if}} -{{if $other_sites}}<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div> -{{/if}} - -{{if $invitations}} - <p id="register-invite-desc">{{$invite_desc}}</p> - - <label for="register-invite" id="label-register-invite" class="register-label">{{$label_invite}}</label> - <input type="text" maxlength="72" size="32" name="invite_code" id="register-invite" class="register-input" value="{{$invite_code}}" /> - <div id="register-invite-feedback" class="register-feedback"></div> - <div id="register-invite-end" class="register-field-end"></div> -{{/if}} - - <label for="register-email" id="label-register-email" class="register-label" >{{$label_email}}</label> - <input type="text" maxlength="72" size="32" name="email" id="register-email" class="register-input" value="{{$email}}" /> - <div id="register-email-feedback" class="register-feedback"></div> - <div id="register-email-end" class="register-field-end"></div> - - <label for="register-password" id="label-register-password" class="register-label" >{{$label_pass1}}</label> - <input type="password" maxlength="72" size="32" name="password" id="register-password" class="register-input" value="{{$pass1}}" /> - <div id="register-password-feedback" class="register-feedback"></div> - <div id="register-password-end" class="register-field-end"></div> - - <label for="register-password2" id="label-register-password2" class="register-label" >{{$label_pass2}}</label> - <input type="password" maxlength="72" size="32" name="password2" id="register-password2" class="register-input" value="{{$pass2}}" /> - <div id="register-password2-feedback" class="register-feedback"></div> - <div id="register-password2-end" class="register-field-end"></div> - - {{if $enable_tos}} - <input type="checkbox" name="tos" id="register-tos" value="1" /> - <label for="register-tos" id="label-register-tos">{{$label_tos}}</label> - <div id="register-tos-feedback" class="register-feedback"></div> - <div id="register-tos-end" class="register-field-end"></div> - {{else}} - <input type="hidden" name="tos" value="1" /> - {{/if}} - - <input type="submit" name="submit" class="btn btn-default" id="register-submit-button" value="{{$submit}}" /> - <div id="register-submit-end" class="register-field-end"></div> - -</form> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> + <form action="register" method="post" id="register-form"> + {{if $reg_is}} + <div class="section-content-warning-wrapper"> + <div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div> + <div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div> + </div> + {{/if}} + + {{if $registertext}} + <div id="register-text" class="descriptive-paragraph">{{$registertext}}</div> + {{/if}} + + {{if $invitations}} + <div class="section-content-info-wrapper"> + <div id="register-invite-desc" class="descriptive-paragraph">{{$invite_desc}}</div> + </div> + {{include file="field_input.tpl" field=$invite_code}} + {{/if}} + + {{include file="field_input.tpl" field=$email}} + + {{include file="field_password.tpl" field=$pass1}} + + {{include file="field_password.tpl" field=$pass2}} + + {{if $auto_create}} + {{if $default_role}} + <input type="hidden" name="permissions_role" value="{{$default_role}}" /> + {{else}} + <div class="section-content-info-wrapper"> + {{$help_role}} + </div> + {{include file="field_select_grouped.tpl" field=$role}} + {{/if}} + + {{include file="field_input.tpl" field=$name}} + <div id="name-spinner"></div> + + {{include file="field_input.tpl" field=$nickname}} + <div id="nick-spinner"></div> + {{/if}} + + {{if $enable_tos}} + {{include file="field_checkbox.tpl" field=$tos}} + {{else}} + <input type="hidden" name="tos" value="1" /> + {{/if}} + + <button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button> + <div id="register-submit-end" class="register-field-end"></div> + </form> + </div> </div> diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl index aefcd51a8..ce6c8ac22 100644 --- a/view/tpl/removeaccount.tpl +++ b/view/tpl/removeaccount.tpl @@ -10,7 +10,7 @@ <input type="hidden" name="verify" value="{{$hash}}" /> <div class="form-group" id="remove-account-pass-wrapper"> <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> - <input class="form-control" type="password" id="remove-account-pass" name="qxz_password" /> + <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " /> </div> {{include file="field_checkbox.tpl" field=$global}} <button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button> diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl index 5b329dd6d..40b9546d2 100755 --- a/view/tpl/removeme.tpl +++ b/view/tpl/removeme.tpl @@ -10,7 +10,7 @@ <input type="hidden" name="verify" value="{{$hash}}" /> <div class="form-group" id="remove-account-pass-wrapper"> <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> - <input class="form-control" type="password" id="remove-account-pass" name="qxz_password" /> + <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " /> </div> {{include file="field_checkbox.tpl" field=$global}} <button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 24e1b97d5..872551529 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -20,7 +20,7 @@ <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}}"> + <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}"> <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}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index af5f222fe..6f50f820a 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i> {{$removeme}}</a> + {{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i> {{$removeme}}</a>{{/if}} <h2>{{$ptitle}}</h2> <div class="clear"></div> </div> @@ -42,8 +42,12 @@ </div> <div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings"> <div class="section-content-tools-wrapper"> + {{if $server_role != 'basic'}} {{include file="field_select_grouped.tpl" field=$role}} - <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> + {{/if}} + <div id="advanced-perm" style="display:{{if $permissions_set && $server_role != 'basic' }}none{{else}}block{{/if}};"> + + {{if $server_role != 'basic'}} <div class="form-group"> <button type="button" class="btn btn-default" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> </div> @@ -65,6 +69,7 @@ </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> + {{/if}} <div id="settings-default-perms" class="form-group" > <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon"></i> {{$permissions}}</button> {{$aclselect}} diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 9f550fe4a..4a93e0610 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -8,6 +8,7 @@ <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div class="section-content-tools-wrapper"> {{include file="field_input.tpl" field=$email}} + {{include file="field_password.tpl" field=$origpass}} {{include file="field_password.tpl" field=$password1}} {{include file="field_password.tpl" field=$password2}} <div class="settings-submit-wrapper" > diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 02f679852..cf79671fd 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -65,6 +65,7 @@ {{include file="field_checkbox.tpl" field=$channel_list_mode}} {{include file="field_checkbox.tpl" field=$network_list_mode}} {{include file="field_checkbox.tpl" field=$user_scalable}} + {{include file="field_checkbox.tpl" field=$preload_images}} {{if $expert}} <div class="form-group"> <a class="btn btn-default "href="pdledit">{{$layout_editor}}</a> diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index 20e8f458f..94d76028a 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -1,7 +1,9 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> - +<div class="generic-content-wrapper"> +<div class="section-title-wrapper"> + <h2>{{$title}}</h2> +</div> +<div class="section-content-tools-wrapper"> <form action="settings/oauth" method="post" autocomplete="off"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> @@ -31,3 +33,4 @@ </form> </div> +</div> diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl index bf805363c..b94dec48a 100755 --- a/view/tpl/settings_oauth_edit.tpl +++ b/view/tpl/settings_oauth_edit.tpl @@ -1,5 +1,8 @@ -<h1>{{$title}}</h1> - +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> +<div class="section-content-tools-wrapper"> <form method="POST"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> @@ -15,3 +18,5 @@ </div> </form> +</div> +</div> diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index 2acbb24e4..ad409d75b 100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -1,11 +1,10 @@ <div class="vcard"> <div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div> +{{if $connect}} +<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div> +{{/if}} <div class="fn">{{$name}}</div> </div> -{{if $mode != 'mail'}} -{{if $connect}} - <a href="follow?f=&url={{$follow}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a> -{{/if}} -{{/if}} + diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 631ed3f18..754eb3944 100755 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -17,6 +17,8 @@ <Link rel="http://microformats.org/profile/hcard" type="text/html" href="{{$hcard_url}}" /> + <Link rel="http://ostatus.org/schema/1.0/subscribe" + template="{{$subscribe}}" /> <Link rel="magic-public-key" href="{{$modexp}}" /> diff --git a/view/tpl/zcard.tpl b/view/tpl/zcard.tpl new file mode 100644 index 000000000..908f07631 --- /dev/null +++ b/view/tpl/zcard.tpl @@ -0,0 +1,144 @@ +<style> +{{if $size == 'hz_large'}} +.hz_card { +/* -moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); + transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */ + font-family: sans-serif, arial, freesans; +} +.hz_cover_photo { + max-width: 100%; +} +.hz_profile_photo { + position: relative; + top: -300px; + left: 30px; + background-color: white; + border: 1px solid #ddd; + border-radius: 5px; + -moz-border-radius: 5px; + padding: 10px; + width: 320px; + height: 320px; +} + +.hz_name { + position: relative; + top: -100px; + left: 400px; + color: #fff; + font-size: 48px; + text-rendering: optimizelegibility; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.8); +} +.hz_addr { + position: relative; + top: -110px; + left: 400px; + color: #fff; + font-size: 24px; + text-rendering: optimizelegibility; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.8); +} +{{elseif $size == 'hz_medium'}} +.hz_card { +/* -moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); + transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */ + font-family: sans-serif, arial, freesans; + width: 100%; + overflow: hidden; + height: 390px; +} +.hz_cover_photo img { + width: {{$maxwidth}}px; +/* max-width: 100%; */ +} +.hz_profile_photo { + position: relative; + top: -165px; + left: 30px; + + width: 150px; + height: 150px; +} +.hz_profile_photo img { + background-color: white; + border: 1px solid #ddd; + border-radius: 5px; + -moz-border-radius: 5px; + padding: 5px; + width: 150px; + height: 150px; +} + +.hz_name { + position: relative; + top: -100px; + left: 210px; + color: #fff; + font-size: 32px; + text-rendering: optimizelegibility; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.8); +} +.hz_addr { + position: relative; + top: -100px; + left: 210px; + color: #fff; + font-size: 18px; + text-rendering: optimizelegibility; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.8); +} + + +{{else}} +.hz_card { +/* -moz-transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); + transform: translate(-{{$translate}}%, -{{$translate}}%) scale({{$scale}}, {{$scale}}); */ + font-family: sans-serif, arial, freesans; +} +.hz_cover_photo { + max-width: 100%; +} +.hz_profile_photo { + position: relative; + top: -75px; + left: 20px; + background-color: white; + border: 1px solid #ddd; +/* border-radius: 5px; + -moz-border-radius: 5px; */ + padding: 3px; + width: 80px; + height: 80px; +} + +.hz_name { + position: relative; + top: -40px; + left: 120px; + color: #fff; + font-size: 18px; + text-rendering: optimizelegibility; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.8); +} +.hz_addr { + position: relative; + top: -40px; + left: 120px; + color: #fff; + font-size: 10px; + text-rendering: optimizelegibility; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.8); +} +{{/if}} + +</style> + +<div class="hz_card {{$size}}"> + <div class="hz_cover_photo"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" /> + <div class="hz_name">{{$zcard.chan.xchan_name}}</div> + <div class="hz_addr">{{$zcard.chan.channel_addr}}</div> + </div> + <div class="hz_profile_photo"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></div> +</div> + |