Add an overflow/options/hamburger menu to download the original file, and also turn...

diff --git a/files/options.png b/files/options.png
new file mode 100644 (file)
index 0000000..6ab2b82
Binary files /dev/null and b/files/options.png differ

diff --git a/files/pr0n-fullscreen.css b/files/pr0n-fullscreen.css
index 7f93aff2fd4e06b74a5b20528e8e1149fc419491..16d52088f109908d767c9495569fe9ddcbd82973 100644 (file)
--- a/files/pr0n-fullscreen.css
+++ b/files/pr0n-fullscreen.css
@@ -33,6 +33,31 @@ img, #text {
        right: 0px;
        z-index: 2;
 }
        right: 0px;
        z-index: 2;
 }

+#options {
+       position: absolute;
+       top: 0px;
+       left: 0px;
+       z-index: 2;
+}
+#optionmenu {
+       display: none;
+       position: absolute;
+       top: 50px;
+       left: 0px;
+       z-index: 2;
+       background-color: white;
+       color: black;
+       font-family: sans-serif;
+       padding: 5px;
+       margin-left: 2px;
+       border: 1px solid black;
+       opacity: 0.7;
+       line-height: 1.5em;
+}
+#optionmenu a {
+       color: black;
+       text-decoration: none;
+}

 
 #preload, #preload_box {
        position: absolute;
 
 #preload, #preload_box {
        position: absolute;

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index bedaeb178806d4ef7cede0cce1334491eb36fa42..c69f8a7a5830fc92f756356b7736b1db43fc34e1 100644 (file)
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -121,7 +121,7 @@ function rename_element(old_name, new_name)
 
 function display_image(width, height, evt, filename, element_id)
 {
 
 function display_image(width, height, evt, filename, element_id)
 {

-       var url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/nobox/" + filename;
+       var url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/" + filename;

        var main = document.getElementById("iehack");
        var preload = document.getElementById("preload");
        var dpr = find_dpr();
        var main = document.getElementById("iehack");
        var preload = document.getElementById("preload");
        var dpr = find_dpr();


@@ -139,20 +139,30 @@ function display_image(width, height, evt, filename, element_id)
        img.style.transformOrigin = "top left";
        img.style.transform = "scale(" + (1.0 / dpr) + ")";
 
        img.style.transformOrigin = "top left";
        img.style.transform = "scale(" + (1.0 / dpr) + ")";
 

-       // Infobox.
-       var url;
-       if (dpr == 1) {
-               url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/box/" + filename;
+       // Update the "download original" link.
+       var original_url = window.location.origin + "/" + evt + "/original/" + filename;
+       document.getElementById("origdownload").href = original_url;
+
+       if (global_infobox) {
+               var url;
+               if (dpr == 1) {
+                       url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/box/" + filename;
+               } else {
+                       url = window.location.origin + "/" + evt + "/" + width + "x" + height + "@" + dpr.toFixed(2) + "/box/" + filename;
+               }
+               var boximg = replace_image_element(url, element_id + "_box", main);
+
+               boximg.style.position = "absolute";
+               boximg.style.left = "0px";
+               boximg.style.bottom = "-1px";
+               boximg.style.transformOrigin = "bottom left";
+               boximg.style.transform = "scale(" + (1.0 / dpr) + ")";

        } else {
        } else {

-               url = window.location.origin + "/" + evt + "/" + width + "x" + height + "@" + dpr.toFixed(2) + "/box/" + filename;
+               var boximg = document.getElementById(element_id + "_box");
+               if (boximg !== null) {
+                       boximg.parentNode.removeChild(boximg);
+               }

        }
        }

-       var boximg = replace_image_element(url, element_id + "_box", main);
-
-       boximg.style.position = "absolute";
-       boximg.style.left = "0px";
-       boximg.style.bottom = "-1px";
-       boximg.style.transformOrigin = "bottom left";
-       boximg.style.transform = "scale(" + (1.0 / dpr) + ")";

 
        return img;
 }
 
        return img;
 }


@@ -218,6 +228,14 @@ function can_go_previous()
 function set_opacity(id, amount)
 {
        var elem = document.getElementById(id);
 function set_opacity(id, amount)
 {
        var elem = document.getElementById(id);

+
+       // If optionmenu is visible, options is also visible.
+       if (id === "options" && amount < 0.7) {
+               var optionmenu = document.getElementById("optionmenu");
+               if (optionmenu.style.display === "block") {
+                       amount = 0.7;
+               }
+       }

        elem.style.opacity = amount;
 }
 
        elem.style.opacity = amount;
 }
 


@@ -256,9 +274,10 @@ function relayout()
                prepare_preload(img, global_image_num + 1);
        }
 
                prepare_preload(img, global_image_num + 1);
        }
 

-       set_opacity("previous", can_go_previous() ? 0.7 : 0.1);
-       set_opacity("next", can_go_next() ? 0.7 : 0.1);
-       set_opacity("close", 0.7);
+       set_opacity("previous", can_go_previous() ? global_default_opacity : 0.1);
+       set_opacity("next", can_go_next() ? global_default_opacity : 0.1);
+       set_opacity("close", global_default_opacity);
+       set_opacity("options", global_default_opacity);

 }
 
 function go_previous()
 }
 
 function go_previous()


@@ -269,12 +288,12 @@ function go_previous()
 
        var img = display_image_num(--global_image_num, "image");
        if (can_go_previous()) {
 
        var img = display_image_num(--global_image_num, "image");
        if (can_go_previous()) {

-               set_opacity("previous", 0.7);
+               set_opacity("previous", global_default_opacity);

                prepare_preload(img, global_image_num - 1);
        } else {
                set_opacity("previous", 0.1);
        }
                prepare_preload(img, global_image_num - 1);
        } else {
                set_opacity("previous", 0.1);
        }

-       set_opacity("next", can_go_next() ? 0.7 : 0.1);
+       set_opacity("next", can_go_next() ? global_default_opacity : 0.1);

 }
 
 function go_next()
 }
 
 function go_next()


@@ -285,12 +304,12 @@ function go_next()
 
        var img = display_image_num(++global_image_num, "image");
        if (can_go_next()) {
 
        var img = display_image_num(++global_image_num, "image");
        if (can_go_next()) {

-               set_opacity("next", 0.7);
+               set_opacity("next", global_default_opacity);

                prepare_preload(img, global_image_num + 1);
        } else {
                set_opacity("next", 0.1);
        }
                prepare_preload(img, global_image_num + 1);
        } else {
                set_opacity("next", 0.1);
        }

-       set_opacity("previous", can_go_previous() ? 0.7 : 0.1);
+       set_opacity("previous", can_go_previous() ? global_default_opacity : 0.1);

 }
 
 function do_close()
 }
 
 function do_close()


@@ -298,6 +317,17 @@ function do_close()
        window.location = global_return_url;
 }
 
        window.location = global_return_url;
 }
 

+function toggle_optionmenu()
+{
+       var optionmenu = document.getElementById("optionmenu");
+       if (optionmenu.style.display === "block") {
+               optionmenu.style.display = "none";
+       } else {
+               optionmenu.style.display = "block";
+               set_opacity("options", 0.7);
+       }
+}
+

 function draw_text(msg)
 {
        // remove any text we might have left
 function draw_text(msg)
 {
        // remove any text we might have left


@@ -377,16 +407,16 @@ function key_down(which)
 function key_up(which) {
        if (which == 39) {   // right
                if (can_go_next()) {
 function key_up(which) {
        if (which == 39) {   // right
                if (can_go_next()) {

-                       set_opacity("next", 0.7);
+                       set_opacity("next", global_default_opacity);

                        go_next();
                }
        } else if (which == 37) {   // left
                if (can_go_previous()) {
                        go_next();
                }
        } else if (which == 37) {   // left
                if (can_go_previous()) {

-                       set_opacity("previous", 0.7);
+                       set_opacity("previous", global_default_opacity);

                        go_previous();
                }
        } else if (which == 27) {   // escape
                        go_previous();
                }
        } else if (which == 27) {   // escape

-               set_opacity("close", 0.7);
+               set_opacity("close", global_default_opacity);

                do_close();
        } else if (which == 32 && global_select) {   // space
                select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1], 1);
                do_close();
        } else if (which == 32 && global_select) {   // space
                select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1], 1);


@@ -413,3 +443,16 @@ function check_for_hash_change() {
                relayout();
        }
 }
                relayout();
        }
 }

+
+function toggle_immersive() {
+       if (global_default_opacity == 0.7) {
+               global_default_opacity = 0.0;
+               global_infobox = false;
+               document.getElementById('immersivetoggle').innerHTML = 'Show decorations';
+       } else {
+               global_default_opacity = 0.7;
+               global_infobox = true;
+               document.getElementById('immersivetoggle').innerHTML = 'Hide all decorations';
+       }
+       relayout();
+}

diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm
index 383b7fc434dccee85d954adceaedbdf11fedd03d..f5715f53b7077b9f7d5b30831f7915ff75aecb79 100644 (file)
--- a/perl/Sesse/pr0n/pr0n.pm
+++ b/perl/Sesse/pr0n/pr0n.pm
@@ -28,6 +28,7 @@ sub handler {
                 $uri eq '/previous.png' ||
                 $uri eq '/next.png' ||
                 $uri eq '/close.png' ||
                 $uri eq '/previous.png' ||
                 $uri eq '/next.png' ||
                 $uri eq '/close.png' ||

+                $uri eq '/options.png' ||

                 $uri =~ m#^/usage/([a-zA-Z0-9_.]+)$#) {
                $uri =~ s#^/##;
                my $fname = $Sesse::pr0n::Config::image_base . 'files/' . $uri;
                 $uri =~ m#^/usage/([a-zA-Z0-9_.]+)$#) {
                $uri =~ s#^/##;
                my $fname = $Sesse::pr0n::Config::image_base . 'files/' . $uri;

diff --git a/templates/default/fullscreen-footer b/templates/default/fullscreen-footer
index 3b1f5e96e1bcbe9345e150694ca3f8169b5b90d7..de29479c48be82feaa27d4364719fd31b8f95728 100644 (file)
--- a/templates/default/fullscreen-footer
+++ b/templates/default/fullscreen-footer
@@ -2,15 +2,19 @@
 var global_return_url = "%RETURNURL%";
 var global_image_num = parse_image_num(%START%);
 var global_select = %SEL%;
 var global_return_url = "%RETURNURL%";
 var global_image_num = parse_image_num(%START%);
 var global_select = %SEL%;

+var global_default_opacity = 0.7;
+var global_infobox = true;

 // end generated
     </script>
   </head>
   <body onresize="relayout();" onload="init_ajax(); relayout(); setInterval('check_for_hash_change()', 1000);" onkeydown="key_down(event.keyCode);" onkeyup="key_up(event.keyCode);" onhashchange="check_for_hash_change();" onclick="check_for_hash_change();">
     <div>
       <div class="container" id="main"><div id="iehack"></div></div>
 // end generated
     </script>
   </head>
   <body onresize="relayout();" onload="init_ajax(); relayout(); setInterval('check_for_hash_change()', 1000);" onkeydown="key_down(event.keyCode);" onkeyup="key_up(event.keyCode);" onhashchange="check_for_hash_change();" onclick="check_for_hash_change();">
     <div>
       <div class="container" id="main"><div id="iehack"></div></div>

-      <img id="previous" src="/previous.png" alt="&lt;-" onmousedown="if (can_go_previous()) set_opacity('previous', 1.0)" onmouseup="if (can_go_previous()) { set_opacity('previous', 0.7); go_previous(); }" onmouseout="if (can_go_previous()) { set_opacity('previous', 0.7); }" />
-      <img id="next" src="/next.png" alt="-&gt;" onmousedown="if (can_go_next()) set_opacity('next', 1.0)" onmouseup="if (can_go_next()) { set_opacity('next', 0.7); go_next(); }" onmouseout="if (can_go_next()) { set_opacity('next', 0.7); }" />
-      <img id="close" src="/close.png" alt="x" onmousedown="set_opacity('close', 1.0)" onmouseup="set_opacity('close', 0.7); do_close();" onmouseout="set_opacity('close', 0.7);" />
+      <img id="previous" src="/previous.png" alt="&lt;-" onmousedown="if (can_go_previous()) set_opacity('previous', 1.0)" onmouseup="if (can_go_previous()) { set_opacity('previous', global_default_opacity); go_previous(); }" onmouseout="if (can_go_previous()) { set_opacity('previous', global_default_opacity); }" />
+      <img id="next" src="/next.png" alt="-&gt;" onmousedown="if (can_go_next()) set_opacity('next', 1.0)" onmouseup="if (can_go_next()) { set_opacity('next', global_default_opacity); go_next(); }" onmouseout="if (can_go_next()) { set_opacity('next', global_default_opacity); }" />
+      <img id="close" src="/close.png" alt="x" onmousedown="set_opacity('close', 1.0)" onmouseup="set_opacity('close', global_default_opacity); do_close();" onmouseout="set_opacity('close', global_default_opacity);" />
+      <img id="options" src="/options.png" alt="=" onmousedown="set_opacity('options', 1.0)" onmouseup="set_opacity('options', global_default_opacity); toggle_optionmenu();" onmouseout="set_opacity('options', global_default_opacity);" />
+      <div id="optionmenu"><p><a id="origdownload">Download original image</a></p><p><a id="immersivetoggle" href="javascript:toggle_optionmenu();toggle_immersive();">Hide all decorations</a></p></div>

     </div>
   </body>
 </html>
     </div>
   </body>
 </html>