diff options
Diffstat (limited to 'view/tpl')
25 files changed, 82 insertions, 270 deletions
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index 2ab3edcc2..013b72d50 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -18,7 +18,6 @@ <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.hubloc.0}}'>{{$admin.hubloc.1}}</a></li> <li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> </ul> </div> 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 bf39e6158..82f2a7628 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -1,34 +1,42 @@ <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > + <input type="hidden" name="channelnick" value="{{$channelnick}}" /> + <input type="hidden" name="filehash" value="{{$file.hash}}" /> + <input type="hidden" name="uid" value="{{$uid}}" /> + <input type="hidden" name="fileid" value="{{$file.id}}" /> -<div id="attach-edit-perms" > -<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"></i> -</button> -<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit"> - {{$submit}} -</button> -</div> + <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"> + <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');"> + <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}} - -<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> + {{$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/channel.tpl b/view/tpl/channel.tpl index 55b122d9b..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,8 +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">{{if $channel.mail != 0}}<span style="color:#c60032;"><i class="icon-envelope"></i> {{$channel.mail}}</span>{{else}}<i class="icon-envelope"></i> {{/if}} {{if $channel.intros != 0}}<span style="color:#c60032;"><i class="icon-user"></i> {{$channel.intros}}</span>{{else}}<i class="icon-user"></i> {{/if}}</div> +<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/channels.tpl b/view/tpl/channels.tpl index 0dec68a53..26d0e14d2 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -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"> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index d88bc94c4..da708a98c 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -2,16 +2,18 @@ <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"> - <input type="submit" value="{{$folder_submit}}"> + <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 id="files-upload" type="file" name="file" style="display: inline;"> - <input type="submit" value="{{$upload_submit}}"> + <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 99bba9474..77d861224 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,12 +1,12 @@ -<div class="section-content-wrapper generic-content-wrapper"> +<div class="generic-content-wrapper section-content-wrapper-np"> <table id="cloud-index"> <tr> - <th></th> - <th>{{$name}}</th> - <th></th><th></th><th></th><th></th> - <th>{{*{{$type}}*}}</th> - <th class="hidden-xs">{{$size}}</th> - <th class="hidden-xs">{{$lastmod}}</th> + <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> @@ -19,14 +19,14 @@ </tr> {{/if}} {{foreach $entries as $item}} - <tr id="cloud-panel-{{$item.attachId}}"> + <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-remove drop-icons"></i></a></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> {{else}} <td></td><td></td><td></td><td></td> @@ -35,7 +35,9 @@ <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> + <tr> + <td id="perms-panel-{{$item.attachId}}" colspan="9"></td> + </tr> {{/foreach}} </table> </div> 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/diaspora_profile.tpl b/view/tpl/diaspora_profile.tpl deleted file mode 100644 index cf53f51c0..000000000 --- a/view/tpl/diaspora_profile.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<XML> - <post><profile> - <diaspora_handle>{{$handle}}</diaspora_handle> - <first_name>{{$first}}</first_name> - <last_name>{{$last}}</last_name> - <image_url>{{$large}}</image_url> - <image_url_medium>{{$medium}}</image_url_medium> - <image_url_small>{{$small}}</image_url_small> - <birthday>{{$dob}}</birthday> - <gender>{{$gender}}</gender> - <bio>{{$about}}</bio> - <location>{{$location}}</location> - <searchable>{{$searchable}}</searchable> - <tag_string>{{$tags}}</tag_string> - </profile></post> -</XML> 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/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/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/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/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/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_comments_item.tpl b/view/tpl/notifications_comments_item.tpl deleted file mode 100755 index d3c79be82..000000000 --- a/view/tpl/notifications_comments_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div class="notif-item"> - <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/notifications_dislikes_item.tpl b/view/tpl/notifications_dislikes_item.tpl deleted file mode 100755 index d3c79be82..000000000 --- a/view/tpl/notifications_dislikes_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div class="notif-item"> - <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/notifications_friends_item.tpl b/view/tpl/notifications_friends_item.tpl deleted file mode 100755 index d3c79be82..000000000 --- a/view/tpl/notifications_friends_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div class="notif-item"> - <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/notifications_likes_item.tpl b/view/tpl/notifications_likes_item.tpl deleted file mode 100755 index d3c79be82..000000000 --- a/view/tpl/notifications_likes_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div class="notif-item"> - <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/notifications_posts_item.tpl b/view/tpl/notifications_posts_item.tpl deleted file mode 100755 index d3c79be82..000000000 --- a/view/tpl/notifications_posts_item.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div class="notif-item"> - <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/photos_upload.tpl b/view/tpl/photos_upload.tpl index 10fc82648..6cd7e3eb9 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -18,30 +18,40 @@ {{$aclselect}} {{if $default}} - <div class="pull-left"> + <div class="form-group"> <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" 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" >{{$submit}}</button> + <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> - <div class="checkbox"> - <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"> + <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> diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl deleted file mode 100755 index e0983f0dd..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" 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}}" class="pull-right" 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/settings.tpl b/view/tpl/settings.tpl index 7fa52677b..47d85d8e4 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -113,6 +113,8 @@ {{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> 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> |