diff options
| author | mrjive <mrjive@mrjive.it> | 2015-01-06 15:13:03 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-01-06 15:13:03 +0100 |
| commit | b80c218606994032e76805900cb9b340ea132358 (patch) | |
| tree | bf625cf4c59bf521e639018399bf1770d116a6a0 /view/tpl | |
| parent | aa6d61d3b19cb13c30bf5a1579adefedf0cc9515 (diff) | |
| parent | 3185bfe3ca131d471b8fcdc0c94abf1a114486c7 (diff) | |
| download | volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.tar.gz volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.tar.bz2 volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.zip | |
Merge pull request #1 from friendica/master
test pull request
Diffstat (limited to 'view/tpl')
157 files changed, 1949 insertions, 1242 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 9b12b5f29..bb20312fa 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h2>{{$header}}</h2> <h3>{{$addr}}</h3> @@ -7,14 +7,27 @@ <div id="connection-flag-tabs"> {{$tabs}} </div> -{{/if}} - -{{if $self}} -<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div> +<div id="connection-edit-buttons"> +{{foreach $buttons as $b }} +<button class="btn btn-sm btn-default" title="{{$b.title}}" onclick="window.location.href='{{$b.url}}'; return false;">{{$b.label}}</button> +{{/foreach}} {{/if}} <div id="contact-edit-wrapper"> +<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" > + +<div class="abook-permschange" style="display: none;"> +<div class="abook-perms-steps"><i class="icon-check"></i><br />{{$perms_step1}}</div> +<div class="abook-perms-steps"><i class="icon-check-empty"></i><br />{{$perms_step2}}</div> +<div class="abook-perms-steps"><i class="icon-check-empty"></i><br />{{$perms_step3}}</div> +</div> + +<div class="abook-permssave" style="display: none;"> +<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> +</div> + + {{if $last_update}} {{$lastupdtext}} {{$last_update}} @@ -30,11 +43,19 @@ {{/if}} -<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" > + +{{if $self}} +<div class="abook-autotext"> +<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div> +{{include file="field_checkbox.tpl" field=$autoperms}} +</div> +{{/if}} + + <input type="hidden" name="contact_id" value="{{$contact_id}}"> <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> -<div class="abook-permschange" style="display: none;"></div> + {{if $is_pending}} <div class="abook-pending-contact"> @@ -53,36 +74,6 @@ <h3>{{$permlbl}}</h3> <div id="perm-desc" class="descriptive-text">{{$permnote}}</div> - - -{{* {{if $noperms}} -<div id="noperm-msg" class="warning-text">{{$noperms}}</div> -<div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div> -{{/if}} -*}} - - - -<br /> -<h3>{{$quick}}</h3> -<ul> -{{if $self}} -<li><span class="fakelink" onclick="connectClear();">{{$clear}}</span></li> -<li><span class="fakelink" onclick="connectForum();">{{$forum}}</span></li> -<li><span class="fakelink" onclick="connectSoapBox();">{{$soapbox}}</span></li> -{{/if}} -<li><span class="fakelink" onclick="connectFullShare();">{{$full}}</span></li> -<li><span class="fakelink" onclick="connectCautiousShare();">{{$cautious}}</span></li> -<li><span class="fakelink" onclick="connectFollowOnly();">{{$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;"> - <table> <tr><td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td><td></td></tr> <tr><td colspan="5"><hr /></td></tr> diff --git a/view/tpl/achievements.tpl b/view/tpl/achievements.tpl new file mode 100644 index 000000000..2b80b9e80 --- /dev/null +++ b/view/tpl/achievements.tpl @@ -0,0 +1,9 @@ +<div class="generic-content-wrapper"> +<p>{{$newmembertext}}</p> + +{{if $profilebadge}}<div id="profile-badge" class="badges"><img src="images/smiley-thumbsup.gif"></div>{{/if}} +{{if $contactbadge}}<div id="contact-badge" class="badges"><img src="images/smiley-thumbsup.gif"></div>{{/if}} +{{if $keywordsbadge}}<div id="keywords-badge" class="badges"><img src="images/smiley-thumbsup.gif"></div>{{/if}} +{{if $channelsbadge}}<div id="channels-badge" class="badges"><img src="images/smiley-thumbsup.gif"></div>{{/if}} + +</div> diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 4babf5669..e8b779622 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -31,14 +31,14 @@ </div><!-- /.modal --> <script> -$(document).ready(function() { - setTimeout( function () { +//$(document).ready(function() { +// setTimeout( function () { if(typeof acl=="undefined"){ acl = new ACL( baseurl+"/acl", [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ] ); } - }, 5000 ); -}); +// }, 5000 ); +//}); </script> diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index cb3827bf2..013b72d50 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -10,35 +10,40 @@ }); }); </script> -<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4> -<ul class='admin linklist'> - <li class='admin link button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li> - <li class='admin link button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li> - <li class='admin link button {{$admin.channels.2}}'><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li> - <li class='admin link button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> - <li class='admin link button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> - <li class='admin link button {{$admin.hubloc.2}}'><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li> - <li class='admin link button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> +<div class="widget"> +<h3>{{$admtxt}}</h3> +<ul class="nav nav-pills nav-stacked"> + <li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li> + <li><a href='{{$admin.users.0}}'>{{$admin.users.1}}<span id='pending-update' title='{{$h_pending}}'></span></a></li> + <li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li> + <li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> + <li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> + <li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> </ul> +</div> {{if $admin.update}} -<ul class='admin linklist'> - <li class='admin link button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li> - <li class='admin link button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li> +<ul class="nav nav-pills nav-stacked"> + <li><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li> + <li><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li> </ul> {{/if}} -{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}} -<ul class='admin linklist'> +{{if $admin.plugins_admin}} +<div class="widget"> +<h3>{{$plugadmtxt}}</h3> +<ul class="nav nav-pills nav-stacked"> {{foreach $admin.plugins_admin as $l}} - <li class='admin link button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li> + <li><a href='{{$l.0}}'>{{$l.1}}</a></li> {{/foreach}} </ul> +</div> +{{/if}} - -<h4>{{$logtxt}}</h4> -<ul class='admin linklist'> - <li class='admin link button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li> +<div class="widget"> +<h3>{{$logtxt}}</h3> +<ul class="nav nav-pills nav-stacked"> + <li><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li> </ul> - +</div> diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index b26e67687..817eb939a 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -10,7 +10,7 @@ return false; } </script> -<div class = "generic-content-wrapper" id='adminpage'> +<div class = "generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/channels" method="post"> diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl index 06a8cdf6a..1bd1f0122 100755 --- a/view/tpl/admin_hubloc.tpl +++ b/view/tpl/admin_hubloc.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper" id='adminpage'> +<div class="generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <table id='server'> diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl index 3d2adc660..6d2d7834c 100755 --- a/view/tpl/admin_logs.tpl +++ b/view/tpl/admin_logs.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper" id='adminpage'> +<div class="generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/logs" method="post"> diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 40821c534..0f76cc4fe 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper" id='adminpage'> +<div class="generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <ul id='pluginslist'> diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index 1c1a59879..bdcc82c08 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -1,4 +1,4 @@ -<div class = "generic-content-wrapper" id='adminpage'> +<div class = "generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <p><i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&t={{$form_security_token}}">{{$action}}</a></p> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index c6c15cec4..caeddeecb 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -1,15 +1,15 @@ <script> $(function(){ - $("#cnftheme").fancybox({ + $("#cnftheme").colorbox({ width: 800, - autoDimensions: false, - onStart: function(){ + onLoad: function(){ var theme = $("#id_theme :selected").val(); $("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme); }, onComplete: function(){ - $("div#fancybox-content form").submit(function(e){ + $(this).colorbox.resize(); + $("#colorbox form").submit(function(e){ var url = $(this).attr('action'); // can't get .serialize() to work... var data={}; @@ -34,7 +34,7 @@ }); }); </script> -<div id="adminpage" class="generic-content-wrapper"> +<div id="adminpage" class="generic-content-wrapper-styled"> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/site" method="post"> @@ -46,8 +46,6 @@ {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} - {{include file="field_select.tpl" field=$theme_accessibility}} - {{include file="field_input.tpl" field=$site_channel}} {{include file="field_checkbox.tpl" field=$no_login_on_homepage}} @@ -65,6 +63,9 @@ <h3>{{$corporate}}</h3> {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$verify_email}} + {{include file="field_checkbox.tpl" field=$diaspora_enabled}} + {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$disable_discover_tab}} diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index 24cdd57cc..7f752a773 100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper" id='adminpage'> +<div class="generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <dl> diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 65fffd17c..5bf64b4df 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -10,7 +10,7 @@ return false; } </script> -<div class = "generic-content-wrapper" id='adminpage'> +<div class = "generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/users" method="post"> diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index 61653c47c..f5495f149 100755 --- a/view/tpl/album_edit.tpl +++ b/view/tpl/album_edit.tpl @@ -1,15 +1,22 @@ -<div id="photo-album-edit-wrapper"> -<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" > - - -<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label> -<input type="text" size="64" name="albumname" value="{{$album}}" > - -<div id="photo-album-edit-name-end"></div> +<div id="photo-album-edit-wrapper" class="section-content-tools-wrapper"> + <form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" > + <div class="form-group"> + <label id="photo-album-edit-name-label" for="photo-album-edit-name">{{$nametext}}</label> + <input type="text" name="albumname" placeholder="{{$name_placeholder}}" value="{{$album}}" class="form-control" list="dl-album-edit" /> + <datalist id="dl-album-edit"> + {{foreach $albums as $al}} + {{if $al.text}} + <option value="{{$al.text}}"> + {{/if}} + {{/foreach}} + </datalist> + </div> + <div class="form-group"> + <button id="photo-album-edit-submit" type="submit" name="submit" class="btn btn-primary btn-sm pull-right" />{{$submit}}</button> + <button id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" class="btn btn-danger btn-sm pull-left" onclick="return confirmDelete();" />{{$dropsubmit}}</button> + </div> + </form> + <div id="photo-album-edit-end" class="clear"></div> +</div> -<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" /> -<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" /> -</form> -</div> -<div id="photo-album-edit-end" ></div> diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 4719f7f96..9f0b1746b 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,6 +1,6 @@ <div class="app-container"> <a href="{{$app.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" /> -<div class="app-name">{{$app.name}}</div> +<div class="app-name" style="text-align:center;">{{$app.name}}</div> </a> {{if $app.type !== 'system'}} {{if $purchase}} diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl index 5cf3f40d6..527d01eae 100644 --- a/view/tpl/app_select.tpl +++ b/view/tpl/app_select.tpl @@ -1,7 +1,7 @@ {{if $authed}} <div class="widget"> <h3>{{$title}}</h3> -<ul> +<ul class="nav nav-pills nav-stacked"> <li><a href="appman">{{$new}}</a></li> <li><a href="apps/edit">{{$edit}}</a></li> </ul> diff --git a/view/tpl/apps.tpl b/view/tpl/apps.tpl deleted file mode 100755 index d8e538cb7..000000000 --- a/view/tpl/apps.tpl +++ /dev/null @@ -1,11 +0,0 @@ -<h3>{{$title}}</h3> - -{{foreach $apps as $ap}} -<div class="app-container"> -<a href="{{$ap.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $ap.hover}}title="{{$ap.hover}}"{{/if}}><img src="{{$ap.photo}}" width="80" height="80" /> -<div class="app-name">{{$ap.name}}</div> -</a> -</div> -{{/foreach}} -<div class="clear"></div> - diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl index 2c8024d47..9e5b5a5be 100755 --- a/view/tpl/atom_feed.tpl +++ b/view/tpl/atom_feed.tpl @@ -15,6 +15,7 @@ <title>{{$feed_title}}</title> <generator uri="http://getzot.com" version="{{$version}}">{{$red}}</generator> <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" /> + <link rel="alternate" type="text/html" href="{{$profile_page}}" /> {{if $hub}} {{$hub}} {{/if}} diff --git a/view/tpl/atom_feed_dfrn.tpl b/view/tpl/atom_feed_dfrn.tpl deleted file mode 100755 index 307001fbe..000000000 --- a/view/tpl/atom_feed_dfrn.tpl +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<feed xmlns="http://www.w3.org/2005/Atom" - xmlns:thr="http://purl.org/syndication/thread/1.0" - xmlns:at="http://purl.org/atompub/tombstones/1.0" - xmlns:media="http://purl.org/syndication/atommedia" - xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" - xmlns:as="http://activitystrea.ms/spec/1.0/" - xmlns:georss="http://www.georss.org/georss" - xmlns:poco="http://portablecontacts.net/spec/1.0" - xmlns:ostatus="http://ostatus.org/schema/1.0" - xmlns:statusnet="http://status.net/schema/api/1/" > - - <id>{{$feed_id}}</id> - <title>{{$feed_title}}</title> - <generator uri="http://friendica.com" version="{{$version}}">Friendica</generator> - <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" /> - {{$hub}} - {{$salmon}} - {{$community}} - - <updated>{{$feed_updated}}</updated> - - <author> - <name dfrn:updated="{{$namdate}}" >{{$name}}</name> - <uri dfrn:updated="{{$uridate}}" >{{$profile_page}}</uri> - <link rel="photo" type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" /> - <link rel="avatar" type="image/jpeg" dfrn:updated="{{$picdate}}" media:width="175" media:height="175" href="{{$photo}}" /> - {{$birthday}} - </author> diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index e91b4c0c6..0147d35ba 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -1,36 +1,42 @@ -<div id="attach-edit-backlink">< <a href="{{$parentpath}}">{{$backlink}}</a></div> - -<h1>{{$header}}</h1> - <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > - -<div id="attach-edit-perms" > -<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> -</button> -{{$aclselect}} {{$file.filename}} -</div> - -<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 class="clear"></div> -<input id="attach-edit-submit" type="submit" name="submit" value="{{$submit}}" /> + <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}}" /> + + <div id="attach-edit-tools-share" class="btn-group form-group"> + {{if !$isadir}} + <a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}"> + <i class="icon-paperclip jot-icons"></i> + </a> + {{/if}} + <button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}"> + <i class="icon-share jot-icons"></i> + </button> + </div> + <div id="attach-edit-tools-perms" class="form-group pull-right{{if $isadir}} btn-group{{/if}}"> + {{if $isadir}} + <div id="attach-edit-perms-recurse" class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-xs" title="{{$recurse}}"> + <input type="checkbox" autocomplete="off" name="recurse" value="1"><i class="icon-level-down jot-icons"></i> + </label> + </div> + {{/if}} + <div id="attach-edit-perms" class="btn-group"> + <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> + </button> + <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit"> + {{$submit}} + </button> + </div> + </div> + + {{$aclselect}} + + <div id="link-code" class="form-group"> + <label for="">{{$cpldesc}}</label> + <input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/> + </div> </form> - diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index adf61f788..4068375cb 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -4,9 +4,9 @@ {{foreach $pages as $key => $items}} {{foreach $items as $item}} <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="block/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon"></i></a> {{/if}} - {{if $preview}}<a href="block/{{$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}} + {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}} + {{if $view}}<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}} + {{*if $preview}}<a href="block/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn-btn-default"></i></a> {{/if*}} {{$item.title}} </div> {{/foreach}} diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 204b5114a..8110b70b1 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -22,6 +22,7 @@ var bParam_order = "{{$order}}"; var bParam_file = "{{$file}}"; var bParam_cats = "{{$cats}}"; + var bParam_tags = "{{$tags}}"; var bParam_dend = "{{$dend}}"; var bParam_dbegin = "{{$dbegin}}"; var bParam_mid = "{{$mid}}"; @@ -46,6 +47,7 @@ if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order; if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file; if(bParam_cats != "") bCmd = bCmd + "&cat=" + bParam_cats; + if(bParam_tags != "") bCmd = bCmd + "&tag=" + bParam_tags; if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend; if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin; if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid; diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl index 2c0b3bcc2..ea6d28dfc 100755 --- a/view/tpl/categories_widget.tpl +++ b/view/tpl/categories_widget.tpl @@ -2,10 +2,10 @@ <h3>{{$title}}</h3> <div id="categories-sidebar-desc">{{$desc}}</div> - <ul class="categories-ul"> - <li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li> + <ul class="nav nav-pills nav-stacked"> + <li><a href="{{$base}}"{{if $sel_all}} class="categories-selected"{{/if}}>{{$all}}</a></li> {{foreach $terms as $term}} - <li class="tool"><a href="{{$base}}?f=&cat={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li> + <li><a href="{{$base}}?f=&cat={{$term.name}}"{{if $term.selected}} class="categories-selected"{{/if}}>{{$term.name}}</a></li> {{/foreach}} </ul> diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 1ed2fbd2c..af80e7b4d 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,4 +1,4 @@ -<div class="channel-selection"> +<div class='channel-selection {{if $selected == $channel.channel_id}}selected-channel{{/if}}'> {{if $channel.default_links}} {{if $channel.default}} <div class="channel-selection-default default"><i class="icon-check"></i> {{$msg_default}}</div> @@ -7,6 +7,6 @@ {{/if}} {{/if}} <a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a> +<div class="channels-notifications-wrapper"><a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a> <a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a></div> <a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a> </div> -<div class="channel-selection-end"></div> diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl index f7635ea52..f76594934 100755 --- a/view/tpl/channel_import.tpl +++ b/view/tpl/channel_import.tpl @@ -22,6 +22,11 @@ <input type="password" name="password" id="import-old-pass" class="import-input" value="{{$pass}}" /> <div id="import-old-pass-end" class="import-field-end"></div> + <input type="checkbox" name="import_posts" id="import-posts" value="1" /> + <label for="import-posts" id="label-import-posts">{{$label_import_posts}}</label> + <div id="import-posts-end" class="import-field-end"></div> + + <div id="import-common-desc" class="descriptive-paragraph">{{$common}}</div> <input type="checkbox" name="make_primary" id="import-make-primary" value="1" /> diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 2c31cb498..26d0e14d2 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,6 +1,6 @@ +<div class="generic-content-wrapper-styled"> <h3>{{$header}}</h3> - {{if $links}} {{foreach $links as $l}} <a class="channels-links" href="{{$l.0}}" title="{{$l.1}}">{{$l.2}}</a> @@ -13,14 +13,6 @@ {{$channel_usage_message}} </div> {{/if}} -{{if $selected}} -<div id="selected-channel"> -<div id="channels-selected">{{$msg_selected}}</div> -{{include file="channel.tpl" channel=$selected}} -</div> -<div class="channels-end selected"></div> -{{/if}} -<br /> <div id="channels-desc" class="descriptive-text">{{$desc}}</div> <div id="all-channels"> @@ -30,3 +22,5 @@ </div> <div class="channels-end all"></div> + +</div> diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index 287f95cc0..a559dba54 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -2,12 +2,12 @@ <form action="chat" method="post" > {{include file="field_input.tpl" field=$name}} -<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> +<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button> {{$acl}} <div class="clear"></div> <br /> <br /> -<input type="submit" name="submit" value="{{$submit}}" /> +<input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" /> </form> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 69931b292..da708a98c 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -1,23 +1,19 @@ -<table> - <tr> - <td><strong>{{$folder_header}}</strong> </td> - <td> - <form method="post" action=""> - <input type="hidden" name="sabreAction" value="mkcol"> - <input type="text" name="name"> - <input type="submit" value="{{$folder_submit}}"> - </form> - </td> - </tr> - <tr> - <td><strong>{{$upload_header}}</strong> </td> - <td> - <form method="post" action="" enctype="multipart/form-data"> - <input type="hidden" name="sabreAction" value="put"> - <input type="file" name="file" style="display: inline;"> - <input type="submit" value="{{$upload_submit}}"> - <!-- Name (optional): <input type="text" name="name"> we should rather provide a rename action in edit form--> - </form> - </td> - </tr> -</table>
\ No newline at end of file +<div id="files-mkdir-tools" class="section-content-tools-wrapper form-group"> + <label for="files-mkdir">{{$folder_header}}</label> + <form method="post" action=""> + <input type="hidden" name="sabreAction" value="mkcol"> + <input id="files-mkdir" type="text" name="name" class="form-control form-group"> + <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button> + </form> + <div class="clear"></div> +</div> +<div id="files-upload-tools" class="section-content-tools-wrapper form-group"> + <label for="files-upload">{{$upload_header}}</label> + <form method="post" action="" enctype="multipart/form-data"> + <input type="hidden" name="sabreAction" value="put"> + <input class="form-group" id="files-upload" type="file" name="file"> + <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button> + <!-- Name (optional): <input type="text" name="name"> we should rather provide a rename action in edit form--> + </form> + <div class="clear"></div> +</div> diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 5d22e4a16..77d861224 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,43 +1,43 @@ -<h1>{{$header}}</h1> -<table id="cloud-index"> - <tr> - <th></th> - <th>{{$name}} </th> - <th></th><th></th><th></th> - <th>{{$type}} </th> - <th>{{$size}} </th> - <th>{{$lastmod}}</th> - </tr> - <tr><td colspan="8"><hr></td></tr> -{{if $parentpath}} - <tr> - <td>{{$parentpath.icon}}</td> - <td><a href="{{$parentpath.path}}" title="{{$parent}}">..</a></td> - <td></td><td></td><th></td> - <td>[{{$parent}}]</td> - <td></td> - <td></td> - </tr> -{{/if}} -{{foreach $entries as $item}} - <tr> - <td>{{$item.icon}}</td> - <td style="min-width: 15em"><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td> -{{if $item.is_owner}} - <td>{{$item.attachIcon}}</td> - <td style="position:relative;"><a href="{{$item.fileStorageUrl}}/{{$item.attachId}}/edit" title="{{$edit}}"><i class="icon-pencil btn btn-default"></i></a></td> - <td><a href="{{$item.fileStorageUrl}}/{{$item.attachId}}/delete" title="{{$delete}}" onclick="return confirmDelete();"><i class="icon-remove btn btn-default drop-icons"></i></a></td> -{{else}} - <td></td><td></td><td></td> -{{/if}} - <td>{{$item.type}}</td> - <td>{{$item.sizeFormatted}}</td> - <td>{{$item.lastmodified}}</td> - </tr> -{{/foreach}} - <tr><td colspan="8"><hr></td></tr> -</table> +<div class="generic-content-wrapper section-content-wrapper-np"> + <table id="cloud-index"> + <tr> + <th width="1%"></th> + <th width="92%">{{$name}}</th> + <th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th> + <th width="1%">{{*{{$type}}*}}</th> + <th width="1%" class="hidden-xs">{{$size}}</th> + <th width="1%" class="hidden-xs">{{$lastmod}}</th> + </tr> + {{if $parentpath}} + <tr> + <td><i class="icon-level-up"></i>{{*{{$parentpath.icon}}*}}</td> + <td><a href="{{$parentpath.path}}" title="{{$parent}}">..</a></td> + <td></td><td></td><td></td><td></td> + <td>{{*[{{$parent}}]*}}</td> + <td class="hidden-xs"></td> + <td class="hidden-xs"></td> + </tr> + {{/if}} + {{foreach $entries as $item}} + <tr id="cloud-index-{{$item.attachId}}"> + <td><i class="{{$item.iconFromType}}" title="{{$item.type}}"></i></td> + <td><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td> + {{if $item.is_owner}} + <td class="cloud-index-tool">{{$item.attachIcon}}</td> + <td id="file-edit-{{$item.attachId}}" class="cloud-index-tool"></td> + <td class="cloud-index-tool"><i class="fakelink icon-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td> + <td class="cloud-index-tool"><a href="{{$item.fileStorageUrl}}/{{$item.attachId}}/delete" title="{{$delete}}" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a></td> -{{if $quota.limit || $quota.used}} - <p><strong>{{$total}}</strong> {{$quota.desc}}</p> -{{/if}}
\ No newline at end of file + {{else}} + <td></td><td></td><td></td><td></td> + {{/if}} + <td>{{*{{$item.type}}*}}</td> + <td class="hidden-xs">{{$item.sizeFormatted}}</td> + <td class="hidden-xs">{{$item.lastmodified}}</td> + </tr> + <tr> + <td id="perms-panel-{{$item.attachId}}" colspan="9"></td> + </tr> + {{/foreach}} + </table> +</div> diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl new file mode 100644 index 000000000..f5f123edb --- /dev/null +++ b/view/tpl/cloud_header.tpl @@ -0,0 +1,13 @@ +<div class="section-title-wrapper"> + {{if $actionspanel}} + <div class="pull-right"> + <button id="files-create-btn"class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i> Create</button> + <button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i> Upload</button> + </div> + {{/if}} + <h2>{{$header}}</h2> + <div class="clear"></div> +</div> +{{if $actionspanel}} + {{$actionspanel}} +{{/if}} diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 423d13d88..ab67bc196 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -21,35 +21,41 @@ {{/if}} <div class="clear"></div> <div id="comment-tools-{{$id}}" class="comment-tools"> - <div id="comment-edit-bb-{{$id}}" class="btn-group pull-left"> - <button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;"> - <i class="icon-bold comment-icon"></i> - </button> - <button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;"> - <i class="icon-italic comment-icon"></i> - </button> - <button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;"> - <i class="icon-underline comment-icon"></i> - </button> - <button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;"> - <i class="icon-quote-left comment-icon"></i> - </button> - <button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> - <i class="icon-terminal comment-icon"></i> - </button> - <button class="btn btn-default btn-xs" title="{{$comment}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> - <i class="icon-camera comment-icon"></i> - </button> - <button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('{{$comment}}','url', {{$id}}); return false;"> - <i class="icon-link comment-icon"></i> - </button> - <button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;"> - <i class="icon-facetime-video comment-icon"></i> - </button> + <div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left"> + <div class='btn-group'> + <button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;"> + <i class="icon-bold comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;"> + <i class="icon-italic comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;"> + <i class="icon-underline comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;"> + <i class="icon-quote-left comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> + <i class="icon-terminal comment-icon"></i> + </button> + </div> + <div class='btn-group'> + <button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> + <i class="icon-camera comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('{{$comment}}','url', {{$id}}); return false;"> + <i class="icon-link comment-icon"></i> + </button> + <button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;"> + <i class="icon-facetime-video comment-icon"></i> + </button> + </div> {{if $feature_encrypt}} - <button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"> - <i class="icon-key comment-icon"></i> - </button> + <div class='btn-group'> + <button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"> + <i class="icon-key comment-icon"></i> + </button> + </div> {{/if}} </div> <div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}"> @@ -58,7 +64,7 @@ <i class="icon-eye-open comment-icon" ></i> </button> {{/if}} - <button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button> + <button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button> </div> </div> <div class="clear"></div> diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 44866c323..47f01ef5d 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -1,9 +1,9 @@ <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" > <div class="contact-entry-photo-wrapper" > - <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img class="contact-block-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> + <a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="contact-block-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> </div> <div class="contact-entry-photo-end" ></div> - <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a> - <div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$edit}}</a></div> + <a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a> + <div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$contact.edit}}</a></div> <div class="contact-entry-end" ></div> </div> diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index c69dcde50..8e5266978 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,3 +1,5 @@ +<div class="generic-content-wrapper-styled"> + <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1> {{if $finding}}<h4>{{$finding}}</h4>{{/if}} @@ -13,14 +15,13 @@ {{$tabs}} - +<div id="connections-wrapper"> {{foreach $contacts as $contact}} {{include file="connection_template.tpl"}} {{/foreach}} +<div id="page-end"></div> +</div> <div id="contact-edit-end"></div> - -{{$paginate}} - - - - +</div> +<script>$(document).ready(function() { loadingPage = false;});</script> +<div id="page-spinner"></div> diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl index 33cd3fb71..09a79edd8 100755 --- a/view/tpl/contact_slider.tpl +++ b/view/tpl/contact_slider.tpl @@ -1,4 +1,4 @@ <div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div> <script> - $("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } }); + $("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], width:'100%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } }); </script> diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl index 7feefa655..3d1bfa4a4 100755 --- a/view/tpl/contact_template.tpl +++ b/view/tpl/contact_template.tpl @@ -1,6 +1,6 @@ <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" > <div class="contact-entry-photo-wrapper" > - <a href="{{$contact.link}}" title="{{$contact.img_hover}}" /><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> + <a href="{{$contact.link}}" title="{{$contact.img_hover}}" ><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> </div> <div class="contact-entry-photo-end" ></div> <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div> diff --git a/view/tpl/contactsajax.tpl b/view/tpl/contactsajax.tpl new file mode 100644 index 000000000..1cce0f105 --- /dev/null +++ b/view/tpl/contactsajax.tpl @@ -0,0 +1,3 @@ +{{foreach $contacts as $contact}} + {{include file="connection_template.tpl"}} +{{/foreach}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index d7ed7d0f4..f30ca7fc0 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -15,7 +15,9 @@ <div class="wall-item-photo-end" style="clear:both"></div> </div> {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3>{{$item.title}}</h3></div> + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> + </div> {{/if}} {{if $item.lock}} <div class="wall-item-lock dropdown"> @@ -26,7 +28,7 @@ <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}} </div> <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> - {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/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}} + {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-remove item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-title-end"></div> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl new file mode 100755 index 000000000..59bb8f918 --- /dev/null +++ b/view/tpl/conv_list.tpl @@ -0,0 +1,179 @@ +{{if $item.comment_firstcollapsed}} +<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});"> + <span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span> <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> +</div> +<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> +{{/if}} + <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}} conv-list-mode"> + <a name="{{$item.id}}" ></a> + <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > + <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> + <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > + <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> + <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> + </div> + <div class="wall-item-photo-end" style="clear:both"></div> + </div> + {{if $item.title}} + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> + </div> + {{/if}} + {{if $item.lock}} + <div class="wall-item-lock dropdown"> + <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + </div> + {{/if}} + <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}} + </div> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> + {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-remove item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + </div> + <div class="wall-item-content conv-list-mode" id="wall-item-content-{{$item.id}}"> + <div class="wall-item-title-end"></div> + <div class="wall-item-body wall-item-listbody" id="wall-item-body-{{$item.id}}" > + {{$item.body}} + {{if $item.tags}} + <div class="body-tag"> + {{foreach $item.tags as $tag}} + <span class='tag'>{{$tag}}</span> + {{/foreach}} + </div> + {{/if}} + {{if $item.has_cats}} + <div class="categorytags"> + <span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} + </div> + {{/if}} + {{if $item.has_folders}} + <div class="filesavetags"> + <span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} + </div> + {{/if}} + </div> + </div> + <div class="wall-item-tools"> + <div class="wall-item-tools-right btn-group pull-right"> + {{if $item.like}} + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false"> + <i class="icon-thumbs-up-alt" title="{{$item.like.0}}"></i> + </button> + {{/if}} + {{if $item.dislike}} + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'dislike'); return false"> + <i class="icon-thumbs-down-alt" title="{{$item.dislike.0}}"></i> + </button> + {{/if}} + <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> + <i class="icon-caret-down"></i> + </button> + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> + {{if $item.share}} + <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li> + {{/if}} + {{if $item.plink}} + <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="icon-external-link"></i> {{$item.plink.title}}</a></li> + {{/if}} + {{if $item.edpost}} + <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost icon-pencil"></i> {{$item.edpost.1}}</a></li> + {{/if}} + {{if $item.tagger}} + <li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="icon-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li> + {{/if}} + {{if $item.filer}} + <li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="icon-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li> + {{/if}} + {{if $item.bookmark}} + <li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="icon-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li> + {{/if}} + {{if $item.addtocal}} + <li role="presentation"><a role="menuitem" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="icon-calendar" title="{{$item.addtocal}}"></i> {{$item.addtocal}}</a></li> + {{/if}} + {{if $item.star}} + <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li> + {{/if}} + {{if $item.item_photo_menu}} + <li role="presentation" class="divider"></li> + {{$item.item_photo_menu}} + {{/if}} + {{if $item.drop.dropping}} + <li role="presentation" class="divider"></li> + <li role="presentation"><a role="menuitem" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove"></i> {{$item.drop.delete}}</a></li> + {{/if}} + </ul> + </div> + <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> + <div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count}} btn-group{{/if}}"> + + + <div class="wall-item-list-comments btn-group"><button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.viewthread}}'; return false;">{{$item.comment_count_txt}}{{if $item.unseen_comments}} +<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}{{/if}}</span></button></div>{{if $item.unseen_comments}}<div class="unseen-wall-indicator-{{$item.id}} btn-group"><button class="btn btn-default btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"><i class="icon-check"></i></div>{{/if}} + + {{if $item.like_count}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-like-{{$item.id}}">{{$item.like_count}} {{$item.like_button_label}}</button> + {{if $item.like_list_part}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $item.like_list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + {{else}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $item.like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + {{/if}} + </div> + {{/if}} + {{if $item.dislike_count}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-dislike dropdown-toggle" data-toggle="dropdown" id="wall-item-dislike-{{$item.id}}">{{$item.dislike_count}} {{$item.dislike_button_label}}</button> + {{if $item.dislike_list_part}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$item.id}}">{{foreach $item.dislike_list_part as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + {{else}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$item.id}}">{{foreach $item.dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + {{/if}} + </div> + {{/if}} + </div> + {{if $item.like_list_part}} + <div class="modal" id="likeModal-{{$item.id}}"> + <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">{{$item.like_modal_title}}</h4> + </div> + <div class="modal-body"> + <ul>{{foreach $item.like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + </div> + <div class="modal-footer clear"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} + {{if $item.dislike_list_part}} + <div class="modal" id="dislikeModal-{{$item.id}}"> + <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">{{$item.dislike_modal_title}}</h4> + </div> + <div class="modal-body"> + <ul>{{foreach $item.dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + </div> + <div class="modal-footer clear"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} + </div> + <div class="clear"></div> + </div> + <div class="wall-item-wrapper-end"></div> + <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> + </div> + </div> +{{if $item.comment_lastcollapsed}} +</div> +{{/if}} diff --git a/view/tpl/crepair.tpl b/view/tpl/crepair.tpl deleted file mode 100755 index 1a5a019db..000000000 --- a/view/tpl/crepair.tpl +++ /dev/null @@ -1,45 +0,0 @@ -<form id="crepair-form" action="crepair/{{$contact_id}}" method="post" > - -<h4>{{$contact_name}}</h4> - -<label id="crepair-name-label" class="crepair-label" for="crepair-name">{{$label_name}}</label> -<input type="text" id="crepair-name" class="crepair-input" name="name" value="{{$contact_name}}" /> -<div class="clear"></div> - -<label id="crepair-nick-label" class="crepair-label" for="crepair-nick">{{$label_nick}}</label> -<input type="text" id="crepair-nick" class="crepair-input" name="nick" value="{{$contact_nick}}" /> -<div class="clear"></div> - -<label id="crepair-attag-label" class="crepair-label" for="crepair-attag">{{$label_attag}}</label> -<input type="text" id="crepair-attag" class="crepair-input" name="attag" value="{{$contact_attag}}" /> -<div class="clear"></div> - -<label id="crepair-url-label" class="crepair-label" for="crepair-url">{{$label_url}}</label> -<input type="text" id="crepair-url" class="crepair-input" name="url" value="{{$contact_url}}" /> -<div class="clear"></div> - -<label id="crepair-request-label" class="crepair-label" for="crepair-request">{{$label_request}}</label> -<input type="text" id="crepair-request" class="crepair-input" name="request" value="{{$request}}" /> -<div class="clear"></div> - -<label id="crepair-confirm-label" class="crepair-label" for="crepair-confirm">{{$label_confirm}}</label> -<input type="text" id="crepair-confirm" class="crepair-input" name="confirm" value="{{$confirm}}" /> -<div class="clear"></div> - -<label id="crepair-notify-label" class="crepair-label" for="crepair-notify">{{$label_notify}}</label> -<input type="text" id="crepair-notify" class="crepair-input" name="notify" value="{{$notify}}" /> -<div class="clear"></div> - -<label id="crepair-poll-label" class="crepair-label" for="crepair-poll">{{$label_poll}}</label> -<input type="text" id="crepair-poll" class="crepair-input" name="poll" value="{{$poll}}" /> -<div class="clear"></div> - -<label id="crepair-photo-label" class="crepair-label" for="crepair-photo">{{$label_photo}}</label> -<input type="text" id="crepair-photo" class="crepair-input" name="photo" value="" /> -<div class="clear"></div> - -<input type="submit" name="submit" value="{{$lbl_submit}}" /> - -</form> - - diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl index 80a538231..53d90be74 100644 --- a/view/tpl/design_tools.tpl +++ b/view/tpl/design_tools.tpl @@ -2,7 +2,7 @@ <h3>{{$title}}</h3> <ul> <li><a href="blocks/{{$who}}">{{$blocks}}</a></li> -<li><a href="menu">{{$menus}}</a></li> +<li><a href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a></li> <li><a href="layouts/{{$who}}">{{$layout}}</a></li> <li><a href="webpages/{{$who}}">{{$pages}}</a></li> </ul> diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl new file mode 100644 index 000000000..27ec3dffc --- /dev/null +++ b/view/tpl/diaspora_comment.tpl @@ -0,0 +1,11 @@ +<XML> + <post> + <comment> + <guid>{{$guid}}</guid> + <parent_guid>{{$parent_guid}}</parent_guid> + <author_signature>{{$authorsig}}</author_signature> + <text>{{$body}}</text> + <diaspora_handle>{{$handle}}</diaspora_handle> + </comment> + </post> +</XML>
\ No newline at end of file diff --git a/view/tpl/diaspora_comment_relay.tpl b/view/tpl/diaspora_comment_relay.tpl new file mode 100644 index 000000000..37a9e88b3 --- /dev/null +++ b/view/tpl/diaspora_comment_relay.tpl @@ -0,0 +1,12 @@ +<XML> + <post> + <comment> + <guid>{{$guid}}</guid> + <parent_guid>{{$parent_guid}}</parent_guid> + <parent_author_signature>{{$parentsig}}</parent_author_signature> + <author_signature>{{$authorsig}}</author_signature> + <text>{{$body}}</text> + <diaspora_handle>{{$handle}}</diaspora_handle> + </comment> + </post> +</XML>
\ No newline at end of file diff --git a/view/tpl/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl new file mode 100644 index 000000000..dc4482e4b --- /dev/null +++ b/view/tpl/diaspora_conversation.tpl @@ -0,0 +1,29 @@ +<XML> + <post> + <conversation> + <guid>{{$conv.guid}}</guid> + <subject>{{$conv.subject}}</subject> + <created_at>{{$conv.created_at}}</created_at> + + {{foreach $conv.messages as $msg}} + + <message> + <guid>{{$msg.guid}}</guid> + <parent_guid>{{$msg.parent_guid}}</parent_guid> + {{if $msg.parent_author_signature}} + <parent_author_signature>{{$msg.parent_author_signature}}</parent_author_signature> + {{/if}} + <author_signature>{{$msg.author_signature}}</author_signature> + <text>{{$msg.text}}</text> + <created_at>{{$msg.created_at}}</created_at> + <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle> + <conversation_guid>{{$msg.conversation_guid}}</conversation_guid> + </message> + + {{/foreach}} + + <diaspora_handle>{{$conv.diaspora_handle}}</diaspora_handle> + <participant_handles>{{$conv.participant_handles}}</participant_handles> + </conversation> + </post> +</XML> diff --git a/view/tpl/diaspora_like.tpl b/view/tpl/diaspora_like.tpl new file mode 100644 index 000000000..a27e92240 --- /dev/null +++ b/view/tpl/diaspora_like.tpl @@ -0,0 +1,12 @@ +<XML> + <post> + <like> + <positive>{{$positive}}</positive> + <guid>{{$guid}}</guid> + <target_type>{{$target_type}}</target_type> + <parent_guid>{{$parent_guid}}</parent_guid> + <author_signature>{{$authorsig}}</author_signature> + <diaspora_handle>{{$handle}}</diaspora_handle> + </like> + </post> +</XML> diff --git a/view/tpl/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl new file mode 100644 index 000000000..8209540c5 --- /dev/null +++ b/view/tpl/diaspora_like_relay.tpl @@ -0,0 +1,13 @@ +<XML> + <post> + <like> + <positive>{{$positive}}</positive> + <guid>{{$guid}}</guid> + <target_type>{{$target_type}}</target_type> + <parent_guid>{{$parent_guid}}</parent_guid> + <parent_author_signature>{{$parentsig}}</parent_author_signature> + <author_signature>{{$authorsig}}</author_signature> + <diaspora_handle>{{$handle}}</diaspora_handle> + </like> + </post> +</XML> diff --git a/view/tpl/diaspora_message.tpl b/view/tpl/diaspora_message.tpl new file mode 100644 index 000000000..3413d79b0 --- /dev/null +++ b/view/tpl/diaspora_message.tpl @@ -0,0 +1,13 @@ +<XML> + <post> + <message> + <guid>{{$msg.guid}}</guid> + <parent_guid>{{$msg.parent_guid}}</parent_guid> + <author_signature>{{$msg.author_signature}}</author_signature> + <text>{{$msg.text}}</text> + <created_at>{{$msg.created_at}}</created_at> + <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle> + <conversation_guid>{{$msg.conversation_guid}}</conversation_guid> + </message> + </post> +</XML> diff --git a/view/tpl/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl new file mode 100644 index 000000000..256459d8d --- /dev/null +++ b/view/tpl/diaspora_photo.tpl @@ -0,0 +1,13 @@ +<XML> + <post> + <photo> + <guid>{{$guid}}</guid> + <diaspora_handle>{{$handle}}</diaspora_handle> + <public>{{$public}}</public> + <created_at>{{$created_at}}</created_at> + <remote_photo_path>{{$path}}</remote_photo_path> + <remote_photo_name>{{$filename}}</remote_photo_name> + <status_message_guid>{{$msg_guid}}</status_message_guid> + </photo> + </post> +</XML> diff --git a/view/tpl/diaspora_post.tpl b/view/tpl/diaspora_post.tpl new file mode 100644 index 000000000..2fe916e00 --- /dev/null +++ b/view/tpl/diaspora_post.tpl @@ -0,0 +1,12 @@ +<XML> + <post> + <status_message> + <raw_message>{{$body}}</raw_message> + <guid>{{$guid}}</guid> + <diaspora_handle>{{$handle}}</diaspora_handle> + <public>{{$public}}</public> + <created_at>{{$created}}</created_at> + <provider_display_name>{{$provider}}</provider_display_name> + </status_message> + </post> +</XML> diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl new file mode 100644 index 000000000..5e7aed41f --- /dev/null +++ b/view/tpl/diaspora_relay_retraction.tpl @@ -0,0 +1,10 @@ +<XML> + <post> + <relayable_retraction> + <target_type>{{$type}}</target_type> + <target_guid>{{$guid}}</target_guid> + <target_author_signature>{{$signature}}</target_author_signature> + <sender_handle>{{$handle}}</sender_handle> + </relayable_retraction> + </post> +</XML> diff --git a/view/tpl/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl new file mode 100644 index 000000000..4e3ff3243 --- /dev/null +++ b/view/tpl/diaspora_relayable_retraction.tpl @@ -0,0 +1,11 @@ +<XML> + <post> + <relayable_retraction> + <parent_author_signature>{{$parentsig}}</parent_author_signature> + <target_guid>{{$guid}}</target_guid> + <target_type>{{$target_type}}</target_type> + <sender_handle>{{$handle}}</sender_handle> + <target_author_signature>{{$authorsig}}</target_author_signature> + </relayable_retraction> + </post> +</XML> diff --git a/view/tpl/diaspora_reshare.tpl b/view/tpl/diaspora_reshare.tpl new file mode 100644 index 000000000..963bb9e12 --- /dev/null +++ b/view/tpl/diaspora_reshare.tpl @@ -0,0 +1,13 @@ +<XML> + <post> + <reshare> + <root_diaspora_id>{{$root_handle}}</root_diaspora_id> + <root_guid>{{$root_guid}}</root_guid> + <guid>{{$guid}}</guid> + <diaspora_handle>{{$handle}}</diaspora_handle> + <public>{{$public}}</public> + <created_at>{{$created}}</created_at> + <provider_display_name>{{$provider}}</provider_display_name> + </reshare> + </post> +</XML> diff --git a/view/tpl/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl new file mode 100644 index 000000000..9df066d38 --- /dev/null +++ b/view/tpl/diaspora_retract.tpl @@ -0,0 +1,9 @@ +<XML> + <post> + <retraction> + <post_guid>{{$guid}}</post_guid> + <diaspora_handle>{{$handle}}</diaspora_handle> + <type>{{$type}}</type> + </retraction> + </post> +</XML> diff --git a/view/tpl/diaspora_share.tpl b/view/tpl/diaspora_share.tpl new file mode 100644 index 000000000..59eb06124 --- /dev/null +++ b/view/tpl/diaspora_share.tpl @@ -0,0 +1,8 @@ +<XML> + <post> + <request> + <sender_handle>{{$sender}}</sender_handle> + <recipient_handle>{{$recipient}}</recipient_handle> + </request> + </post> +</XML>
\ No newline at end of file diff --git a/view/tpl/diaspora_signed_retract.tpl b/view/tpl/diaspora_signed_retract.tpl new file mode 100644 index 000000000..f0f346da8 --- /dev/null +++ b/view/tpl/diaspora_signed_retract.tpl @@ -0,0 +1,10 @@ +<XML> + <post> + <signed_retraction> + <target_guid>{{$guid}}</target_guid> + <target_type>{{$type}}</target_type> + <sender_handle>{{$handle}}</sender_handle> + <target_author_signature>{{$signature}}</target_author_signature> + </signed_retraction> + </post> +</XML> diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl new file mode 100644 index 000000000..f9dac9306 --- /dev/null +++ b/view/tpl/diaspora_vcard.tpl @@ -0,0 +1,57 @@ +<div style="display:none;"> + <dl class='entity_nickname'> + <dt>Nickname</dt> + <dd> + <a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.fullname}}</a> + </dd> + </dl> + <dl class='entity_fn'> + <dt>Full name</dt> + <dd> + <span class='fn'>{{$diaspora.fullname}}</span> + </dd> + </dl> + + <dl class='entity_given_name'> + <dt>First name</dt> + <dd> + <span class='given_name'>{{$diaspora.firstname}}</span> + </dd> + </dl> + <dl class='entity_family_name'> + <dt>Family name</dt> + <dd> + <span class='family_name'>{{$diaspora.lastname}}</span> + </dd> + </dl> + <dl class="entity_url"> + <dt>URL</dt> + <dd> + <a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a> + </dd> + </dl> + <dl class="entity_photo"> + <dt>Photo</dt> + <dd> + <img class="photo avatar" height="300" width="300" src="{{$diaspora.photo300}}"> + </dd> + </dl> + <dl class="entity_photo_medium"> + <dt>Photo</dt> + <dd> + <img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}"> + </dd> + </dl> + <dl class="entity_photo_small"> + <dt>Photo</dt> + <dd> + <img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}"> + </dd> + </dl> + <dl class="entity_searchable"> + <dt>Searchable</dt> + <dd> + <span class="searchable">{{$diaspora.searchable}}</span> + </dd> + </dl> +</div> diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index d78aec1f5..d9ecd22c6 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -1,6 +1,10 @@ <div class="widget" id="dir_sort_links"> <h3>{{$header}}</h3> -<a href="directory?f=&order=normal">{{$normal}}</a><br /> -<a href="directory?f=&order=reverse">{{$reverse}}</a><br /> -<a href="directory?f=&order=date">{{$date}}</a><br /> +{{$sort}}: <select onchange='window.location.href="{{$sorturl}}&order="+this.value'> +<option value='normal' {{if $selected_sort == 'normal'}}selected='selected'{{/if}}>{{$normal}}</option> +<option value='reverse' {{if $selected_sort == 'reverse'}}selected='selected'{{/if}}>{{$reverse}}</option> +<option value='date' {{if $selected_sort == 'date'}}selected='selected'{{/if}}>{{$date}}</option> +<option value='reversedate' {{if $selected_sort == 'reversedate'}}selected='selected'{{/if}}>{{$reversedate}}</option> +</select><br /> +<input type='checkbox' {{if $pubforumsonly}}checked='checked'{{/if}} onchange='window.location.href="{{$forumsurl}}&pubforums="+(this.checked ? 1 : 0)'/> {{$pubforums}}<br /> </div> diff --git a/view/tpl/directajax.tpl b/view/tpl/directajax.tpl new file mode 100644 index 000000000..8faec4222 --- /dev/null +++ b/view/tpl/directajax.tpl @@ -0,0 +1,4 @@ +{{foreach $entries as $entry}} +{{include file="direntry.tpl"}} +{{/foreach}} + diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 5d703e2dd..477df8a63 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$dirlbl}}</h1> {{if $search}} @@ -5,12 +6,11 @@ {{/if}} {{foreach $entries as $entry}} - {{include file="direntry.tpl"}} - {{/foreach}} - - +<div id="page-end"></div> <div class="directory-end"></div> - +</div> +<script>$(document).ready(function() { loadingPage = false;});</script> +<div id="page-spinner"></div> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index e5f12944e..cdc6f1f97 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,16 +1,38 @@ <div class="directory-item lframe" id="directory-item-{{$entry.id}}" > -<div class="generic-content-wrapper"> <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > <div class="contact-photo" id="directory-photo-{{$entry.id}}" > <a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a> +{{if $entry.connect}} +<div class="directory-connect btn btn-default"><a href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a></div> +{{/if}} +{{if $entry.ignlink}} +<div class="directory-ignore btn btn-default"><a href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a></div> +{{/if}} </div> </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 btn btn-default"><a href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a></div> +<div class='contact-info'> +<div class="contact-name" id="directory-name-{{$entry.id}}" ><a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</div> + +{{if $entry.public_forum}} +<div class="contact-forum"> +{{$entry.forum_label}} @{{$entry.nickname}}+ +</div> {{/if}} + <div class="contact-details">{{$entry.details}}</div> +{{if $entry.hometown}} +<div class="directory-hometown">{{$entry.hometown}} </div> +{{/if}} +{{if $entry.about}} +<div class="directory-about">{{$entry.about}} </div> +{{/if}} +{{if $entry.homepage}} +<div class="directory-homepage">{{$entry.homepage}}{{$entry.homepageurl}} </div> +{{/if}} +{{if $entry.kw}} +<div class="directory-keywords">{{$entry.kw}} {{$entry.keywords}}</div> +{{/if}} </div> </div> diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl deleted file mode 100755 index da6ea1a44..000000000 --- a/view/tpl/direntry_large.tpl +++ /dev/null @@ -1,43 +0,0 @@ -<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 btn btn-default"><a href="{{$connect}}"><i class="icon-plus connect-icon"></i> {{$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/display-head.tpl b/view/tpl/display-head.tpl index 3d4e7e96a..007d33fe8 100755 --- a/view/tpl/display-head.tpl +++ b/view/tpl/display-head.tpl @@ -1,8 +1,8 @@ <script> $(document).ready(function() { - $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); + $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1"); // make auto-complete work in more places - $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl"); + $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1"); }); </script> diff --git a/view/tpl/edpage_head.tpl b/view/tpl/edpage_head.tpl deleted file mode 100755 index 890b746bf..000000000 --- a/view/tpl/edpage_head.tpl +++ /dev/null @@ -1 +0,0 @@ -<h2>{{$title}}</h2> diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index bfdf4d0b6..a4717415e 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,3 +1,5 @@ +<div class="generic-content-wrapper-styled"> + <h3>{{$title}}</h3> <p> @@ -7,21 +9,26 @@ <form action="{{$post}}" method="post" > <input type="hidden" name="event_id" value="{{$eid}}" /> +<input type="hidden" name="event_hash" value="{{$event_hash}}" /> <input type="hidden" name="xchan" value="{{$xchan}}" /> <input type="hidden" name="mid" value="{{$mid}}" /> +<div id="event-summary-text">{{$t_text}}</div> +<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" /> + <div id="event-start-text">{{$s_text}}</div> -{{$s_dsel}} {{$s_tsel}} +{{$s_dsel}} <div class="clear"></div><br /> -<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div> +<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} onclick="showHideFinishDate(); return true;" /> <div id="event-nofinish-text">{{$n_text}}</div> <div id="event-nofinish-break"></div> - +<div id="event-finish-wrapper"> <div id="event-finish-text">{{$f_text}}</div> -{{$f_dsel}} {{$f_tsel}} +{{$f_dsel}} +</div> <div id="event-datetime-break"></div> @@ -30,8 +37,14 @@ <div id="event-adjust-break"></div> -<div id="event-summary-text">{{$t_text}}</div> -<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" /> + + +{{if $catsenabled}} +<div id="event-category-wrap"> + <input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" /> +</div> +{{/if}} + <div id="event-desc-text">{{$d_text}}</div> @@ -45,10 +58,11 @@ <input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div> <div id="event-share-break"></div> -{{$acl}} +<button id="event-permissions-button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> + {{$acl}} <div class="clear"></div> <input id="event-submit" type="submit" name="submit" value="{{$submit}}" /> </form> - +</div> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 8388187d1..830347555 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -24,10 +24,16 @@ eventClick: function(calEvent, jsEvent, view) { showEvent(calEvent.id); }, - + loading: function(isLoading, view) { + if(!isLoading) { + $('td.fc-day').dblclick(function() { window.location.href='/events/new?start='+$(this).data('date'); }); + } + }, + eventRender: function(event, element, view) { //console.log(view.name); if (event.item['author']['xchan_name']==null) return; + switch(view.name){ case "month": element.find(".fc-event-title").html( @@ -115,10 +121,10 @@ $('#event-share-checkbox').change(function() { if ($('#event-share-checkbox').is(':checked')) { - $('#acl-wrapper').show(); + $('#event-permissions-button').show(); } else { - $('#acl-wrapper').hide(); + $('#event-permissions-button').hide(); } }).trigger('change'); diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index c87d20529..9812291bf 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,6 +1,18 @@ {{$tabs}} +<div class="generic-content-wrapper-styled"> <h2>{{$title}}</h2> -<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div> + +<div id="export-event-link"><button class="btn btn-default btn-sm" onclick="exportDate(); return false;" >{{$export.1}}</button></div> +<div id="new-event-link"><button class="btn btn-default btn-sm" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button></div> + +<script> +function exportDate() { + var moment = $('#events-calendar').fullCalendar('getDate'); + var sT = 'events/' + moment.getFullYear() + '/' + (moment.getMonth() + 1) + '/export'; + window.location.href=sT; +} +</script> <div id="events-calendar"></div> +</div> diff --git a/view/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl index 68c0bcdf2..f53f1f478 100755 --- a/view/tpl/failed_updates.tpl +++ b/view/tpl/failed_updates.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h2>{{$banner}}</h2> <div id="failed_updates_desc">{{$desc}}</div> @@ -14,4 +15,4 @@ <hr /> {{/foreach}} {{/if}} - +</div> diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 342491ded..816af2a65 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,12 +1,12 @@ <tr> <td> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> </td> <td class="abook-them"> <input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> </td> <td class="abook-me"> - <input type="checkbox" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> + <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> </td> <td> {{if $field.5}}<span class="permission-inherited">{{$inherited}}</span> {{/if}} diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index 51d56f69c..7a2781be0 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,5 +1,4 @@ <div class='field checkbox'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}> - <span class='field_help'>{{$field.3}}</span> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> + <div><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div><span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl index a68781698..a1e912186 100644 --- a/view/tpl/field_colorinput.tpl +++ b/view/tpl/field_colorinput.tpl @@ -1,5 +1,5 @@ <div class='field input color'> - <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> <input class='color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span> <div id='end_{{$field.0}}' class='field_end'></div> diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl index 1f9218954..337c60673 100755 --- a/view/tpl/field_combobox.tpl +++ b/view/tpl/field_combobox.tpl @@ -1,5 +1,5 @@ <div class='field combobox'> - <label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> {{* 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}}" > diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl index a6b49f6da..754f5b2f4 100755 --- a/view/tpl/field_custom.tpl +++ b/view/tpl/field_custom.tpl @@ -1,5 +1,5 @@ <div class='field custom'> - <label for='{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='{{$field.0}}'>{{$field.1}}</label> {{$field.2}} <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index a584f95e7..be6e3f047 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,5 +1,5 @@ <div class='field input'> - <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span> <div id='end_{{$field.0}}' class='field_end'></div> diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index d9a8d7289..847783518 100755 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,5 +1,4 @@ <div class='field checkbox'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="true"{{/if}}> - <span class='field_help'>{{$field.4}}</span> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> + <div><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.5}}{{$field.5.1}}{{/if}}' data-off='{{if $field.5}}{{$field.5.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div><span class='field_help'>{{$field.4}}</span> </div> diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index 23058f8a6..38ecf3d07 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@ <div class='field password'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl index 147b6b834..a92324cad 100755 --- a/view/tpl/field_radio.tpl +++ b/view/tpl/field_radio.tpl @@ -1,5 +1,5 @@ <div class='field radio'> - <label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label> <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}> <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl index c8639cf10..378e02a62 100755 --- a/view/tpl/field_richtext.tpl +++ b/view/tpl/field_richtext.tpl @@ -1,5 +1,5 @@ <div class='field richtext'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea> <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index 9aca26e7b..95d1855d6 100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,5 +1,5 @@ <div class='field select'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <select 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> diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl index f0090cf98..e241be895 100644 --- a/view/tpl/field_select_disabled.tpl +++ b/view/tpl/field_select_disabled.tpl @@ -1,5 +1,5 @@ <div class='field select'> - <label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" 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> diff --git a/view/tpl/field_select_grouped.tpl b/view/tpl/field_select_grouped.tpl new file mode 100644 index 000000000..c7fb4f322 --- /dev/null +++ b/view/tpl/field_select_grouped.tpl @@ -0,0 +1,12 @@ + <div class='field select'> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <select name='{{$field.0}}' id='id_{{$field.0}}'> + {{foreach $field.4 as $group=>$opts}} + <optgroup label='{{$group}}'> + {{foreach $opts as $opt=>$val}} + <option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} + {{/foreach}} + </optgroup> + </select> + <span class='field_help'>{{$field.3}}</span> + </div> diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl index 861be3201..74d575bd0 100755 --- a/view/tpl/field_select_raw.tpl +++ b/view/tpl/field_select_raw.tpl @@ -1,5 +1,5 @@ <div class='field select'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <select name='{{$field.0}}' id='id_{{$field.0}}'> {{$field.4}} </select> diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index b454045c0..dad89a145 100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,5 +1,5 @@ <div class='field textarea'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <textarea name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl index a0e454bf5..120727478 100755 --- a/view/tpl/field_themeselect.tpl +++ b/view/tpl/field_themeselect.tpl @@ -1,6 +1,6 @@ <script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script> <div class='field select'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} > {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl index e36e775c7..f5a909833 100755 --- a/view/tpl/field_yesno.tpl +++ b/view/tpl/field_yesno.tpl @@ -1,5 +1,5 @@ <div class='field yesno'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <div class='onoff' id="id_{{$field.0}}_onoff"> <input type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> <a href="#" class='off'> diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl index 70d68c56e..a92440cb0 100755 --- a/view/tpl/fileas_widget.tpl +++ b/view/tpl/fileas_widget.tpl @@ -2,10 +2,10 @@ <h3>{{$title}}</h3> <div id="nets-desc">{{$desc}}</div> - <ul class="fileas-ul"> - <li class="tool"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li> + <ul class="nav nav-pills nav-stacked"> + <li><a href="{{$base}}"{{if $sel_all}} class="fileas-selected"{{/if}}>{{$all}}</a></li> {{foreach $terms as $term}} - <li class="tool"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link{{if $term.selected}} fileas-selected{{/if}}">{{$term.name}}</a></li> + <li><a href="{{$base}}?f=&file={{$term.name}}"{{if $term.selected}} class="fileas-selected"{{/if}}>{{$term.name}}</a></li> {{/foreach}} </ul> diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl index 5ae52aa8a..d7c234a84 100755 --- a/view/tpl/generic_links_widget.tpl +++ b/view/tpl/generic_links_widget.tpl @@ -2,9 +2,9 @@ {{if $title}}<h3>{{$title}}</h3>{{/if}} {{if $desc}}<div class="desc">{{$desc}}</div>{{/if}} - <ul> + <ul class="nav nav-pills nav-stacked"> {{foreach $items as $item}} - <li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li> + <li><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li> {{/foreach}} </ul> diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 8c5d3927d..4afe1286f 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -1,31 +1,25 @@ <div class="widget" id="group-sidebar"> -<h3>{{$title}}</h3> - - -<div id="sidebar-group-list"> - <ul id="sidebar-group-ul"> - {{foreach $groups as $group}} - <li class="sidebar-group-li"> + <h3>{{$title}}</h3> + <div> + <ul class="nav nav-pills nav-stacked"> + {{foreach $groups as $group}} + <li> {{if $group.cid}} - <input type="checkbox" - class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" - onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;" - {{if $group.ismember}}checked="checked"{{/if}} - /> - {{/if}} + <a class="pull-right group-edit-tool fakelink" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"/> + <i id="group-{{$group.id}}" class="{{if $group.ismember}}icon-check{{else}}icon-check-empty{{/if}}"></i> + </a> + {{/if}} {{if $group.edit}} - <a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><i id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer icon-pencil"></i></a> + <a class="pull-right group-edit-tool" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="group-edit-icon icon-pencil"></i></a> {{/if}} - <span class="sidebar-group-name"><a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a></span> + <a{{if $group.selected}} class="group-selected"{{/if}} href="{{$group.href}}">{{$group.text}}</a> </li> - {{/foreach}} - </ul> -</div> - - <div id="sidebar-new-group"> - <a href="group/new">{{$createtext}}</a> - </div> - + {{/foreach}} + <li> + <a href="group/new">{{$createtext}}</a> + </li> + </ul> + </div> </div> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index b90bf8b89..8a32bd7f6 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,6 +1,6 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <base href="{{$baseurl}}/" /> -<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=0" /> +<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" /> <meta name="generator" content="{{$generator}}" /> <!--[if IE]> @@ -17,7 +17,7 @@ <link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" - title="Search in Red" /> + title="Search in the Red Matrix" /> <script> @@ -25,6 +25,9 @@ var updateInterval = {{$update_interval}}; var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; + var justifiedGalleryActive = false; + {{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}} + {{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}} </script> diff --git a/view/tpl/hide_comments.tpl b/view/tpl/hide_comments.tpl deleted file mode 100755 index f4ed9c552..000000000 --- a/view/tpl/hide_comments.tpl +++ /dev/null @@ -1,4 +0,0 @@ -<div class="hide-comments-outer"> -<span id="hide-comments-total-{{$id}}" class="hide-comments-total">{{$num_comments}}</span> <span id="hide-comments-{{$id}}" class="hide-comments fakelink" onclick="showHideComments({{$id}});">{{$hide_text}}</span> -</div> -<div id="collapsed-comments-{{$id}}" class="collapsed-comments" style="display: {{$display}};"> diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl index 3968d2a54..1a58de129 100755 --- a/view/tpl/install_db.tpl +++ b/view/tpl/install_db.tpl @@ -22,7 +22,7 @@ {{include file="field_input.tpl" field=$dbuser}} {{include file="field_password.tpl" field=$dbpass}} {{include file="field_input.tpl" field=$dbdata}} - +{{include file="field_select.tpl" field=$dbtype}} <input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl index d6fc66c87..62dcbb8b3 100755 --- a/view/tpl/install_settings.tpl +++ b/view/tpl/install_settings.tpl @@ -14,12 +14,13 @@ <input type="hidden" name="dbuser" value="{{$dbuser}}" /> <input type="hidden" name="dbpass" value="{{$dbpass}}" /> <input type="hidden" name="dbdata" value="{{$dbdata}}" /> +<input type="hidden" name="dbtype" value="{{$dbtype}}" /> <input type="hidden" name="pass" value="4" /> {{include file="field_input.tpl" field=$adminmail}} {{include file="field_input.tpl" field=$siteurl}} -{{$timezone}} +{{include file="field_select_grouped.tpl" field=$timezone}} <input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> diff --git a/view/tpl/intros.tpl b/view/tpl/intros.tpl deleted file mode 100755 index a4aed3bb8..000000000 --- a/view/tpl/intros.tpl +++ /dev/null @@ -1,17 +0,0 @@ -<div class="intro-wrapper" id="intro-{{$contact_id}}" > - -<div class="intro-fullname" id="intro-fullname-{{$contact_id}}" >{{$fullname}}</div> -<a class="intro-url-link" id="intro-url-link-{{$contact_id}}" href="{{$url}}" ><img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" /></a> -<div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div> -<form class="intro-form" action="intro" method="post"> -<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" /> -<input class="intro-submit-block" type="submit" name="submit" value="{{$block}}" /> -<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" /> -{{include file="field_checkbox.tpl" field=$hidden}} -{{* {{include file="field_checkbox.tpl" field=$activity}} *}} -<input type="hidden" name="contact_id" value="{{$contact_id}}" > - -<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" /> -</form> -</div> -<div class="intro-end"></div> diff --git a/view/tpl/intros_header.tpl b/view/tpl/intros_header.tpl deleted file mode 100755 index 15096c7f8..000000000 --- a/view/tpl/intros_header.tpl +++ /dev/null @@ -1 +0,0 @@ -<h3>{{$title}}</h3> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index abf446ba9..8d26fc653 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -10,7 +10,10 @@ function initEditor(cb){ if(plaintext == 'none') { $("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); - $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); + if(typeof channelId === 'undefined') + $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); + else + $("#profile-jot-text").contact_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections editor = true; $("a#jot-perms-icon").colorbox({ 'inline' : true, @@ -309,7 +312,7 @@ function enableOnUser(){ function jotClearLocation() { $('#jot-coord').val(''); - $('#profile-nolocation-wrapper').hide(); + $('#profile-nolocation-wrapper').attr('disabled', true); } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c4fdba0f5..00ef77d93 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -19,64 +19,72 @@ <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}} </div> {{/if}} - <div id="jot-title-wrap"> - <input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"> + <div id="jot-title-wrap" class="jothidden" style="display:none"> + <input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}"> </div> {{if $catsenabled}} - <div id="jot-category-wrap"> - <input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /> + <div id="jot-category-wrap" class="jothidden" style="display:none"> + <input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="tagsinput"/> </div> {{/if}} {{if $webpage}} - <div id="jot-pagetitle-wrap"> - <input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /> + <div id="jot-pagetitle-wrap" class="jothidden" style="display:none"> + <input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" /> </div> {{/if}} <div id="jot-text-wrap"> <textarea class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea> </div> <div id="profile-jot-submit-wrapper" class="jothidden"> - <div id="profile-jot-submit-left" class="btn-group pull-left"> + <div id="profile-jot-submit-left" class="btn-toolbar pull-left"> {{if $visitor}} - <button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" > - <i class="icon-camera jot-icons"></i> - </button> - <button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" > - <i id="wall-file-upload" class="icon-paper-clip jot-icons"></i> - </button> - <button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"> - <i id="profile-link" class="icon-link jot-icons"></i> - </button> - <button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;"> - <i id="profile-video" class="icon-facetime-video jot-icons"></i> - </button> - <button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;"> - <i id="profile-audio" class="icon-volume-up jot-icons"></i> - </button> - <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;"> - <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i> - </button> - <button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;"> - <i id="profile-location" class="icon-globe jot-icons"></i> - </button> + <div class='btn-group'> + <button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" > + <i class="icon-camera jot-icons"></i> + </button> + <button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" > + <i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i> + </button> + <button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"> + <i id="profile-link" class="icon-link jot-icons"></i> + </button> + <button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;"> + <i id="profile-video" class="icon-facetime-video jot-icons"></i> + </button> + <button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;"> + <i id="profile-audio" class="icon-volume-up jot-icons"></i> + </button> + </div> + <div class='btn-group'> + <button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;"> + <i id="profile-location" class="icon-globe jot-icons"></i> + </button> + {{if $noloc}} + <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$noloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> + <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i> + </button> + {{/if}} + {{else}} + <div class='btn-group'> {{/if}} {{if $feature_expire}} - <button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;"> - <i id="profile-expires" class="icon-eraser jot-icons"></i> - </button> + <button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;"> + <i id="profile-expires" class="icon-eraser jot-icons"></i> + </button> {{/if}} {{if $feature_encrypt}} - <button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"> - <i id="profile-encrypt" class="icon-key jot-icons"></i> - </button> + <button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"> + <i id="profile-encrypt" class="icon-key jot-icons"></i> + </button> {{/if}} + </div> </div> <div id="profile-rotator-wrapper"> <div id="profile-rotator"></div> </div> <div id="profile-jot-submit-right" class="btn-group pull-right"> {{if $showacl}} - <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i> </button> {{/if}} @@ -85,7 +93,7 @@ <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} - <button class="btn btn-primary btn-sm" type="submit" name="submit">{{$share}}</button> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="button-submit" >{{$share}}</button> </div> <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> @@ -108,12 +116,7 @@ </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 class='date'><input type='text' placeholder='yyyy-mm-dd HH:MM' name='start_text' id='expiration-date' class="form-control" /></div><script type='text/javascript'>$(function () {var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); })</script> </div> <!-- </div> --> <div class="modal-footer"> diff --git a/view/tpl/jot_geotag.tpl b/view/tpl/jot_geotag.tpl index 7a398b612..60f128850 100755 --- a/view/tpl/jot_geotag.tpl +++ b/view/tpl/jot_geotag.tpl @@ -1,7 +1,7 @@ if(navigator.geolocation) { navigator.geolocation.getCurrentPosition(function(position) { $('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude); - $('#profile-nolocation-wrapper').show(); + $('#profile-nolocation-wrapper').attr('disabled', false); }); } diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 515e3107f..eb78c669f 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -15,6 +15,7 @@ 'passhint' : "{{$passhint}}", 'permschange' : "{{$permschange}}", 'closeAll' : "{{$closeAll}}", + 'nothingnew' : "{{$nothingnew}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl index 96c692c1c..0a0085497 100644 --- a/view/tpl/layoutlist.tpl +++ b/view/tpl/layoutlist.tpl @@ -4,10 +4,10 @@ {{foreach $pages as $key => $items}} {{foreach $items as $item}} <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 $share}}<a href="layouts/{{$channel}}/share/{{$item.mid}}" title="{{$share}}"><i class="icon-share design-icons"></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}} + {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}} + {{if $view}}<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}} + {{if $share}}<a href="layouts/{{$channel}}/share/{{$item.mid}}" title="{{$share}}"><i class="icon-share design-icons btn btn-default"></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}} diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl index 60ba14d8c..3ce7eb497 100755 --- a/view/tpl/like_noshare.tpl +++ b/view/tpl/like_noshare.tpl @@ -1,5 +1,5 @@ <div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}"> - <i class="icon-thumbs-up-alt item-tool" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i> - <i class="icon-thumbs-down-alt item-tool" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i> + <i class="icon-thumbs-up-alt item-tool btn btn-default" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i> + <i class="icon-thumbs-down-alt item-tool btn btn-default" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i> <div id="like-rotator-{{$id}}" class="like-rotator"></div> </div> diff --git a/view/tpl/list_things.tpl b/view/tpl/list_things.tpl deleted file mode 100644 index fb8935d82..000000000 --- a/view/tpl/list_things.tpl +++ /dev/null @@ -1,13 +0,0 @@ -{{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/locmanage.tpl b/view/tpl/locmanage.tpl new file mode 100644 index 000000000..5a25850a1 --- /dev/null +++ b/view/tpl/locmanage.tpl @@ -0,0 +1,26 @@ +<h2>{{$header}}</h2> + +<script> +function primehub(id) { + $.post('locs','primary='+id,function(data) { window.location.href=window.location.href; }); +} +function drophub(id) { + $.post('locs','drop='+id,function(data) { window.location.href=window.location.href; }); +} +</script> + +<table> +<tr><td>{{$loc}}</td><td>{{$mkprm}}</td><td>{{$drop}}</td></tr> +{{foreach $hubs as $hub}} +<tr><td> +{{if $hub.deleted}}<strike>{{/if}} +{{$hub.hubloc_url}} ({{$hub.hubloc_addr}}){{if $hub.deleted}}</strike>{{/if}}</td> +<td> + +{{if $hub.primary}}<i class="icon-check"></i>{{else}}<button class="btn btn-std"><i class="icon-check-empty" onclick="primehub({{$hub.hubloc_id}}); return false;" ></i></button>{{/if}} +</td> +<td>{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}<button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-remove"></i></button>{{/if}}{{/if}}</td> +</tr> +{{/foreach}} +</table> + diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index e17a206a0..6b06f6127 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -3,6 +3,6 @@ <span class="mail-list">{{$from_name}}</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> + <span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><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> </div> diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index fbc290df1..c8f3d2e06 100755 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -2,8 +2,8 @@ <script> var old_cmin = 0; var old_cmax = 99; - $("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { - var carr = v.split(";"); + $("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], width:'100%', showLabels: false, onstatechange: function(v) { + var carr = v.split(","); if(carr[0] != bParam_cmin) { old_cmin = bParam_cmin; bParam_cmin = carr[0]; diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 271bace82..bb862fef0 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,3 +1,5 @@ +<div class="generic-content-wrapper-styled"> + <h1>{{$title}}</h1> <a href="menu/new" title="{{$hintnew}}">{{$hintnew}}</a> @@ -7,10 +9,9 @@ {{if $menus }} <ul id="menulist"> {{foreach $menus as $m }} -<li><a href="menu/{{$m.menu_id}}" title="{{$hintedit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> <a href="menu/{{$m.menu_id}}/drop" title={{$hintdrop}}><i class="icon-remove drop-icons design-icons design-remove-icon"></i></a> <a href="mitem/{{$m.menu_id}}/new" title="{{$hintcontent}}">{{$m.menu_name}}</a></li> +<li><a href="menu/{{$m.menu_id}}" title="{{$hintedit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> <a href="menu/{{$m.menu_id}}/drop" title="{{$hintdrop}}"><i class="icon-remove drop-icons design-icons design-remove-icon btn btn-default"></i></a> {{if $m.bookmark}}<i class="icon-bookmark" title="{{$bmark}}" ></i> {{/if}}<a href="mitem/{{$m.menu_id}}/new" title="{{$hintcontent}}">{{$m.menu_name}}</a></li> {{/foreach}} </ul> {{/if}} - - +</div> diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index 4db427fa7..3e32eae14 100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -1,11 +1,14 @@ -<div id="message-sidebar" class="widget"> - <div id="message-check"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div> - <div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div> - - <ul class="message-ul"> +<div class="widget"> + <h3>{{$title}}</h3> + <ul class="nav nav-pills nav-stacked"> + <li><a href="{{$check.url}}"{{if $check.sel}} class="checkmessage-selected"{{/if}}>{{$check.label}}</a></li> + <li><a href="{{$new.url}}"{{if $new.sel}} class="newmessage-selected"{{/if}}>{{$new.label}}</a></li> + </ul> + {{if $tabs}} + <ul class="nav nav-pills nav-stacked"> {{foreach $tabs as $t}} - <li class="tool"><a href="{{$t.url}}" class="message-link{{if $t.sel}}message-selected{{/if}}">{{$t.label}}</a></li> + <li><a href="{{$t.url}}"{{if $t.sel}} class="message-selected"{{/if}}>{{$t.label}}</a></li> {{/foreach}} </ul> - + {{/if}} </div> diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 482005e44..a18fbb0ef 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -26,7 +26,7 @@ <div class="mitemedit-submit-wrapper" > -<input type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" /> +<input id="dbtn-submit" type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" /> </div> </form> diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index b6cff7c74..85fa51b0a 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -49,38 +49,38 @@ else <script> $(document).ready(function() { var uploader = new window.AjaxUpload( - 'prvmail-upload', + 'prvmail-upload-wrapper', { action: 'wall_upload/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); }, onComplete: function(file,response) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(response); + $('#prvmail-rotator').spin(false); } } ); var file_uploader = new window.AjaxUpload( - 'prvmail-attach', + 'prvmail-attach-wrapper', { action: 'wall_attach/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); }, onComplete: function(file,response) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(response); + $('#prvmail-rotator').spin(false); } } ); }); - function jotGetLink() { + function prvmailJotGetLink() { reply = prompt("{{$linkurl}}"); if(reply && reply.length) { - $('#profile-rotator').spin('tiny'); + $('#prvmail-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(data); + $('#prvmail-rotator').spin(false); }); } } @@ -103,15 +103,15 @@ else event.target.textContent = reply; event.preventDefault(); if(reply && reply.length) { - $('#profile-rotator').spin('tiny'); + $('#prvmail-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(data); + $('#prvmail-rotator').spin(false); }); } } - function addeditortext(data) { + function addmailtext(data) { if(plaintext == 'none') { var currentText = $("#prvmail-text").val(); $("#prvmail-text").val(currentText + data); diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 0602c72af..4241c0a92 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -16,19 +16,24 @@ {{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> + <li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a></li> {{/foreach}} <li role="presentation" class="divider"></li> - {{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.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem">{{$nav.settings.1}}</a></li>{{/if}} + {{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a></li>{{/if}} + {{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a></li>{{/if}} + {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a></li>{{/if}} + {{if $nav.channels}} + {{foreach $nav.channels as $chan}} + <li role="presentation" class="nav-channel-select"><a href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a></li> + {{/foreach}} + {{/if}} {{if $nav.admin}} <li role="presentation" class="divider"></li> - <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem">{{$nav.admin.1}}</a></li> + <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$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> + <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a></li> {{/if}} </ul> {{else}} @@ -42,21 +47,28 @@ </div> <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="nav navbar-nav navbar-left"> + {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a></li>{{/if}} {{if !$userinfo}} - {{if $nav.lock}} - <li> - <a title="{{$nav.lock.3}}" href="{{$nav.lock.0}}"><i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}}"></i></a> - </li> - {{/if}} + {{if $nav.loginmenu}} + <li class="{{$nav.loginmenu.0.2}} hidden-xs"> + <a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a> + <ul class="dropdown-menu" role="menu"> + {{foreach $nav.loginmenu as $loginmenu}} + <li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li> + {{/foreach}} + </ul> + </li> + {{foreach $nav.loginmenu as $loginmenu}} + <li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li> + {{/foreach}} + {{/if}} {{/if}} - - {{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.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</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> + <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" id="{{$nav.network.4}}"><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> *}} @@ -72,7 +84,7 @@ {{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> + <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" id="{{$nav.home.4}}"><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> *}} @@ -86,11 +98,10 @@ </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> + <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}"><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> @@ -106,7 +117,7 @@ {{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> + <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" id='{{$nav.all_events.4}}'><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> @@ -122,7 +133,7 @@ {{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> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}"><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> @@ -137,7 +148,7 @@ {{if $nav.notifications}} <li class="{{$sel.notifications}} hidden-xs"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}"><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> @@ -154,28 +165,31 @@ <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();" /> + <div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder=" {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/> </form> </li> <li class="visible-xs"> <a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a> </li> + {{if $powered_by}} + <div id="powered-by">{{$powered_by}}</div> + {{/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> + <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="icon-sitemap"></i></a> </li> {{/if}} {{if $nav.apps}} <li class="{{$sel.apps}}"> - <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> + <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" id="{{$nav.apps.4}}"><i class="icon-cogs"></i></a> </li> {{/if}} {{if $nav.help}} <li class="{{$sel.help}}"> - <a class="{{$nav.help.2}}" target="redmatrix-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a> + <a class="{{$nav.help.2}}" target="redmatrix-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"><i class="icon-question"></i></a> </li> {{/if}} </ul> diff --git a/view/tpl/netfriend.tpl b/view/tpl/netfriend.tpl deleted file mode 100755 index ec6b3b6cc..000000000 --- a/view/tpl/netfriend.tpl +++ /dev/null @@ -1,14 +0,0 @@ -<div class="intro-approve-as-friend-desc">{{$approve_as}}</div> - -<div class="intro-approve-as-friend-wrapper"> - <label class="intro-approve-as-friend-label" for="intro-approve-as-friend-{{$intro_id}}">{{$as_friend}}</label> - <input type="radio" name="duplex" id="intro-approve-as-friend-{{$intro_id}}" class="intro-approve-as-friend" {{$friend_selected}} value="1" /> - <div class="intro-approve-friend-break" ></div> -</div> -<div class="intro-approve-as-friend-end"></div> -<div class="intro-approve-as-fan-wrapper"> - <label class="intro-approve-as-fan-label" for="intro-approve-as-fan-{{$intro_id}}">{{$as_fan}}</label> - <input type="radio" name="duplex" id="intro-approve-as-fan-{{$intro_id}}" class="intro-approve-as-fan" {{$fan_selected}} value="0" /> - <div class="intro-approve-fan-break"></div> -</div> -<div class="intro-approve-as-end"></div> diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index 261f965da..ff2011181 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -1,11 +1,17 @@ <h2>{{$title}}</h2> -<form action="new_channel" method="post" id="newchannel-form"> +<form action="new_channel" method="post" id="newchannel-form" class="stylish-select"> <div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div> + <div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div> + {{include file="field_select_grouped.tpl" field=$role}} + <div id="newchannel-role-end" class="newchannel-field-end"></div> + + <label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >{{$label_name}}</label> <input type="text" name="name" id="newchannel-name" class="newchannel-input" value="{{$name}}" /> + <div id="name-spinner"></div> <div id="newchannel-name-feedback" class="newchannel-feedback"></div> <div id="newchannel-name-end" class="newchannel-field-end"></div> @@ -13,6 +19,7 @@ <label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label> <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> + <div id="nick-spinner"></div> <div id="newchannel-nickname-feedback" class="newchannel-feedback"></div> <div id="newchannel-nickname-end" class="newchannel-field-end"></div> diff --git a/view/tpl/nogroup-template.tpl b/view/tpl/nogroup-template.tpl deleted file mode 100755 index 15094b2d6..000000000 --- a/view/tpl/nogroup-template.tpl +++ /dev/null @@ -1,12 +0,0 @@ -<h1>{{$header}}</h1> - -{{foreach $contacts as $contact}} - {{include file="contact_template.tpl"}} -{{/foreach}} -<div id="contact-edit-end"></div> - -{{$paginate}} - - - - diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index ae87c8ec8..0b24da7c3 100755 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -1,7 +1,11 @@ +<div class="generic-content-wrapper-styled"> + <h1>{{$notif_header}}</h1> + {{if $notifications_available}} -<a href="#" onclick="markRead('notify');">{{$notif_link_mark_seen}}</a> +<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a> {{/if}} <div class="notif-network-wrapper"> {{$notif_content}} </div> +</div> diff --git a/view/tpl/notifications_comments_item.tpl b/view/tpl/notifications_comments_item.tpl deleted file mode 100755 index 856955424..000000000 --- a/view/tpl/notifications_comments_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> -</div> diff --git a/view/tpl/notifications_dislikes_item.tpl b/view/tpl/notifications_dislikes_item.tpl deleted file mode 100755 index 856955424..000000000 --- a/view/tpl/notifications_dislikes_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> -</div> diff --git a/view/tpl/notifications_friends_item.tpl b/view/tpl/notifications_friends_item.tpl deleted file mode 100755 index 856955424..000000000 --- a/view/tpl/notifications_friends_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> -</div> diff --git a/view/tpl/notifications_likes_item.tpl b/view/tpl/notifications_likes_item.tpl deleted file mode 100755 index b2ba4024b..000000000 --- a/view/tpl/notifications_likes_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> -</div> diff --git a/view/tpl/notifications_posts_item.tpl b/view/tpl/notifications_posts_item.tpl deleted file mode 100755 index 856955424..000000000 --- a/view/tpl/notifications_posts_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> -</div> diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl index 856955424..d3c79be82 100755 --- a/view/tpl/notify.tpl +++ b/view/tpl/notify.tpl @@ -1,3 +1,3 @@ <div class="notif-item"> - <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> + <a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 55bf1575f..ba71c1e80 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,22 +1,19 @@ <div id="peoplefind-sidebar" class="widget"> <h3>{{$findpeople}}</h3> - <div class="descriptive-text">{{$desc}}</div> <form action="directory" method="post" /> - <input class="icon-search" id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" placeholder=""/> - <input id="side-peoplefind-submit" class="btn btn-default" type="submit" name="submit" value="{{$findthem}}" /> - <br /> - {{if $advanced_search}} - <a href="#" onclick="openClose('advanced-people-search-div'); return false;">{{$advanced_search}}</a> - <div id="advanced-people-search-div" style="display: none;"> - <input class="icon-search" id="side-advanced-peoplefind-url" type="text" name="query" size="24" title="{{$advanced_hint}}" placeholder=""/> - <input id="side-advanced-peoplefind-submit" class="btn btn-default" type="submit" name="submit" value="{{$find_advanced}}" /> + <div class="form-group"> + <div class="input-group"> + <input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> + <div class="input-group-btn"> + <button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button> + </div> + </div> </div> - <br /> - {{/if}} </form> - {{if $similar}}<a href="match" >{{$similar}}</a><br />{{/if}} - {{if $loggedin}}<a href="suggest" >{{$suggest}}</a><br />{{/if}} - <a href="randprof" >{{$random}}</a><br /> - {{if $loggedin}}{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}{{/if}} + <ul class="nav nav-pills nav-stacked"> + {{if $similar}}<li><a href="match" >{{$similar}}</a></li>{{/if}} + {{if $loggedin}}<li><a href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}} + <li><a href="randprof" >{{$random}}</a></li> + {{if $loggedin}}{{if $inv}}<li><a href="invite" >{{$inv}}</a></li>{{/if}}{{/if}} + </ul> </div> - diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index a63bff78c..5506b01f2 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,7 +1,28 @@ -<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}}" /> - <p class='caption'>{{$desc}}</p> - </a> +<div class="section-title-wrapper"> + <div class="pull-right"> + <a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a> + <div class="btn-group btn-group"> + {{if $album_edit.1}} + <i class="icon-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i> + {{/if}} + {{if $can_post}} + <button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i> {{$upload.0}}</button> + {{/if}} + </div> + </div> + + <h2>{{$album}}</h2> + + <div class="clear"></div> </div> -<div class="photo-album-image-wrapper-end"></div> +{{$upload_form}} +{{$album_edit.1}} +<div id="photo-album-contents" class="generic-content-wrapper"> + {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + <div id="page-end"></div> +</div> +<div class="photos-end"></div> +<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> +<div id="page-spinner"></div> diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 7ff4a8cc0..de1105bbc 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,15 +1,13 @@ <div id="side-bar-photos-albums" class="widget"> -<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3> -{{if $albums}} -<ul> -{{foreach $albums as $al}} -{{if $al.text}} -<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a> ({{$al.total}})</li> -{{/if}} -{{/foreach}} -</ul> -{{/if}} -{{if $upload}} -<div id="photo-albums-upload-link"><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></div> -{{/if}} + <h3>{{$title}}</h3> + <ul class="nav nav-pills nav-stacked"> + <li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li> + {{if $albums}} + {{foreach $albums as $al}} + {{if $al.text}} + <li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li> + {{/if}} + {{/foreach}} + {{/if}} + </ul> </div> diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl index e7d25fd55..16f9a76c2 100755 --- a/view/tpl/photo_item.tpl +++ b/view/tpl/photo_item.tpl @@ -1,22 +1,27 @@ -<div class="wall-item-outside-wrapper{{$indent}}" id="wall-item-outside-wrapper-{{$id}}" > - <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" > - <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}"> - <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a> - </div> +<div class="wall-item-outside-wrapper {{$indent}}" id="wall-item-outside-wrapper-{{$id}}" > + <div class="wall-item-content-wrapper {{$indent}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;"> + <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > + <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" > + <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}"> + <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a> + </div> + </div> + <div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" > + <div class="wall-item-author"> + <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a> + </div> + <div class="wall-item-ago" id="wall-item-ago-{{$id}}">{{$ago}}</div> + </div> + <div class="wall-item-content" id="wall-item-content-{{$id}}" > + <div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div> + <div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div> + </div> + {{$drop}} + <div class="wall-item-wrapper-end"></div> - <div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" > - <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a> - <div class="wall-item-ago" id="wall-item-ago-{{$id}}">{{$ago}}</div> - </div> - <div class="wall-item-content" id="wall-item-content-{{$id}}" > - <div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div> - <div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div> - </div> - {{$drop}} - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-comment-separator"></div> - {{$comment}} + {{$comment}} -<div class="wall-item-outside-wrapper-end{{$indent}}" ></div> + <div class="wall-item-outside-wrapper-end{{$indent}}" ></div> + </div> </div> diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index 944928f85..a86aa7f80 100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,7 +1,4 @@ -<div class="photo-top-image-wrapper lframe {{$photo.twist}}" id="photo-top-image-wrapper-{{$photo.id}}"> - <a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> - <img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo" id="photo-top-photo-{{$photo.id}}" /> - </a> - <div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div> -</div> +<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> + <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" /> +</a> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 0c16eb362..45a7cd7e5 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,91 +1,188 @@ <div id="live-photos"></div> -<h3><a href="{{$album.0}}">{{$album.1}}</a></h3> - -<div id="photo-edit-link-wrap"> -{{if $tools}} -<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a> -{{/if}} -{{if $lock}} | <i class="lockview icon-lock" title="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');"></i> {{/if}} -</div> +<div class="generic-content-wrapper"> + + <div class="section-title-wrapper"> + <div class="pull-right"> + + {{if $tools}} + <a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a> + {{/if}} + + <div class="btn-group btn-group dropdown"> + {{if $edit}} + <i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i> + {{/if}} + {{if $lock}} + <i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> + {{/if}} + </div> + <div class="btn-group btn-group"> + {{if $prevlink}} + <a href="{{$prevlink.0}}" class="btn btn-default btn-xs" title="{{$prevlink.1}}"><i class="icon-backward"></i></a> + {{/if}} + {{if $nextlink}} + <a href="{{$nextlink.0}}" class="btn btn-default btn-xs" title="{{$nextlink.1}}"><i class="icon-forward"></i></a> + {{/if}} + </div> + </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}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="max-width: 100%;" src="{{$photo.src}}"></a></div> -{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}} -<div id="photo-photo-end"></div> -<div id="photo-caption">{{$desc}}</div> -{{if $tags}} -<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}} + <h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2> -{{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"> + <div class="clear"></div> - <input type="hidden" name="item_id" value="{{$edit.item_id}}"> + </div> + <div id="photo-edit" class="section-content-tools-wrapper"> + <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form"> + <input type="hidden" name="item_id" value="{{$edit.item_id}}" /> + <div class="form-group"> + <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum_label}}</label> + <input id="photo-edit-albumname" class="form-control" type="text" name="albname" value="{{$edit.album}}" placeholder="{{$edit.newalbum_placeholder}}" list="dl-albums" /> + {{if $edit.albums}} + <datalist id="dl-albums"> + {{foreach $edit.albums as $al}} + {{if $al.text}} + <option value="{{$al.text}}"> + {{/if}} + {{/foreach}} + </datalist> + {{/if}} + </div> + <div class="form-group"> + <label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label> + <input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" /> + </div> + <div class="form-group"> + <label id="photo-edit-tags-label" for="photo-edit-newtag">{{$edit.tag_label}}</label> + <input name="newtag" id="photo-edit-newtag" class="form-control" title="{{$edit.help_tags}}" type="text" /> + </div> + <div class="form-group"> + <label class="radio-inline" id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw"><input id="photo-edit-rotate-cw" type="radio" name="rotate" value="1" />{{$edit.rotatecw}}</label> + <label class="radio-inline" id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw"><input id="photo-edit-rotate-ccw" type="radio" name="rotate" value="2" />{{$edit.rotateccw}}</label> + </div> + {{if $edit.adult_enabled}} + <div class="form-group"> + {{include file="field_checkbox.tpl" field=$edit.adult}} + </div> + {{/if}} + + {{$edit.aclselect}} + + <div class="form-group pull-left"> + <button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button> + </div> + <div class="form-group btn-group pull-right"> + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$edit.lockstate}}"></i> + </button> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button> + </div> + </form> + <div id="photo-edit-end" class="clear"></div> + </div> - <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}}" list="dl-albums"> -{{if $edit.albums}} - <datalist id="dl-albums"> - {{foreach $edit.albums as $al}} - {{if $al.text}} - <option value="{{$al.text}}"> - {{/if}} - {{/foreach}} - </datalist> -{{/if}} - <div id="photo-edit-albumname-end"></div> + <div id="photo-view-wrapper"> - <label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label> - <input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$edit.caption}}"> + <div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div> + <div id="photo-photo-end" class="clear"></div> - <div id="photo-edit-caption-end"></div> + {{if $tags}} + <div class="photo-item-tools-left" id="in-this-photo"> + <span id="in-this-photo-text">{{$tag_hdr}}</span> + {{foreach $tags as $t}} + {{$t.0}}{{if $edit}}<span id="tag-remove"> <a href="{{$t.1}}" onclick="return confirmDelete();"><i class="icon-remove"></i></a> </span>{{/if}} + {{/foreach}} + </div> + {{/if}} - <label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label> - <input name="newtag" id="photo-edit-newtag" size="84" title="{{$edit.help_tags}}" type="text"> + <div class="photo-item-tools"> + {{if $like_count || $dislike_count}} + <div class="photo-item-tools-left pull-left"> + <div class="{{if $like_count && $dislike_count}}btn-group{{/if}}"> + {{if $like_count}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-like-{{$id}}">{{$like_count}} {{$like_button_label}}</button> + {{if $like_list_part}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$id}}">{{foreach $like_list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + {{else}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$id}}">{{foreach $like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + {{/if}} + </div> + {{/if}} + {{if $dislike_count}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-dislike dropdown-toggle" data-toggle="dropdown" id="wall-item-dislike-{{$id}}">{{$dislike_count}} {{$dislike_button_label}}</button> + {{if $dislike_list_part}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$id}}">{{foreach $dislike_list_part as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + {{else}} + <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$id}}">{{foreach $dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + {{/if}} + </div> + {{/if}} + </div> + {{if $like_list_part}} + <div class="modal" id="likeModal-{{$id}}"> + <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">{{$like_modal_title}}</h4> + </div> + <div class="modal-body"> + <ul>{{foreach $like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + </div> + <div class="modal-footer clear"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} + {{if $dislike_list_part}} + <div class="modal" id="dislikeModal-{{$id}}"> + <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">{{$dislike_modal_title}}</h4> + </div> + <div class="modal-body"> + <ul>{{foreach $dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul> + </div> + <div class="modal-footer clear"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} + </div> + </div> + {{/if}} - <div id="photo-edit-tags-end"></div> - <div id="photo-edit-rotate-wrapper"> - <div id="photo-edit-rotate-label"> - {{$edit.rotatecw}}<br> - {{$edit.rotateccw}} + {{if $likebuttons}} + <div class="photo-item-tools-right btn-group pull-right"> + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false"> + <i class="icon-thumbs-up-alt" title="{{$likethis}}"></i> + </button> + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false"> + <i class="icon-thumbs-down-alt" title="{{$nolike}}"></i> + </button> </div> - <input type="radio" name="rotate" value="1"><br> - <input type="radio" name="rotate" value="2"> + <div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div> + {{/if}} + <div class="clear"></div> </div> - <div id="photo-edit-rotate-end"></div> - - <div id="settings-default-perms" class="settings-default-perms"> - <span id="jot-perms-icon" class="{{$edit.lockstate}}"></span> - <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$edit.permissions}}</button> - {{$edit.aclselect}} - <div id="settings-default-perms-menu-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();"> - - <div id="photo-edit-end"></div> -</form> </div> -{{/if}} -{{if $likebuttons}} -<div id="photo-like-div"> - {{$likebuttons}} - {{$like}} - {{$dislike}} +{{$comments}} + +{{if $commentbox}} +<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" > + {{$commentbox}} </div> {{/if}} -{{$comments}} +<div class="clear"></div> {{$paginate}} diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 43a22a017..7727abcea 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,11 +1,17 @@ -<h3>{{$title}}</h3> -{{if $can_post}} -<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> -{{/if}} - -<div class="photos"> -{{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} -{{/foreach}} +<div class="section-title-wrapper"> + {{if $can_post}} + <button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i> {{$upload.0}}</button> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> +</div> +{{$upload_form}} +<div id="photo-album-contents" class="generic-content-wrapper"> + {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + <div id="page-end"></div> </div> <div class="photos-end"></div> +<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> +<div id="page-spinner"></div> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 62591c648..6cd7e3eb9 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,41 +1,63 @@ -<h3>{{$pagename}}</h3> - -<div id="photos-usage-message" class="usage-message">{{$usage}}</div> - -<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" > - <input type="hidden" id="photos-upload-source" name="source" value="photos" /> - <div id="photos-upload-new-wrapper" > - <div id="photos-upload-newalbum-div"> - <label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label> - </div> - <input id="photos-upload-newalbum" type="text" name="newalbum" /> +<div id="photo-upload-form" class="generic-content-wrapper"> + <div class="section-content-tools-wrapper"> + <form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form"> + <input type="hidden" id="photos-upload-source" name="source" value="photos" /> + + <div class="form-group"> + <label for="photos-upload-album">{{$newalbum_label}}</label> + <input type="text" class="form-control" id="photos-upload-album" name="newalbum" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload"> + <datalist id="dl-photo-upload"> + {{foreach $albums as $al}} + {{if $al.text}} + <option value="{{$al.text}}"> + {{/if}} + {{/foreach}} + </datalist> + </div> + + {{$aclselect}} + + {{if $default}} + <div class="form-group"> + <input id="photos-upload-choose" type="file" name="userfile" /> + </div> + <div class="pull-right btn-group form-group"> + <div class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-sm" title="{{$nosharetext}}"> + <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i> + </label> + </div> + <div class="btn-group"> + {{if $lockstate}} + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> + {{/if}} + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> + </div> + + </div> + {{/if}} + <div class="clear"></div> + + {{if $uploader}} + <div id="photos-upload-perms" class="btn-group pull-right"> + <div class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-sm" title="{{$nosharetext}}"> + <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i> + </label> + </div> + {{if $lockstate}} + <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> + {{/if}} + <div class="pull-right"> + {{$uploader}} + </div> + </div> + {{/if}} + </form> </div> - <div id="photos-upload-new-end"></div> - <div id="photos-upload-exist-wrapper"> - <div id="photos-upload-existing-album-text">{{$existalbumtext}}</div> - {{$albumselect}} - </div> - <div id="photos-upload-exist-end"></div> - - <div id="photos-upload-noshare-div" class="photos-upload-noshare-div" > - <input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /> - <label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label> - </div> - - - <div id="photos-upload-perms" class="photos-upload-perms" > - <span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span> - <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> - </div> - {{$aclselect}} - <div id="photos-upload-perms-end"></div> - - <div id="photos-upload-spacer"></div> - - {{$uploader}} - - {{$default}} - - <div class="photos-upload-end" ></div> -</form> - + <div id="photos-upload-end" class="clear"></div> +</div> diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl new file mode 100755 index 000000000..632aab2b3 --- /dev/null +++ b/view/tpl/photosajax.tpl @@ -0,0 +1,4 @@ +{{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} +{{/foreach}} +<script>justifyPhotosAjax()</script> diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl index 0867ab392..6298ca0aa 100755 --- a/view/tpl/posted_date_widget.tpl +++ b/view/tpl/posted_date_widget.tpl @@ -1,16 +1,46 @@ +<script> + +function toggle_posted_date_button() { + if($('#posted-date-dropdown').is(':visible')) { + $('#posted-date-icon').removeClass('icon-caret-up'); + $('#posted-date-icon').addClass('icon-caret-down'); + $('#posted-date-dropdown').hide(); + } + else { + $('#posted-date-icon').addClass('icon-caret-up'); + $('#posted-date-icon').removeClass('icon-caret-down'); + $('#posted-date-dropdown').show(); + } +} +</script> + + <div id="datebrowse-sidebar" class="widget"> <h3>{{$title}}</h3> -<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> -<ul id="posted-date-selector"> -{{foreach $dates as $y => $arr}} -<li id="posted-date-selector-year-{{$y}}" class="fakelink" onclick="openClose('posted-date-selector-{{$y}}');">{{$y}}</li> -<div id="posted-date-selector-{{$y}}" style="display: none;"> -<ul class="posted-date-selector-months"> -{{foreach $arr as $d}} -<li class="posted-date-li"><a href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}&dbegin={{$d.2}}'); return false;">{{$d.0}}</a></li> -{{/foreach}} -</ul> -</div> -{{/foreach}} -</ul> + <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> + <ul id="posted-date-selector" class="nav nav-pills nav-stacked"> + {{foreach $dates as $y => $arr}} + {{if $y == $cutoff_year}} + </ul> + <div id="posted-date-dropdown" style="display: none;"> + <ul id="posted-date-selector-drop" class="nav nav-pills nav-stacked"> + {{/if}} + <li id="posted-date-selector-year-{{$y}}"> + <a href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a> + </li> + <div id="posted-date-selector-{{$y}}" style="display: none;"> + <ul class="posted-date-selector-months nav nav-pills nav-stacked"> + {{foreach $arr as $d}} + <li> + <a href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}{{if $showend}}&dbegin={{$d.2}}{{/if}}'); return false;">{{$d.0}}</a> + </li> + {{/foreach}} + </ul> + </div> + {{/foreach}} + {{if $cutoff}} + </div> + <button class="btn btn-default btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="icon-caret-down"></i></button> + {{/if}} + </ul> </div> diff --git a/view/tpl/profdef_edit.tpl b/view/tpl/profdef_edit.tpl new file mode 100644 index 000000000..bfe85314d --- /dev/null +++ b/view/tpl/profdef_edit.tpl @@ -0,0 +1,16 @@ +<h3>{{$header}}</h3> + +<form action="admin/profs" method="post" > + +{{if $id}} +<input type="hidden" name="id" value="{{$id}}" /> +{{/if}} + +{{include file="field_input.tpl" field=$field_name}} +{{include file="field_input.tpl" field=$field_type}} +{{include file="field_input.tpl" field=$field_desc}} +{{include file="field_input.tpl" field=$field_help}} + +<input name="submit" type="submit" value="{{$submit}}" /> + +</form> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 73033fe40..1f99bf1ad 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -1,223 +1,229 @@ <div id="profile-content-wrapper" class="generic-content-wrapper"> -<h2>{{$title}}</h2> - -{{if $profile.canlike || $profile.like_count}} -<div id="profile-like-wrapper"> -{{if $profile.canlike}} - <button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" > - <i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i> - </button> -{{/if}} - - -{{if $profile.like_count}} -<div class="btn-group"> -<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button> -{{if $profile.likers}} -<ul class="dropdown-menu" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}">{{$liker.name}}</a></li>{{/foreach}}</ul> -{{/if}} -</div> -{{/if}} -</div> -{{/if}} - -<dl id="aprofile-fullname" class="aprofile"> - <dt>{{$profile.fullname.0}}</dt> - <dd>{{$profile.fullname.1}}</dd> -</dl> - -{{if $profile.gender}} -<dl id="aprofile-gender" class="aprofile"> - <dt>{{$profile.gender.0}}</dt> - <dd>{{$profile.gender.1}}</dd> -</dl> -{{/if}} - -{{if $profile.birthday}} -<dl id="aprofile-birthday" class="aprofile"> - <dt>{{$profile.birthday.0}}</dt> - <dd>{{$profile.birthday.1}}</dd> -</dl> -{{/if}} - -{{if $profile.age}} -<dl id="aprofile-age" class="aprofile"> - <dt>{{$profile.age.0}}</dt> - <dd>{{$profile.age.1}}</dd> -</dl> -{{/if}} - -{{if $profile.marital}} -<dl id="aprofile-marital" class="aprofile"> - <dt><span class="heart">♥</span> {{$profile.marital.0}}</dt> - <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd> -</dl> -{{/if}} - -{{if $profile.sexual}} -<dl id="aprofile-sexual" class="aprofile"> - <dt>{{$profile.sexual.0}}</dt> - <dd>{{$profile.sexual.1}}</dd> -</dl> -{{/if}} - -{{if $profile.keywords}} -<dl id="aprofile-tags" class="aprofile"> - <dt>{{$profile.keywords.0}}</dt> - <dd>{{$profile.keywords.1}}</dd> -</dl> -{{/if}} - -{{if $profile.homepage}} -<dl id="aprofile-homepage" class="aprofile"> - <dt>{{$profile.homepage.0}}</dt> - <dd>{{$profile.homepage.1}}</dd> -</dl> -{{/if}} - -{{if $profile.hometown}} -<dl id="aprofile-hometown" class="aprofile"> - <dt>{{$profile.hometown.0}}</dt> - <dd>{{$profile.hometown.1}}</dd> -</dl> -{{/if}} - -{{if $profile.politic}} -<dl id="aprofile-politic" class="aprofile"> - <dt>{{$profile.politic.0}}</dt> - <dd>{{$profile.politic.1}}</dd> -</dl> -{{/if}} - -{{if $profile.religion}} -<dl id="aprofile-religion" class="aprofile"> - <dt>{{$profile.religion.0}}</dt> - <dd>{{$profile.religion.1}}</dd> -</dl> -{{/if}} - -{{if $profile.about}} -<dl id="aprofile-about" class="aprofile"> - <dt>{{$profile.about.0}}</dt> - <dd>{{$profile.about.1}}</dd> -</dl> -{{/if}} - -{{if $profile.interest}} -<dl id="aprofile-interest" class="aprofile"> - <dt>{{$profile.interest.0}}</dt> - <dd>{{$profile.interest.1}}</dd> -</dl> -{{/if}} - -{{if $profile.likes}} -<dl id="aprofile-likes" class="aprofile"> - <dt>{{$profile.likes.0}}</dt> - <dd>{{$profile.likes.1}}</dd> -</dl> -{{/if}} - -{{if $profile.dislikes}} -<dl id="aprofile-dislikes" class="aprofile"> - <dt>{{$profile.dislikes.0}}</dt> - <dd>{{$profile.dislikes.1}}</dd> -</dl> -{{/if}} - -{{if $profile.contact}} -<dl id="aprofile-contact" class="aprofile"> - <dt>{{$profile.contact.0}}</dt> - <dd>{{$profile.contact.1}}</dd> -</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"> - <dt>{{$profile.music.0}}</dt> - <dd>{{$profile.music.1}}</dd> -</dl> -{{/if}} - - -{{if $profile.book}} -<dl id="aprofile-book" class="aprofile"> - <dt>{{$profile.book.0}}</dt> - <dd>{{$profile.book.1}}</dd> -</dl> -{{/if}} - - -{{if $profile.tv}} -<dl id="aprofile-tv" class="aprofile"> - <dt>{{$profile.tv.0}}</dt> - <dd>{{$profile.tv.1}}</dd> -</dl> -{{/if}} - - -{{if $profile.film}} -<dl id="aprofile-film" class="aprofile"> - <dt>{{$profile.film.0}}</dt> - <dd>{{$profile.film.1}}</dd> -</dl> -{{/if}} - - -{{if $profile.romance}} -<dl id="aprofile-romance" class="aprofile"> - <dt>{{$profile.romance.0}}</dt> - <dd>{{$profile.romance.1}}</dd> -</dl> -{{/if}} - - -{{if $profile.work}} -<dl id="aprofile-work" class="aprofile"> - <dt>{{$profile.work.0}}</dt> - <dd>{{$profile.work.1}}</dd> -</dl> -{{/if}} - -{{if $profile.education}} -<dl id="aprofile-education" class="aprofile"> - <dt>{{$profile.education.0}}</dt> - <dd>{{$profile.education.1}}</dd> -</dl> -{{/if}} - -{{if $things}} -{{foreach $things as $key => $items}} -<b>{{$profile.fullname.1}} {{$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> -{{if $profile.canlike}}<br /> -<button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" > -<i class="icon-thumbs-up-alt" title="{{$likethis}}"></i> -</button> -{{/if}} -{{if $item.like_count}} -<div class="btn-group"> -<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button> -{{if $item.likes}} -<ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}">{{$liker.xchan_name}}</a></li>{{/foreach}}</ul> -{{/if}} -</div> -{{/if}} -</li> -{{/foreach}} -</ul> -<div class="clear"></div> -{{/foreach}} -{{/if}} - + <div class="section-title-wrapper"> + <div class="pull-right dropdown"> + {{if $profile.like_count}} + <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button> + {{if $profile.likers}} + <ul class="dropdown-menu" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}">{{$liker.name}}</a></li>{{/foreach}}</ul> + {{/if}} + {{/if}} + {{if $profile.canlike}} + <button type="button" class="btn btn-success btn-xs" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" > + <i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i> + </button> + {{/if}} + </div> + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> + <div class="section-content-wrapper"> + <dl id="aprofile-fullname" class="aprofile"> + <dt>{{$profile.fullname.0}}</dt> + <dd>{{$profile.fullname.1}}</dd> + </dl> + + {{if $profile.gender}} + <dl id="aprofile-gender" class="aprofile"> + <dt>{{$profile.gender.0}}</dt> + <dd>{{$profile.gender.1}}</dd> + </dl> + {{/if}} + + {{if $profile.birthday}} + <dl id="aprofile-birthday" class="aprofile"> + <dt>{{$profile.birthday.0}}</dt> + <dd>{{$profile.birthday.1}}</dd> + </dl> + {{/if}} + + {{if $profile.age}} + <dl id="aprofile-age" class="aprofile"> + <dt>{{$profile.age.0}}</dt> + <dd>{{$profile.age.1}}</dd> + </dl> + {{/if}} + + {{if $profile.marital}} + <dl id="aprofile-marital" class="aprofile"> + <dt><span class="heart">♥</span> {{$profile.marital.0}}</dt> + <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd> + </dl> + {{/if}} + + {{if $profile.sexual}} + <dl id="aprofile-sexual" class="aprofile"> + <dt>{{$profile.sexual.0}}</dt> + <dd>{{$profile.sexual.1}}</dd> + </dl> + {{/if}} + + {{if $profile.keywords}} + <dl id="aprofile-tags" class="aprofile"> + <dt>{{$profile.keywords.0}}</dt> + <dd>{{$profile.keywords.1}}</dd> + </dl> + {{/if}} + + {{if $profile.homepage}} + <dl id="aprofile-homepage" class="aprofile"> + <dt>{{$profile.homepage.0}}</dt> + <dd>{{$profile.homepage.1}}</dd> + </dl> + {{/if}} + + {{if $profile.hometown}} + <dl id="aprofile-hometown" class="aprofile"> + <dt>{{$profile.hometown.0}}</dt> + <dd>{{$profile.hometown.1}}</dd> + </dl> + {{/if}} + + {{if $profile.politic}} + <dl id="aprofile-politic" class="aprofile"> + <dt>{{$profile.politic.0}}</dt> + <dd>{{$profile.politic.1}}</dd> + </dl> + {{/if}} + + {{if $profile.religion}} + <dl id="aprofile-religion" class="aprofile"> + <dt>{{$profile.religion.0}}</dt> + <dd>{{$profile.religion.1}}</dd> + </dl> + {{/if}} + + {{if $profile.about}} + <dl id="aprofile-about" class="aprofile"> + <dt>{{$profile.about.0}}</dt> + <dd>{{$profile.about.1}}</dd> + </dl> + {{/if}} + + {{if $profile.interest}} + <dl id="aprofile-interest" class="aprofile"> + <dt>{{$profile.interest.0}}</dt> + <dd>{{$profile.interest.1}}</dd> + </dl> + {{/if}} + + {{if $profile.likes}} + <dl id="aprofile-likes" class="aprofile"> + <dt>{{$profile.likes.0}}</dt> + <dd>{{$profile.likes.1}}</dd> + </dl> + {{/if}} + + {{if $profile.dislikes}} + <dl id="aprofile-dislikes" class="aprofile"> + <dt>{{$profile.dislikes.0}}</dt> + <dd>{{$profile.dislikes.1}}</dd> + </dl> + {{/if}} + + {{if $profile.contact}} + <dl id="aprofile-contact" class="aprofile"> + <dt>{{$profile.contact.0}}</dt> + <dd>{{$profile.contact.1}}</dd> + </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"> + <dt>{{$profile.music.0}}</dt> + <dd>{{$profile.music.1}}</dd> + </dl> + {{/if}} + + + {{if $profile.book}} + <dl id="aprofile-book" class="aprofile"> + <dt>{{$profile.book.0}}</dt> + <dd>{{$profile.book.1}}</dd> + </dl> + {{/if}} + + + {{if $profile.tv}} + <dl id="aprofile-tv" class="aprofile"> + <dt>{{$profile.tv.0}}</dt> + <dd>{{$profile.tv.1}}</dd> + </dl> + {{/if}} + + + {{if $profile.film}} + <dl id="aprofile-film" class="aprofile"> + <dt>{{$profile.film.0}}</dt> + <dd>{{$profile.film.1}}</dd> + </dl> + {{/if}} + + + {{if $profile.romance}} + <dl id="aprofile-romance" class="aprofile"> + <dt>{{$profile.romance.0}}</dt> + <dd>{{$profile.romance.1}}</dd> + </dl> + {{/if}} + + + {{if $profile.work}} + <dl id="aprofile-work" class="aprofile"> + <dt>{{$profile.work.0}}</dt> + <dd>{{$profile.work.1}}</dd> + </dl> + {{/if}} + + {{if $profile.education}} + <dl id="aprofile-education" class="aprofile"> + <dt>{{$profile.education.0}}</dt> + <dd>{{$profile.education.1}}</dd> + </dl> + {{/if}} + + {{foreach $profile.extra_fields as $f}} + {{if $profile.$f}} + <dl id="aprofile-{{$f}}" class="aprofile"> + <dt>{{$profile.$f.0}}</dt> + <dd>{{$profile.$f.1}}</dd> + </dl> + {{/if}} + {{/foreach}} + + + {{if $things}} + {{foreach $things as $key => $items}} + <b>{{$profile.fullname.1}} {{$key}}</b> + <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> + {{if $profile.canlike}}<br /> + <button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" > + <i class="icon-thumbs-up-alt" title="{{$likethis}}"></i> + </button> + {{/if}} + {{if $item.like_count}} + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button> + {{if $item.likes}} + <ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}">{{$liker.xchan_name}}</a></li>{{/foreach}}</ul> + {{/if}} + </div> + {{/if}} + </li> + {{/foreach}} + </ul> + <div class="clear"></div> + {{/foreach}} + {{/if}} + </div> </div> diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 196b3ac6d..535aa19dd 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,23 +1,27 @@ -{{$default}} +<div class="generic-content-wrapper-styled">{{if $is_default}} +<p id="profile-edit-default-desc">{{$default}}</p> +{{/if}} <h1>{{$banner}}</h1> -<div id="profile-edit-links"> -<ul> -<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li> -<li><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li> -<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li> -<li></li> -<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li> +<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" > -</ul> +<div id="profile-edit-links"> +<span class="btn btn-default"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></span> +<span class="btn btn-default"><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></span> +{{if ! $is_default}}<span class="btn btn-default"><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></span>{{/if}} +{{if $profile_clone_link}}<span class="btn btn-default"><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></span>{{/if}} +{{if $exportable}}<br /><span class="btn btn-default"><a href="profiles/export/{{$profile_id}}" target="_blank">{{$lbl_export}}</a></span> +<span class="btn btn-default profile-import"><b>{{$lbl_import}}</b> <input type="file" name="userfile" class="profile-import" ></span> +{{/if}} +{{if ! $is_default}}<span class="btn btn-danger"><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();" {{$disabled}} >{{$del_prof}}</a></span>{{/if}} </div> + <div id="profile-edit-links-end"></div> <div id="profile-edit-wrapper" > -<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" > <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div id="profile-edit-profile-name-wrapper" > @@ -32,19 +36,28 @@ </div> <div id="profile-edit-name-end"></div> + +{{if $fields.pdesc}} <div id="profile-edit-pdesc-wrapper" > <label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label> <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" /> </div> <div id="profile-edit-pdesc-end"></div> +{{/if}} - +{{if $fields.gender}} <div id="profile-edit-gender-wrapper" > <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label> +{{if $advanced}} {{$gender}} +{{else}} +{{$gender_min}} +{{/if}} </div> <div id="profile-edit-gender-end"></div> +{{/if}} +{{if $fields.dob}} <div id="profile-edit-dob-wrapper" > <label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label> <div id="profile-edit-dob" > @@ -52,6 +65,7 @@ </div> </div> <div id="profile-edit-dob-end"></div> +{{/if}} {{$hide_friends}} @@ -60,100 +74,124 @@ </div> <div class="profile-edit-submit-end"></div> - +{{if $fields.address}} <div id="profile-edit-address-wrapper" > <label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label> <input type="text" size="32" name="address" id="profile-edit-address" value="{{$address}}" /> </div> <div id="profile-edit-address-end"></div> +{{/if}} +{{if $fields.locality}} <div id="profile-edit-locality-wrapper" > <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label> <input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality}}" /> </div> <div id="profile-edit-locality-end"></div> +{{/if}} - +{{if $fields.postal_code}} <div id="profile-edit-postal-code-wrapper" > <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label> <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" /> </div> <div id="profile-edit-postal-code-end"></div> +{{/if}} - +{{if $fields.region}} <div id="profile-edit-region-wrapper" > <label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label> <input type="text" size="32" name="region" id="profile-edit-region" value="{{$region}}" /> </div> <div id="profile-edit-region-end"></div> +{{/if}} +{{if $fields.country_name}} <div id="profile-edit-country-name-wrapper" > <label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label> <input type="text" size="32" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" /> </div> <div id="profile-edit-country-name-end"></div> +{{/if}} +{{if $fields.hometown}} <div id="profile-edit-hometown-wrapper" > <label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label> <input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" /> </div> <div id="profile-edit-hometown-end"></div> +{{/if}} <div class="profile-edit-submit-wrapper" > <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> </div> <div class="profile-edit-submit-end"></div> +{{if $fields.marital }} <div id="profile-edit-marital-wrapper" > <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label> +{{if $advanced}} {{$marital}} +{{else}} +{{$marital_min}} +{{/if}} </div> <div class="clear"></div> +{{if $fields.with}} <label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label> <input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" /> <div class="clear"></div> +{{/if}} +{{if $fields.howlong}} <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label> <input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" /> - +<div class="clear"></div> +{{/if}} <div id="profile-edit-marital-end"></div> +{{/if}} -<div id="profile-edit-sexual-wrapper" > -<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label> -{{$sexual}} -</div> -<div id="profile-edit-sexual-end"></div> - - - +{{if $fields.homepage}} <div id="profile-edit-homepage-wrapper" > <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label> <input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" /> </div> <div id="profile-edit-homepage-end"></div> +{{/if}} +{{if $fields.sexual}} +<div id="profile-edit-sexual-wrapper" > +<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label> +{{$sexual}} +</div> +<div id="profile-edit-sexual-end"></div> +{{/if}} + +{{if $fields.politic}} <div id="profile-edit-politic-wrapper" > <label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label> <input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" /> </div> <div id="profile-edit-politic-end"></div> +{{/if}} +{{if $fields.religion}} <div id="profile-edit-religion-wrapper" > <label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label> <input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" /> </div> <div id="profile-edit-religion-end"></div> +{{/if}} +{{if $fields.keywords}} <div id="profile-edit-pubkeywords-wrapper" > <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label> <input type="text" size="32" name="keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$keywords}}" /> </div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div> <div id="profile-edit-pubkeywords-end"></div> +{{/if}} -<div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> -</div> -<div class="profile-edit-submit-end"></div> +{{if $fields.about}} <div id="about-jot-wrapper" > <p id="about-jot-desc" > {{$lbl_about}} @@ -163,8 +201,22 @@ </div> <div id="about-jot-end"></div> +{{/if}} +{{if $fields.contact}} +<div id="contact-jot-wrapper" > +<p id="contact-jot-desc" > +{{$lbl_social}} +</p> + +<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea> + +</div> +<div id="contact-jot-end"></div> +{{/if}} + +{{if $fields.interest}} <div id="interest-jot-wrapper" > <p id="interest-jot-desc" > {{$lbl_hobbies}} @@ -174,8 +226,9 @@ </div> <div id="interest-jot-end"></div> +{{/if}} - +{{if $fields.likes}} <div id="likes-jot-wrapper" > <p id="likes-jot-desc" > {{$lbl_likes}} @@ -185,8 +238,9 @@ </div> <div id="likes-jot-end"></div> +{{/if}} - +{{if $fields.dislikes}} <div id="dislikes-jot-wrapper" > <p id="dislikes-jot-desc" > {{$lbl_dislikes}} @@ -196,18 +250,9 @@ </div> <div id="dislikes-jot-end"></div> +{{/if}} - -<div id="contact-jot-wrapper" > -<p id="contact-jot-desc" > -{{$lbl_social}} -</p> - -<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea> - -</div> -<div id="contact-jot-end"></div> - +{{if $fields.channels}} <div id="channels-jot-wrapper" > <p id="channels-jot-desc" > {{$lbl_channels}} @@ -217,13 +262,9 @@ </div> <div id="channels-jot-end"></div> +{{/if}} -<div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> -</div> -<div class="profile-edit-submit-end"></div> - - +{{if $fields.music}} <div id="music-jot-wrapper" > <p id="music-jot-desc" > {{$lbl_music}} @@ -233,7 +274,9 @@ </div> <div id="music-jot-end"></div> +{{/if}} +{{if $fields.book}} <div id="book-jot-wrapper" > <p id="book-jot-desc" > {{$lbl_book}} @@ -243,9 +286,9 @@ </div> <div id="book-jot-end"></div> +{{/if}} - - +{{if $fields.tv}} <div id="tv-jot-wrapper" > <p id="tv-jot-desc" > {{$lbl_tv}} @@ -255,9 +298,9 @@ </div> <div id="tv-jot-end"></div> +{{/if}} - - +{{if $fields.film}} <div id="film-jot-wrapper" > <p id="film-jot-desc" > {{$lbl_film}} @@ -267,14 +310,10 @@ </div> <div id="film-jot-end"></div> +{{/if}} -<div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> -</div> -<div class="profile-edit-submit-end"></div> - - +{{if $fields.romance}} <div id="romance-jot-wrapper" > <p id="romance-jot-desc" > {{$lbl_love}} @@ -284,9 +323,9 @@ </div> <div id="romance-jot-end"></div> +{{/if}} - - +{{if $fields.work}} <div id="work-jot-wrapper" > <p id="work-jot-desc" > {{$lbl_work}} @@ -296,9 +335,9 @@ </div> <div id="work-jot-end"></div> +{{/if}} - - +{{if $fields.education}} <div id="education-jot-wrapper" > <p id="education-jot-desc" > {{$lbl_school}} @@ -308,8 +347,13 @@ </div> <div id="education-jot-end"></div> +{{/if}} - +{{if $extra_fields}} +{{foreach $extra_fields as $field }} +{{include file="field_input.tpl" field=$field}} +{{/foreach}} +{{/if}} <div class="profile-edit-submit-wrapper" > <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> @@ -319,4 +363,5 @@ </form> </div> +</div> diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl index cc0f3477c..ab81a7fbc 100755 --- a/view/tpl/profile_entry.tpl +++ b/view/tpl/profile_entry.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <div class="profile-listing" > <div class="profile-listing-photo-wrapper" > <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a> @@ -7,4 +8,4 @@ <div class="profile-listing-visible">{{$visible}}</div> </div> <div class="profile-listing-end"></div> - +</div> diff --git a/view/tpl/profile_hide_friends.tpl b/view/tpl/profile_hide_friends.tpl new file mode 100644 index 000000000..4ed6782bb --- /dev/null +++ b/view/tpl/profile_hide_friends.tpl @@ -0,0 +1,20 @@ +{{include file="field_checkbox.tpl"}} + +{{* +<p id="hide-friends-text"> +{{$desc}} +</p> + <div id="hide-friends-yes-wrapper"> + <label id="hide-friends-yes-label" for="hide-friends-yes">{{$yes_str}}</label> + <input type="radio" name="hide-friends" id="hide-friends-yes" {{$yes_selected}} value="1" /> + + <div id="hide-friends-break" ></div> + </div> + + <div id="hide-friends-no-wrapper"> + <label id="hide-friends-no-label" for="hide-friends-no">{{$no_str}}</label> + <input type="radio" name="hide-friends" id="hide-friends-no" {{$no_selected}} value="0" /> + + <div id="hide-friends-end"></div> + </div> +*}} diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index 856d689f1..09d00f982 100755 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -1,11 +1,11 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$header}}</h1> -<p id="profile-listing-desc" class="button" > +<p id="profile-listing-desc" class="btn btn-default" > <a href="profile_photo" >{{$chg_photo}}</a> </p> -<p id="profile-stuff-link" class="button"> +<p id="profile-stuff-link" class="btn btn-default"> <a href="thing" title="{{$stuff_desc}}">{{$addstuff}}</a> </p> -<p id="profile-listing-new-link-wrapper" class="button" > +<p id="profile-listing-new-link-wrapper" class="btn btn-default" > <a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a> </div> - diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index d72507d4c..6904c2fec 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -15,7 +15,7 @@ </div> {{/if}} - <div class="fn label">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> + <div class="fn">{{$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> @@ -41,8 +41,11 @@ {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}} - {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" >{{$profile.homepage}}</a></dd></dl>{{/if}} + {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}} + {{if $diaspora}} + {{include file="diaspora_vcard.tpl"}} + {{/if}} {{if $connect}} <a href="{{$connect_url}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 118bd846f..c6f393aa4 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -26,29 +26,29 @@ <div id="prvmail-submit-wrapper" > <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" /> - <div id="prvmail-upload-wrapper" > + <button id="prvmail-upload-wrapper" class="btn btn-default btn-sm" > <i id="prvmail-upload" class="icon-camera jot-icons" title="{{$upload}}"></i> - </div> + </button> - <div id="prvmail-attach-wrapper" > + <button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" > <i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i> - </div> + </button> - <div id="prvmail-link-wrapper" > - <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i> - </div> + <button id="prvmail-link-wrapper" class="btn btn-default btn-sm" onclick="prvmailJotGetLink(); return false;" > + <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" ></i> + </button> {{if $feature_expire}} - <div id="prvmail-expire-wrapper" > - <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i> - </div> + <button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" onclick="prvmailGetExpiry();return false;" > + <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" ></i> + </button> {{/if}} {{if $feature_encrypt}} - <div id="prvmail-encrypt-wrapper" > - <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i> - </div> + <button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"> + <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i> + </button> {{/if}} <div id="prvmail-rotator-wrapper" > - <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> + <div id="prvmail-rotator"></div> </div> </div> <div id="prvmail-end"></div> diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl new file mode 100644 index 000000000..b7378806b --- /dev/null +++ b/view/tpl/removeaccount.tpl @@ -0,0 +1,22 @@ +<h1>{{$title}}</h1> + +<div id="remove-account-wrapper"> + +<div id="remove-account-desc">{{$desc}}</div> + +<form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" > +<input type="hidden" name="verify" value="{{$hash}}" /> + +<div id="remove-account-pass-wrapper"> +<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> +<input type="password" id="remove-account-pass" name="qxz_password" /> +</div> +<div id="remove-account-pass-end"></div> + +{{include file="field_checkbox.tpl" field=$global}} + +<input type="submit" name="submit" value="{{$submit}}" /> + +</form> +</div> + diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl index e0b2ab538..58ce22741 100644 --- a/view/tpl/safesearch.tpl +++ b/view/tpl/safesearch.tpl @@ -1,4 +1,6 @@ <div id="directory_safemode" class="widget"> <h3>{{$safemode}}</h3> -<a href="toggle_safesearch">{{$toggle}}</a> +<ul class="nav nav-pills nav-stacked"> + <li><a href="toggle_safesearch">{{$toggle}}</a></li> +</ul> </div> diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index 1a9f51af9..73987f192 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -1,12 +1,12 @@ -<div class="widget" id="saved-search-list"> +<div class="widget saved-search-widget"> <h3 id="search">{{$title}}</h3> {{$searchbox}} - <ul id="saved-search-ul"> + <ul id="saved-search-list" class="nav nav-pills nav-stacked"> {{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 saved-search-icon" ></i></a> - <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a> + <li id="search-term-{{$search.id}}"> + <a class="pull-right group-edit-icon" 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" ></i></a> + <a id="saved-search-term-{{$search.id}}"{{if $search.selected}} class="search-selected"{{/if}} href="{{$search.srchlink}}">{{$search.displayterm}}</a> </li> {{/foreach}} </ul> diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl deleted file mode 100755 index 0258a7632..000000000 --- a/view/tpl/saved_searches_aside.tpl +++ /dev/null @@ -1,14 +0,0 @@ -<div class="widget" id="saved-search-list"> - <h3 id="search">{{$title}}</h3> - {{$searchbox}} - - <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="network/?f=&remove=1&search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop saved-search-icon" ></i></a> - <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="network/?f=&search={{$search.encodedterm}}">{{$search.displayterm}}</a> - </li> - {{/foreach}} - </ul> - <div class="clear"></div> -</div> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index f86ee0202..014cf4192 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -20,7 +20,7 @@ <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}} </div> <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> - {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/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}} + {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-remove item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-title-end"></div> diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl new file mode 100644 index 000000000..f4301f0f5 --- /dev/null +++ b/view/tpl/searchbox.tpl @@ -0,0 +1,12 @@ +<form action="{{$action_url}}" method="get" > + <input type="hidden" name="f" value="" /> + <div id="{{$id}}" class="input-group"> + <input class="widget-input" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" /> + <div class="input-group-btn"> + <button type="submit" name="submit" class="btn btn-default btn-sm" id="search-submit" value="{{$search_label}}"><i class="icon-search"></i></button> + {{if $savedsearch}} + <button type="submit" name="searchsave" class="btn btn-default btn-sm" id="search-save" value="{{$save_label}}"><i class="icon-save"></i></button> + {{/if}} + </div> + </div> +</form> diff --git a/view/tpl/select_timezone.tpl b/view/tpl/select_timezone.tpl new file mode 100644 index 000000000..2820a54f4 --- /dev/null +++ b/view/tpl/select_timezone.tpl @@ -0,0 +1,11 @@ +{{* TODO: Make id configurabel *}} +<select id='timezone_select' name='timezone'> +{{foreach $continents as $continent => $cities}} +<optgroup label="{{$continent}}"> +{{foreach $cities as $city => $value}} +<option value='{{$value}}' {{if $value == $selected}}selected='selected'{{/if}}>{{$city}}</option> +{{/foreach}} +</optgroup> +{{/foreach}} +</select> + diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 89c05b75f..894f0fe83 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$ptitle}}</h1> {{$nickname_block}} @@ -9,7 +9,7 @@ <h3 class="settings-heading">{{$h_basic}}</h3> {{include file="field_input.tpl" field=$username}} -{{include file="field_custom.tpl" field=$timezone}} +{{include file="field_select_grouped.tpl" field=$timezone}} {{include file="field_input.tpl" field=$defloc}} {{include file="field_checkbox.tpl" field=$allowloc}} @@ -22,65 +22,50 @@ <h3 class="settings-heading">{{$h_prv}}</h3> -{{include file="field_checkbox.tpl" field=$hide_presence}} - - -<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3> -<ul id="settings-privacy-macros"> -<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-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button> +{{include file="field_select_grouped.tpl" field=$role}} +<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> +{{include file="field_checkbox.tpl" field=$hide_presence}} +<button type="button" class="btn btn-default" 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}} {{foreach $permiss_arr as $permit}} - {{if $expert}} - {{include file="field_select.tpl" field=$permit}} - {{else}} - {{include file="field_select_disabled.tpl" field=$permit}} - {{/if}} + {{include file="field_select.tpl" field=$permit}} {{/foreach}} - -{{if $expert}} <div class="settings-submit-wrapper" > <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> </div> -{{/if}} +</div> +<div id="settings-default-perms" class="settings-default-perms" > + <button class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> + {{$aclselect}} + <div id="settings-default-perms-menu-end"></div> </div> -<div class="settings-common-perms"> +<br/> +<div id="settings-default-perms-end"></div> +{{$group_select}} {{$profile_in_dir}} +</div> + +<div class="settings-common-perms"> + + + {{$suggestme}} -{{include file="field_yesno.tpl" field=$blocktags}} +{{include file="field_checkbox.tpl" field=$blocktags}} {{include file="field_input.tpl" field=$expire}} </div> -<div id="settings-default-perms" class="settings-default-perms" > - <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> - {{$aclselect}} - <div id="settings-default-perms-menu-end"></div> -</div> -<br/> -<div id="settings-default-perms-end"></div> - -{{$group_select}} <div class="settings-submit-wrapper" > @@ -93,9 +78,9 @@ <div id="settings-notifications"> <div id="settings-activity-desc">{{$activity_options}}</div> -{{*the next two aren't yet implemented *}} -{{*include file="field_checkbox.tpl" field=$post_newfriend*}} +{{*not yet implemented *}} {{*include file="field_checkbox.tpl" field=$post_joingroup*}} +{{include file="field_checkbox.tpl" field=$post_newfriend}} {{include file="field_checkbox.tpl" field=$post_profilechange}} @@ -112,6 +97,29 @@ {{include file="field_intcheckbox.tpl" field=$notify8}} </div> +<div id="settings-vnotify-desc">{{$lbl_vnot}}</div> + +<div class="group"> +{{include file="field_intcheckbox.tpl" field=$vnotify1}} +{{include file="field_intcheckbox.tpl" field=$vnotify2}} +{{include file="field_intcheckbox.tpl" field=$vnotify3}} +{{include file="field_intcheckbox.tpl" field=$vnotify4}} +{{include file="field_intcheckbox.tpl" field=$vnotify5}} +{{include file="field_intcheckbox.tpl" field=$vnotify6}} +{{include file="field_intcheckbox.tpl" field=$vnotify10}} +{{include file="field_intcheckbox.tpl" field=$vnotify7}} +{{include file="field_intcheckbox.tpl" field=$vnotify8}} +{{include file="field_intcheckbox.tpl" field=$vnotify9}} +{{include file="field_intcheckbox.tpl" field=$vnotify11}} +{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}} + +{{*include file="field_intcheckbox.tpl" field=$vnotify11*}} +</div> + +{{include file="field_input.tpl" field=$evdays}} + + + </div> <div class="settings-submit-wrapper" > @@ -122,6 +130,8 @@ {{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"> diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 169516f08..36bb494d8 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -1,10 +1,7 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> - - - <form action="settings/account" id="settings-account-form" method="post" autocomplete="off" > <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> @@ -23,4 +20,9 @@ {{$account_settings}} +<div id="settings-remove-account-link"> +<h3 class="settings-heading">{{$removeme}}</h3> +<div id="settings-remove-account-desc">{{$removeaccount}}</div> +<button title="{{$permanent}}" class="btn btn-danger" type="submit" formaction="removeaccount">{{$removeme}}</button> +</div> </div> diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl index 3e447cd0a..f0d5195bf 100755 --- a/view/tpl/settings_addons.tpl +++ b/view/tpl/settings_addons.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> diff --git a/view/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl index a8bde4c1e..8bea9ca63 100755 --- a/view/tpl/settings_connectors.tpl +++ b/view/tpl/settings_connectors.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> <form action="settings/connectors" method="post" autocomplete="off"> @@ -6,4 +7,4 @@ {{$settings_connectors}} </form> - +</div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index a2038b930..8bf4dc0cc 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$ptitle}}</h1> <form action="settings/display" id="settings-form" method="post" autocomplete="off" > @@ -6,10 +6,17 @@ {{include file="field_themeselect.tpl" field=$theme}} {{include file="field_themeselect.tpl" field=$mobile_theme}} +{{if $expert}} +{{include file="field_checkbox.tpl" field=$user_scalable}} +{{/if}} {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} +{{include file="field_input.tpl" field=$channel_divmore_height}} +{{include file="field_input.tpl" field=$network_divmore_height}} {{include file="field_checkbox.tpl" field=$nosmile}} - +{{include file="field_checkbox.tpl" field=$title_tosource}} +{{include file="field_checkbox.tpl" field=$channel_list_mode}} +{{include file="field_checkbox.tpl" field=$network_list_mode}} <div class="settings-submit-wrapper" > <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index a03817f82..3ede4c76d 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> @@ -9,7 +9,7 @@ <h3 class="settings-heading">{{$f.0}}</h3> {{foreach $f.1 as $fcat}} - {{include file="{{$field_yesno}}" field=$fcat}} + {{include file="field_checkbox.tpl" field=$fcat}} {{/foreach}} {{/foreach}} diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index 9be0035ff..f7b4a0b1a 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -1,4 +1,4 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index d956a7228..3b0c8841c 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -4,6 +4,12 @@ {{if $version}} <p>{{$version}}{{if $commit}}+{{$commit}}{{/if}}</p> {{/if}} +{{if $tag}} +<p>{{$tag_txt}} {{$tag}}</p> +{{/if}} +{{if $polled}} +<p>{{$polled}} {{$lastpoll}}</p> +{{/if}} <p>{{$web_location}}</p> <p>{{$visit}}</p> <p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p> diff --git a/view/tpl/smarty3/README b/view/tpl/smarty3/README deleted file mode 100644 index 78ff8d9a1..000000000 --- a/view/tpl/smarty3/README +++ /dev/null @@ -1,4 +0,0 @@ -view/tpl/smarty3 - -This directory must exist and be writeable by the webserver in order to store compiled template files, which are created dynamically. Please see the installation instructions. - diff --git a/view/tpl/suggest_widget.tpl b/view/tpl/suggest_widget.tpl index eba8b496e..7b9afa668 100644 --- a/view/tpl/suggest_widget.tpl +++ b/view/tpl/suggest_widget.tpl @@ -1,4 +1,4 @@ -<div class="widget"> +<div class="widget suggestions-widget"> <h3>{{$title}}</h3> {{if $entries}} {{foreach $entries as $child}} @@ -7,4 +7,4 @@ {{/if}} <div class="clear"></div> <div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div> -</div>
\ No newline at end of file +</div> diff --git a/view/tpl/suggestions.tpl b/view/tpl/suggestions.tpl deleted file mode 100755 index 2d9cba325..000000000 --- a/view/tpl/suggestions.tpl +++ /dev/null @@ -1,20 +0,0 @@ -<div class="intro-wrapper" > - -<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p> -<div class="intro-madeby">{{$madeby}}</div> -<div class="intro-fullname" >{{$fullname}}</div> -<a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" /></a> -<div class="intro-note" >{{$note}}</div> -<div class="intro-wrapper-end"></div> -<form class="intro-form" action="notifications/{{$intro_id}}" method="post"> -<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" /> -<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" /> -</form> -<div class="intro-form-end"></div> - -<form class="intro-approve-form" action="{{$request}}" method="get"> -{{include file="field_checkbox.tpl" field=$hidden}} -<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" /> -</form> -</div> -<div class="intro-end"></div> diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl new file mode 100644 index 000000000..5de995ba0 --- /dev/null +++ b/view/tpl/uexport.tpl @@ -0,0 +1,9 @@ +<div class="generic-content-wrapper"> +<h1>{{$title}}</h1> +<b><a href="uexport/basic">{{$basictitle}}</a></b></p> +<p>{{$basic}}</p> + +<p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p> +<p>{{$full}}</p> + +</div> diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl index 18fed6bb4..cde24525c 100755 --- a/view/tpl/viewcontact_template.tpl +++ b/view/tpl/viewcontact_template.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper generic-content-wrapper-styled"> <h3>{{$title}}</h3> {{foreach $contacts as $contact}} @@ -5,5 +6,5 @@ {{/foreach}} <div id="view-contact-end"></div> - {{$paginate}} +</div> diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 4ae153423..8335ebd62 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,6 +1,7 @@ +{{$listtitle}} {{if $pages}} - <div id="pagelist-content-wrapper" class="generic-content-wrapper"> + <div id="pagelist-content-wrapper" class="generic-content-wrapper-styled"> <table class="webpage-list-table"> <tr><td>{{$actions_txt}}</td><td>{{$pagelink_txt}}</td><td>{{$title_txt}}</td><td>{{$created_txt}}</td><td>{{$edited_txt}}</td></tr> {{foreach $pages as $key => $items}} @@ -9,7 +10,7 @@ <td> {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}} {{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}} - {{if $preview}}<a href="page/{{$channel}}/{{$item.pagetitle}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn btn-default"></i></a> {{/if}} + {{if $preview}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn btn-default"></i></a> {{/if}} </td> <td> {{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a> diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl new file mode 100644 index 000000000..aa0d8c740 --- /dev/null +++ b/view/tpl/xrd_diaspora.tpl @@ -0,0 +1,3 @@ + <Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" /> + <Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" /> + <Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" /> diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 20d438dd5..631ed3f18 100755 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -14,5 +14,13 @@ <Link rel="http://webfinger.net/rel/avatar" type="image/jpeg" href="{{$photo}}" /> - + <Link rel="http://microformats.org/profile/hcard" + type="text/html" + href="{{$hcard_url}}" /> + + <Link rel="magic-public-key" + href="{{$modexp}}" /> + + {{$dspr}} + </XRD> |