ADD: #1334: Show the name of current user.

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 172c3f130516220eaa2ae992c7560a59df2506ac..c5ab1bca91e1b1bfcf03485c1d89e39a69dc8270 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -278,6 +278,9 @@ public class Gigi extends HttpServlet {
             vars.put("static", getStaticTemplateVar(isSecure));
             vars.put("year", Calendar.getInstance().get(Calendar.YEAR));
             vars.put("content", content);
+            if (currentPageUser != null) {
+                vars.put("loggedInAs", currentPageUser.getName().toString());
+            }
             resp.setContentType("text/html; charset=utf-8");
             baseTemplate.output(resp.getWriter(), Page.getLanguage(req), vars);
         } else {

diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ
index f755b2c520e9eb7488126660df9b2676c7ca21d9..dc9c08befd7e63943b89ffa8df1ac49c5b41c3a9 100644 (file)
--- a/src/org/cacert/gigi/Gigi.templ
+++ b/src/org/cacert/gigi/Gigi.templ
@@ -20,6 +20,7 @@
                        </div>
                </div>
                <div id="pageNav">
+                       <? if($loggedInAs) { ?><div><?=_Logged in as?>: <?=$loggedInAs?></div><? } ?>
                        <?=$menu?>
                        <div>
                                <h3 class="pointer"><?=_Advertising?></h3>