Merge pull request #6055 from zeroadam/FileTagHotFix

[friendica.git] / view / theme / smoothly / theme.php

diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 7e8744f0d170e307d6fd9d727e7c9da29a90929d..6168932e95242fc20548cc39a6862f08e9f11f03 100644 (file)
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -10,42 +10,38 @@
  * Screenshot: <a href="screenshot.png">Screenshot</a>
  */
 
+use Friendica\App;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
+
 function smoothly_init(App $a) {
-       set_template_engine($a, 'smarty3');
+       Renderer::setActiveTemplateEngine('smarty3');
 
        $cssFile = null;
        $ssl_state = null;
-       $baseurl = App::get_baseurl($ssl_state);
-$a->page['htmlhead'] .= <<< EOT
+       $baseurl = System::baseUrl($ssl_state);
+       $a->page['htmlhead'] .= <<< EOT
 
 <script>
-function insertFormatting(comment,BBcode,id) {
-
-               var tmpStr = $("#comment-edit-text-" + id).val();
-               if(tmpStr == comment) {
-                       tmpStr = "";
-                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-                       openMenu("comment-edit-submit-wrapper-" + id);
-                       $("#comment-edit-text-" + id).val(tmpStr);
-               }
+function insertFormatting(BBcode, id) {
+       var tmpStr = $("#comment-edit-text-" + id).val();
+       if (tmpStr == "") {
+               $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               openMenu("comment-edit-submit-wrapper-" + id);
+       }
 
        textarea = document.getElementById("comment-edit-text-" +id);
        if (document.selection) {
                textarea.focus();
                selected = document.selection.createRange();
-               if (BBcode == "url"){
-                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-                       } else
                selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
        } else if (textarea.selectionStart || textarea.selectionStart == "0") {
                var start = textarea.selectionStart;
                var end = textarea.selectionEnd;
-               if (BBcode == "url"){
-                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-                       } else
                textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
        }
+
        return true;
 }
 
@@ -57,41 +53,41 @@ function cmtBbClose(comment, id) {
 }
 $(document).ready(function() {
 
-$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+       $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
 
-$('.group-edit-icon').hover(
-       function() {
-               $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-       function() {
-               $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       $('.group-edit-icon').hover(
+               function() {
+                       $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+               function() {
+                       $(this).removeClass('icon'); $(this).addClass('iconspacer');}
        );
 
-$('.sidebar-group-element').hover(
-       function() {
-               id = $(this).attr('id');
-               $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+       $('.sidebar-group-element').hover(
+               function() {
+                       id = $(this).attr('id');
+                       $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
 
-       function() {
-               id = $(this).attr('id');
-               $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+               function() {
+                       id = $(this).attr('id');
+                       $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
        );
 
 
-$('.savedsearchdrop').hover(
-       function() {
-               $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-       function() {
-               $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+       $('.savedsearchdrop').hover(
+               function() {
+                       $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+               function() {
+                       $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
        );
 
-$('.savedsearchterm').hover(
-       function() {
-               id = $(this).attr('id');
-               $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+       $('.savedsearchterm').hover(
+               function() {
+                       id = $(this).attr('id');
+                       $('#drop-' + id).addClass('icon');      $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
 
-       function() {
-               id = $(this).attr('id');
-               $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+               function() {
+                       id = $(this).attr('id');
+                       $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
        );
 
 });
@@ -99,25 +95,24 @@ $('.savedsearchterm').hover(
 </script>
 EOT;
 
-       /** custom css **/
+       /** custom css **/
        if (!is_null($cssFile)) {
         $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
        }
 
-_js_in_foot();
-
+       _js_in_foot();
 }
 
-if(! function_exists('_js_in_foot')) {
+if (! function_exists('_js_in_foot')) {
        function _js_in_foot() {
                /** @purpose insert stuff in bottom of page
                */
                $a = get_app();
                $ssl_state = null;
-               $baseurl = App::get_baseurl($ssl_state);
+               $baseurl = System::baseUrl($ssl_state);
                $bottom['$baseurl'] = $baseurl;
-               $tpl = get_markup_template('bottom.tpl');
+               $tpl = Renderer::getMarkupTemplate('bottom.tpl');
 
-               return $a->page['bottom'] = replace_macros($tpl, $bottom);
+               return $a->page['bottom'] = Renderer::replaceMacros($tpl, $bottom);
        }
 }