diff --git a/altpager/view/smarty3/admin.tpl b/altpager/templates/admin.tpl similarity index 100% rename from altpager/view/smarty3/admin.tpl rename to altpager/templates/admin.tpl diff --git a/altpager/view/admin.tpl b/altpager/view/admin.tpl deleted file mode 100644 index 605588084..000000000 --- a/altpager/view/admin.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{{ inc field_radio.tpl with $field=$global }}{{ endinc }} -{{ inc field_radio.tpl with $field=$individual }}{{ endinc }} -
diff --git a/altpager/view/admin.tpl.old b/altpager/view/admin.tpl.old deleted file mode 100755 index 605588084..000000000 --- a/altpager/view/admin.tpl.old +++ /dev/null @@ -1,3 +0,0 @@ -{{ inc field_radio.tpl with $field=$global }}{{ endinc }} -{{ inc field_radio.tpl with $field=$individual }}{{ endinc }} -
diff --git a/blackout/view/smarty3/admin.tpl b/blackout/templates/admin.tpl similarity index 100% rename from blackout/view/smarty3/admin.tpl rename to blackout/templates/admin.tpl diff --git a/blackout/view/admin.tpl b/blackout/view/admin.tpl deleted file mode 100644 index 25922193d..000000000 --- a/blackout/view/admin.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{{ inc field_input.tpl with $field=$startdate }}{{ endinc }} -{{ inc field_input.tpl with $field=$enddate }}{{ endinc }} -{{ inc field_input.tpl with $field=$rurl }}{{ endinc }} - -
Note: The redirect will be active from the moment you -press the submit button. Users currently logged in will not be -thrown out but can't login again after logging out should the blackout is -still in place.
- -
diff --git a/communityhome/view/smarty3/communityhome.tpl b/communityhome/templates/communityhome.tpl similarity index 100% rename from communityhome/view/smarty3/communityhome.tpl rename to communityhome/templates/communityhome.tpl diff --git a/communityhome/view/smarty3/directory_item.tpl b/communityhome/templates/directory_item.tpl similarity index 100% rename from communityhome/view/smarty3/directory_item.tpl rename to communityhome/templates/directory_item.tpl diff --git a/communityhome/view/communityhome.tpl b/communityhome/view/communityhome.tpl deleted file mode 100755 index 846878097..000000000 --- a/communityhome/view/communityhome.tpl +++ /dev/null @@ -1,70 +0,0 @@ - -{{ if $noOid }} -

$login_title

-{{ else }} - -{{ endif }} -$login_form - - -{{ if $lastusers_title }} -

$lastusers_title

-
-{{ for $lastusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - - -{{ if $activeusers_title }} -

$activeusers_title

-
-{{ for $activeusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - -{{ if $photos_title }} -

$photos_title

-
-{{ for $photos_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - - -{{ if $like_title }} -

$like_title

- -{{ endif }} diff --git a/communityhome/view/directory_item.tpl b/communityhome/view/directory_item.tpl deleted file mode 100755 index f32f5a4f7..000000000 --- a/communityhome/view/directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt_text - -
-
-
diff --git a/defaultfeatures/view/smarty3/admin.tpl b/defaultfeatures/templates/admin.tpl similarity index 100% rename from defaultfeatures/view/smarty3/admin.tpl rename to defaultfeatures/templates/admin.tpl diff --git a/defaultfeatures/view/admin.tpl b/defaultfeatures/view/admin.tpl deleted file mode 100644 index e7793d3da..000000000 --- a/defaultfeatures/view/admin.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -{{ for $features as $f }} -

$f.0

- -{{ for $f.1 as $fcat }} - {{ inc field_yesno.tpl with $field=$fcat }}{{endinc}} -{{ endfor }} -{{ endfor }} -
diff --git a/forumdirectory/view/smarty3/forumdirectory_item.tpl b/forumdirectory/templates/forumdirectory_item.tpl similarity index 100% rename from forumdirectory/view/smarty3/forumdirectory_item.tpl rename to forumdirectory/templates/forumdirectory_item.tpl diff --git a/forumdirectory/view/forumdirectory_item.tpl b/forumdirectory/view/forumdirectory_item.tpl deleted file mode 100755 index e1bbffec8..000000000 --- a/forumdirectory/view/forumdirectory_item.tpl +++ /dev/null @@ -1,42 +0,0 @@ - -
-
-
- - $alt_text - -
-
-
-
$name
-
$page_type
- {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
-
- {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} -
-
- {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} -
-
-
- {{ if $about }}
$about
$profile.about
{{ endif }} -
-
-
diff --git a/gravatar/view/smarty3/admin.tpl b/gravatar/templates/admin.tpl similarity index 100% rename from gravatar/view/smarty3/admin.tpl rename to gravatar/templates/admin.tpl diff --git a/gravatar/view/admin.tpl b/gravatar/view/admin.tpl deleted file mode 100644 index 83144e432..000000000 --- a/gravatar/view/admin.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }} -{{ inc field_select.tpl with $field=$rating }}{{ endinc }} -
diff --git a/impressum/view/smarty3/admin.tpl b/impressum/templates/admin.tpl similarity index 100% rename from impressum/view/smarty3/admin.tpl rename to impressum/templates/admin.tpl diff --git a/impressum/view/admin.tpl b/impressum/view/admin.tpl deleted file mode 100644 index 901df73fa..000000000 --- a/impressum/view/admin.tpl +++ /dev/null @@ -1,7 +0,0 @@ -{{ inc field_input.tpl with $field=$owner }}{{ endinc }} -{{ inc field_input.tpl with $field=$ownerprofile }}{{ endinc }} -{{ inc field_textarea.tpl with $field=$postal }}{{ endinc }} -{{ inc field_textarea.tpl with $field=$notes }}{{ endinc }} -{{ inc field_input.tpl with $field=$email }}{{ endinc }} -{{ inc field_textarea.tpl with $field=$footer_text }}{{ endinc }} -
diff --git a/libravatar/view/smarty3/admin.tpl b/libravatar/templates/admin.tpl similarity index 100% rename from libravatar/view/smarty3/admin.tpl rename to libravatar/templates/admin.tpl diff --git a/libravatar/view/admin.tpl b/libravatar/view/admin.tpl deleted file mode 100644 index 814f4a44a..000000000 --- a/libravatar/view/admin.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }} -
diff --git a/mailstream/view/smarty3/admin.tpl b/mailstream/templates/admin.tpl similarity index 100% rename from mailstream/view/smarty3/admin.tpl rename to mailstream/templates/admin.tpl diff --git a/mailstream/view/smarty3/mail.tpl b/mailstream/templates/mail.tpl similarity index 100% rename from mailstream/view/smarty3/mail.tpl rename to mailstream/templates/mail.tpl diff --git a/mailstream/view/smarty3/settings.tpl b/mailstream/templates/settings.tpl similarity index 100% rename from mailstream/view/smarty3/settings.tpl rename to mailstream/templates/settings.tpl diff --git a/mailstream/view/admin.tpl b/mailstream/view/admin.tpl deleted file mode 100644 index bf5e67a26..000000000 --- a/mailstream/view/admin.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{{ inc field_input.tpl with $field=$frommail }}{{ endinc }} -
- diff --git a/mailstream/view/mail.tpl b/mailstream/view/mail.tpl deleted file mode 100644 index 9eb7ff529..000000000 --- a/mailstream/view/mail.tpl +++ /dev/null @@ -1,5 +0,0 @@ -
$item.body
-{{ if $item.plink }} -
$upstream: $item.plink
-
$local: $item.url
-{{ endif }} diff --git a/mailstream/view/settings.tpl b/mailstream/view/settings.tpl deleted file mode 100644 index 45b0511a0..000000000 --- a/mailstream/view/settings.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
-

$title

-{{ inc field_input.tpl with $field=$address }}{{ endinc }} -{{ inc field_checkbox.tpl with $field=$enabled }}{{ endinc }} - -
diff --git a/mathjax/view/smarty3/admin.tpl b/mathjax/templates/admin.tpl similarity index 100% rename from mathjax/view/smarty3/admin.tpl rename to mathjax/templates/admin.tpl diff --git a/mathjax/view/admin.tpl b/mathjax/view/admin.tpl deleted file mode 100644 index 1c723cddd..000000000 --- a/mathjax/view/admin.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{{ inc field_input.tpl with $field=$baseurl }}{{endinc }} -
diff --git a/openstreetmap/view/smarty3/admin.tpl b/openstreetmap/templates/admin.tpl similarity index 100% rename from openstreetmap/view/smarty3/admin.tpl rename to openstreetmap/templates/admin.tpl diff --git a/openstreetmap/view/admin.tpl b/openstreetmap/view/admin.tpl deleted file mode 100644 index 75db9cd7b..000000000 --- a/openstreetmap/view/admin.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{{ inc field_input.tpl with $field=$tmsserver }}{{ endinc }} -{{ inc field_input.tpl with $field=$zoom }}{{ endinc }} -
diff --git a/piwik/view/smarty3/admin.tpl b/piwik/templates/admin.tpl similarity index 100% rename from piwik/view/smarty3/admin.tpl rename to piwik/templates/admin.tpl diff --git a/piwik/view/admin.tpl b/piwik/view/admin.tpl deleted file mode 100644 index e57758a9d..000000000 --- a/piwik/view/admin.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{{ inc field_input.tpl with $field=$baseurl }}{{ endinc }} -{{ inc field_input.tpl with $field=$siteid }}{{ endinc }} -{{ inc field_checkbox.tpl with $field=$optout }}{{ endinc }} -{{ inc field_checkbox.tpl with $field=$async }}{{ endinc }} -
diff --git a/remote_permissions/view/smarty3/admin.tpl b/remote_permissions/templates/admin.tpl similarity index 100% rename from remote_permissions/view/smarty3/admin.tpl rename to remote_permissions/templates/admin.tpl diff --git a/remote_permissions/view/smarty3/settings.tpl b/remote_permissions/templates/settings.tpl similarity index 100% rename from remote_permissions/view/smarty3/settings.tpl rename to remote_permissions/templates/settings.tpl diff --git a/remote_permissions/view/admin.tpl b/remote_permissions/view/admin.tpl deleted file mode 100644 index 605588084..000000000 --- a/remote_permissions/view/admin.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{{ inc field_radio.tpl with $field=$global }}{{ endinc }} -{{ inc field_radio.tpl with $field=$individual }}{{ endinc }} -
diff --git a/remote_permissions/view/settings.tpl b/remote_permissions/view/settings.tpl deleted file mode 100644 index 9fd98957f..000000000 --- a/remote_permissions/view/settings.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
-

$remote_perms_title

-
- - -
-
- diff --git a/retriever/view/smarty3/extract.tpl b/retriever/templates/extract.tpl similarity index 100% rename from retriever/view/smarty3/extract.tpl rename to retriever/templates/extract.tpl diff --git a/retriever/view/smarty3/help.tpl b/retriever/templates/help.tpl similarity index 100% rename from retriever/view/smarty3/help.tpl rename to retriever/templates/help.tpl diff --git a/retriever/view/smarty3/rule-config.tpl b/retriever/templates/rule-config.tpl similarity index 100% rename from retriever/view/smarty3/rule-config.tpl rename to retriever/templates/rule-config.tpl diff --git a/retriever/view/smarty3/settings.tpl b/retriever/templates/settings.tpl similarity index 100% rename from retriever/view/smarty3/settings.tpl rename to retriever/templates/settings.tpl diff --git a/retriever/view/extract.tpl b/retriever/view/extract.tpl deleted file mode 100644 index e851ddb52..000000000 --- a/retriever/view/extract.tpl +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - -{{ if $exclude }} - -{{ endif }} - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/retriever/view/help.tpl b/retriever/view/help.tpl deleted file mode 100644 index 37789a521..000000000 --- a/retriever/view/help.tpl +++ /dev/null @@ -1,148 +0,0 @@ -

Retriever Plugin Help

-

-This plugin replaces the short excerpts you normally get in RSS feeds -with the full content of the article from the source website. You -specify which part of the page you're interested in with a set of -rules. When each item arrives, the plugin downloads the full page -from the website, extracts content using the rules, and replaces the -original article. -

-

-There's a few reasons you may want to do this. The source website -might be slow or overloaded. The source website might be -untrustworthy, in which case using Friendica to scrub the HTML is a -good idea. You might be on a LAN that blacklists certain websites. -It also works neatly with the mailstream plugin, allowing you to read -a news stream comfortably without needing continuous Internet -connectivity. -

-

-However, setting up retriever can be quite tricky since it depends on -the internal design of the website. This was designed to make life -easy for the website's developers, not for you. You'll need to have -some familiarity with HTML, and be willing to adapt when the website -suddenly changes everything without notice. -

-

Configuring Retriever for a feed

-

-To set up retriever for an RSS feed, go to the "Contacts" page and -find your feed. Then click on the drop-down menu on the contact. -Select "Retriever" to get to the retriever configuration. -

-

-The "Include" configuration section specifies parts of the page to -include in the article. Each row has three components: -

- -

-A simple case is when the article is wrapped in a "div" element: -

-
-    ...
-    <div class="main-content">
-      <h2>Man Bites Dog</h2>
-      <img src="mbd.jpg">
-      <p>
-        Residents of the sleepy community of Nowheresville were
-        shocked yesterday by the sight of creepy local weirdo Jim
-        McOddman assaulting innocent local dog Snufflekins with his
-        false teeth.
-      </p>
-      ...
-    </div>
-    ...
-
-

-You then specify the tag "div", attribute "class", and value -"main-content". Everything else in the page, such as navigation -panels and menus and footers and so on, will be discarded. If there -is more than one section of the page you want to include, specify each -one on a separate row. If the matching section contains some sections -you want to remove, specify those in the "Exclude" section in the same -way. -

-

-Once you've got a configuration that you think will work, you can try -it out on some existing articles. Type a number into the -"Retrospectively Apply" box and click "Submit". After a while -(exactly how long depends on your system's cron configuration) the new -articles should be available. -

-

Techniques

-

-You can leave the attribute and value blank to include all the -corresponding elements with the specified tag name. You can also use -a tag name of "*", which will match any element type with the -specified attribute regardless of the tag. -

-

-Note that the "class" attribute is a special case. Many web page -templates will put multiple different classes in the same element, -separated by spaces. If you specify an attribute of "class" it will -match an element if any of its classes matches the specified value. -For example: -

-
-    <div class="article breaking-news">
-
-

-In this case you can specify a value of "article", or "breaking-news". -You can also specify "article breaking-news", but that won't match if -the website suddenly changes to "breaking-news article", so that's not -recommended. -

-

-One useful trick you can try is using the website's "print" pages. -Many news sites have print versions of all their articles. These are -usually drastically simplified compared to the live website page. -Sometimes this is a good way to get the whole article when it's -normally split across multiple pages. -

-

-Hopefully the URL for the print page is a predictable variant of the -normal article URL. For example, an article URL like: -

-
-    http://www.newssite.com/article-8636.html
-
-

-...might have a print version at: -

-
-    http://www.newssite.com/print/article-8636.html
-
-

-To change the URL used to retrieve the page, use the "URL Pattern" and -"URL Replace" fields. The pattern is a regular expression matching -part of the URL to replace. In this case, you might use a pattern of -"/article" and a replace string of "/print/article". A common pattern -is simply "$", used to add the replace string to the end of the URL. -

-

Background Processing

-

-Note that retrieving and processing the articles can take some time, -so it's done in the background. Incoming articles will be marked as -invisible while they're in the process of being downloaded. If a URL -fails, the plugin will keep trying at progressively longer intervals -for up to a month, in case the website is temporarily overloaded or -the network is down. -

-

Retrieving Images

-

-Retriever can also optionally download images and store them in the -local Friendica instance. Just check the "Download Images" box. You -can also download images in every item from your network, whether it's -an RSS feed or not. Go to the "Settings" page and -click "Plugin settings". Then check the "All -Photos" box in the "Retriever Settings" section and click "Submit". -

-

Configure Feeds:

-
-{{ for $feeds as $feed }} -{{ inc contact_template.tpl with $contact=$feed }}{{ endinc }} -{{ endfor }} -
diff --git a/retriever/view/rule-config.tpl b/retriever/view/rule-config.tpl deleted file mode 100644 index 3bd2bfce4..000000000 --- a/retriever/view/rule-config.tpl +++ /dev/null @@ -1,111 +0,0 @@ -
- -

$title

-

Get Help

-
- -{{ inc field_checkbox.tpl with $field=$enable }}{{ endinc }} -{{ inc field_input.tpl with $field=$pattern }}{{ endinc }} -{{ inc field_input.tpl with $field=$replace }}{{ endinc }} -{{ inc field_checkbox.tpl with $field=$images }}{{ endinc }} -{{ inc field_input.tpl with $field=$retrospective }}{{ endinc }} -

$include_t:

-
- - - - - -{{ if $include }} - {{ for $include as $k=>$m }} - - - - - - - {{ endfor }} -{{ else }} - - - - - - -{{ endif }} - -
$tag_t$attribute_t$value_t
- -
-

$exclude_t:

-
- - - - - -{{ if $exclude }} - {{ for $exclude as $k=>$r }} - - - - - - - {{ endfor }} -{{ else }} - - - - - - -{{ endif }} - -
TagAttributeValue
- -
- -
-
diff --git a/retriever/view/settings.tpl b/retriever/view/settings.tpl deleted file mode 100644 index 87b952874..000000000 --- a/retriever/view/settings.tpl +++ /dev/null @@ -1,17 +0,0 @@ -
-

$title

-

- Get Help -

- - - - - - - - - - -
$all_photos_t:
-
diff --git a/statusnet/view/smarty3/admin.tpl b/statusnet/templates/admin.tpl similarity index 100% rename from statusnet/view/smarty3/admin.tpl rename to statusnet/templates/admin.tpl diff --git a/statusnet/view/admin.tpl b/statusnet/view/admin.tpl deleted file mode 100644 index 686a4c792..000000000 --- a/statusnet/view/admin.tpl +++ /dev/null @@ -1,17 +0,0 @@ -{{ for $sites as $s }} - {{ inc field_input.tpl with $field=$s.sitename }}{{ endinc }} - {{ inc field_input.tpl with $field=$s.apiurl }}{{ endinc }} - {{ inc field_input.tpl with $field=$s.secret }}{{ endinc }} - {{ inc field_input.tpl with $field=$s.key }}{{ endinc }} - {{ inc field_input.tpl with $field=$s.applicationname }}{{ endinc }} - {{ if $s.delete }} - {{ inc field_checkbox.tpl with $field=$s.delete }}{{ endinc }} -
- {{ else }} -

Fill this form to add a new site

- {{ endif }} - -{{ endfor }} - - -
diff --git a/twitter/view/smarty3/admin.tpl b/twitter/templates/admin.tpl similarity index 100% rename from twitter/view/smarty3/admin.tpl rename to twitter/templates/admin.tpl diff --git a/twitter/view/admin.tpl b/twitter/view/admin.tpl deleted file mode 100644 index b89f51b6c..000000000 --- a/twitter/view/admin.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{{ inc field_input.tpl with $field=$consumerkey }}{{ endinc }} -{{ inc field_input.tpl with $field=$consumersecret }}{{ endinc }} -{{ inc field_input.tpl with $field=$applicationname }}{{ endinc }} -
diff --git a/uhremotestorage/view/smarty3/settings.tpl b/uhremotestorage/templates/settings.tpl similarity index 100% rename from uhremotestorage/view/smarty3/settings.tpl rename to uhremotestorage/templates/settings.tpl diff --git a/uhremotestorage/view/settings.tpl b/uhremotestorage/view/settings.tpl deleted file mode 100644 index 22d7d6084..000000000 --- a/uhremotestorage/view/settings.tpl +++ /dev/null @@ -1,9 +0,0 @@ -
-

$title

-

$desc

- {{ inc field_input.tpl with $field=$url }}{{ endinc }} - {{ inc field_input.tpl with $field=$auth }}{{ endinc }} - {{ inc field_select.tpl with $field=$api }}{{ endinc }} -
- -
diff --git a/widgets/view/smarty3/settings.tpl b/widgets/templates/settings.tpl similarity index 100% rename from widgets/view/smarty3/settings.tpl rename to widgets/templates/settings.tpl diff --git a/widgets/view/smarty3/widget_like.tpl b/widgets/templates/widget_like.tpl similarity index 100% rename from widgets/view/smarty3/widget_like.tpl rename to widgets/templates/widget_like.tpl diff --git a/widgets/view/settings.tpl b/widgets/view/settings.tpl deleted file mode 100755 index 9d0f21d29..000000000 --- a/widgets/view/settings.tpl +++ /dev/null @@ -1,19 +0,0 @@ -
-

$title

-
- - $key -
- -
- -
- -

$widgets_h

-
    - {{ for $widgets as $w }} -
  • $w.1
    • - {{ endfor }} -
- -
diff --git a/widgets/view/widget_like.tpl b/widgets/view/widget_like.tpl deleted file mode 100755 index 3c26d1da3..000000000 --- a/widgets/view/widget_like.tpl +++ /dev/null @@ -1,3 +0,0 @@ - -$like like -$dislike dislike