diff options
Diffstat (limited to 'view/tpl')
59 files changed, 794 insertions, 293 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 30abcc6b3..274d0d5de 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> @@ -26,28 +30,40 @@ {{/if}} +<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}}" /> + + +{{if $is_pending}} +<div class="abook-pending-contact"> +{{include file="field_checkbox.tpl" field=$unapproved}} +</div> +{{/if}} + +{{if $multiprofs }} +<div> +<h3>{{$lbl_vis1}}</h3> +<div>{{$lbl_vis2}}</div> + +{{$profile_select}} +</div> +{{/if}} <h3>{{$permlbl}}</h3> <div id="perm-desc" class="descriptive-text">{{$permnote}}</div> -<form id="abook-edit-form" action="connections/{{$contact_id}}" method="post" > -<input type="hidden" name="contact_id" value="{{$contact_id}}"> -<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> -{{if $noperms}} +{{* {{if $noperms}} <div id="noperm-msg" class="warning-text">{{$noperms}}</div> <div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div> {{/if}} +*}} -{{if $is_pending}} -<div class="abook-pending-contact"> -{{include file="field_checkbox.tpl" field=$unapproved}} -</div> -{{/if}} <br /> -<b>{{$quick}}</b> +<h3>{{$quick}}</h3> <ul> {{if $self}} <li><span class="fakelink" onclick="connectForum(); // $('#abook-edit-form').submit();">{{$forum}}</span></li> @@ -58,6 +74,9 @@ <li><span class="fakelink" onclick="connectFollowOnly(); // $('#abook-edit-form').submit();">{{$follow}}</span></li> </ul> +<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> + + <div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div> <div id="abook-advanced-panel" style="display: block;"> @@ -72,14 +91,6 @@ </div> -{{if $multiprofs }} -<div> -<h3>{{$lbl_vis1}}</h3> -<div>{{$lbl_vis2}}</div> - -{{$profile_select}} -</div> -{{/if}} <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl index a9f250652..06a8cdf6a 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,14 @@ {{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='hidden' name='url' value='{{$hub.hubloc_host}}'> + <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/channel.tpl b/view/tpl/channel.tpl index d6462d1e4..1ed2fbd2c 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,9 +1,9 @@ <div class="channel-selection"> {{if $channel.default_links}} {{if $channel.default}} -<div class="channel-selection-default default">{{$msg_default}}</div> +<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">{{$msg_make_default}}</a></div> +<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> diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index af6b36b1d..2c31cb498 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -6,6 +6,7 @@ <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"> @@ -16,10 +17,10 @@ <div id="selected-channel"> <div id="channels-selected">{{$msg_selected}}</div> {{include file="channel.tpl" channel=$selected}} -<div class="channels-end selected"></div> </div> +<div class="channels-end selected"></div> {{/if}} - +<br /> <div id="channels-desc" class="descriptive-text">{{$desc}}</div> <div id="all-channels"> diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl index 4df327bf9..a43ea1b5d 100755 --- a/view/tpl/chanview.tpl +++ b/view/tpl/chanview.tpl @@ -1,2 +1,2 @@ -<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" >☐</div> +<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" ><i class="icon-fullscreen"></i></div> <iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe> diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl new file mode 100644 index 000000000..acb7e5bef --- /dev/null +++ b/view/tpl/chat.tpl @@ -0,0 +1,117 @@ +<h1>{{$room_name}}</h1> +<div id="chatContainer"> + + <div id="chatTopBar"> + <div id="chatLineHolder"></div> + </div> + + <div id="chatUsers"></div> + + <div class="clear"></div> + <div id="chatBottomBar"> + <div class="tip"></div> + + <form id="chat-form" method="post" action="#"> + <input type="hidden" name="room_id" value="{{$room_id}}" /> + <textarea id="chatText" name="chat_text" rows=3 cols=80></textarea><br /> + <input type="submit" name="submit" value="{{$submit}}" /> + </form> + + <a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}} + + </div> + +</div> + +<script> +var room_id = {{$room_id}}; +var last_chat = 0; +var chat_timer = null; + +$(document).ready(function() { + chat_timer = setTimeout(load_chats,300); + +}); + + +$('#chat-form').submit(function(ev) { + $('body').css('cursor','wait'); + $.post("chatsvc", $('#chat-form').serialize(),function(data) { + if(chat_timer) clearTimeout(chat_timer); + $('#chatText').val(''); + load_chats(); + $('body').css('cursor','auto'); + },'json'); + ev.preventDefault(); +}); + +function load_chats() { + + $.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat + ((stopped) ? '&stopped=1' : ''),function(data) { + if(data.success && (! stopped)) { + update_inroom(data.inroom); + update_chats(data.chats); + } + }); + + chat_timer = setTimeout(load_chats,10000); + +} + +function update_inroom(inroom) { + var html = document.createElement('div'); + var count = inroom.length; + $.each( inroom, function(index, item) { + var newNode = document.createElement('div'); + $(newNode).html('<img style="height: 32px; width: 32px;" src="' + item.img + '" alt="' + item.name + '" /> ' + item.status + '<br />' + item.name + '<br/>'); + html.appendChild(newNode); + }); + $('#chatUsers').html(html); +} + +function update_chats(chats) { + + var count = chats.length; + $.each( chats, function(index, item) { + last_chat = item.id; + var newNode = document.createElement('div'); + newNode.setAttribute('class', 'chat-item'); + $(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span><br /><span class="chat-item-text">' + item.text + '</span></div><div class="chat-item-end"></div>'); + $('#chatLineHolder').append(newNode); + $(".autotime").timeago(); + + }); + var elem = document.getElementById('chatTopBar'); + elem.scrollTop = elem.scrollHeight; + +} + +</script> +<script> +function isMobile() { +if( navigator.userAgent.match(/Android/i) + || navigator.userAgent.match(/webOS/i) + || navigator.userAgent.match(/iPhone/i) + || navigator.userAgent.match(/iPad/i) + || navigator.userAgent.match(/iPod/i) + || navigator.userAgent.match(/BlackBerry/i) + || navigator.userAgent.match(/Windows Phone/i) + ){ + return true; + } + else { + return false; + } +} +$(function(){ + + $('#chatText').keypress(function(e){ + if (e.keyCode == 13 && e.shiftKey||isMobile()) { + } + else if (e.keyCode == 13) { + e.preventDefault(); + $(this).parent('form').trigger('submit'); + } + }); +}); +</script> diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl new file mode 100644 index 000000000..86eadb132 --- /dev/null +++ b/view/tpl/chatroom_new.tpl @@ -0,0 +1,12 @@ +<h1>{{$header}}</h1> + +<form action="chat" method="post" > +{{include file="field_input.tpl" field=$name}} +<br /> +<br /> +{{$acl}} +<div class="clear"></div> +<input type="submit" name="submit" value="{{$submit}}" /> +</form> + + diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl new file mode 100644 index 000000000..c26ba0c33 --- /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 align="left"><a href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}">{{$item.cr_name}}</a></td><td align="right">{{$item.cr_inroom}}</td></tr> +{{/foreach}} +</table> +{{/if}} +</div> + diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl new file mode 100644 index 000000000..c3dae6627 --- /dev/null +++ b/view/tpl/chatrooms.tpl @@ -0,0 +1,10 @@ +<h2>{{$header}}</h2> + +{{if $is_owner}} +<p> +<a href="{{$baseurl}}/chat/{{$nickname}}/new">{{$newroom}}</a> +</p> +{{/if}} + +{{$rooms}} + diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index fb36f5dca..869692bfa 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> @@ -85,6 +85,9 @@ {{/if}} {{if $item.filer}} <i id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon-folder-open item-tool" title="{{$item.filer}}"></i> + {{/if}} + {{if $item.bookmark}} + <i id="bookmarker-{{$item.id}}" onclick="itemBookmark({{$item.id}}); return false;" class="bookmark-item icon-bookmark item-tool" title="{{$item.bookmark}}"></i> {{/if}} <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> 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/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl new file mode 100644 index 000000000..f0090cf98 --- /dev/null +++ b/view/tpl/field_select_disabled.tpl @@ -0,0 +1,7 @@ + <div class='field select'> + <label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label> + <select disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'> + {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} + </select> + <span class='field_help'>{{$field.3}}</span> + </div> diff --git a/view/tpl/filestorage.tpl b/view/tpl/filestorage.tpl index 995b52cc8..1995b95e1 100644 --- a/view/tpl/filestorage.tpl +++ b/view/tpl/filestorage.tpl @@ -2,15 +2,16 @@ <div class="generic-content-wrapper"> {{if $limit}}{{$limitlabel}}{{$limit}}{{/if}} {{if $used}} {{$usedlabel}}{{$used}}{{/if}} - + <br /> + <br /> {{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" title="{{$edit}}"><i class="icon-pencil"></i></a> + <a href="{{$baseurl}}/{{$item.id}}/delete" title="{{$delete}}"><i class="icon-remove drop-icons"></i></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/head.tpl b/view/tpl/head.tpl index eb4c6c2ad..c676cd773 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,5 +1,6 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <base href="{{$baseurl}}/" /> +<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="generator" content="{{$generator}}" /> <!--[if IE]> diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl index 25c127a15..7dc8dfd59 100644 --- a/view/tpl/item_attach.tpl +++ b/view/tpl/item_attach.tpl @@ -1,6 +1,6 @@ +<div class="clear"></div> <div class="body-attach"> {{foreach $attaches as $a}} <a href="{{$a.url}}" title="{{$a.title}}" class="attachlink" ><i class="icon-paper-clip attach-icons attach-clip"></i><i class="{{$a.icon}} attach-icons"></i></a> {{/foreach}} -<div class="clear"></div> </div> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 1ceca04c6..80421d552 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}}'; @@ -185,7 +185,6 @@ function enableOnUser(){ } } - function jotGetLocation() { reply = prompt("{{$whereareu}}", $('#jot-location').val()); if(reply && reply.length) { @@ -194,10 +193,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) { @@ -288,6 +294,13 @@ function enableOnUser(){ } + function itemBookmark(id) { + $.get('{{$baseurl}}/bookmarks?f=&item=' + id); + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,1000); + } + + function jotClearLocation() { $('#jot-coord').val(''); $('#profile-nolocation-wrapper').hide(); @@ -299,3 +312,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/js_strings.tpl b/view/tpl/js_strings.tpl index 144ecb17c..fe5228ee9 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -2,33 +2,35 @@ var aStr = { - 'delitem' : '{{$delitem}}', - 'comment' : '{{$comment}}', - 'showmore' : '{{$showmore}}', - 'showfewer' : '{{$showfewer}}', - 'pwshort' : '{{$pwshort}}', - 'pwnomatch' : '{{$pwnomatch}}', - 'everybody' : '{{$everybody}}', - 'passphrase' : '{{$passphrase}}', - 'passhint' : '{{$passhint}}', + 'delitem' : "{{$delitem}}", + 'comment' : "{{$comment}}", + 'showmore' : "{{$showmore}}", + 'showfewer' : "{{$showfewer}}", + 'divgrowmore' : "{{$divgrowmore}}", + 'divgrowless' : "{{$divgrowless}}", + 'pwshort' : "{{$pwshort}}", + 'pwnomatch' : "{{$pwnomatch}}", + 'everybody' : "{{$everybody}}", + 'passphrase' : "{{$passphrase}}", + 'passhint' : "{{$passhint}}", - 't01' : {{$t01}}, - 't02' : {{$t02}}, - 't03' : '{{$t03}}', - 't04' : '{{$t04}}', - 't05' : '{{$t05}}', - 't06' : '{{$t06}}', - 't07' : '{{$t07}}', - 't08' : '{{$t08}}', - 't09' : '{{$t09}}', - 't10' : '{{$t10}}', - 't11' : '{{$t11}}', - 't12' : '{{$t12}}', - 't13' : '{{$t13}}', - 't14' : '{{$t14}}', - 't15' : '{{$t15}}', - 't16' : '{{$t16}}', - 't17' : '{{$t17}}', + 't01' : "{{$t01}}", + 't02' : "{{$t02}}", + 't03' : "{{$t03}}", + 't04' : "{{$t04}}", + 't05' : "{{$t05}}", + 't06' : "{{$t06}}", + 't07' : "{{$t07}}", + 't08' : "{{$t08}}", + 't09' : "{{$t09}}", + 't10' : "{{$t10}}", + 't11' : "{{$t11}}", + 't12' : "{{$t12}}", + 't13' : "{{$t13}}", + 't14' : "{{$t14}}", + 't15' : "{{$t15}}", + 't16' : "{{$t16}}", + 't17' : "{{$t17}}", }; </script> 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/menuedit.tpl b/view/tpl/menuedit.tpl index ea9e775e2..1ccfb3d68 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -10,10 +10,14 @@ {{if $menu_id}} <input type="hidden" name="menu_id" value="{{$menu_id}}" /> {{/if}} +{{if $menu_system}} +<input type="hidden" name="menu_system" value="{{$menu_system}}" /> +{{/if}} + {{include file="field_input.tpl" field=$menu_name}} {{include file="field_input.tpl" field=$menu_desc}} - +{{include file="field_checkbox.tpl" field=$menu_bookmark}} <div class="menuedit-submit-wrapper" > <input type="submit" name="submit" class="menuedit-submit" value="{{$submit}}" /> </div> diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 057665d49..421b610f1 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -5,11 +5,12 @@ <a href="mitem/{{$menu_id}}/new" title="{{$hintnew}}">{{$hintnew}}</a> <br /> +<br /> {{if $mlist }} -<ul id="mitemlist"> +<ul id="mitemlist" class="menu-item-list"> {{foreach $mlist as $m }} -<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}">{{$edit}}</a> | <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}>{{$drop}}</a> <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li> +<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil mitem-edit"></i></a><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}><i class="icon-remove"></i></a> <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li> {{/foreach}} </ul> {{/if}} 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/nav.tpl b/view/tpl/nav.tpl index f27afed09..20600ccd7 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,151 +1,184 @@ <header> - <div id="site-location">{{$sitelocation}}</div> - <div id="banner">{{$banner}}</div> +<!-- <div id="site-location">{{$sitelocation}}</div> --> + <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> </header> -<nav> - <ul> - {{if $userinfo}} - <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="nav-dropdown-indicator">▼</span></a> - {{if $localuser}} - <ul id="nav-user-menu" class="menu-popup"> - {{foreach $nav.usermenu as $usermenu}} - <li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li> - {{/foreach}} - {{if $nav.profiles}}<li><a class="{{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a></li>{{/if}} - {{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}} - {{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}} - {{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}} - - {{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}} - - {{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}} - - </ul> - {{/if}} - </li> - {{/if}} - - - {{if $nav.lock}} - <li id="nav-rmagic-link" class="nav-menu-icon" > - <i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}} fakelink nav-icon" onclick="window.location.href='{{$nav.lock.0}}'; return false;" title="{{$nav.lock.3}}" ></i> - </li> - {{/if}} - - - {{if $nav.network}} - <li id="nav-network-link" class="nav-menu {{$sel.network}}"> - <a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th nav-icon"></i></a> - <span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span> - <ul id="nav-network-menu" class="menu-popup notify-menus" rel="network"> - <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> - <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - - {{if $nav.home}} - <li id="nav-home-link" class="nav-menu {{$sel.home}}"> - <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home nav-icon"></i></a> - <span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span> - <ul id="nav-home-menu" class="menu-popup notify-menus" rel="home"> - <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> - <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - - {{if $nav.register}}<li id="nav-register-link" class="nav-menu {{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} - - - {{if $nav.messages}} - <li id="nav-mail-link" class="nav-menu {{$sel.messages}}"> - <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope nav-icon"></i></a> - <span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span> - <ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages"> - <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> - <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - - {{if $nav.all_events}} - <li id="nav-all_events-link" class="nav-menu {{$sel.all_events}}"> - <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar nav-icon"></i></a> - <span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span> - <ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events"> - <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> - <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - - {{if $nav.intros}} - <li id="nav-intros-link" class="nav-menu {{$sel.intros}}"> - <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user nav-icon"></i></a> - <span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span> - <ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros"> - <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} +<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> + <div class="container-fluid"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + {{if $userinfo}} + <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret"></span> + {{if $localuser}} + <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> + {{foreach $nav.usermenu as $usermenu}} + <li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem">{{$usermenu.1}}</a></li> + {{/foreach}} + {{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem">{{$nav.profiles.1}}</a></li>{{/if}} + {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem">{{$nav.manage.1}}</a></li>{{/if}} + {{if $nav.contacts}}<li role="presentation"><a href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" role="menuitem">{{$nav.contacts.1}}</a></li>{{/if}} + {{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem">{{$nav.settings.1}}</a></li>{{/if}} + {{if $nav.admin}}<li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem">{{$nav.admin.1}}</a></li>{{/if}} + {{if $nav.logout}} + <li role="presentation" class="divider"></li> + <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem">{{$nav.logout.1}}</a></li> + {{/if}} + </ul> + {{/if}} + {{/if}} + </div> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav navbar-left"> + {{if $nav.lock}} + <li> + <a class="fakelink" title="{{$nav.lock.3}}" onclick="window.location.href='{{$nav.lock.0}}'; return false;"><i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}}"></i></a> + </li> + {{/if}} + + {{if $nav.network}} + <li class="{{$sel.network}} hidden-xs"> + <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a> + <span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span> + <ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network"> + {{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}} + <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.network}} visible-xs"> + <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a> + <span class="net-update badge" rel="#nav-network-menu"></span> + </li> + {{/if}} + + {{if $nav.home}} + <li class="{{$sel.home}} hidden-xs"> + <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a> + <span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span> + <ul id="nav-home-menu" class="dropdown-menu" rel="home"> + {{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}} + <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.home}} visible-xs"> + <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a> + <span class="home-update badge"rel="#nav-home-menu"></span> + </li> + {{/if}} + + {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} + + {{if $nav.messages}} + <li class="{{$sel.messages}} hidden-xs"> + <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a> + <span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span> + <ul id="nav-messages-menu" class="dropdown-menu" rel="messages"> + <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> + <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.messages}} visible-xs"> + <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a> + <span class="mail-update badge" rel="#nav-messages-menu"></span> + </li> + {{/if}} + + {{if $nav.all_events}} + <li class="{{$sel.all_events}} hidden-xs"> + <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a> + <span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span> + <ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> + <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> + <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.all_events}} visible-xs"> + <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a> + <span class="all_events-update badge" rel="#nav-all_events-menu"></span> + </li> + {{/if}} + + {{if $nav.intros}} + <li class="{{$sel.intros}} hidden-xs"> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a> + <span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span> + <ul id="nav-intros-menu" class="dropdown-menu" rel="intros"> + <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.intros}} visible-xs"> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a> + <span class="intro-update badge" rel="#nav-intros-menu"></span> + </li> + {{/if}} - {{if $nav.notifications}} - <li id="nav-notify-linkmenu" class="nav-menu fakelink {{$sel.notifications}}"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation nav-icon"></i></a> - <span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span> - <ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify"> - <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> - <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> + {{if $nav.notifications}} + <li class="{{$sel.notifications}} hidden-xs"> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a> + <span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span> + <ul id="nav-notify-menu" class="dropdown-menu" rel="notify"> + <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> + <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.notifications}} visible-xs"> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a> + <span class="notify-update badge" rel="#nav-notify-menu"></span> + </li> + {{/if}} </ul> - </li> - {{/if}} - - {{if $nav.login}}<li id="nav-login-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} - {{if $nav.alogout}}<li id=nav-alogout-link" class="nav-menu {{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} - - {{if $nav.directory}} - <li id="nav-directory-link" class="nav-menu {{$sel.directory}}"> - <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap nav-icon"></i></a> - </li> - {{/if}} - - {{if $nav.help}} - <li id="nav-help-link" class="nav-menu {{$sel.help}}"> - <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question nav-icon"></i></a> - </li> - {{/if}} - - {{if $nav.apps}} - <li id="nav-apps-link" class="nav-menu {{$sel.apps}}"> - <a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs nav-icon"></i></a> - <ul id="nav-apps-menu" class="menu-popup"> - {{foreach $apps as $ap}} - <li>{{$ap}}</li> - {{/foreach}} + <ul class="nav navbar-nav navbar-right"> + <li class="hidden-xs"> + <form method="get" action="search" role="search"> + <div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder="" name="search" title="{{$nav.search.3}}" onclick="this.submit();" /> + </form> + </li> + <li class="visible-xs"> + <a href="/search" title="Search"><i class="icon-search"></i></a> + </li> + + {{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} + + {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} + + {{if $nav.directory}} + <li class="{{$sel.directory}}"> + <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a> + </li> + {{/if}} + + {{if $nav.apps}} + <li class="{{$sel.apps}} hidden-xs"> + <a class="{{$nav.apps.2}} dropdown-toggle" data-toggle="dropdown" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> + <ul class="dropdown-menu"> + {{foreach $apps as $ap}} + <li>{{$ap}}</li> + {{/foreach}} + </ul> + </li> + {{/if}} + + {{if $nav.help}} + <li class="{{$sel.help}}"> + <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a> + </li> + {{/if}} </ul> - </li> - {{/if}} - - <li id="nav-searchbar"> - <form method="get" action="search"> - <input class="icon-search" id="nav-search-text" type="text" value="" placeholder="" name="search" title="{{$nav.search.3}}" onclick="this.submit();" /> - </form> - </li> - <div id="nav-search-spinner"></div> - - </ul> + </div> + </div> </nav> <ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> + <li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> </ul> {{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}} 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..f5e5bb7b5 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,6 +1,4 @@ -{{include file="prettyphoto.tpl"}} - -<div id="live-display"></div> +<div id="live-photos"></div> <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <div id="photo-edit-link-wrap"> @@ -11,22 +9,24 @@ </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> {{if $tags}} -<div id="in-this-photo-text">{{$tags.0}}</div> -<div id="in-this-photo">{{$tags.1}}</div> +<div id="in-this-photo-text">{{$tag_hdr}}</div> +{{foreach $tags as $t}} +<div id="in-this-photo">{{$t.0}}</div> +{{if $edit}}<div id="tag-remove"><a href="{{$t.1}}">{{$t.2}}</a></div>{{/if}} +{{/foreach}} {{/if}} -{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}} {{if $edit}} <div id="photo-edit-edit-wrapper" class="fakelink" onclick="openClose('photo-edit-edit');">{{$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" > - <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}}" /> @@ -52,19 +52,20 @@ </div> <div id="photo-edit-rotate-end"></div> - <div id="photo-edit-perms" class="photo-edit-perms" > - <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$edit.permissions}}"/> - <span id="jot-perms-icon" class="icon {{$edit.lockstate}}" ></span>{{$edit.permissions}} - </a> - <div id="photo-edit-perms-menu-end"></div> - - <div style="display: none;"> - <div id="photo-edit-perms-select" > - {{$edit.aclselect}} + <div id="settings-default-perms" class="settings-default-perms" > + <span id="jot-perms-icon" class="icon {{$edit.lockstate}}" ></span> + <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$edit.permissions}}</a> + <div id="settings-default-perms-menu-end"></div> + <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" > + <div style="display: none;"> + <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> + {{$edit.aclselect}} + </div> </div> </div> - </div> - <div id="photo-edit-perms-end"></div> + </div> + <br/> + <div id="settings-default-perms-end"></div> <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}" /> <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete()"; /> 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..10a928e1c 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -2,21 +2,20 @@ {{if $profile.edit}} <div class="action"> - <a class="profile-edit-side-link" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil vcard-profile-edit-icon" title="{{$profile.edit.1}}" ></i></a> - <ul id="profiles-menu" class="menu-popup"> + <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil vcard-profile-edit-icon" title="{{$profile.edit.1}}" ></i></a> + <ul id="profiles-menu" class="menu-popup dropdown-menu"> {{foreach $profile.menu.entries as $e}} <li> <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a> </li> {{/foreach}} <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li> - <li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li> - + {{if $profile.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>{{/if}} </ul> </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/rbmark.tpl b/view/tpl/rbmark.tpl new file mode 100644 index 000000000..bead1de2f --- /dev/null +++ b/view/tpl/rbmark.tpl @@ -0,0 +1,16 @@ +<h3>{{$header}}</h3> + + +<form action="rbmark" method="post" > + +<input type="hidden" name="private" value="{{$private}}" /> +<input type="hidden" name="ischat" value="{{$ischat}}" /> + +{{include file="field_input.tpl" field=$url}} +{{include file="field_input.tpl" field=$title}} +{{include file="field_select.tpl" field=$menus}} +{{include file="field_input.tpl" field=$menu_name}} + +<input type="submit" name="submit" value="{{$submit}}" /> + +</form> 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..49dff4822 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -16,41 +16,61 @@ {{include file="field_checkbox.tpl" field=$adult}} <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> </div> <h3 class="settings-heading">{{$h_prv}}</h3> -<div id="settings-privacy-macros">{{$lbl_pmacro}}</div> +{{include file="field_checkbox.tpl" field=$hide_presence}} + + +<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3> <ul> -<li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li> <li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li> <li><a href="#" onclick="channel_privacy_macro(1); return false" id="settings_pmacro1">{{$pmacro1}}</a></li> +<li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li> <li><a href="#" onclick="channel_privacy_macro(0); return false" id="settings_pmacro0">{{$pmacro0}}</a></li> </ul> +<button type="button" class="btn btn-xs btn-warning" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button> + + + +<div class="collapse well" id="settings-permissions-wrapper"> +{{if !$expert}} + <div class="alert alert-info">{{$hint}}</div> +{{/if}} -<div id="settings-permissions-wrapper"> {{foreach $permiss_arr as $permit}} -{{include file="field_select.tpl" field=$permit}} + {{if $expert}} + {{include file="field_select.tpl" field=$permit}} + {{else}} + {{include file="field_select_disabled.tpl" field=$permit}} + {{/if}} {{/foreach}} -</div> +{{if $expert}} + <div class="settings-submit-wrapper" > + <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> + </div> +{{/if}} -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> </div> +<div class="settings-common-perms"> {{$profile_in_dir}} {{$suggestme}} +{{include file="field_yesno.tpl" field=$blocktags}} + {{include file="field_input.tpl" field=$maxreq}} {{include file="field_input.tpl" field=$cntunkmail}} +</div> <div id="settings-default-perms" class="settings-default-perms" > <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a> @@ -73,7 +93,7 @@ <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> </div> @@ -104,7 +124,26 @@ </div> <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> +</div> + + +{{if $menus}} +<h3 class="settings-heading">{{$lbl_misc}}</h3> + +<div id="settings-menu-desc">{{$menu_desc}}</div> +<div class="settings-channel-menu-div"> +<select name="channel_menu" class="settings-channel-menu-sel"> +{{foreach $menus as $menu }} +<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> +{{/foreach}} +</select> +</div> +<div class="settings-submit-wrapper" > +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> </div> +<div id="settings-channel-menu-end"></div> +{{/if}} + </div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index ddd3ca56d..a8fb002fb 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -9,6 +9,7 @@ {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} {{include file="field_checkbox.tpl" field=$nosmile}} +{{include file="field_checkbox.tpl" field=$chanview_full}} <div class="settings-submit-wrapper" > 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..d956a7228 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -2,13 +2,16 @@ <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}} <div style="margin-left: 25px; margin-right: 25px;">{{$plugins_list}}</div> {{/if}} +<p>{{$donate}}</p> 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..b170f152c --- /dev/null +++ b/view/tpl/thing_edit.tpl @@ -0,0 +1,33 @@ +<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> +<div class="thing-field-end"></div> +{{/if}} + +<div class="thing-verb-label">{{$verb_lbl}}</div> + +<div class="thing-verb">{{$verb_select}}</div> +<div class="thing-field-end"></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> + +{{include file="field_checkbox.tpl" field=$activity}} + +<div class="thing-end"></div> + +<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> +</form> diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl index 06cbfe917..e93a1aa65 100644 --- a/view/tpl/thing_input.tpl +++ b/view/tpl/thing_input.tpl @@ -5,11 +5,14 @@ <div class="thing-profile-label">{{$profile_lbl}}</div> <div class="thing-profile">{{$profile_select}}</div> +<div class="thing-field-end"></div> {{/if}} + <div class="thing-verb-label">{{$verb_lbl}}</div> <div class="thing-verb">{{$verb_select}}</div> +<div class="thing-field-end"></div> <label class="thing-label" for="thing-term">{{$thing_lbl}}</label> @@ -22,6 +25,8 @@ <input type="text" class="thing-input" id="thing-img" name="img" /> <div class="thing-field-end"></div> +{{include file="field_checkbox.tpl" field=$activity}} + <div class="thing-end"></div> <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index 3904f4696..80e160fdf 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -2,6 +2,9 @@ {{if $menu.menu_desc}} <h3 class="pmenu-title">{{$menu.menu_desc}}</h3> {{/if}} +{{if $edit}} +<a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a> +{{/if}} {{if $items }} <ul class="pmenu-body"> {{foreach $items as $mitem }} 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}} |