diff options
Diffstat (limited to 'view/tpl')
42 files changed, 298 insertions, 71 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 30abcc6b3..590213fd3 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -16,6 +16,10 @@ <div id="contact-edit-wrapper"> +{{if $last_update}} +{{$lastupdtext}} {{$last_update}} +{{/if}} + {{if $notself}} {{if $slide}} <h3>{{$lbl_slider}}</h3> @@ -30,7 +34,7 @@ <h3>{{$permlbl}}</h3> <div id="perm-desc" class="descriptive-text">{{$permnote}}</div> -<form id="abook-edit-form" action="connections/{{$contact_id}}" method="post" > +<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" > <input type="hidden" name="contact_id" value="{{$contact_id}}"> <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl index a9f250652..ea840e1b3 100755 --- a/view/tpl/admin_hubloc.tpl +++ b/view/tpl/admin_hubloc.tpl @@ -1,9 +1,6 @@ <div class="generic-content-wrapper" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> - <form action="{{$baseurl}}/admin/hubloc" method="post"> - <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - <table id='server'> <thead> <tr> @@ -14,6 +11,13 @@ {{foreach $hubloc as $hub}}<tr> <td>{{$hub.hubloc_id}}</td><td>{{$hub.hubloc_addr}}</td><td>{{$hub.hubloc_host}}</td><td>{{$hub.hubloc_status}}</td> + <td> + <form action="{{$baseurl}}/admin/hubloc" method="post"> + <input type="hidden" name="hublocid" value="{{$hub.hubloc_id}}"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <input type="submit" name="check" value="check" > + <input type="submit" name="repair" value="repair" ></td> + </form> </tr>{{/foreach}} </tbody> </table> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index b0f9d4a74..9b90fb4b0 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -42,6 +42,7 @@ {{include file="field_input.tpl" field=$sitename}} {{include file="field_textarea.tpl" field=$banner}} + {{include file="field_textarea.tpl" field=$admininfo}} {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 3549dc5c2..65fffd17c 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -29,9 +29,8 @@ <tbody> {{foreach $pending as $u}} <tr> - <td class="created">{{$u.created}}</td> - <td class="name">{{$u.name}}</td> - <td class="email">{{$u.email}}</td> + <td class="created">{{$u.account_created}}</td> + <td class="email">{{$u.account_email}}</td> <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td> <td class="tools"> <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><i class='icon-thumbs-up-alt admin-icons'></i></a> diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl new file mode 100644 index 000000000..77f32b5bc --- /dev/null +++ b/view/tpl/attach_edit.tpl @@ -0,0 +1,39 @@ + +<h1>{{$header}}</h1> + +<h2>{{$file.filename}}</h2> + + +<div id="attach-edit-backlink"><a href="filestorage/{{$channelnick}}">{{$backlink}}</a></div> + + +<form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > + +<input type="hidden" name="channelnick" value="{{$channelnick}}" /> +<input type="hidden" name="filehash" value="{{$file.hash}}" /> +<input type="hidden" name="uid" value="{{$uid}}" /> +<input type="hidden" name="fileid" value="{{$file.id}}" /> + + +{{if $isadir}} +<div id="attach-edit-recurse" > + <label id="attach-edit-recurse-text" for="attach-recurse-input" >{{$recurse}}</label> + <input id="attach-recurse-input" type="checkbox" name="recurse" value="1" /> +</div> +{{else}} +<div class="cut-paste-desc">{{$cpdesc}}</div> +<input type="text" id="cutpasteinput" name="cutpastelink" value="[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" onclick="this.select();" /><br /> +{{/if}} + +<div class="cut-paste-desc">{{$cpldesc}}</div> +<input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br /> + +<div id="attach-edit-perms" > +{{$aclselect}} +</div> + +<div class="clear"></div> +<input id="attach-edit-submit" type="submit" name="submit" value="{{$submit}}" /> +</form> + + diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 53a8c0f6b..98a1c7846 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -15,6 +15,7 @@ var bParam_new = {{$nouveau}}; var bParam_page = {{$page}}; var bParam_wall = {{$wall}}; + var bParam_list = {{$list}}; var bParam_search = "{{$search}}"; var bParam_order = "{{$order}}"; @@ -38,6 +39,7 @@ if(bParam_spam != 0) bCmd = bCmd + "&spam=" + bParam_spam; if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new; if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall; + if(bParam_list != 0) bCmd = bCmd + "&list=" + bParam_list; if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search; if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order; if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file; diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl new file mode 100644 index 000000000..d2cf4d7b0 --- /dev/null +++ b/view/tpl/chatroomlist.tpl @@ -0,0 +1,11 @@ +<div class="widget"> +<h3>{{$header}}</h3> +{{if $items}} +<table> +{{foreach $items as $item}} +<tr><td>{{$item.cr_name}}</td><td>{{$item.cr_inroom}}</td></tr> +{{/foreach}} +</table> +{{/if}} +</div> + diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index fb36f5dca..50a243ff4 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -39,7 +39,7 @@ <div class="wall-item-author"> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br /> - <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}" > <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div> @@ -72,10 +72,10 @@ <i class="icon-retweet item-tool" title="{{$item.share.0}}" onclick="jotShare({{$item.id}}); return false"></i> {{/if}} {{if $item.plink}} - <i class="icon-external-link item-tool" onclick="window.location.href='{{$item.plink.href}}'; return false;" title="{{$item.plink.title}}"></i> + <a href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="icon-external-link item-tool"></i></a> {{/if}} {{if $item.edpost}} - <i class="editpost icon-pencil item-tool" onclick="window.location.href='{{$item.edpost.0}}'; return false;" title="{{$item.edpost.1}}"></i> + <a href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost icon-pencil item-tool"></i></a> {{/if}} {{if $item.star}} <i id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item item-tool {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl index eb082dc37..80a538231 100644 --- a/view/tpl/design_tools.tpl +++ b/view/tpl/design_tools.tpl @@ -1,7 +1,9 @@ <div id="design-tools" class="widget design-tools"> <h3>{{$title}}</h3> +<ul> <li><a href="blocks/{{$who}}">{{$blocks}}</a></li> <li><a href="menu">{{$menus}}</a></li> <li><a href="layouts/{{$who}}">{{$layout}}</a></li> <li><a href="webpages/{{$who}}">{{$pages}}</a></li> +</ul> </div> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 35bbbe0fd..e40504c8f 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -7,7 +7,7 @@ </div> </div> -<div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div> +<div class="contact-name" id="directory-name-{{$entry.id}}" ><span onclick="dirdetails('{{$entry.hash}}');" class="fakelink" >{{$entry.name}}</span></div> {{if $entry.connect}} <div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div> {{/if}} diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl new file mode 100755 index 000000000..f00448175 --- /dev/null +++ b/view/tpl/direntry_large.tpl @@ -0,0 +1,43 @@ +<div class="directory-popup-item lframe" id="directory-item-{{$id}}" > +<div class="generic-content-wrapper"> + +<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > + <div class="contact-photo dirpopup" id="directory-photo-{{$id}}" > + <a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" ><img class="directory-photo-img" style="height:175px; width:175px;" src="{{$photo}}" alt="{{$alttext}}" title="{{$alttext}}" /></a> + </div> + <div class="contact-photo dirpopup" id="directory-qr-{{$id}}" > + <img class="directory-photo-img" style="height:175px; width:175px;" src="photo/qr?f=&qr={{$qrlink}}" alt="QR" title="{{$qrlink}}" /> + </div> +</div> + +<div class="clear"></div> + + +<div class="contact-name" id="directory-name-{{$id}}" >{{$name}}{{if $online}} <i class="icon-asterisk online-now" title="{{$online}}"></i>{{/if}}</div> +{{if $connect}} +<div class="directory-connect"><a href="{{$connect}}">{{$conn_label}}</a></div> +{{/if}} + +<div class="contact-webbie">{{$address}}</div> + +<div class="contact-details">{{$details}}</div> +{{if $marital}} +<div class="directory-marital">{{$marital}} </div> +{{/if}} +{{if $sexual}} +<div class="directory-sexual">{{$sexual}} </div> +{{/if}} +{{if $homepage}} +<div class="directory-homepage">{{$homepage}} </div> +{{/if}} +{{if $hometown}} +<div class="directory-hometown">{{$hometown}} </div> +{{/if}} +{{if $about}} +<div class="directory-about">{{$about}} </div> +{{/if}} +{{if $kw}} +<div class="directory-keywords">{{$kw}} {{$keywords}}</div> +{{/if}} +</div> +</div> diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl index c4356e1cd..1f9218954 100755 --- a/view/tpl/field_combobox.tpl +++ b/view/tpl/field_combobox.tpl @@ -1,6 +1,6 @@ <div class='field combobox'> <label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> - {{* html5 don't work on Chrome, Safari and IE9 + {{* html5 don't work on Chrome, Safari and IE9 see https://github.com/thgreasi/datalist-polyfill <input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" > <datalist id="data_{{$field.0}}" > {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}} diff --git a/view/tpl/filestorage.tpl b/view/tpl/filestorage.tpl index 995b52cc8..7b88c6440 100644 --- a/view/tpl/filestorage.tpl +++ b/view/tpl/filestorage.tpl @@ -7,10 +7,10 @@ {{foreach $files as $key => $items}} {{foreach $items as $item}} <div class="files-list-item"> - <a href="attach/{{$item.download}}">{{$download}}</a> | - <a href="{{$baseurl}}/{{$item.id}}/delete">{{$delete}} - <a href="page/{{$channel}}/{{$item.title}}">{{$title}}</a> {{$item.title}} | - {{$item.size}} bytes + <a href="{{$baseurl}}/{{$item.id}}/edit">{{$edit}}</a> | + <a href="{{$baseurl}}/{{$item.id}}/delete">{{$delete}}</a> | + {{if ! $item.dir}}<a href="attach/{{$item.download}}">{{/if}}{{$item.title}}{{if ! $item.dir}}</a>{{/if}} + {{if ! $item.dir}} | {{$item.size}} bytes{{else}}{{$directory}}{{/if}} </div> {{/foreach}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 1ceca04c6..878e1e7da 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -103,7 +103,7 @@ function enableOnUser(){ } </script> -<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script> +<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script> <script> var ispublic = '{{$ispublic}}'; @@ -194,10 +194,17 @@ function enableOnUser(){ } function jotGetExpiry() { - reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); - if(reply && reply.length) { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#expiryModal').modal(); + $('#expiry-modal-OKButton').on('click', function() { + reply=$('#expiration-date').val(); + if(reply && reply.length) { $('#jot-expire').val(reply); + $('#expiryModal').modal('hide'); } +}) + + } function jotShare(id) { @@ -299,3 +306,20 @@ function enableOnUser(){ </script> +<script> +$( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-delete-link,.block-delete-link", function(e) { + var link = $(this).attr("href"); // "get" the intended link in a var + + if (typeof(eval($.fn.modal)) === 'function'){ + e.preventDefault(); + bootbox.confirm("<h4>{{$confirmdelete}}</h4>",function(result) { + if (result) { + document.location.href = link;} + });} + else { + return confirm("{{$confirmdelete}}"); + } + }); +</script> + + diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 666fae9cd..e1e1e3080 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -12,7 +12,6 @@ <input type="hidden" name="post_id" value="{{$post_id}}" /> <input type="hidden" name="webpage" value="{{$webpage}}" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> - {{$mimeselect}} {{$layoutselect}} @@ -71,7 +70,7 @@ </div> {{/if}} - {{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}} + {{if $preview}}<span onclick="preview_post();" id="jot-preview-link"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}} <div id="profile-jot-perms-end"></div> @@ -90,9 +89,49 @@ {{$jotnets}} </div> </div> +<!-- Modal for item expiry--> +<div class="modal fade" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4> + </div> + <!-- <div class="modal-body"> --> + <div class="modal-body form-group" style="width:90%"> + <div class="input-group input-group-sm date" id="datetimepicker1"> + <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> --> + <span class="icon-calendar"></span> + </span> + <input id="expiration-date" type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/> + </div> + </div> + <!-- </div> --> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> + <button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> +</div><!-- /.modal --> +<script type="text/javascript"> + $(function() { + $('#datetimepicker1').datetimepicker({ + language: 'us', + icons: { + time: "icon-time", + date: "icon-calendar", + up: "icon-arrow-up", + down: "icon-arrow-down" + } + }); + }); +</script> +</div> + + -</div> <div id="profile-jot-end"></div> </form> diff --git a/view/tpl/list_things.tpl b/view/tpl/list_things.tpl new file mode 100644 index 000000000..fb8935d82 --- /dev/null +++ b/view/tpl/list_things.tpl @@ -0,0 +1,13 @@ +{{if $things}} +{{foreach $things as $key => $items}} +<b>{{$items.profile}} {{$key}}</b> +<ul class="profile-thing-list"> +{{foreach $items as $item}} +<li>{{if $item.img}}<img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" />{{/if}} +<a href="{{$item.url}}" >{{$item.term}}</a> +</li> +{{/foreach}} +</ul> +<div class="clear"></div> +{{/foreach}} +{{/if}} diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index 84bdb451a..f794ffc78 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -8,9 +8,9 @@ <div class="mail-conv-date">{{$mail.date}}</div> <div class="mail-conv-subject">{{$mail.subject}}</div> <div class="mail-conv-body">{{$mail.body}}</div> - <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div> {{if $mail.can_recall}} - <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="message/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div> + <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div> {{/if}} <div class="mail-conv-outside-wrapper-end"></div> </div> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index c96827996..e17a206a0 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper" id="mail-list-wrapper"> <a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a> <span class="mail-list">{{$from_name}}</span> - <span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span> + <span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span> <span class="mail-list" title="{{$date}}">{{$date}}</span> <span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span> <div class="clear"> </div> diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 79f9e23c1..b6cff7c74 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -45,7 +45,7 @@ else </script> -<script type="text/javascript" src="js/ajaxupload.js" ></script> +<script type="text/javascript" src="view/js/ajaxupload.js" ></script> <script> $(document).ready(function() { var uploader = new window.AjaxUpload( diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl index 7300779f4..09932e545 100644 --- a/view/tpl/notes.tpl +++ b/view/tpl/notes.tpl @@ -1,13 +1,10 @@ <div class="widget"> <script> -function notePost() { - $('#note-rotator').spin('tiny'); - $.post('notes', { 'note_text' : $('#note-text').val() },function(data) { $('#note-rotator').spin(false); }); -} +$("#note-text").live('input paste',function(e){ + $.post('notes', { 'note_text' : $('#note-text').val() }); +}); </script> <h3>{{$banner}}</h3> <textarea name="note_text" id="note-text">{{$text}}</textarea> -<input type="submit" name="submit" id="note-save" value="{{$save}}" onclick="notePost(); return true;"> -<div id="note-rotator"></div> </div> diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl index 4ad75a82e..b0cfed2e5 100755 --- a/view/tpl/oembed_video.tpl +++ b/view/tpl/oembed_video.tpl @@ -1,4 +1,4 @@ -<a href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); return false;' style='float:left; margin: 1em; position: relative;'> - <img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' > - <div style='position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;'></div> +<a href="{{$embedurl}}" onclick="this.innerHTML=Base64.decode('{{$escapedhtml}}'); return false;" style="float:left; margin: 1em; position: relative;"> + <img width="{{$tw}}" height="{{$th}}" src="{{$turl}}" /> + <div style="position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;"></div> </a> diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index d8175bdd2..9b6b182c8 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -2,7 +2,7 @@ <div class="generic-content-wrapper" id="page-content-wrapper" > <h3 class="page-title">{{$title}}</h3> - <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> + <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}{{if $zid}}?zid={{$zid}}{{/if}}">{{$author}}</a></div> <div class="page-date">{{$date}}</div> <div class="page-body">{{$body}}</div> </div> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index aef341d41..45b3d7d4b 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -7,8 +7,8 @@ </form> <br /> {{if $similar}}<a href="match" >{{$similar}}</a><br />{{/if}} - <a href="suggest" >{{$suggest}}</a><br /> + {{if $loggedin}}<a href="suggest" >{{$suggest}}</a><br />{{/if}} <a href="randprof" >{{$random}}</a><br /> - {{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}} + {{if $loggedin}}{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}{{/if}} </div> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index c170d47a3..a63bff78c 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,4 +1,3 @@ -{{include file="prettyphoto.tpl"}} <div class="photo-album-image-wrapper{{$twist}}" id="photo-album-image-wrapper-{{$id}}"> <a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}"> <img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize" id="photo-album-photo-{{$id}}" /> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index cdaae67e4..93e9abfa5 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,5 +1,3 @@ -{{include file="prettyphoto.tpl"}} - <div id="live-display"></div> <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> @@ -11,7 +9,7 @@ </div> {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}} -<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" rel="prettyPhoto"><img src="{{$photo.src}}" /></a></div> +<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;" ><img 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> @@ -26,7 +24,7 @@ <div id="photo-edit-edit" style="display: none;"> <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" > - <input type="hidden" name="item_id" value="{{$item_id}}" /> + <input type="hidden" name="item_id" value="{{$edit.item_id}}" /> <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label> <input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" /> diff --git a/view/tpl/prettyphoto.tpl b/view/tpl/prettyphoto.tpl deleted file mode 100644 index 6d047e620..000000000 --- a/view/tpl/prettyphoto.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<script type="text/javascript" charset="utf-8"> - $(document).ready(function(){ - $("a[rel^='prettyPhoto']").prettyPhoto(); - }); -</script> - diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 9f17a0ffa..f25608430 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -111,6 +111,13 @@ </dl> {{/if}} +{{if $profile.channels}} +<dl id="aprofile-channels" class="aprofile"> + <dt>{{$profile.channels.0}}</dt> + <dd>{{$profile.channels.1}}</dd> +</dl> +{{/if}} + {{if $profile.music}} <dl id="aprofile-music" class="aprofile"> diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 183389b9b..196b3ac6d 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -108,8 +108,10 @@ <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label> {{$marital}} </div> +<div class="clear"></div> <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> <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}}" /> diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index b771a1ea2..856d689f1 100755 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -2,7 +2,10 @@ <p id="profile-listing-desc" class="button" > <a href="profile_photo" >{{$chg_photo}}</a> </p> -<div id="profile-listing-new-link-wrapper" class="button" > +<p id="profile-stuff-link" class="button"> +<a href="thing" title="{{$stuff_desc}}">{{$addstuff}}</a> +</p> +<p id="profile-listing-new-link-wrapper" class="button" > <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 aaee02ab5..7a857fd67 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -16,7 +16,7 @@ </div> {{/if}} - <div class="fn label">{{$profile.name}}</div> + <div class="fn label">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index b7654dc2d..3330a338f 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -1,7 +1,7 @@ <h3>{{$header}}</h3> <div id="prvmail-wrapper" > -<form id="prvmail-form" action="message" method="post" > +<form id="prvmail-form" action="mail" method="post" > {{$parent}} diff --git a/view/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl index 3993dec64..a9106343f 100755 --- a/view/tpl/pwdreset.tpl +++ b/view/tpl/pwdreset.tpl @@ -6,9 +6,7 @@ <p> {{$lbl3}} </p> -<p> -{{$newpass}} -</p> +<p>{{$newpass}}</p> <p> {{$lbl4}} {{$lbl5}} </p> diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 48c1ba525..916a946d3 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -2,8 +2,14 @@ <form action="register" method="post" id="register-form"> -{{if $registertext}} -<div id="register-desc" class="descriptive-paragraph">{{$registertext}}</div> + + +{{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}} diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index bdff72ba1..d0f9e2b0e 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -5,7 +5,7 @@ <ul id="saved-search-ul"> {{foreach $saved as $search}} <li id="search-term-{{$search.id}}" class="saved-search-li clear"> - <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a> + <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer" ></i></a> <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a> </li> {{/foreach}} diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 3018fc747..c5acfa4a4 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -29,13 +29,7 @@ <div class="wall-item-content" id="wall-item-content-{{$item.id}}" > <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div> <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}} - <div class="body-tag"> - {{foreach $item.tags as $tag}} - <span class='tag'>{{$tag}}</span> - {{/foreach}} - </div> - </div> + <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div> </div> <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}"> <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" > diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 7b6add231..b1a4f956d 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -22,6 +22,9 @@ <h3 class="settings-heading">{{$h_prv}}</h3> +{{include file="field_checkbox.tpl" field=$hide_presence}} + + <div id="settings-privacy-macros">{{$lbl_pmacro}}</div> <ul> <li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li> diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl new file mode 100644 index 000000000..2a8c06076 --- /dev/null +++ b/view/tpl/show_thing.tpl @@ -0,0 +1,16 @@ +<h2>{{$header}}</h2> +{{if $thing}} +<div class="thing-show"> +{{if $thing.imgurl}}<img src="{{$thing.imgurl}}" width="175" height="175" alt="{{$thing.term}}" />{{/if}} +<a href="{{$thing.url}}" >{{$thing.term}}</a> +</div> +{{if $canedit}} +<div class="thing-edit-links"> +<a href="thing/edit/{{$thing.term_hash}}" title="{{$edit}}"><i class="icon-pencil thing-edit-icon"></i></a> +<a href="thing/drop/{{$thing.term_hash}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></a> +</div> +<div class="thing-edit-links-end"></div> +{{/if}} + +{{/if}} + diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index f6647110c..4baa1969b 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -2,11 +2,13 @@ <p></p> <p>{{$description}}</p> {{if $version}} -<p>{{$version}}</p> +<p>{{$version}}{{if $commit}}+{{$commit}}{{/if}}</p> {{/if}} <p>{{$web_location}}</p> <p>{{$visit}}</p> <p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p> +<p>{{$adminlabel}}</p> +<p>{{$admininfo}}</p> <p>{{$contact}}</p> <p>{{$plugins_text}}</p> {{if $plugins_list}} diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl index 6e9cee32b..34023e03f 100644 --- a/view/tpl/sources_edit.tpl +++ b/view/tpl/sources_edit.tpl @@ -4,7 +4,7 @@ <form action="sources" method="post"> <input type="hidden" name="source" value="{{$id}}" /> -<input type="hidden" id="id_xchan" name="xchan" value="{{$xchan}}" /> +<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" /> {{include file="field_input.tpl" field=$name}} {{include file="field_textarea.tpl" field=$words}} diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl index 267245ae4..3c6a4be30 100644 --- a/view/tpl/sources_new.tpl +++ b/view/tpl/sources_new.tpl @@ -3,7 +3,7 @@ <div class="descriptive-text">{{$desc}}</div> <form action="sources" method="post"> -<input type="hidden" id="id_xchan" name="xchan" value="{{$xchan}}" /> +<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" /> {{include file="field_input.tpl" field=$name}} {{include file="field_textarea.tpl" field=$words}} diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl new file mode 100644 index 000000000..8379c15ae --- /dev/null +++ b/view/tpl/thing_edit.tpl @@ -0,0 +1,29 @@ +<h2>{{$thing_hdr}}</h2> +<form action="thing" method="post" > +<input type="hidden" name="term_hash" value="{{$thing_hash}}" /> + +{{if $multiprof }} +<div class="thing-profile-label">{{$profile_lbl}}</div> + +<div class="thing-profile">{{$profile_select}}</div> +{{/if}} + +<div class="thing-verb-label">{{$verb_lbl}}</div> + +<div class="thing-verb">{{$verb_select}}</div> + + +<label class="thing-label" for="thing-term">{{$thing_lbl}}</label> +<input type="text" class="thing-input" id="thing-term" name="term" value="{{$thething}}" /> +<div class="thing-field-end"></div> +<label class="thing-label" for="thing-url">{{$url_lbl}}</label> +<input type="text" class="thing-input" id="thing-url" name="url" value="{{$theurl}}" /> +<div class="thing-field-end"></div> +<label class="thing-label" for="thing-img">{{$img_lbl}}</label> +<input type="text" class="thing-input" id="thing-img" name="img" value="{{$imgurl}}" /> +<div class="thing-field-end"></div> + +<div class="thing-end"></div> + +<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> +</form> diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 437e93348..c19836a28 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,5 +1,3 @@ -{{include file="prettyphoto.tpl"}} - {{if $pages}} <div id="pagelist-content-wrapper" class="generic-content-wrapper"> @@ -8,7 +6,7 @@ <div class="page-list-item"> {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> {{/if}} {{if $view}}<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon"></i></a> {{/if}} - {{if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" rel="xprettyPhoto[iframesx]" title="{{$preview}}"><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}} + {{if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}} {{$item.title}} </div> {{/foreach}} |