aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/atom_feed_dfrn.tpl29
-rw-r--r--view/tpl/attach_edit.tpl43
-rwxr-xr-xview/tpl/crepair.tpl45
-rw-r--r--view/tpl/diaspora_profile.tpl16
-rwxr-xr-xview/tpl/edpage_head.tpl1
-rwxr-xr-xview/tpl/hide_comments.tpl4
-rwxr-xr-xview/tpl/intros.tpl17
-rwxr-xr-xview/tpl/intros_header.tpl1
-rw-r--r--view/tpl/list_things.tpl13
-rwxr-xr-xview/tpl/netfriend.tpl14
-rwxr-xr-xview/tpl/nogroup-template.tpl12
-rwxr-xr-xview/tpl/notifications_comments_item.tpl3
-rwxr-xr-xview/tpl/notifications_dislikes_item.tpl3
-rwxr-xr-xview/tpl/notifications_friends_item.tpl3
-rwxr-xr-xview/tpl/notifications_likes_item.tpl3
-rwxr-xr-xview/tpl/notifications_posts_item.tpl3
-rwxr-xr-xview/tpl/photos_upload.tpl35
-rwxr-xr-xview/tpl/saved_searches_aside.tpl14
-rwxr-xr-xview/tpl/settings.tpl2
-rwxr-xr-xview/tpl/suggestions.tpl20
20 files changed, 47 insertions, 234 deletions
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 033ee40a7..82f2a7628 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -1,6 +1,10 @@
<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-tools" class="btn-group form-group">
+ <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>
@@ -10,28 +14,25 @@
<i class="icon-share jot-icons"></i>
</button>
</div>
- <div id="attach-edit-perms" class="btn-group form-group pull-right">
- <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 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 class="form-group">
- <label id="attach-edit-recurse-text" class="checkbox-inline" for="attach-recurse-input" >
- <input class="checkbox-inline" id="attach-recurse-input" type="checkbox" name="recurse" value="1" />{{$recurse}}
- </label>
- </div>
- {{/if}}
+ {{$aclselect}}
<div id="link-code" class="form-group">
<label for="">{{$cpldesc}}</label>
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 0b3a0ae81..6cd7e3eb9 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -21,26 +21,37 @@
<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>
- {{/if}}
+ <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 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}}
<div class="clear"></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=&amp;remove=1&amp;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=&amp;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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 12:49:01 +0000