]> git.wh0rd.org Git - tt-rss.git/commitdiff
use css for help overlay, css cleanup
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 21 Nov 2011 12:10:24 +0000 (16:10 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 21 Nov 2011 12:13:47 +0000 (16:13 +0400)
15 files changed:
functions.js
functions.php
images/c1.png [deleted file]
images/c2.png [deleted file]
images/c3.png [deleted file]
images/c4.png [deleted file]
images/shadow-grid.gif [deleted file]
images/shadow.png [deleted file]
images/shadow_dark.png [deleted file]
images/shadow_white.png [deleted file]
prefs.js
prefs.php
tt-rss.css
tt-rss.js
tt-rss.php

index 1fd421809267b57d0be66ddede63ab1c4cd97640..c47070ed3e3e78f2ec3cc52b0f705b8fd90ac5b6 100644 (file)
@@ -394,16 +394,6 @@ function make_timestamp() {
 }
 
 
-function closeErrorBox() {
-
-       if (Element.visible("errorBoxShadow")) {
-               Element.hide("dialog_overlay");
-               Element.hide("errorBoxShadow");
-       }
-
-       return false;
-}
-
 function closeInfoBox(cleanup) {
        try {
                dialog = dijit.byId("infoBox");
index 83159e62cabbefe1f79576f7bd34ee75ec6849a2..498750851cecf5bcb3d0767186d0d95729ab8717 100644 (file)
                }
        }
 
-       function rounded_table_start($classname, $header = "&nbsp;") {
-               print "<table width='100%' class='$classname' cellspacing='0' cellpadding='0'>";
-               print "<tr><td class='c1'>&nbsp;</td><td class='top'>$header</td><td class='c2'>&nbsp;</td></tr>";
-               print "<tr><td class='left'>&nbsp;</td><td class='content'>";
-       }
-
-       function rounded_table_end($footer = "&nbsp;") {
-               print "</td><td class='right'>&nbsp;</td></tr>";
-               print "<tr><td class='c4'>&nbsp;</td><td class='bottom'>$footer</td><td class='c3'>&nbsp;</td></tr>";
-               print "</table>";
-       }
-
        function feed_has_icon($id) {
                return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0;
        }
diff --git a/images/c1.png b/images/c1.png
deleted file mode 100644 (file)
index 84e294e..0000000
Binary files a/images/c1.png and /dev/null differ
diff --git a/images/c2.png b/images/c2.png
deleted file mode 100644 (file)
index 98303a4..0000000
Binary files a/images/c2.png and /dev/null differ
diff --git a/images/c3.png b/images/c3.png
deleted file mode 100644 (file)
index c291242..0000000
Binary files a/images/c3.png and /dev/null differ
diff --git a/images/c4.png b/images/c4.png
deleted file mode 100644 (file)
index 682d494..0000000
Binary files a/images/c4.png and /dev/null differ
diff --git a/images/shadow-grid.gif b/images/shadow-grid.gif
deleted file mode 100644 (file)
index ff58a61..0000000
Binary files a/images/shadow-grid.gif and /dev/null differ
diff --git a/images/shadow.png b/images/shadow.png
deleted file mode 100644 (file)
index 394eb50..0000000
Binary files a/images/shadow.png and /dev/null differ
diff --git a/images/shadow_dark.png b/images/shadow_dark.png
deleted file mode 100644 (file)
index c91a562..0000000
Binary files a/images/shadow_dark.png and /dev/null differ
diff --git a/images/shadow_white.png b/images/shadow_white.png
deleted file mode 100644 (file)
index b04efaa..0000000
Binary files a/images/shadow_white.png and /dev/null differ
index 13dc93b1c374e6d56d9588f6ef5e8e0153dbde1a..dc06ef35b5011d5a085e1ebff5dff009f4f0db92 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -1049,7 +1049,7 @@ function pref_hotkey_handler(e) {
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
                                        //Element.show("hotkey_help_overlay");
-                                       Effect.Appear("hotkey_help_overlay", {duration : 0.3});
+                                       Effect.Appear("hotkey_help_overlay", {duration : 0.3, to: 0.9});
                                } else {
                                        Element.hide("hotkey_help_overlay");
                                }
index c28a5b1ef2336657b8626cf6258e92ad013062f2..794ebb7b25d2699a2fd69aa68220c3068391e3bb 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -72,9 +72,7 @@
 </div>
 
 <div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
-       <?php rounded_table_start("hho"); ?>
        <?php include "help/4.php" ?>
-       <?php rounded_table_end(); ?>
 </div>
 
 <img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
index a1b896a07b8534b0ec4e2a5ff594a9d8ddfdcb2c..fe6d883533fe9be4be164e82ae5c0833a1d9a20f 100644 (file)
@@ -749,16 +749,6 @@ div.browserFeedInfo div.detailsPart {
        border-width : 0px;
 }
 
-#dialog_overlay {
-       left : 0;
-       top : 0;
-       height : 100%;
-       width : 100%;
-       z-index : 4;
-       position : absolute;
-       background-image : url("images/shadow_white.png");
-}
-
 #overlay {
        background : white;
        left : 0;
@@ -1040,6 +1030,9 @@ div#hotkey_help_overlay {
        z-index : 999;
        color : white;
        font-size : 15px;
+       background : black;
+       border-radius : 30px;
+       padding : 10px;
 }
 
 div#hotkey_help_overlay h1 {
@@ -1091,43 +1084,6 @@ div#hotkey_help_overlay h2 {
        color : #88b0f0;
 }
 
-div#hotkey_help_overlay table.hho td.c1 {
-       height : 30px;
-       width : 30px;
-       background : url("images/c1.png");
-       background-repeat : no-repeat;
-
-}
-
-div#hotkey_help_overlay table.hho td.c2 {
-       height : 30px;
-       width : 30px;
-       background : url("images/c2.png");
-       background-repeat : no-repeat;
-}
-
-div#hotkey_help_overlay table.hho td.c3 {
-       height : 30px;
-       width : 30px;
-       background : url("images/c3.png");
-       background-repeat : no-repeat;
-}
-
-div#hotkey_help_overlay table.hho td.c4 {
-       height : 30px;
-       width : 30px;
-       background : url("images/c4.png");
-       background-repeat : no-repeat;
-}
-
-div#hotkey_help_overlay table.hho td.top,
-div#hotkey_help_overlay table.hho td.left,
-div#hotkey_help_overlay table.hho td.right,
-div#hotkey_help_overlay table.hho td.bottom,
-div#hotkey_help_overlay table.hho td.content {
-       background : url("images/shadow_dark.png");     
-}
-
 div#hotkey_help_overlay table.hho td.top,
 div#hotkey_help_overlay table.hho td.bottom {
        text-align : center;
index a64bed37412a9cb6c10722a065caad9805eb855f..321a74c176750bca9f68dbf12b919e5354ff9c11 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -695,7 +695,7 @@ function hotkey_handler(e) {
 
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
-                                       Effect.Appear("hotkey_help_overlay", {duration : 0.3});
+                                       Effect.Appear("hotkey_help_overlay", {duration : 0.3, to : 0.9});
                                } else {
                                        Element.hide("hotkey_help_overlay");
                                }
index 65dcdde830cd59fa25d713a7ec9ed33e99ce5b5c..679b09b658d17e78f1f85d48abdf2aca14e8996e 100644 (file)
@@ -90,9 +90,7 @@
 </div>
 
 <div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
-       <?php rounded_table_start("hho"); ?>
        <?php include "help/3.php" ?>
-       <?php rounded_table_end(); ?>
 </div>
 
 <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>