Merge branch 'develop' of github.com:Rudloff/alltube into develop

index.php

@@ -22,7 +22,8 @@ $app = new \Slim\Slim(
 );
 $view = $app->view();
 $view->parserExtensions = array(
-    dirname(__FILE__).'/vendor/slim/views/SmartyPlugins',
+    __DIR__.'/vendor/slim/views/SmartyPlugins',
+    __DIR__.'/smarty'
 );
 $app->get(
     '/',

smarty/modifier.noscheme.php

@@ -0,0 +1,5 @@
+<?php
+function smarty_modifier_noscheme($url) {
+    $info = parse_url($url);
+    return '//'.$info['host'].$info['path'];
+}

templates/disabled.tpl

@@ -1,15 +0,0 @@
-<div class="wrapper">
-    <div class="main">
-    <h1><img itemprop="image" class="logo" src="img/logo.png"
-    alt="AllTube Download" width="328" height="284"></h1>
-    <div>
-        Due to various technical reasons,
-            we can no longer host an online version of AllTube.<br/>
-        However, you are free to
-            <a title="AllTube releases on GitHub"
-                href="https://github.com/Rudloff/alltube/releases">
-                download the code</a>
-            and run it on your own server.
-    </div>
-</div>
-</div>

templates/index.tpl

@@ -1,5 +1,5 @@
     <div class="main">
-    <div><img itemprop="image" class="logo" src="img/logo.png"
+    <div><img itemprop="image" class="logo" src="{siteUrl url='img/logo.png'}"
     alt="AllTube Download" width="328" height="284"></div>
     <form action="{urlFor name="video"}">
     <label class="labelurl" for="url">
@@ -23,7 +23,7 @@
     <a class="combatiblelink" href="{urlFor name="extractors"}">See all supported websites</a>
     <div id="bookmarklet">
         <p> Drag this to your bookmarks bar: </p>
-        <a class="bookmarklet" href="javascript:window.location='{siteUrl url='api.php'}?url='+encodeURIComponent(location.href);">Bookmarklet</a>
+        <a class="bookmarklet" href="javascript:window.location='{siteUrl withUri=false url='img/logo.png'}{urlFor name='video'}?url='+encodeURIComponent(location.href);">Bookmarklet</a>
     </div>
 
 </div>

templates/logo.tpl

@@ -1,4 +1,4 @@
 <h1 class="logobis">
 <a class="logocompatible" href="{siteUrl}">
-AllTube Download<span class="logocompatiblemask"><img src="img/logocompatiblemask.png" width="447" height="107" alt="" /></span>
+AllTube Download<span class="logocompatiblemask"><img src="{siteUrl url='img/logocompatiblemask.png'}" width="447" height="107" alt="" /></span>
 </a></h1>

templates/maintenance.tpl

@@ -1,9 +0,0 @@
-<div class="wrapper">
-    <div class="main">
-    <h1><img itemprop="image" class="logo" src="img/logo.png"
-    alt="AllTube Download" width="328" height="284"></h1>
-    <div>Due to some issues with our server,
-        we have to disable AllTube for a few days.
-        Sorry for the inconvenience.</div>
-</div>
-</div>

templates/video.tpl

@@ -9,13 +9,13 @@
         href="{$video->webpage_url}">
 {$video->title}</a></i>.
 <img class="cast_icon" id="cast_disabled"
-    src="img/ic_media_route_disabled_holo_light.png"
+    src="{siteUrl url='img/ic_media_route_disabled_holo_light.png'}"
     alt="Google Cast™ is disabled"
     title="Google Cast is not supported on this browser." />
 <img class="cast_btn cast_hidden cast_icon" id="cast_btn_launch"
-    src="img/ic_media_route_off_holo_light.png"
+    src="{siteUrl url='img/ic_media_route_off_holo_light.png'}"
     title="Cast to ChromeCast" alt="Google Cast™" />
-<img src="img/ic_media_route_on_holo_light.png"
+<img src="{siteUrl url='img/ic_media_route_on_holo_light.png'}"
     alt="Casting to ChromeCast…" title="Stop casting"
     id="cast_btn_stop" class="cast_btn cast_hidden cast_icon" /></p>
 <img itemprop="image" class="thumb" src="{$video->thumbnail}" alt="" />