diff options
Diffstat (limited to 'view/tpl')
29 files changed, 367 insertions, 298 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 078eb4df4..c2c11e4b1 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -9,9 +9,6 @@ </div> {{/if}} -{{if $self}} -<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div> -{{/if}} <div id="contact-edit-wrapper"> @@ -31,6 +28,15 @@ <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}}" /> 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_site.tpl b/view/tpl/admin_site.tpl index 8c62cb80f..0003ddfc0 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -46,7 +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_checkbox.tpl" field=$no_login_on_homepage}} diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index 84a47378b..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" 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/attach_edit.tpl b/view/tpl/attach_edit.tpl index e91b4c0c6..1254c713b 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -5,7 +5,7 @@ <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;"> +<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" disabled="disabled" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> </button> {{$aclselect}} {{$file.filename}} @@ -30,7 +30,7 @@ <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 id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" disabled="disabled"/> </form> diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index 287f95cc0..bb1121924 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;" disabled="disabled">{{$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}}" disabled="disabled"/> </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/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index d78aec1f5..f6d8c3454 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -1,6 +1,8 @@ <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 /> +<ul class="nav nav-pills nav-stacked"> + <li><a href="directory?f=&order=normal">{{$normal}}</a></li> + <li><a href="directory?f=&order=reverse">{{$reverse}}</a></li> + <li><a href="directory?f=&order=date">{{$date}}</a></li> +</ul> </div> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index a6252bb9a..2da920ab1 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -3,12 +3,33 @@ <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}} </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/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..f4fd82fdb 100755 --- a/view/tpl/install_settings.tpl +++ b/view/tpl/install_settings.tpl @@ -14,6 +14,7 @@ <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}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index be896adb5..29dc41525 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -42,7 +42,7 @@ <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> + <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> @@ -76,7 +76,7 @@ </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}}" disabled="disabled" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i> </button> {{/if}} @@ -85,7 +85,7 @@ <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} - <button class="btn btn-primary btn-sm" type="submit" name="button-submit">{{$share}}</button> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="button-submit"{{if $showacl}} disabled="disabled"{{/if}}>{{$share}}</button> </div> <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> 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/menulist.tpl b/view/tpl/menulist.tpl index 2feb75d90..bb862fef0 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -9,7 +9,7 @@ {{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}} diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 482005e44..f398cf02c 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}}" disabled="disabled" /> </div> </form> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index a8a7a7da7..53c68f1e0 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -47,11 +47,11 @@ </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}}" >{{$nav.register.1}}</a><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 !$userinfo}} {{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}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a> + <a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$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">{{$loginmenu.1}}</a></li> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 55bf1575f..2f23948c8 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="suggest" >{{$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 0a26fc367..5506b01f2 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,17 +1,21 @@ <div class="section-title-wrapper"> - <div class="btn-group btn-group-xs pull-right"> - {{if $album_edit.1}} - <i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper');"></i> - {{/if}} - <a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a> - {{if $can_post}} - <a class="btn btn-xs btn-success" href="{{$upload.1}}"><i class="icon-upload"></i> {{$upload.0}}</a> - {{/if}} + <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> +{{$upload_form}} {{$album_edit.1}} <div id="photo-album-contents" class="generic-content-wrapper"> {{foreach $photos as $photo}} diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 0f8b809ac..de1105bbc 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,17 +1,13 @@ <div id="side-bar-photos-albums" class="widget"> <h3>{{$title}}</h3> <ul class="nav nav-pills nav-stacked"> - {{if $upload}} - <li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li> - {{/if}} <li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li> - {{if $albums}} + {{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}} + {{/if}} </ul> </div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index c79cd7d56..4652f33c6 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -2,28 +2,28 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> + <div class="pull-right"> - <div class="btn-group btn-group-xs pull-right"> - {{if $prevlink}} - <a href="{{$prevlink.0}}" class="btn btn-default" title="{{$prevlink.1}}"><i class="icon-backward"></i></a> - {{/if}} - {{if $nextlink}} - <a href="{{$nextlink.0}}" class="btn btn-default" title="{{$nextlink.1}}"><i class="icon-forward"></i></a> - {{/if}} - </div> - <div class="btn-group btn-group-xs pull-right dropdown"> {{if $tools}} - <a class="btn btn-default" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a> + <a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a> {{/if}} - {{if $edit}} - <i class="icon-pencil btn btn-default" title="{{$edit.edit}}" onclick="openClose('photo-edit-edit');"></i> - {{/if}} - - {{if $lock}} - <i class="icon-lock btn btn-default dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> - {{/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> <h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2> @@ -31,55 +31,56 @@ <div class="clear"></div> </div> - <div id="photo-edit-edit"> + <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}}" /> - <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label> - <input id="photo-edit-albumname" type="text" 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}}"> + <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}} - {{/foreach}} - </datalist> - {{/if}} - <div id="photo-edit-albumname-end"></div> + </div> + <div class="form-group"> <label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label> - <input id="photo-edit-caption" type="text" name="desc" value="{{$edit.caption}}" /> - <div id="photo-edit-caption-end"></div> - <label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label> - <input name="newtag" id="photo-edit-newtag" title="{{$edit.help_tags}}" type="text" /> - <div id="photo-edit-tags-end"></div> - <div id="photo-edit-rotate-wrapper"> - <div id="photo-edit-rotate-label"> - {{$edit.rotatecw}}<br> - {{$edit.rotateccw}} - </div> - <input type="radio" name="rotate" value="1" /><br> - <input type="radio" name="rotate" value="2" /> + <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 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 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> + <div class="form-group"> + {{include file="field_checkbox.tpl" field=$edit.adult}} + </div> + {{$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" disabled="disabled" 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" disabled="disabled">{{$edit.submit}}</button> </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 id="photo-edit-end" class="clear"></div> </div> <div id="photo-view-wrapper"> - <div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div> - <div id="photo-photo-end"></div> + <div id="photo-photo-end" class="clear"></div> {{if $tags}} <div class="photo-item-tools-left" id="in-this-photo"> @@ -93,97 +94,92 @@ <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> + <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 $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 $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> - {{/if}} - - {{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> - <div id="like-rotator-{{$id}}" class="like-rotator pull-right"></div> - {{/if}} - - <div class="clear"></div> </div> + {{/if}} + {{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> + <div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div> + {{/if}} + <div class="clear"></div> </div> +</div> - {{$comments}} - - {{if $commentbox}} - <div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" > - {{$commentbox}} - </div> - {{/if}} - - - <div class="clear"></div> +{{$comments}} +{{if $commentbox}} +<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" > + {{$commentbox}} </div> +{{/if}} + +<div class="clear"></div> {{$paginate}} diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 91b088c93..7727abcea 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,10 +1,11 @@ <div class="section-title-wrapper"> {{if $can_post}} - <a class="btn btn-xs btn-success pull-right" href="{{$upload.1}}"><i class="icon-upload"></i> {{$upload.0}}</a> + <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"}} diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 81d7b6dc0..2dd7de9b2 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,44 +1,53 @@ -<div class="section-title-wrapper"> - <div id="photos-usage-message" class="pull-right">{{$usage}}</div> - <h2>{{$pagename}}</h2> - <div class="clear"></div> -</div> - -<div class="generic-content-wrapper-styled"> -<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> - <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 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="pull-left"> + <input id="photos-upload-choose" type="file" name="userfile" /> + </div> + <div class="btn-group pull-right"> + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" disabled="disabled" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" disabled="disabled">{{$submit}}</button> + </div> + {{/if}} + + <div id="photos-upload-new-end" class="clear"></div> + + <div class="checkbox pull-left"> + <label class="checkbox-inline" for="photos-upload-noshare" > + <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />{{$nosharetext}} + </label> + </div> + + {{if $uploader}} + <div id="photos-upload-perms" class="pull-right"> + <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> + <div class="pull-right"> + {{$uploader}} + </div> + </div> + {{/if}} + </form> </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/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl index 1104d61bb..6298ca0aa 100755 --- a/view/tpl/posted_date_widget.tpl +++ b/view/tpl/posted_date_widget.tpl @@ -1,8 +1,30 @@ +<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" 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> @@ -10,11 +32,15 @@ <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}}&dbegin={{$d.2}}'); return false;">{{$d.0}}</a> + <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/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 3c83cd685..6904c2fec 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -41,7 +41,7 @@ {{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"}} 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/searchbox.tpl b/view/tpl/searchbox.tpl index 02b2d4a50..f4301f0f5 100644 --- a/view/tpl/searchbox.tpl +++ b/view/tpl/searchbox.tpl @@ -1,7 +1,7 @@ <form action="{{$action_url}}" method="get" > <input type="hidden" name="f" value="" /> <div id="{{$id}}" class="input-group"> - <input type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" /> + <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}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 4c1b8eb8f..7fa52677b 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -100,6 +100,27 @@ {{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*}} +</div> + +{{include file="field_input.tpl" field=$evdays}} + + + </div> <div class="settings-submit-wrapper" > @@ -110,6 +131,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/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. - |