Merge pull request #5773 from MrPetovan/task/rewrite-js-hooks

Rewrite JS hooks

diff --cc include/conversation.php
Simple merge

diff --cc include/text.php
Simple merge

diff --cc mod/contacts.php
Simple merge

diff --cc mod/editpost.php
Simple merge

diff --cc mod/events.php
Simple merge

diff --cc mod/message.php
Simple merge

diff --cc mod/videos.php
Simple merge

diff --cc src/App.php
Simple merge

diff --cc view/js/main.js
Simple merge

diff --cc view/templates/head.tpl
index 7da270d3ff1ed8b6a0b59905178766ee874a7f43,6c08bc8e452870f8fffbad9360ea81cc08d3a67d..6c55f99771e63beb58ed9f61852136bfb32f896e
--- 1/view/templates/head.tpl
--- 2/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@@ -7,13 -7,12 +7,11 @@@
  <link rel="stylesheet" href="view/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
  <link rel="stylesheet" href="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
  <link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
 -<link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" />
  
- <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
+ {{foreach $stylesheets as $stylesheetUrl}}
+ <link rel="stylesheet" href="{{$stylesheetUrl}}" type="text/css" media="screen" />
+ {{/foreach}}
  
- <!--
- <link rel="shortcut icon" href="images/friendica-32.png" />
- <link rel="apple-touch-icon" href="images/friendica-128.png"/>
- -->
  <link rel="shortcut icon" href="{{$shortcut_icon}}" />
  <link rel="apple-touch-icon" href="{{$touch_icon}}"/>
  

diff --cc view/theme/frio/templates/head.tpl
Simple merge