diff options
| author | Andrew Dolgov <[email protected]> | 2005-11-17 19:29:13 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2005-11-17 19:29:13 +0100 |
| commit | c93f38c4949fdbfaf256f493bcdaf772873f4e8a (patch) | |
| tree | 65c8412ea46d7459348c62448aad3353a9e5a15f | |
| parent | 0cc89acb29b6e851bceed111edd8f316f59fc697 (diff) | |
display username in header
| -rw-r--r-- | backend.php | 1 | ||||
| -rw-r--r-- | functions.php | 1 | ||||
| -rw-r--r-- | prefs.php | 7 | ||||
| -rw-r--r-- | tt-rss.css | 7 | ||||
| -rw-r--r-- | tt-rss.php | 13 |
5 files changed, 23 insertions, 6 deletions
diff --git a/backend.php b/backend.php index 810097a41..54bd1e069 100644 --- a/backend.php +++ b/backend.php @@ -10,6 +10,7 @@ require_once "magpierss/rss_fetch.inc"; $_SESSION["uid"] = PLACEHOLDER_UID; // FIXME: placeholder + $_SESSION["name"] = PLACEHOLDER_NAME; $op = $_REQUEST["op"]; diff --git a/functions.php b/functions.php index 42d00c060..8b6bc6620 100644 --- a/functions.php +++ b/functions.php @@ -5,6 +5,7 @@ require_once 'db-prefs.php'; $_SESSION["uid"] = PLACEHOLDER_UID; // FIXME: placeholder + $_SESSION["name"] = PLACEHOLDER_NAME; define('MAGPIE_OUTPUT_ENCODING', 'UTF-8'); @@ -6,6 +6,9 @@ require_once "db-prefs.php"; $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); + + $_SESSION["uid"] = PLACEHOLDER_UID; // FIXME: placeholder + $_SESSION["name"] = PLACEHOLDER_NAME; ?> <html> <head> @@ -40,12 +43,14 @@ <tr> <td colspan="2"> <table cellspacing="0" cellpadding="0" width="100%"><tr> - <td class="header" valign="middle"> + <td rowspan="2" 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><tr><td class="welcomePrompt"> + Hello, <b><?= $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>)</td> </tr></table> </td> </tr> diff --git a/tt-rss.css b/tt-rss.css index e075acda6..25eb83548 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -533,3 +533,10 @@ div.prefHelp, td.prefHelp { padding : 5px; } +td.welcomePrompt { + font-size : small; + color : gray; + text-align : right; + padding-right : 10px; + +} diff --git a/tt-rss.php b/tt-rss.php index d1460935e..ed7e6dc13 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -6,6 +6,10 @@ require_once "db-prefs.php"; $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); + + $_SESSION["uid"] = PLACEHOLDER_UID; // FIXME: placeholder + $_SESSION["name"] = PLACEHOLDER_NAME; + ?> <html> <head> @@ -47,18 +51,17 @@ <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main"> <? if (get_pref($link, 'DISPLAY_HEADER')) { ?> <tr> - <td colspan="2" class="headerBox"> + <td colspan="2"> <table cellspacing="0" cellpadding="0" width="100%"><tr> - <td class="header" valign="middle"> + <td rowspan="2" 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><tr><td class="welcomePrompt"> + Hello, <b><?= $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>)</td> </tr></table> - - <div id="userDlg"> </div> - </td> </tr> <? } ?> |