Merge branch 'develop' into feature/stream

Conflicts:
	composer.lock

templates/index.tpl

@@ -12,6 +12,9 @@
         <input class="URLinput" type="url" name="url" id="url"
         required autofocus placeholder="http://example.com/video" />
         </span>
+        {if uglyUrls}
+            <input type="hidden" name="page" value="video" />
+        {/if}
         <input class="downloadBtn" type="submit" value="Download" /><br/>
         {if $convert}
             <div class="mp3">
@@ -25,7 +28,7 @@
     <a class="combatiblelink" href="{path_for name="extractors"}">See all supported websites</a>
     <div id="bookmarklet" class="bookmarklet_wrapper">
         <p> Drag this to your bookmarks bar: </p>
-        <a class="bookmarklet" href="javascript:window.location='{base_url|noscheme}{path_for name='video'}?url='+encodeURIComponent(location.href);">Bookmarklet</a>
+        <a class="bookmarklet" href="javascript:window.location='{$domain}{path_for name='video'}?url='+encodeURIComponent(location.href);">Bookmarklet</a>
     </div>
 
 </div>

templates/video.tpl

@@ -24,6 +24,9 @@
     <h3><label for="format">Available formats:</label></h3>
     <form action="{path_for name="redirect"}">
         <input type="hidden" name="url" value="{$video->webpage_url}" />
+        {if uglyUrls}
+            <input type="hidden" name="page" value="redirect" />
+        {/if}
         <select name="format" id="format" class="formats monospace">
             <optgroup label="Generic formats">
                 <option value="best">