display username in header

author Andrew Dolgov <fox@bah.spb.su>

Thu, 17 Nov 2005 18:29:13 +0000 (19:29 +0100)

committer Andrew Dolgov <fox@bah.spb.su>

Thu, 17 Nov 2005 18:29:13 +0000 (19:29 +0100)
author Andrew Dolgov <fox@bah.spb.su>
Thu, 17 Nov 2005 18:29:13 +0000 (19:29 +0100)
committer Andrew Dolgov <fox@bah.spb.su>
Thu, 17 Nov 2005 18:29:13 +0000 (19:29 +0100)
diff --git a/backend.php b/backend.php

index 810097a41c068f3a2b0d3486f5573a25662bb3f1..54bd1e069e2f59d2844323a73db1eaad49d8dc80 100644 (file)
--- 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 42d00c060e50dc68b9bd1e87e77bb773993e67c0..8b6bc6620fe60e019727d4eb0b32dc96171317e7 100644 (file)
--- 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');
  
diff --git a/prefs.php b/prefs.php

index 72e15904d3319c4b3ab1295c909f334bd675757a..ab76f38ff829d47011eb2635597b38666f7d946e 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -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 e075acda6193018edbb4966551d0a65fe7d40065..25eb835480b3e530caf1f09645bd03e2279e977f 100644 (file)
--- 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 d1460935e42750a17a9c8927d1af7853d53cb292..ed7e6dc136148ce2af17ec029482d63fd194f45f 100644 (file)
--- 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">&nbsp;</div>
-
         </td>
  </tr>
  <? } ?>
author	Andrew Dolgov <fox@bah.spb.su>
	Thu, 17 Nov 2005 18:29:13 +0000 (19:29 +0100)
committer	Andrew Dolgov <fox@bah.spb.su>
	Thu, 17 Nov 2005 18:29:13 +0000 (19:29 +0100)
backend.php		patch \| blob \| history
functions.php		patch \| blob \| history
prefs.php		patch \| blob \| history
tt-rss.css		patch \| blob \| history
tt-rss.php		patch \| blob \| history