summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-11-21 16:10:24 +0400
committerAndrew Dolgov <[email protected]>2011-11-21 16:13:47 +0400
commit56d7e943532a8f100bcd8d2e1b9958cc1ce2e18b (patch)
treee20b3e83274617d88e67ffea09cb83e0e6246daf
parent620c22aada7358d59009c63d6c2920bf47ca4f7e (diff)
use css for help overlay, css cleanup
-rw-r--r--functions.js10
-rw-r--r--functions.php12
-rw-r--r--images/c1.pngbin266 -> 0 bytes
-rw-r--r--images/c2.pngbin267 -> 0 bytes
-rw-r--r--images/c3.pngbin266 -> 0 bytes
-rw-r--r--images/c4.pngbin266 -> 0 bytes
-rw-r--r--images/shadow-grid.gifbin56 -> 0 bytes
-rw-r--r--images/shadow.pngbin2925 -> 0 bytes
-rw-r--r--images/shadow_dark.pngbin111 -> 0 bytes
-rw-r--r--images/shadow_white.pngbin111 -> 0 bytes
-rw-r--r--prefs.js2
-rw-r--r--prefs.php2
-rw-r--r--tt-rss.css50
-rw-r--r--tt-rss.js2
-rw-r--r--tt-rss.php2
15 files changed, 5 insertions, 75 deletions
diff --git a/functions.js b/functions.js
index 1fd421809..c47070ed3 100644
--- a/functions.js
+++ b/functions.js
@@ -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");
diff --git a/functions.php b/functions.php
index 83159e62c..498750851 100644
--- a/functions.php
+++ b/functions.php
@@ -5979,18 +5979,6 @@
}
}
- 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
index 84e294e54..000000000
--- a/images/c1.png
+++ /dev/null
Binary files differ
diff --git a/images/c2.png b/images/c2.png
deleted file mode 100644
index 98303a485..000000000
--- a/images/c2.png
+++ /dev/null
Binary files differ
diff --git a/images/c3.png b/images/c3.png
deleted file mode 100644
index c291242fc..000000000
--- a/images/c3.png
+++ /dev/null
Binary files differ
diff --git a/images/c4.png b/images/c4.png
deleted file mode 100644
index 682d494ba..000000000
--- a/images/c4.png
+++ /dev/null
Binary files differ
diff --git a/images/shadow-grid.gif b/images/shadow-grid.gif
deleted file mode 100644
index ff58a611c..000000000
--- a/images/shadow-grid.gif
+++ /dev/null
Binary files differ
diff --git a/images/shadow.png b/images/shadow.png
deleted file mode 100644
index 394eb5010..000000000
--- a/images/shadow.png
+++ /dev/null
Binary files differ
diff --git a/images/shadow_dark.png b/images/shadow_dark.png
deleted file mode 100644
index c91a56206..000000000
--- a/images/shadow_dark.png
+++ /dev/null
Binary files differ
diff --git a/images/shadow_white.png b/images/shadow_white.png
deleted file mode 100644
index b04efaa00..000000000
--- a/images/shadow_white.png
+++ /dev/null
Binary files differ
diff --git a/prefs.js b/prefs.js
index 13dc93b1c..dc06ef35b 100644
--- 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");
}
diff --git a/prefs.php b/prefs.php
index c28a5b1ef..794ebb7b2 100644
--- 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"/>
diff --git a/tt-rss.css b/tt-rss.css
index a1b896a07..fe6d88353 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -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;
diff --git a/tt-rss.js b/tt-rss.js
index a64bed374..321a74c17 100644
--- 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");
}
diff --git a/tt-rss.php b/tt-rss.php
index 65dcdde83..679b09b65 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -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>