tidying up html structures

svn path=/trunk/; revision=61

diff --git a/templates/common.css.sh b/templates/common.css.sh
index c9cb0166e6606a2f1c32b9a6516f94717d3db108..00428da00e1ffb3cb7fa9a8e7a6b113ea9bf85c8 100755 (executable)
--- a/templates/common.css.sh
+++ b/templates/common.css.sh
@@ -106,7 +106,7 @@ a.clearsearch, a.advanced, a.tagger, .pagination_nav {
 
 .panel .filter {
   vertical-align: top;
-  border: solid 1px; border-radius: .25em;
+  border: solid 1px #FFF; border-radius: .25em;
   padding: .25em .5em;
   margin: 0 0 1em 0;
 }
@@ -180,7 +180,7 @@ a.clearsearch, a.advanced, a.tagger, .pagination_nav {
 }
 
 #tagger { display: none; }
-#tagger:target { display: block; }
+#tagger:target { display: block; z-index: 1; }
 .footer {
   position: fixed;
   min-height: 2em;

diff --git a/templates/list.html.sh b/templates/list.html.sh
index 40a7d27b1e3f5feb188dfea9e0d1d7a03527b9c7..eed4fef9312fc42868d48cd505a5713f17646020 100755 (executable)
--- a/templates/list.html.sh
+++ b/templates/list.html.sh
@@ -43,16 +43,6 @@ cat <<EOF
     <ul id="thumblist">
       $(thumblist)
     </ul>
-    <div class="panel footer" id="foot">
-      <a class="panel tagger show" href="#tagger">Add Tags</a>
-
-      <div class="pagination_nav">
-        <label>Page:</label>
-        <a href="?${page_prev}">&lt;&lt;</a>
-        <a href="?${page_this}">$(($page + 1))</a>
-        <a href="?${page_next}">&gt;&gt;</a>
-      </div>
-    </div>
 
     <div class="panel footer" id="tagger">
       <a class="panel tagger hide" href="#foot">Hide</a>
@@ -80,6 +70,17 @@ cat <<EOF
       <input type="submit" value="Add Tags!">
     </div>
   </form>
+
+  <div class="panel footer" id="foot">
+    <a class="panel tagger show" href="#tagger">Add Tags</a>
+
+    <div class="pagination_nav">
+      <label>Page:</label>
+      <a href="?${page_prev}">&lt;&lt;</a>
+      <a href="?${page_this}">$(($page + 1))</a>
+      <a href="?${page_next}">&gt;&gt;</a>
+    </div>
+  </div>
 EOF
 
 # vi:set filetype=html:

diff --git a/templates/view.html.sh b/templates/view.html.sh
index b251b871527a01a5b76e0d4e514e4eb6c4b85ba2..e622658c0bc83684036486bfbd80376e43fe1566 100755 (executable)
--- a/templates/view.html.sh
+++ b/templates/view.html.sh
@@ -16,68 +16,67 @@
 # along with Serve0  If not, see <http://www.gnu.org/licenses/>. 
 
 cat <<EOF
-  <form class="panel" id="search" style="display: block;"
-        action="?" method="get" accept-charset="UTF-8">
-    <input type="text" name="s" value="$search" placeholder="Search">
-
-    <label for="o1" class="order">Order by:</label>
-    <select class="order" size="1" name="o" id="o1">
-      <option>Name</option>
-      <option>Date</option>
-      <option>Length</option>
-    </select>
-    <input type="submit" name="submit" value="Find">
-
-    <a class="panel clearsearch" href="?">Clear All</a>
-    <a class="panel advanced show" href="?p=filter">Advanced</a>
-
-    <div class="pagination_nav">
-      <label>Page:</label>
-      <a href="?${page_prev}">&lt;&lt;</a>
-      <a href="?${page_this}">$(($page + 1))</a>
-      <a href="?${page_next}">&gt;&gt;</a>
-    </div>
-  </form>
-
-  <div class="panel" id="videoview">
-    <a href="?p=list" class="panel">Dismiss</a>
-    <div class="video">
-      <a href="$video">Full</a>
-      <video controls>
-       <source src="$video" type='video/mp4; codecs="avc1.4D401E, mp3"'>"
-      </video>
-    </div>
-  
-    <div class="tabcontainer">
+<form class="panel" id="search" style="display: block;" action="?" method="get" accept-charset="UTF-8">
+  <input type="text" name="s" value="$search" placeholder="Search">
+
+  <label for="o1" class="order">Order by:</label>
+  <select class="order" size="1" name="o" id="o1">
+    <option>Name</option>
+    <option>Date</option>
+    <option>Length</option>
+  </select>
+  <input type="submit" name="submit" value="Find">
+
+  <a class="panel clearsearch" href="?">Clear All</a>
+  <a class="panel advanced show" href="?p=filter">Advanced</a>
+
+  <div class="pagination_nav">
+    <label>Page:</label>
+    <a href="?p=view&amp;${page_prev}">&lt;&lt;</a>
+    <a href="?p=view&amp;${page_this}">$(($page + 1))</a>
+    <a href="?p=view&amp;${page_next}">&gt;&gt;</a>
+  </div>
+</form>
+
+<div class="panel" id="videoview">
+  <a href="?p=list&amp;${page_this}" class="panel">Dismiss</a>
+    <h1>$info</h1>
+
+  <div class="video">
+    <a href="$video">Full</a>
+    <video controls>
+      <source src="$video" type='video/mp4; codecs="avc1.4D401E, mp3"'>"
+    </video>
+  </div>
+
+  <div class="tabcontainer">
     <input type="radio" class="tabhandle" name="viewmode" value="view" id="viewmeta" checked>
     <div class="videoinfo tabcontent">
-      <h2>$info</h2>
       <label class="meta edit" for="editmeta">Edit</label>
 
-      <span class="info property">$(($length / 60)):$(($length % 60)) min</span>
-      <span class="info property">Width: $width</span>
-      <span class="info property">Height: $height</span><br>
+      <span class="info length">$(($length / 60)):$(($length % 60)) min</span>
+      <span class="info width" >Width: $width</span>
+      <span class="info height">Height: $height</span><br>
 
-      <span class="label tags">Tags:</span>
+      <label class="tags">Tags:</label>
       $(echo "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
-      $([ -n "$description" ] && echo "<span class=\"info description\">$(_wiki <<<"$description")</span>")
-    </div>
+      ${description:+<span class="info description">$(echo -E "$description" |_wiki)</span>}
     </div>
-  
-    <div class="tabcontainer">
+  </div>
+
+  <div class="tabcontainer">
     <input type="radio" class="tabhandle" name="viewmode" value="edit" id="editmeta">
     <form class="videoinfo tabcontent" action="?action=meta&${page_this}" method="post" accept-charset="UTF-8">
+      <label class="meta cancel" for="viewmeta">Cancel Edit</label>
+
       <input type="hidden" name="length" value="$length">
       <input type="hidden" name="width" value="$width">
       <input type="hidden" name="height" value="$height">
 
-      <h2>$info</h2>
-      <label class="meta cancel" for="viewmeta">Cancel</label>
+      <span class="info length">$(($length / 60)):$(($length % 60)) min</span>
+      <span class="info width" >Width: $width</span>
+      <span class="info height">Height: $height</span>
 
-      <span class="info property">$(($length / 60)):$(($length % 60)) min</span>
-      <span class="info property">Width: $width</span>
-      <span class="info property">Height: $height</span>
-  
       <span class="label tags">Tags:</span>
       <select class="edit tags" name="tag" size="16" multiple>
         $(echo "$taglist" |while read line; do
@@ -85,31 +84,33 @@ cat <<EOF
         done)
       </select>
 
-      <span class="label moretags">Additional Tags (one per line):</span>
+      <label class="moretags">Additional Tags (one per line):</label>
       <textarea class="edit moretags" name="tags" rows="4"></textarea>
 
-      <span class="label description">Description:</span>
+      <label class="description">Description:</label>
       <textarea class="edit description" name="description" rows="4">$description</textarea>
+
       <input type="submit" value="Submit">
       <input type="submit" name="trash" value="Delete Video">
       <!-- input type="submit" name="cancel" value="Cancel" -->
     </form>
   </div>
-  </div>
+</div>
 
-  <form>
-    <ul id="thumblist">
-      $(thumblist)
-    </ul>
-    <div class="panel footer" id="foot">
-      <div class="pagination_nav">
-        <label>Page:</label>
-        <a href="?${page_prev}">&lt;&lt;</a>
-        <a href="?${page_this}">$(($page + 1))</a>
-        <a href="?${page_next}">&gt;&gt;</a>
-      </div>
-    </div>
-  </form>
+<form>
+  <ul id="thumblist">
+    $(thumblist)
+  </ul>
+</form>
+
+<div class="panel footer" id="foot">
+  <div class="pagination_nav">
+    <label>Page:</label>
+    <a href="?${page_prev}">&lt;&lt;</a>
+    <a href="?${page_this}">$(($page + 1))</a>
+    <a href="?${page_next}">&gt;&gt;</a>
+  </div>
+</div>
 EOF
 
 # vi:set filetype=html: