add merge option and some sorting

weboob/frontends/videoob_web/templates/index.mako

@@ -2,6 +2,11 @@
 
 <%inherit file="base.mako"/>
 
+<%def name="video_link(item)">
+  <a href="${item['page_url']}">${item['title']}</a>
+  ## (<a href="${item['url']}"><em>download</em></a>)
+</%def>
+
 <%def name="body()">
 <h1>Videoob Web</h1>
 <div id="search">
@@ -12,16 +17,21 @@
   </form>
 </div>
 <div id="results">
-  % for backend, items in results.iteritems():
-    <h2>${backend}</h2>
+  % if merge:
     <ul>
-      % for item in items:
-        <li>
-          <a href="${item['page_url']}">${item['title']}</a>
-##          (<a href="${item['url']}"><em>download</em></a>)
-        </li>
+      % for item in results:
+        <li>${video_link(item)}</li>
       % endfor
     </ul>
-  % endfor
+  % else:
+    % for backend, items in sorted(results.iteritems()):
+      <h2>${backend}</h2>
+      <ul>
+        % for item in items:
+          <li>${video_link(item)}</li>
+        % endfor
+      </ul>
+    % endfor
+  % endif
 </div>
 </%def>