diff options
| -rw-r--r-- | functions.js | 12 | ||||
| -rw-r--r-- | images/ttrss_logo.png | bin | 8445 -> 8580 bytes | |||
| -rw-r--r-- | images/ttrss_logo.svg | 4 | ||||
| -rw-r--r-- | prefs.php | 22 | ||||
| -rw-r--r-- | tt-rss.css | 12 | ||||
| -rw-r--r-- | tt-rss.php | 15 |
6 files changed, 41 insertions, 24 deletions
diff --git a/functions.js b/functions.js index cc8a5fbdf..d79490a41 100644 --- a/functions.js +++ b/functions.js @@ -57,13 +57,15 @@ function p_notify(msg) { if (!n || !nb) return; + if (msg == "") msg = " "; + nb.innerHTML = msg; - if (msg.length == 0) { +/* if (msg.length == 0) { n.style.display = "none"; } else { n.style.display = "block"; - } + } */ } @@ -74,13 +76,15 @@ function notify(msg) { if (!n || !nb) return; + if (msg == "") msg = " "; + nb.innerHTML = msg; - if (msg.length == 0) { +/* if (msg.length == 0) { n.style.display = "none"; } else { n.style.display = "block"; - } + } */ } diff --git a/images/ttrss_logo.png b/images/ttrss_logo.png Binary files differindex e52780f20..02e566d61 100644 --- a/images/ttrss_logo.png +++ b/images/ttrss_logo.png diff --git a/images/ttrss_logo.svg b/images/ttrss_logo.svg index e8bfd1d85..e8aed3abd 100644 --- a/images/ttrss_logo.svg +++ b/images/ttrss_logo.svg @@ -16,8 +16,8 @@ sodipodi:docbase="/naboo/home/fox/public_html/testbox/tt-rss/images" sodipodi:docname="ttrss_logo.svg" inkscape:export-filename="/naboo/home/fox/public_html/testbox/tt-rss/images/ttrss_logo.png" - inkscape:export-xdpi="150.00000" - inkscape:export-ydpi="150.00000"> + inkscape:export-xdpi="139.35001" + inkscape:export-ydpi="139.35001"> <defs id="defs4"> <linearGradient @@ -18,20 +18,22 @@ <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main"> <? if (DISPLAY_HEADER) { ?> <tr> - <td class="header" valign="middle"> - <img src="images/ttrss_logo.png" alt="logo"> + <td colspan="2"> + <table cellspacing="0" cellpadding="0" width="100%"><tr> + <td class="header" valign="middle"> + <img src="images/ttrss_logo.png" alt="logo"> + </td> + <td align="right" valign="top"> + <div id="notify"><span id="notify_body"></div> + </td> + </tr></table> </td> </tr> <? } ?> <tr> - <td class="prefsToolbar" valign="middle"> - - <table width='100%' cellspacing='0' cellpadding='0'> - <td><span id="notify"><span id="notify_body"></span></td> - <td align='right'> - <input type="submit" onclick="gotoMain()" - class="button" value="Return to main"></td> - </table> + <td class="prefsToolbar" valign="middle" align="right"> + <input type="submit" onclick="gotoMain()" class="button" value="Return to main"> + </td> </tr> </tr> <td id="prefContent" class="prefContent" valign="top"> diff --git a/tt-rss.css b/tt-rss.css index 5e87a353c..388b2e44b 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -10,7 +10,7 @@ body { table.main td.header { padding : 10px 10px 10px 50px; - height : 80px; + height : 70px; font-size : 24pt; font-weight : bold; background-image : url("images/vgrad_light_rev2.png"); @@ -210,11 +210,15 @@ a:hover { } #notify { - font-weight : bold; font-size : 10pt; - display : none; - width : 350px; + text-align : right; color : gray; + border-style : solid; + border-width : 0px 0px 1px 1px; + border-color : #c0c0c0; + background-color : white; + padding : 3px; + width : 350px; } #dispSwitch { diff --git a/tt-rss.php b/tt-rss.php index 96261bb66..7dbe92236 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -31,11 +31,18 @@ <body onload="init()"> -<table width="100%" height="100%" cellspacing=0 cellpadding=0 class="main"> +<table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main"> <? if (DISPLAY_HEADER) { ?> <tr> - <td class="header" valign="middle" colspan="2"> - <img src="images/ttrss_logo.png" alt="logo"> + <td colspan="2"> + <table cellspacing="0" cellpadding="0" width="100%"><tr> + <td class="header" valign="middle"> + <img src="images/ttrss_logo.png" alt="logo"> + </td> + <td align="right" valign="top"> + <div id="notify"><span id="notify_body"></div> + </td> + </tr></table> </td> </tr> <? } ?> @@ -43,7 +50,7 @@ <td class="mainToolbar" colspan="2"> <table width='100%' cellspacing='0' cellpadding='0'> - <td><span id="notify"><span id="notify_body"></span></td> + <td><!-- <span id="notify"><span id="notify_body"></span> --></td> <td align='right'> <input type="submit" onclick="gotoPreferences()" class="button" value="Preferences"></td> |
