diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/channel.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/comment_item.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/directajax.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/directory_header.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/frphotos.tpl | 13 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/like_noshare.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/message_side.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 14 | ||||
| -rwxr-xr-x | view/tpl/profile_advanced.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/profile_edit.tpl | 161 | ||||
| -rwxr-xr-x | view/tpl/profile_listing_header.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/removeaccount.tpl | 22 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/settings_account.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/settings_display.tpl | 3 |
18 files changed, 191 insertions, 82 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 9b12b5f29..f7bcb56c3 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -35,6 +35,10 @@ <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> <div class="abook-permschange" style="display: none;"></div> +<div class="abook-permssave" style="display: none;"> +<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> +</div> + {{if $is_pending}} <div class="abook-pending-contact"> diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 1ed2fbd2c..55b122d9b 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -7,6 +7,8 @@ {{/if}} {{/if}} <a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a> +<div class="channels-notifications-wrapper">{{if $channel.mail != 0}}<span style="color:#c60032;"><i class="icon-envelope"></i> {{$channel.mail}}</span>{{else}}<i class="icon-envelope"></i> {{/if}} {{if $channel.intros != 0}}<span style="color:#c60032;"><i class="icon-user"></i> {{$channel.intros}}</span>{{else}}<i class="icon-user"></i> {{/if}}</div> <a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a> </div> + <div class="channel-selection-end"></div> diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 423d13d88..351cc8e14 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -37,7 +37,7 @@ <button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> <i class="icon-terminal comment-icon"></i> </button> - <button class="btn btn-default btn-xs" title="{{$comment}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> + <button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> <i class="icon-camera comment-icon"></i> </button> <button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('{{$comment}}','url', {{$id}}); return false;"> diff --git a/view/tpl/directajax.tpl b/view/tpl/directajax.tpl new file mode 100644 index 000000000..8faec4222 --- /dev/null +++ b/view/tpl/directajax.tpl @@ -0,0 +1,4 @@ +{{foreach $entries as $entry}} +{{include file="direntry.tpl"}} +{{/foreach}} + diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 5d703e2dd..01356597e 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -5,12 +5,12 @@ {{/if}} {{foreach $entries as $entry}} - {{include file="direntry.tpl"}} - {{/foreach}} - +<div id="page-end"></div> <div class="directory-end"></div> +<script>$(document).ready(function() { loadingPage = false;});</script> +<div id="page-spinner"></div> diff --git a/view/tpl/frphotos.tpl b/view/tpl/frphotos.tpl new file mode 100644 index 000000000..b8e978825 --- /dev/null +++ b/view/tpl/frphotos.tpl @@ -0,0 +1,13 @@ +<h3>{{$header}}</h3> + +<p class="descriptive-text">{{$desc}}</p> + +<form action="frphotos" method="post" autocomplete="off" > + +{{include file="field_input.tpl" field=$fr_server}} +{{include file="field_input.tpl" field=$fr_username}} +{{include file="field_password.tpl" field=$fr_password}} + +<input type="submit" name="submit" value="{{$submit}}" /> +</form> + diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index b90bf8b89..703b08547 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,6 +1,6 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <base href="{{$baseurl}}/" /> -<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=0" /> +<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" /> <meta name="generator" content="{{$generator}}" /> <!--[if IE]> @@ -17,7 +17,7 @@ <link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" - title="Search in Red" /> + title="Search in the Red Matrix" /> <script> diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl index 60ba14d8c..3ce7eb497 100755 --- a/view/tpl/like_noshare.tpl +++ b/view/tpl/like_noshare.tpl @@ -1,5 +1,5 @@ <div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}"> - <i class="icon-thumbs-up-alt item-tool" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i> - <i class="icon-thumbs-down-alt item-tool" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i> + <i class="icon-thumbs-up-alt item-tool btn btn-default" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i> + <i class="icon-thumbs-down-alt item-tool btn btn-default" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i> <div id="like-rotator-{{$id}}" class="like-rotator"></div> </div> diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index 4db427fa7..723a64019 100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -1,6 +1,6 @@ <div id="message-sidebar" class="widget"> - <div id="message-check"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div> - <div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div> + <div id="message-check" class="btn btn-default"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div> + <div id="message-new" class="btn btn-default"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div> <ul class="message-ul"> {{foreach $tabs as $t}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 0c16eb362..a0ca7e0f9 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -9,8 +9,8 @@ </div> {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}} +<div id="photo-view-wrapper"> <div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="max-width: 100%;" src="{{$photo.src}}"></a></div> -{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}} <div id="photo-photo-end"></div> <div id="photo-caption">{{$desc}}</div> {{if $tags}} @@ -22,7 +22,7 @@ {{/if}} {{if $edit}} -<div id="photo-edit-edit-wrapper" class="fakelink" onclick="openClose('photo-edit-edit');">{{$edit.edit}}</div> +<div id="photo-edit-edit-wrapper" class="btn btn-default fakelink" onclick="openClose('photo-edit-edit'); closeOpen('photo-photo-delete-button')">{{$edit.edit}}</div> <div id="photo-edit-edit" style="display: none;"> <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form"> @@ -75,6 +75,10 @@ <div id="photo-edit-end"></div> </form> </div> + +<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post"> + <input id="photo-photo-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();"> +</form> {{/if}} {{if $likebuttons}} @@ -87,5 +91,11 @@ {{$comments}} +</div> + +{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}} + +<div class="clear"></div> + {{$paginate}} diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 73033fe40..cbb078710 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -193,6 +193,16 @@ </dl> {{/if}} +{{foreach $profile.extra_fields as $f}} +{{if $profile.$f}} +<dl id="aprofile-{{$f}}" class="aprofile"> + <dt>{{$profile.$f.0}}</dt> + <dd>{{$profile.$f.1}}</dd> +</dl> +{{/if}} +{{/foreach}} + + {{if $things}} {{foreach $things as $key => $items}} <b>{{$profile.fullname.1}} {{$key}}</b> diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 196b3ac6d..0e902e9e2 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,23 +1,27 @@ -{{$default}} +{{if $is_default}} +<p id="profile-edit-default-desc">{{$default}}</p> +{{/if}} <h1>{{$banner}}</h1> -<div id="profile-edit-links"> -<ul> -<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li> -<li><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li> -<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li> -<li></li> -<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li> +<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" > -</ul> +<div id="profile-edit-links"> +<span class="btn btn-default"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></span> +<span class="btn btn-default"><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></span> +{{if ! $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 ! $default}}<span class="btn btn-danger"><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();" {{$disabled}} >{{$del_prof}}</a></span>{{/if}} </div> + <div id="profile-edit-links-end"></div> <div id="profile-edit-wrapper" > -<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" > <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div id="profile-edit-profile-name-wrapper" > @@ -32,19 +36,28 @@ </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" > @@ -52,6 +65,7 @@ </div> </div> <div id="profile-edit-dob-end"></div> +{{/if}} {{$hide_friends}} @@ -60,100 +74,124 @@ </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}} -<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 $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}} -<div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> -</div> -<div class="profile-edit-submit-end"></div> +{{if $fields.about}} <div id="about-jot-wrapper" > <p id="about-jot-desc" > {{$lbl_about}} @@ -163,8 +201,22 @@ </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}} @@ -174,8 +226,9 @@ </div> <div id="interest-jot-end"></div> +{{/if}} - +{{if $fields.likes}} <div id="likes-jot-wrapper" > <p id="likes-jot-desc" > {{$lbl_likes}} @@ -185,8 +238,9 @@ </div> <div id="likes-jot-end"></div> +{{/if}} - +{{if $fields.dislikes}} <div id="dislikes-jot-wrapper" > <p id="dislikes-jot-desc" > {{$lbl_dislikes}} @@ -196,18 +250,9 @@ </div> <div id="dislikes-jot-end"></div> +{{/if}} - -<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 $fields.channels}} <div id="channels-jot-wrapper" > <p id="channels-jot-desc" > {{$lbl_channels}} @@ -217,13 +262,9 @@ </div> <div id="channels-jot-end"></div> +{{/if}} -<div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> -</div> -<div class="profile-edit-submit-end"></div> - - +{{if $fields.music}} <div id="music-jot-wrapper" > <p id="music-jot-desc" > {{$lbl_music}} @@ -233,7 +274,9 @@ </div> <div id="music-jot-end"></div> +{{/if}} +{{if $fields.book}} <div id="book-jot-wrapper" > <p id="book-jot-desc" > {{$lbl_book}} @@ -243,9 +286,9 @@ </div> <div id="book-jot-end"></div> +{{/if}} - - +{{if $fields.tv}} <div id="tv-jot-wrapper" > <p id="tv-jot-desc" > {{$lbl_tv}} @@ -255,9 +298,9 @@ </div> <div id="tv-jot-end"></div> +{{/if}} - - +{{if $fields.film}} <div id="film-jot-wrapper" > <p id="film-jot-desc" > {{$lbl_film}} @@ -267,14 +310,10 @@ </div> <div id="film-jot-end"></div> +{{/if}} -<div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> -</div> -<div class="profile-edit-submit-end"></div> - - +{{if $fields.romance}} <div id="romance-jot-wrapper" > <p id="romance-jot-desc" > {{$lbl_love}} @@ -284,9 +323,9 @@ </div> <div id="romance-jot-end"></div> +{{/if}} - - +{{if $fields.work}} <div id="work-jot-wrapper" > <p id="work-jot-desc" > {{$lbl_work}} @@ -296,9 +335,9 @@ </div> <div id="work-jot-end"></div> +{{/if}} - - +{{if $fields.education}} <div id="education-jot-wrapper" > <p id="education-jot-desc" > {{$lbl_school}} @@ -308,7 +347,7 @@ </div> <div id="education-jot-end"></div> - +{{/if}} <div class="profile-edit-submit-wrapper" > diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index 856d689f1..c4bc367ba 100755 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -1,11 +1,11 @@ <h1>{{$header}}</h1> -<p id="profile-listing-desc" class="button" > +<p id="profile-listing-desc" class="btn btn-default" > <a href="profile_photo" >{{$chg_photo}}</a> </p> -<p id="profile-stuff-link" class="button"> +<p id="profile-stuff-link" class="btn btn-default"> <a href="thing" title="{{$stuff_desc}}">{{$addstuff}}</a> </p> -<p id="profile-listing-new-link-wrapper" class="button" > +<p id="profile-listing-new-link-wrapper" class="btn btn-default" > <a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a> </div> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index d72507d4c..a653dca7d 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -2,7 +2,7 @@ {{if $profile.edit}} <div class="dropdown"> - <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> + <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil btn btn-default btn-xs" title="{{$profile.edit.1}}" ></i></a> <ul class="dropdown-menu" role="menu"> {{foreach $profile.menu.entries as $e}} <li> diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl new file mode 100644 index 000000000..b7378806b --- /dev/null +++ b/view/tpl/removeaccount.tpl @@ -0,0 +1,22 @@ +<h1>{{$title}}</h1> + +<div id="remove-account-wrapper"> + +<div id="remove-account-desc">{{$desc}}</div> + +<form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" > +<input type="hidden" name="verify" value="{{$hash}}" /> + +<div id="remove-account-pass-wrapper"> +<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> +<input type="password" id="remove-account-pass" name="qxz_password" /> +</div> +<div id="remove-account-pass-end"></div> + +{{include file="field_checkbox.tpl" field=$global}} + +<input type="submit" name="submit" value="{{$submit}}" /> + +</form> +</div> + diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 89c05b75f..443e63696 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -93,9 +93,9 @@ <div id="settings-notifications"> <div id="settings-activity-desc">{{$activity_options}}</div> -{{*the next two aren't yet implemented *}} -{{*include file="field_checkbox.tpl" field=$post_newfriend*}} +{{*not yet implemented *}} {{*include file="field_checkbox.tpl" field=$post_joingroup*}} +{{include file="field_checkbox.tpl" field=$post_newfriend}} {{include file="field_checkbox.tpl" field=$post_profilechange}} diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 169516f08..1e28d8b84 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -2,9 +2,6 @@ <h1>{{$title}}</h1> - - - <form action="settings/account" id="settings-account-form" method="post" autocomplete="off" > <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> @@ -23,4 +20,9 @@ {{$account_settings}} +<div id="settings-remove-account-link"> +<h3 class="settings-heading">{{$removeme}}</h3> +<div id="settings-remove-account-desc">{{$removeaccount}}</div> +<button title="{{$permanent}}" class="btn btn-danger" type="submit" formaction="removeaccount">{{$removeme}}</button> +</div> </div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index a2038b930..6eda6a6ec 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -6,6 +6,9 @@ {{include file="field_themeselect.tpl" field=$theme}} {{include file="field_themeselect.tpl" field=$mobile_theme}} +{{if $expert}} +{{include file="field_checkbox.tpl" field=$user_scalable}} +{{/if}} {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} {{include file="field_checkbox.tpl" field=$nosmile}} |