]> git.plutz.net Git - serve0/commitdiff
projects / serve0 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fbbdc30)
replaced all javascript bits
authorpaul <paul@plutz.net>
Fri, 3 Jul 2015 19:25:33 +0000 (19:25 +0000)
committerpaul <paul@plutz.net>
Fri, 3 Jul 2015 19:25:33 +0000 (19:25 +0000)
svn path=/trunk/; revision=60

actions/watch.sh patch | blob | history
templates/common.css.sh patch | blob | history
templates/frame.html.sh patch | blob | history
templates/list.html.sh patch | blob | history
templates/view.html.sh patch | blob | history

diff --git a/actions/watch.sh b/actions/watch.sh
index d64ae6716550b054f4888c8c05e95019fa43b1d9..dbbc219624280d0f0a653ad89281fc52bbde65db 100755 (executable)
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -14,4 +14,4 @@ watch_link=''
 [ -n "$filter" ] && watch_link="${watch_link}f=${filter}&"
 [ -n "$page" ]   && watch_link="${watch_link}pn=${page}"
 
-echo -n "Location: ?page=view&${watch_link}\n\n"
+echo -n "Location: ?p=view&${watch_link}\n\n"
diff --git a/templates/common.css.sh b/templates/common.css.sh
index 0ae44a787e78d882943b5b8762c3d1ac8e746970..c9cb0166e6606a2f1c32b9a6516f94717d3db108 100755 (executable)
--- a/templates/common.css.sh
+++ b/templates/common.css.sh
@@ -121,7 +121,6 @@ a.clearsearch, a.advanced, a.tagger, .pagination_nav {
 .panel > .tabhandle:checked + label.tabhandle + .tabcontent { display: inline-block; }
 .panel > .tabhandle:checked + label.tabhandle + .tabcontent + .tabhandle + label{ display: inline-block; }
 .panel > .tabhandle:checked + label.tabhandle + .tabcontent + .tabhandle:checked + label{ display: none; }
-
 .panel .filter .tabcontainer {
   position: relative;
   width: 16em;
@@ -180,10 +179,13 @@ a.clearsearch, a.advanced, a.tagger, .pagination_nav {
   margin-top: .3em;
 }
 
+#tagger { display: none; }
+#tagger:target { display: block; }
 .footer {
   position: fixed;
   min-height: 2em;
   bottom: 0px;
+  width: 100%;
   border-style: solid none none none;
 }
 
@@ -202,14 +204,13 @@ a.clearsearch, a.advanced, a.tagger, .pagination_nav {
   display: block;
 }
 #videoview .videoinfo {
-  display: inline-block;
   width: 39%;
   margin-top: 2em;
 }
 #videoview .videoinfo h2 {
   display: inline;
 } 
-#videoview .videoinfo a.meta:after {
+#videoview .videoinfo .meta:after {
   content: "\A";
   white-space: pre;
 }
diff --git a/templates/frame.html.sh b/templates/frame.html.sh
index 4cb612b320f62b76bd6cf38889786e9da7854443..41727864ce88053fe0617d096ca2494a1d9dec14 100755 (executable)
--- a/templates/frame.html.sh
+++ b/templates/frame.html.sh
@@ -27,26 +27,6 @@ cat <<EOF
     $(. $PAGE css)
     -->
     </style>
-    <script type="text/javascript">
-    <!--
-    function show_block(id){
-      document.getElementById(id).style.display = "block";
-      try{document.getElementById('vid_'+id).play();}catch(foo){}
-    }
-    function show_inline(id){
-      document.getElementById(id).style.display = "inline";
-      try{document.getElementById('vid_'+id).play();}catch(foo){}
-    }
-    function show_iblock(id){
-      document.getElementById(id).style.display = "inline-block";
-      try{document.getElementById('vid_'+id).play();}catch(foo){}
-    }
-    function hide(id){
-      try{document.getElementById('vid_'+id).pause();}catch(foo){}
-      document.getElementById(id).style.display = "none";
-    }
-    -->
-    </script>
   </head>
   <body>
     $(. $PAGE body)
diff --git a/templates/list.html.sh b/templates/list.html.sh
index 684cb7432b145ed55859c85273881e7de3968fc3..40a7d27b1e3f5feb188dfea9e0d1d7a03527b9c7 100755 (executable)
--- a/templates/list.html.sh
+++ b/templates/list.html.sh
@@ -44,7 +44,7 @@ cat <<EOF
       $(thumblist)
     </ul>
     <div class="panel footer" id="foot">
-      <a class="panel tagger show" href="#foot" onclick="javascript:hide('foot');show_block('tagger');">Add Tags</a>
+      <a class="panel tagger show" href="#tagger">Add Tags</a>
 
       <div class="pagination_nav">
         <label>Page:</label>
@@ -54,10 +54,8 @@ cat <<EOF
       </div>
     </div>
 
-    <div class="panel footer" id="tagger" style="display: none;">
-      <a class="panel tagger hide" href="#"
-       onclick="javascript:hide('tagger');$(for n in $(seq 1 4); do echo "hide('filter$n');"; done)show_block('foot')"
-      >Hide</a>
+    <div class="panel footer" id="tagger">
+      <a class="panel tagger hide" href="#foot">Hide</a>
       <hr>
       <p class="help">Add selectetd tags to selected videos.</p>
       <p class="newtag">
diff --git a/templates/view.html.sh b/templates/view.html.sh
index 7092fa50e59c2e70d2855890b466d24a263d9f4f..b251b871527a01a5b76e0d4e514e4eb6c4b85ba2 100755 (executable)
--- a/templates/view.html.sh
+++ b/templates/view.html.sh
@@ -48,9 +48,11 @@ cat <<EOF
       </video>
     </div>
   
-    <div class="videoinfo" id="viewmeta">
+    <div class="tabcontainer">
+    <input type="radio" class="tabhandle" name="viewmode" value="view" id="viewmeta" checked>
+    <div class="videoinfo tabcontent">
       <h2>$info</h2>
-      <a class="meta edit" href="#" onclick="javascript:hide('viewmeta');show_iblock('editmeta')">Edit</a>
+      <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>
@@ -60,15 +62,17 @@ cat <<EOF
       $(echo "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
       $([ -n "$description" ] && echo "<span class=\"info description\">$(_wiki <<<"$description")</span>")
     </div>
+    </div>
   
-    <form class="videoinfo" id="editmeta" style="display: none;"
-          action="?action=meta&${page_this}" method="post" accept-charset="UTF-8">
+    <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">
       <input type="hidden" name="length" value="$length">
       <input type="hidden" name="width" value="$width">
       <input type="hidden" name="height" value="$height">
 
       <h2>$info</h2>
-      <a class="meta cancel" href="#" onclick="javascript:hide('editmeta');show_iblock('viewmeta')">Cancel</a>
+      <label class="meta cancel" for="viewmeta">Cancel</label>
 
       <span class="info property">$(($length / 60)):$(($length % 60)) min</span>
       <span class="info property">Width: $width</span>
@@ -91,6 +95,7 @@ cat <<EOF
       <!-- input type="submit" name="cancel" value="Cancel" -->
     </form>
   </div>
+  </div>
 
   <form>
     <ul id="thumblist">
Webapp for managing video collections including tagging and playback