Merge pull request #9870 from annando/uri-id

"uri-id" instead of "uri" or "id"

diff --git a/CREDITS.txt b/CREDITS.txt
index 2f68970..25caae4 100644 (file)
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -120,7 +120,7 @@ Jakob
 Jens Tautenhahn
 jensp
 Jeroen De Meerleer
-jeroenpraat
+joenepraat
 Joan Bar
 JOduMonT
 joe slam

diff --git a/doc/FAQ.md b/doc/FAQ.md
index ed9d2bb..4d45877 100644 (file)
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -5,6 +5,7 @@ Frequently Asked Questions - FAQ
 
 User
 
+* **[Where I can find help?](help/FAQ#help)**
 * **[Why do I getting warnings about certificates?](help/FAQ#ssl)**
 * **[How can I upload images, files, links, videos and sound files to posts?](help/FAQ#upload)**
 * **[Is it possible to have different avatars per profile?](help/FAQ#avatars)**
@@ -14,7 +15,6 @@ User
 * **[Can I subscribe to a hashtag?](help/FAQ#hashtag)**
 * **[How to create a RSS feed of the stream?](help/FAQ#rss)**
 * **[What friendica clients can I use?](help/FAQ#clients)**
-* **[Where I can find help?](help/FAQ#help)**
 
 Admins
 
@@ -26,6 +26,23 @@ Admins
 
 User
 --------
+<a name="help"></a>
+
+### Where I can find help?
+
+If this FAQ does not answer your question you can always reach out to the community via the following options:
+
+  * [Friendica Support Forum](https://forum.friendi.ca/~helpers)
+  * XMPP support(at)forum.friendi.ca
+  * [IRC](https://webchat.freenode.net/?settings=#friendica)
+  * [Matrix](https://matrix.to/#/#friendica-en:matrix.org)
+  * [Mailing List](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca)
+  <!--- * [XMPP](xmpp:support@forum.friendi.ca?join)
+       https://github.com/github/markup/issues/202
+       https://github.com/gjtorikian/html-pipeline/pull/307
+       https://github.com/github/opensource.guide/pull/807
+  --->
+
 <a name="ssl"></a>
 ### Why do I get warnings about SSL certificates?
 
@@ -181,21 +198,6 @@ Here is a list of known working clients:
 
 Depending on the features of the client you might encounter some glitches in usability, like being limited in the length of your postings to 140 characters and having no access to the [permission settings](help/Groups-and-Privacy).
 
-<a name="help"></a>
-
-### Where I can find help?
-
-If you have problems with your Friendica page, you can ask the community at the [Friendica Support Group](https://forum.friendi.ca/profile/helpers).
-If you can't use your default profile you can use an account at a public site [list](https://dir.friendica.social/servers).
-
-In case you do not want to set up another account on Friendica, you can also use one of the following channels to reach out for help:
-
-  * [Friendica Support Forum](https://forum.friendi.ca/~helpers)
-  * [Mailing List Archive](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca) you can subscribe to the list by sending an email to ``support-request(at)friendi.ca?subject=subscribe``
-  * XMPP/Jabber MUC: support(at)forum.friendi.ca
-  * IRC: #friendica at irc.freenode.net
-  * Matrix: #friendi.ca or #friendica at matrix.org
-
 Admin
 --------
 

diff --git a/src/Module/Manifest.php b/src/Module/Manifest.php
index 8ea6fbc..754e08c 100644 (file)
--- a/src/Module/Manifest.php
+++ b/src/Module/Manifest.php
@@ -36,12 +36,15 @@ class Manifest extends BaseModule
                $theme = DI::config()->get('system', 'theme');
 
                $manifest = [
-                       'name'        => $config->get('config', 'sitename', 'Friendica'),
-                       'start_url'   => DI::baseUrl()->get(),
-                       'display'     => 'standalone',
-                       'description' => $config->get('config', 'info', DI::l10n()->t('A Decentralized Social Network')),
-                       'short_name'  => 'Friendica',
-                       'icons'       => [
+                       'name'          => $config->get('config', 'sitename', 'Friendica'),
+                       'start_url'     => DI::baseUrl()->get(),
+                       'display'       => 'standalone',
+                       'description'   => $config->get('config', 'info', DI::l10n()->t('A Decentralized Social Network')),
+                       'short_name'    => 'Friendica',
+                       'lang'          => $config->get('system', 'language'),
+                       'dir'           => 'auto',
+                       'categories'    => ['social network', 'internet'],
+                       'icons'         => [
                                [
                                        'src'   => DI::baseUrl()->get() . '/' . $touch_icon,
                                        'sizes' => '192x192',
@@ -53,6 +56,28 @@ class Manifest extends BaseModule
                                        'type'  => 'image/png',
                                ],
                        ],
+                       'shortcuts'     => [
+                               [
+                                       'name'  => 'Latest posts',
+                                       'url'   => '/network'
+                               ],
+                               [
+                                       'name'  => 'Messages',
+                                       'url'   => '/message'
+                               ],
+                               [
+                                       'name'  => 'Notifications',
+                                       'url'   => '/notifications/system'
+                               ],
+                               [
+                                       'name'  => 'Contacts',
+                                       'url'   => '/contact'
+                               ],
+                               [
+                                       'name'  => 'Events',
+                                       'url'   => '/events'
+                               ]
+                       ]
                ];
 
                if ($background_color = Core\Theme::getBackgroundColor($theme)) {

diff --git a/static/routes.config.php b/static/routes.config.php
index 4ad122f..879a48d 100644 (file)
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -301,6 +301,7 @@ return [
        '/magic'              => [Module\Magic::class,           [R::GET]],
        '/maintenance'        => [Module\Maintenance::class,     [R::GET]],
        '/manifest'           => [Module\Manifest::class,        [R::GET]],
+       '/friendica.webmanifest'  => [Module\Manifest::class,    [R::GET]],
        '/modexp/{nick}'      => [Module\PublicRSAKey::class,    [R::GET]],
        '/newmember'          => [Module\Welcome::class,         [R::GET]],
        '/nodeinfo/1.0'       => [Module\NodeInfo110::class,     [R::GET]],

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index dedad0d..05fcd92 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2189,6 +2189,12 @@ ul.tabs li:hover,
 ul.tabs li.active {
        border-bottom-width: 4px;
 }
+.tabbar.visible-xs .tabs-extended {
+       padding-top: 0;
+}
+#dropdownMenuTools-xs {
+       padding: 9px 10px;
+}
 ul.tabbar ul.tabs-extended:hover li.dropdown {
        border-bottom: 0;
 }

diff --git a/view/theme/frio/templates/common_tabs.tpl b/view/theme/frio/templates/common_tabs.tpl
index 27ae116..0f95d1a 100644 (file)
--- a/view/theme/frio/templates/common_tabs.tpl
+++ b/view/theme/frio/templates/common_tabs.tpl
@@ -1,13 +1,17 @@
-
 <div class="tabbar-wrapper">
        {{* Tab navigation bar for tablets and computer *}}
        <ul role="menubar" class="tabbar list-inline visible-lg visible-md visible-sm hidden-xs">
                {{* The normal tabbar *}}
                <li>
-                       <ul class="tabs flex-nav" role="menu" >
-                       {{foreach $tabs as $tab}}
-                               <li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}"{{/if}} {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
-                       {{/foreach}}
+                       <ul class="tabs flex-nav" role="menu">
+                               {{foreach $tabs as $tab}}
+                                       <li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+                                               <a role="menuitem" href="{{$tab.url}}" {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}" {{/if}}
+                                                       {{if $tab.title}} title="{{$tab.title}}" {{/if}}>
+                                                       {{$tab.label}}
+                                               </a>
+                                       </li>
+                               {{/foreach}}
                        </ul>
                </li>
 
@@ -16,11 +20,12 @@
                <li class="pull-right">
                        <ul class="tabs tabs-extended" role="menu">
                                <li role="presentation" class="dropdown flex-target">
-                                       <button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="false">
+                                       <button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools" data-toggle="dropdown"
+                                               aria-expanded="false">
                                                <i class="fa fa-chevron-down" aria-hidden="true"></i>
                                        </button>
                                </li>
-                        </ul>
+                       </ul>
                </li>
        </ul>
 
@@ -31,24 +36,33 @@
                        <ul class="tabs" role="menu">
                                {{foreach $tabs as $tab}}
                                        {{if $tab.sel}}
-                                       <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+                                               <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+                                                       <a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}" {{/if}}>
+                                                               {{$tab.label}}
+                                                       </a>
+                                               </li>
                                        {{else}}
-                                       {{$exttabs[]=$tab}}
+                                               {{$exttabs[]=$tab}}
                                        {{/if}}
                                {{/foreach}}
                        </ul>
                </li>
 
                {{* All others are moved to this dropdown menu *}}
-               <li class="pull-right">
+               <li>
                        <ul class="tabs tabs-extended">
                                <li class="dropdown">
-                                       <button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools-xs" data-toggle="dropdown" aria-expanded="false">
+                                       <button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools-xs"
+                                               data-toggle="dropdown" aria-expanded="false">
                                                <i class="fa fa-chevron-down" aria-hidden="true"></i>
                                        </button>
-                                       <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools">
+                                       <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenuTools">
                                                {{foreach $exttabs as $tab}}
-                                               <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+                                                       <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+                                                               <a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}" {{/if}}>
+                                                                       {{$tab.label}}
+                                                               </a>
+                                                       </li>
                                                {{/foreach}}
                                        </ul>
                                </li>

diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 65af769..7c81237 100644 (file)
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -1,4 +1,3 @@
-
 {{* This content will be added to the html page <head> *}}
 
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
@@ -8,86 +7,137 @@
 
 {{* All needed css files - Note: css must be inserted before js files *}}
 <link rel="stylesheet" href="view/global.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="all" />
-<link rel="stylesheet" href="view/asset/jquery-colorbox/example5/colorbox.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen" />
-<link rel="stylesheet" href="view/asset/jgrowl/jquery.jgrowl.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen" />
-<link rel="stylesheet" href="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen" />
-<link rel="stylesheet" href="view/asset/perfect-scrollbar/dist/css/perfect-scrollbar.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen" />
+<link rel="stylesheet" href="view/asset/jquery-colorbox/example5/colorbox.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet" href="view/asset/jgrowl/jquery.jgrowl.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet"
+       href="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet"
+       href="view/asset/perfect-scrollbar/dist/css/perfect-scrollbar.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
 
-<link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap/css/bootstrap.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
-<link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap/css/bootstrap-theme.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
-<link rel="stylesheet" href="view/asset/fork-awesome/css/fork-awesome.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
-<link rel="stylesheet" href="view/theme/frio/frameworks/jasny/css/jasny-bootstrap.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
-<link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap-select/css/bootstrap-select.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
-<link rel="stylesheet" href="view/theme/frio/frameworks/ekko-lightbox/ekko-lightbox.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
-<link rel="stylesheet" href="view/theme/frio/frameworks/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
-<link rel="stylesheet" href="view/theme/frio/frameworks/justifiedGallery/justifiedGallery.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
-<link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
-<link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap-toggle/css/bootstrap-toggle.min.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
-<link rel="stylesheet" href="view/theme/frio/font/open_sans/open-sans.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
+<link rel="stylesheet"
+       href="view/theme/frio/frameworks/bootstrap/css/bootstrap.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet"
+       href="view/theme/frio/frameworks/bootstrap/css/bootstrap-theme.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet" href="view/asset/fork-awesome/css/fork-awesome.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet"
+       href="view/theme/frio/frameworks/jasny/css/jasny-bootstrap.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet"
+       href="view/theme/frio/frameworks/bootstrap-select/css/bootstrap-select.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet"
+       href="view/theme/frio/frameworks/ekko-lightbox/ekko-lightbox.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet"
+       href="view/theme/frio/frameworks/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet"
+       href="view/theme/frio/frameworks/justifiedGallery/justifiedGallery.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet"
+       href="view/theme/frio/frameworks/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet"
+       href="view/theme/frio/frameworks/bootstrap-toggle/css/bootstrap-toggle.min.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
+<link rel="stylesheet" href="view/theme/frio/font/open_sans/open-sans.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
 
 {{* own css files *}}
-<link rel="stylesheet" href="view/theme/frio/css/hovercard.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
-<link rel="stylesheet" href="view/theme/frio/css/font-awesome.custom.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
+<link rel="stylesheet" href="view/theme/frio/css/hovercard.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css"
+       media="screen" />
+<link rel="stylesheet" href="view/theme/frio/css/font-awesome.custom.css?v={{$smarty.const.FRIENDICA_VERSION}}"
+       type="text/css" media="screen" />
 
 {{foreach $stylesheets as $stylesheetUrl => $media}}
-<link rel="stylesheet" href="{{$stylesheetUrl}}" type="text/css" media="{{$media}}" />
+       <link rel="stylesheet" href="{{$stylesheetUrl}}" type="text/css" media="{{$media}}" />
 {{/foreach}}
 
 <link rel="shortcut icon" href="{{$shortcut_icon}}" />
-<link rel="apple-touch-icon" href="{{$touch_icon}}"/>
+<link rel="apple-touch-icon" href="{{$touch_icon}}" />
 
 <meta name="apple-mobile-web-app-capable" content="yes" />
-<link rel="manifest" href="{{$baseurl}}/manifest" />
+<link rel="manifest" href="{{$baseurl}}/friendica.webmanifest">
+
 <script type="text/javascript">
-// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
-// Prevents links to switch to Safari in a home screen app - see https://gist.github.com/irae/1042167
-(function(a,b,c){if(c in b&&b[c]){var d,e=a.location,f=/^(a|html)$/i;a.addEventListener("click",function(a){d=a.target;while(!f.test(d.nodeName))d=d.parentNode;"href"in d&&(chref=d.href).replace("{{$baseurl}}/", "").replace(e.href,"").indexOf("#")&&(!/^[a-z\+\.\-]+:/i.test(chref)||chref.indexOf(e.protocol+"//"+e.host)===0)&&(a.preventDefault(),e.href=d.href)},!1)}})(document,window.navigator,"standalone");
-// |license-end
-</script>
+       // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
+       // Prevents links to switch to Safari in a home screen app - see https://gist.github.com/irae/1042167
+       (function(a,b,c){if(c in b&&b[c]){var d,e=a.location,f=/^(a|html)$/i;a.addEventListener("click",function(a){d=a.target;while(!f.test(d.nodeName))d=d.parentNode;"href"in d&&(chref=d.href).replace("{{$baseurl}}/", "").replace(e.href,"").indexOf("#")&&(!/^[a-z\+\.\-]+:/i.test(chref)||chref.indexOf(e.protocol+"//"+e.host)===0)&&(a.preventDefault(),e.href=d.href)},!1)}})(document,window.navigator,"standalone");
+               // |license-end
+       </script>
 
-<link rel="search"
-         href="{{$baseurl}}/opensearch"
-         type="application/opensearchdescription+xml"
-         title="Search in Friendica" />
+       <link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml"
+               title="Search in Friendica" />
 
 
-{{* The js files we use *}}
-<!--[if IE]>
+       {{* The js files we use *}}
+       <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <![endif]-->
-<script type="text/javascript" src="view/js/modernizr.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/asset/jquery/dist/jquery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/js/jquery.textinputs.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/asset/textcomplete/dist/textcomplete.min.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
-<script type="text/javascript" src="view/js/autocomplete.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/asset/jquery-colorbox/jquery.colorbox-min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/asset/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/asset/imagesloaded/imagesloaded.pkgd.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/asset/base64/base64.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/asset/dompurify/dist/purify.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/js/main.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript" src="view/js/modernizr.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript" src="view/asset/jquery/dist/jquery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}">
+       </script>
+       <script type="text/javascript" src="view/js/jquery.textinputs.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript"
+               src="view/asset/textcomplete/dist/textcomplete.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript" src="view/js/autocomplete.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript"
+               src="view/asset/jquery-colorbox/jquery.colorbox-min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js?v={{$smarty.const.FRIENDICA_VERSION}}">
+       </script>
+       <script type="text/javascript"
+               src="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js?v={{$smarty.const.FRIENDICA_VERSION}}">
+       </script>
+       <script type="text/javascript"
+               src="view/asset/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}">
+       </script>
+       <script type="text/javascript"
+               src="view/asset/imagesloaded/imagesloaded.pkgd.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript" src="view/asset/base64/base64.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript" src="view/asset/dompurify/dist/purify.min.js?v={{$smarty.const.FRIENDICA_VERSION}}">
+       </script>
+       <script type="text/javascript" src="view/js/main.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 
-<script type="text/javascript" src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/theme/frio/frameworks/jasny/js/jasny-bootstrap.custom.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/theme/frio/frameworks/bootstrap-select/js/bootstrap-select.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/theme/frio/frameworks/ekko-lightbox/ekko-lightbox.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/theme/frio/frameworks/justifiedGallery/jquery.justifiedGallery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/theme/frio/frameworks/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/theme/frio/frameworks/flexMenu/flexmenu.custom.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/theme/frio/frameworks/jquery-scrollspy/jquery-scrollspy.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/theme/frio/frameworks/autosize/autosize.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/theme/frio/frameworks/sticky-kit/jquery.sticky-kit.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript"
+               src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript"
+               src="view/theme/frio/frameworks/jasny/js/jasny-bootstrap.custom.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript"
+               src="view/theme/frio/frameworks/bootstrap-select/js/bootstrap-select.min.js?v={{$smarty.const.FRIENDICA_VERSION}}">
+       </script>
+       <script type="text/javascript"
+               src="view/theme/frio/frameworks/ekko-lightbox/ekko-lightbox.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript"
+               src="view/theme/frio/frameworks/justifiedGallery/jquery.justifiedGallery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}">
+       </script>
+       <script type="text/javascript"
+               src="view/theme/frio/frameworks/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js?v={{$smarty.const.FRIENDICA_VERSION}}">
+       </script>
+       <script type="text/javascript"
+               src="view/theme/frio/frameworks/flexMenu/flexmenu.custom.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript"
+               src="view/theme/frio/frameworks/jquery-scrollspy/jquery-scrollspy.js?v={{$smarty.const.FRIENDICA_VERSION}}">
+       </script>
+       <script type="text/javascript"
+               src="view/theme/frio/frameworks/autosize/autosize.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript"
+               src="view/theme/frio/frameworks/sticky-kit/jquery.sticky-kit.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 
-{{* own js files *}}
-<script type="text/javascript" src="view/theme/frio/js/theme.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/theme/frio/js/modal.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-{{if ! $block_public}}
-<script type="text/javascript" src="view/theme/frio/js/hovercard.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-{{/if}}
-<script type="text/javascript" src="view/theme/frio/js/textedit.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       {{* own js files *}}
+       <script type="text/javascript" src="view/theme/frio/js/theme.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript" src="view/theme/frio/js/modal.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       {{if ! $block_public}}
+               <script type="text/javascript" src="view/theme/frio/js/hovercard.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       {{/if}}
+       <script type="text/javascript" src="view/theme/frio/js/textedit.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 
-{{* Include the strings which are needed for some js functions (e.g. translation)
+       {{* Include the strings which are needed for some js functions (e.g. translation)
 They are loaded into the html <head> so that js functions can use them *}}
-{{include file="js_strings.tpl"}}
+       {{include file="js_strings.tpl"}}