diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/comment_item.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/like_noshare.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 14 | ||||
| -rwxr-xr-x | view/tpl/profile_edit.tpl | 45 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 4 |
8 files changed, 56 insertions, 23 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/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/head.tpl b/view/tpl/head.tpl index b90bf8b89..d64731ee3 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" /> <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/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_edit.tpl b/view/tpl/profile_edit.tpl index 196b3ac6d..22e92390b 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -6,9 +6,9 @@ <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> +{{if $profile_clone_link}}<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>{{/if}} <li></li> -<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li> +{{if ! $default}}<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>{{/if}} </ul> </div> @@ -41,7 +41,11 @@ <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> @@ -106,7 +110,11 @@ <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> <label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label> @@ -119,7 +127,11 @@ <div id="profile-edit-sexual-wrapper" > <label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label> +{{if $advanced}} {{$sexual}} +{{else}} +{{$sexual_min}} +{{/if}} </div> <div id="profile-edit-sexual-end"></div> @@ -131,6 +143,8 @@ </div> <div id="profile-edit-homepage-end"></div> +{{if $advanced}} + <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}}" /> @@ -143,6 +157,8 @@ </div> <div id="profile-edit-religion-end"></div> +{{/if}} + <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}}" /> @@ -165,6 +181,19 @@ <div id="about-jot-end"></div> + +<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 $advanced}} + <div id="interest-jot-wrapper" > <p id="interest-jot-desc" > {{$lbl_hobbies}} @@ -198,16 +227,6 @@ <div id="dislikes-jot-end"></div> -<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> - <div id="channels-jot-wrapper" > <p id="channels-jot-desc" > {{$lbl_channels}} @@ -309,7 +328,7 @@ </div> <div id="education-jot-end"></div> - +{{/if}} <div class="profile-edit-submit-wrapper" > <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> 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/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}} |