Merge pull request #5862 from nupplaphil/rename_App_Methods

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

diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index a10a071392aea4df8b5078a4ad4b5f7843053056..e961146f6a941dd0d7aac1760a01706130641a54 100644 (file)
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -10,13 +10,16 @@
  * Screenshot: <a href="screenshot.png">Screenshot</a>
  */
 
-function smoothly_init(&$a) {
-       set_template_engine($a, 'smarty3');
+use Friendica\App;
+use Friendica\Core\System;
+
+function smoothly_init(App $a) {
+       $a->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(BBcode, id) {
@@ -25,26 +28,17 @@ function insertFormatting(BBcode, id) {
                $("#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);
        }
 
        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+"]";
-               }
+               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);
-               }
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
        }
 
        return true;
@@ -100,13 +94,12 @@ $(document).ready(function() {
 </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')) {
@@ -115,7 +108,7 @@ if (! function_exists('_js_in_foot')) {
                */
                $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');