display username/logout prompt if header is disabled (closes #10)

diff --git a/prefs.php b/prefs.php
index 5a56f896fdd0bb49a22911f9ce89091afb5cb1c5..cfdb5e0c8a4236e32d9892b80cc1e2423e8bf315 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -57,7 +57,7 @@
                        <td rowspan="2" class="header" valign="middle"> 
                                <img src="images/ttrss_logo.png" alt="logo">    
                        </td>
-                       <td align="right" valign="top">
+                       <td valign="top" class="notifyBox">
                                <div id="notify"><span id="notify_body">&nbsp;</span></div>
                        </td>
                </tr><tr><td class="welcomePrompt">
@@ -70,9 +70,15 @@
        </td>
 </tr>
 <? } else { ?>
-<tr><td colspan="2" align="right">
-       <div id="notify"><span id="notify_body">&nbsp;</span></div>
-       <div id="userDlgShadow"><div id="userDlg">&nbsp;</div></div>
+<tr>
+       <td class="small">
+               <div id="notify"><span id="notify_body">&nbsp;</span></div>
+               <div id="userDlgShadow"><div id="userDlg">&nbsp;</div></div>
+       </td><td class="welcomePrompt">
+               <? if (!SINGLE_USER_MODE) { ?>
+                       Hello, <b><?= $_SESSION["name"] ?></b>
+                       (<a href="logout.php">Logout</a>)
+               <? } ?>
 </td></tr>
 <? } ?>
 <tr>

diff --git a/tt-rss.css b/tt-rss.css
index 584c41b3561a1565aac3088cb99770887e0e98a1..d99a6308f96638c8f193cac0742c9a423b0e9195 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -329,18 +329,21 @@ input.editbox {
        padding-left : 2px;
 }
 
-#notify {
+td.notifyBox {
        font-size : 10pt;
        text-align : right;
+}
+
+#notify {
        color : black;
        font-weight : bold;
        padding : 3px;
 }
 
 #dispSwitch {
-       text-align : right;
        padding : 5px 5px 5px 0px;
        font-size : x-small;
+       text-align : right;
 }
 
 #dispSwitch a {
@@ -692,10 +695,6 @@ table.innerLoginForm td {
        padding : 3px 3px 5px 3px;
 }
 
-div.small, p.small {
-       font-size : x-small;
-}
-
 span.insensitive {
        color : gray;
 }
@@ -730,7 +729,7 @@ div.logoutContent {
 }
 
 .small {
-       font-size : small;
+       font-size : x-small;
 }
 
 table.innerFeedTable td {

diff --git a/tt-rss.php b/tt-rss.php
index 069293590f4748c8eb3ca7836d78cc085bce0ea9..d6b3aeee0024fde174a2ad5a9e8eb89f1df085e2 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -57,7 +57,7 @@
                        <td rowspan="2" class="header" valign="middle"> 
                                <img src="images/ttrss_logo.png" alt="logo">    
                        </td>
-                       <td align="right" valign="top">
+                       <td valign="top" class="notifyBox">
                                <div id="notify"><span id="notify_body">&nbsp;</span></div>
                        </td>
 
@@ -73,9 +73,15 @@
        </td>
 </tr>
 <? } else { ?>
-<tr><td align="right" colspan="2">
-       <div id="notify"><span id="notify_body">&nbsp;</span></div>
-       <div id="userDlgShadow"><div id="userDlg">&nbsp;</div></div>
+<tr>
+       <td class="small">
+               <div id="notify"><span id="notify_body">&nbsp;</span></div>
+               <div id="userDlgShadow"><div id="userDlg">&nbsp;</div></div>
+       </td><td class="welcomePrompt">
+               <? if (!SINGLE_USER_MODE) { ?>
+                       Hello, <b><?= $_SESSION["name"] ?></b>
+                       (<a href="logout.php">Logout</a>)
+               <? } ?>
 </td></tr>
 <? } ?>
 <tr>