mild fixes

diff --git a/source/mircoders/pdf/PDFGenerator.java b/source/mircoders/pdf/PDFGenerator.java
index d684602..82d212a 100755 (executable)
--- a/source/mircoders/pdf/PDFGenerator.java
+++ b/source/mircoders/pdf/PDFGenerator.java
@@ -29,11 +29,6 @@
  */
 package mircoders.pdf;
 
-import gnu.regexp.RE;
-import gnu.regexp.REMatch;
-import gnu.regexp.REMatchEnumeration;
-import gnu.regexp.REException;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -52,20 +47,21 @@ import com.lowagie.text.pdf.ColumnText;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
+import gnu.regexp.RE;
+import gnu.regexp.REException;
+import gnu.regexp.REMatch;
+import gnu.regexp.REMatchEnumeration;
 
-import mir.misc.*;
-import mir.util.*;
 import mir.config.MirPropertiesConfiguration;
-import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
+import mir.config.MirPropertiesConfiguration$PropertiesConfigExc;
 import mir.entity.EntityList;
 import mir.log.LoggerWrapper;
+import mir.misc.StringUtil;
+import mir.util.DateTimeFunctions;
 import mircoders.entity.EntityContent;
 import mircoders.entity.EntityImages;
 import mircoders.storage.DatabaseContentToMedia;
 
-
-
-
 public class PDFGenerator{
 
   public Document document;

diff --git a/templates/admin/head.template b/templates/admin/head.template
index e06abda..e9ed39c 100755 (executable)
--- a/templates/admin/head.template
+++ b/templates/admin/head.template
@@ -2,17 +2,19 @@
 
 <table class="table-head" width="100%" cellspacing="0" cellpadding="0">
   <tr>
+    <td><img src="${config.docRoot}/img/logo_small.gif" border="0" align="left"></td>
     <td>
-      <img src="${config.docRoot}/img/logo_small.gif" border="0" align="middle">&nbsp;
-      ${config["Mir.Name"]}
+      ${config["Mir.Name"]} &nbsp; | &nbsp; ${config.now.format("yyyy-MM-dd HH:mm z")} 
     </td>
-    <td align="right">
-      <a href="${config.actionRoot}?module=Users&amp;do=changepassword&amp;id=${login_user.id}&amp;returnurl="><span class="table-head">${lang("head.changepassword")}</span></a>&nbsp;&nbsp;
+    <td class="table-head" align="right">
+      <a href="${config.actionRoot}?module=Users&amp;do=changepassword&amp;id=${login_user.id}&amp;returnurl="><span class="table-head">${lang("head.changepassword")}</span></a> &nbsp; | &nbsp;
       <if returnurl>
-        <a href="${config.actionRoot}?${returnurl}"><span class="table-head">[ &lt; ] ${lang("back")}</span></a>&nbsp;&nbsp;|
-      </if>
-      <a href="${config.actionRoot}"><span class="table-head">${lang("head.start")}</span></a> |
-      <a href="${config.actionRoot}?module=logout"><span class="table-head">${lang("head.logout")}</span></a>
+        <a href="${config.actionRoot}?${returnurl}"><span class="table-head">[ &lt; ] ${lang("back")}</span></a> &nbsp; | &nbsp;
+      </if> 
+      <a href="${config.actionRoot}"><span class="table-head">${lang("head.start")}</span></a> &nbsp; | &nbsp;
+      <a href="${config.actionRoot}?module=logout"><span class="table-head">${lang("head.logout")}
+      <if login_user> <i>${login_user.login}</i> </if>
+      </span></a>
     </td>
   </tr>
 </table>

diff --git a/templates/admin/head_nonavi.template b/templates/admin/head_nonavi.template
index 1cdb111..1316e53 100755 (executable)
--- a/templates/admin/head_nonavi.template
+++ b/templates/admin/head_nonavi.template
@@ -3,12 +3,12 @@
   <tr>
     <td class="table-head">
       <img src="${config.docRoot}/img/logo_small.gif" border="0" align="middle">&nbsp;
-      <b>${config["Mir.Name"]}</b>
+      <b>${config["Mir.Name"]} [ ${config.now.format("yyyy-MM-dd HH:mm z")} ]</b>
     </td>
   </tr>
 <if login_user>
   <tr>
-    <td align="right">
+    <td align="right" class="table-head">
       <b>${login_user.login}</b> ${lang("head.logged_in")} |
       <a href="${actionRoot}?module=logout">${lang("head.logout")}</a>
     </td>