From 77c283456020d1fda4bd127badfac238491edf78 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 25 Jan 2006 13:45:11 +0100
Subject: [PATCH] changed layout, some HTML cleanup

darcs-hash:20060125124511-6e07b-9f30580c4249dfd0a689ef8f378089b2fe0151fe.gz
---
 entry.php                   |   3 --
 help.php                    |   2 -
 index.php                   |   3 --
 js/gui.js                   |   4 +-
 lang/de.php                 |   1 +
 lang/en.php                 |   1 +
 login.php                   |   2 -
 orgs.php                    |   5 ---
 pix/tag_blue.png            | Bin 0 -> 769 bytes
 tags.php                    |   3 --
 templates/entry_edit.tpl    |   6 +--
 templates/entry_show.tpl    |  16 ++++----
 templates/error.tpl         |   9 ++---
 templates/extended_edit.tpl |   4 +-
 templates/extended_show.tpl |   2 +-
 templates/filter.tpl        |  63 +++++++++++++++++++++++++++++
 templates/footer.tpl        |  26 +++++++++++-
 templates/header.tpl        |  37 +++++++++++++++--
 templates/help.tpl          |   6 +--
 templates/layout.css        |  64 +++++++++++++++++++++++++++++
 templates/ldaperror.tpl     |   5 ---
 templates/list.tpl          |   6 ++-
 templates/login.tpl         |   4 ++
 templates/orgs.tpl          |   4 ++
 templates/style.css         |  11 ++++-
 templates/tags.tpl          |   5 ++-
 templates/toolbar.tpl       |  78 ++++++++++++++++++++++++++++++++++++
 27 files changed, 310 insertions(+), 60 deletions(-)
 create mode 100644 pix/tag_blue.png
 create mode 100644 templates/filter.tpl
 create mode 100644 templates/layout.css
 delete mode 100644 templates/ldaperror.tpl
 create mode 100644 templates/toolbar.tpl

diff --git a/entry.php b/entry.php
index 63e15e1..10d4661 100644
--- a/entry.php
+++ b/entry.php
@@ -57,10 +57,7 @@
     $smarty->display($template);
   }else{
     header('Content-Type: text/html; charset=utf-8');
-    $smarty->display('header.tpl');
-    $smarty->display('list_filter.tpl');
     $smarty->display($template);
-    $smarty->display('footer.tpl');
   }
 
   //--------------------------------------------------------------
diff --git a/help.php b/help.php
index 8aaa8f8..dd933da 100644
--- a/help.php
+++ b/help.php
@@ -6,8 +6,6 @@
   tpl_std();
   //display templates
   header('Content-Type: text/html; charset=utf-8');
-  $smarty->display('header.tpl');
   $smarty->display('help.tpl');
-  $smarty->display('footer.tpl');
 
 ?>
diff --git a/index.php b/index.php
index 5241b5e..04ab996 100644
--- a/index.php
+++ b/index.php
@@ -59,10 +59,7 @@
     $_SESSION[ldapab][lastlocation]=$_SERVER["REQUEST_URI"];
 
     header('Content-Type: text/html; charset=utf-8');
-    $smarty->display('header.tpl');
-    $smarty->display('list_filter.tpl');
     $smarty->display('list.tpl');
-    $smarty->display('footer.tpl');
   }
 
   //------- functions -----------//
diff --git a/js/gui.js b/js/gui.js
index cbf7275..c64013a 100644
--- a/js/gui.js
+++ b/js/gui.js
@@ -21,7 +21,7 @@ NoteEditor.prototype = {
  * Create the editor component
  */
 
-function nedit_showEditor(type,dn){
+function nedit_showEditor(type,dn,name){
   // if the editor already exists cancel it
   if($('nedit_editor') !== null){
     nedit_cleanUp();
@@ -41,7 +41,7 @@ function nedit_showEditor(type,dn){
   }
 
   var dt = new Date();
-  editor += '//'+dt.formatDate('j. M y H:i')+'//: ';
+  editor += '//'+dt.formatDate('j. M y H:i')+' '+name+'//: ';
   editor += '</textarea><br />';
 
   editor += '<input id="nedit_save" type="button" value="SAVE" />';
diff --git a/lang/de.php b/lang/de.php
index 0e11b9f..21fa105 100644
--- a/lang/de.php
+++ b/lang/de.php
@@ -66,6 +66,7 @@ $lang[msg_addto]      = 'Zu welchem Adressbuch soll der Eintrag hinzugefügt wer
 $lang[msg_jpegonly]   = 'Nur JPEG';
 $lang[msg_dateformat] = 'JJJJ-MM-TT';
 $lang[msg_uploadvcf]  = 'Upload VCard File';
+$lang[msg_tagsep]     = 'Durch Komma getrennt';
 
 $lang[err_noentries]  = 'Keine Einträge';
 $lang[err_ldap]       = 'Der LDAP Server lieferte folgende Fehlermeldungen';
diff --git a/lang/en.php b/lang/en.php
index 369d82d..cca3902 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -65,6 +65,7 @@ $lang[msg_addto]      = 'Select address book to which the entry should be added:
 $lang[msg_jpegonly]   = 'JPEG only';
 $lang[msg_dateformat] = 'YYYY-MM-DD';
 $lang[msg_uploadvcf]  = 'Upload VCard File';
+$lang[msg_tagsep]     = 'Comma separated';
 
 $lang[err_noentries]  = 'No entries';
 $lang[err_ldap]       = 'The LDAP server returned the following errors';
diff --git a/login.php b/login.php
index a2d0a12..2bf41bc 100644
--- a/login.php
+++ b/login.php
@@ -21,7 +21,5 @@
   $smarty->assign('msg',$msg);
   //display templates
   header('Content-Type: text/html; charset=utf-8');
-  $smarty->display('header.tpl');
   $smarty->display('login.tpl');
-  $smarty->display('footer.tpl');
 ?>
diff --git a/orgs.php b/orgs.php
index aaefcd0..6e79970 100644
--- a/orgs.php
+++ b/orgs.php
@@ -7,10 +7,5 @@
   tpl_orgs();
   //display templates
   header('Content-Type: text/html; charset=utf-8');
-  $smarty->display('header.tpl');
-  $smarty->display('list_filter.tpl');
   $smarty->display('orgs.tpl');
-  $smarty->display('footer.tpl');
-
-
 ?>
diff --git a/pix/tag_blue.png b/pix/tag_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5ba31f9619f963d59f0d246b77e5e93fba974c0
GIT binary patch
literal 769
zcmV+c1OEJpP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!lSxEDRCwBA
zyn6NOe;{D^_wOGAh(=}uX)zNMlh+J*06+jSUcP+!zm}F3hQ#yd&lz66e97?p_ir(C
zb90=A00a;d$R-eY`t&Ko#fuji9zT8z=1WRSGKh+bGB7hUzdCyKs3<N200M{!<XjMV
z{rWY7p`jt;t5>hief#ze><wvYX}BQ=4<5v72tWYA4G<O<W;lKN^iLpPl!b+b;q4Cw
zh6B$S7-VH-8N|iK!G`SHw-3V*fB<5Fc>$zQMn;AW=x5o_|JWE7-C<<-`IiwGnEx0Y
z<>kRHdh+DSt6jTxiMhGC!NUX~fIu$z{_fp7FbAaQ!ygug`8OFEcvu-3#5oxl&c9`1
z*#DG)K~YhWK}t%B0qD9{+qP|ky96MBKnA$qxpU|Hn>TMj&SZE4bo#G<j0{X5=K%=;
zc7!3y%E};Df(_ZUX%pBGfB<3ydEwZxW7a@}cB`tYa)JWw=KFsPn;tST2yielumKJE
z3-skXpuvX1{}`NQ7#MEdy2Wts-aUq&KYxk=1Q5s~1}iJ8qd)^(Z``=?9T*D?>VixR
ze)2%?{P+iS4FdxsPz@_k<>lAE82$kbV`5?gW1t=`fB<5I1tJIlL)jY0->s>s$tfWr
z0d~oThagulF>o{eW{6Sy&+zQg1F-F1zkXE;4i3H#5I`sffWYqEyTRVk(b3@qC8ird
zLk>M-Vo1<rV0d)z4p{S-FJF{GLPG9?)B^+%h5;b3efxH>A$odxoS?)60>FS~xO?|5
z*k+h!5C8}utOkI<=FOWefO7lv_4PS_{P+QPHnL_A00<zQ27thZ4I3<gF4@Nk1R!UJ
zhKAlpR|610cntu7HEY&@T=ER4`4KjGfB*vk%!f%;9^tfU00000NkvXXu0mjfa)w2W

literal 0
HcmV?d00001

diff --git a/tags.php b/tags.php
index 13b07b2..4a3019a 100644
--- a/tags.php
+++ b/tags.php
@@ -7,10 +7,7 @@
   $smarty->assign('tagcloud',tag_cloud());
   //display templates
   header('Content-Type: text/html; charset=utf-8');
-  $smarty->display('header.tpl');
-  $smarty->display('list_filter.tpl');
   $smarty->display('tags.tpl');
-  $smarty->display('footer.tpl');
 
   function tag_cloud(){
     global $conf;
diff --git a/templates/entry_edit.tpl b/templates/entry_edit.tpl
index 22e5d20..9461846 100644
--- a/templates/entry_edit.tpl
+++ b/templates/entry_edit.tpl
@@ -1,3 +1,5 @@
+{include file="header.tpl"}
+
 <h1>
   {if $entry.type != ''}
   <img src="pix/{$entry.type}.png" border="0" width="22" height="22" align="middle" title="{$entry.type}">
@@ -10,8 +12,6 @@
 <input type="hidden" name="dn" value="{$entry.dn|escape}" />
 <input type="hidden" name="save" value="1" />
 
-{include file="ldaperror.tpl"}
-
 <table width="100%">
   <tr>
     <td valign="top" width="50%" align="center">
@@ -179,4 +179,4 @@
 
 </form>
 
-<br>
+{include file="footer.tpl"}
diff --git a/templates/entry_show.tpl b/templates/entry_show.tpl
index 6bf9d23..c1a73e4 100644
--- a/templates/entry_show.tpl
+++ b/templates/entry_show.tpl
@@ -1,3 +1,5 @@
+{include file="header.tpl"}
+
 <h1>
   <img src="pix/{$entry.type}.png" border="0" width="22" height="22" align="middle" title="{$entry.type}">
   {$entry.givenname} {$entry.name}
@@ -6,9 +8,6 @@
   <a href="img.php?dn={$entry.dn|escape:url}"><img src="img.php?dn={$entry.dn|escape:url}" align="right" class="photo" width="130" /></a>
 {/if}
 
-{include file="ldaperror.tpl"}
-
-
 <table width="100%">
   <tr>
     <td valign="top" width="50%">
@@ -115,10 +114,10 @@
 <b>{$lang.note}</b>
 
 {if $user}
- <img src="pix/phone.png" width="16" height="16" onclick="nedit_showEditor('call','{$entry.dn}');" />
- <img src="pix/email.png" width="16" height="16" onclick="nedit_showEditor('mail','{$entry.dn}');" />
- <img src="pix/arrow_right.png" width="16" height="16" onclick="nedit_showEditor('todo','{$entry.dn}');" />
- <img src="pix/note.png" width="16" height="16" onclick="nedit_showEditor('note','{$entry.dn}');" />
+ <img src="pix/phone.png" width="16" height="16" onclick="nedit_showEditor('call','{$entry.dn}','{$user|escape:javascript}');" />
+ <img src="pix/email.png" width="16" height="16" onclick="nedit_showEditor('mail','{$entry.dn}','{$user|escape:javascript}');" />
+ <img src="pix/arrow_right.png" width="16" height="16" onclick="nedit_showEditor('todo','{$entry.dn}','{$user|escape:javascript}');" />
+ <img src="pix/note.png" width="16" height="16" onclick="nedit_showEditor('note','{$entry.dn}','{$user|escape:javascript}');" />
 {/if}
 
 <dl><dd id="nedit_insert">
@@ -129,5 +128,4 @@
   {include file="openxchange_show.tpl"}
 {/if}
 
-<br><br><br>
-
+{include file="footer.tpl"}
diff --git a/templates/error.tpl b/templates/error.tpl
index 6f8d460..244250e 100644
--- a/templates/error.tpl
+++ b/templates/error.tpl
@@ -1,10 +1,7 @@
+{include file="header.tpl"}
 
 <h1>An error occured</h1>
 
-{include file="ldaperror.tpl"}
+<div class="error">{$error}</div>
 
-<table class="tableborder">
-<tr>
-  <td>{$error}</td>
-</tr>
-</table>
+{include file="footer.tpl"}
diff --git a/templates/extended_edit.tpl b/templates/extended_edit.tpl
index 3462a86..b69323d 100644
--- a/templates/extended_edit.tpl
+++ b/templates/extended_edit.tpl
@@ -8,9 +8,9 @@
   </tr>
 
   <tr>
-    <td align="right" valign="top" nowrap="nowrap">{$lang.marker}:</td>
+    <td align="right" valign="top" nowrap="nowrap">{$lang.marker}:<br><span class="hint">({$lang.msg_tagsep})</span></td>
     <td>
-      <input type="text" class="input" name="entry[markers]" value="{$entry.markers|escape}" id="tageditlookup"><div id="tageditresult" class="autocomplete"></div>
+      <textarea class="input" name="entry[markers]" id="tageditlookup">{$entry.markers|escape}</textarea><div id="tageditresult" class="autocomplete"></div>
     </td>
 
   </tr>
diff --git a/templates/extended_show.tpl b/templates/extended_show.tpl
index 24dc2be..8508101 100644
--- a/templates/extended_show.tpl
+++ b/templates/extended_show.tpl
@@ -13,7 +13,7 @@
       <td valign="top" align="right">{$lang.marker}:</td>
       <td>
         {foreach from=$entry.marker item=marker}
-          <a href="index.php?marker={$marker|escape:url}">{$marker}</a> 
+          <a href="index.php?marker={$marker|escape:url}" class="tag">{$marker}</a> 
         {/foreach}
       </td>
     </tr>
diff --git a/templates/filter.tpl b/templates/filter.tpl
new file mode 100644
index 0000000..85cb88d
--- /dev/null
+++ b/templates/filter.tpl
@@ -0,0 +1,63 @@
+<ul class="x">
+  <li><a href="index.php?filter=a">A</a></li>
+  <li><a href="index.php?filter=b">B</a></li>
+  <li><a href="index.php?filter=c">C</a></li>
+  <li><a href="index.php?filter=d">D</a></li>
+  <li><a href="index.php?filter=e">E</a></li>
+  <li><a href="index.php?filter=f">F</a></li>
+  <li><a href="index.php?filter=g">G</a></li>
+  <li><a href="index.php?filter=h">H</a></li>
+  <li><a href="index.php?filter=i">I</a></li>
+  <li><a href="index.php?filter=j">J</a></li>
+  <li><a href="index.php?filter=k">K</a></li>
+  <li><a href="index.php?filter=l">L</a></li>
+  <li><a href="index.php?filter=m">M</a></li>
+  <li><a href="index.php?filter=n">N</a></li>
+  <li><a href="index.php?filter=o">O</a></li>
+  <li><a href="index.php?filter=p">P</a></li>
+  <li><a href="index.php?filter=q">Q</a></li>
+  <li><a href="index.php?filter=r">R</a></li>
+  <li><a href="index.php?filter=s">S</a></li>
+  <li><a href="index.php?filter=t">T</a></li>
+  <li><a href="index.php?filter=u">U</a></li>
+  <li><a href="index.php?filter=v">V</a></li>
+  <li><a href="index.php?filter=w">W</a></li>
+  <li><a href="index.php?filter=x">X</a></li>
+  <li><a href="index.php?filter=y">Y</a></li>
+  <li><a href="index.php?filter=z">Z</a></li>
+  <li><a href="index.php?filter=other">#</a></li>
+  <li><a href="index.php?filter=*">*</a></li>
+</ul>
+
+{if $conf.openxchange}
+  <div class="categories x">
+    <form method="get" action="index.php">
+      <select name="categories" class="searchfield">
+        <option value="">--- {$lang.categories} ---</option>
+        {html_options values=$categories output=$categories selected=$smarty.request.categories}
+      </select>
+      <input type="submit" value="{$lang.search}" class="searchbutton" />
+    </form>
+  </div>
+{/if}
+
+{if $conf.extended}
+  <div class="tags x">
+    <form method="get" action="index.php" accept-charset="utf-8">
+      <a href="tags.php" class="tag">{$lang.marker}</a>:
+
+      <input name="marker" class="searchfield" type="text" id="taglookup"
+       value="{$smarty.request.marker|escape}" />
+      <input type="submit" value="{$lang.search}" class="searchbutton" />
+    </form>
+  </div>
+  <div id="tagresult" class="autocomplete"></div>
+{/if}
+
+<div class="search x">
+  <form method="get" action="index.php" accept-charset="utf-8">
+    <input type="text" name="search" class="searchfield"
+     value="{$smarty.request.search|escape}" />
+    <input type="submit" value="{$lang.search}" class="searchbutton" />
+  </form>
+</div>
diff --git a/templates/footer.tpl b/templates/footer.tpl
index c3017f4..7b3f048 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -1,8 +1,29 @@
+  </div>
+
+  <div id="footrow">
+    {if $user == ''}
+      {$lang.notloggedin}
+      &nbsp;&nbsp;&nbsp;
+      <a href="login.php"><img src="pix/key.png" border="0" width="16" height="16" align="middle" /> {$lang.login}</a>
+    {else}
+      {$lang.loggedinas} <b>{$user}</b>
+      &nbsp;&nbsp;&nbsp;
+      <a href="login.php?username="><img src="pix/key_go.png" border="0" width="16" height="16" align="middle" /> {$lang.logout}</a>
+    {/if}
+  </div>
+</div>
+
+</body>
+</html>
+
+
+<!--
+
   </td>
 </tr>
 
 <tr>
-  <td class="buttonrow" align="right">
+  <td class="buttonrow" align="right" colspan="2">
     <table width="100%"><tr>
       <td align="left">
         <a href="orgs.php"><img src="pix/book_open.png" border="0" width="16" height="16" align="middle" />{$lang.orgs}</a>
@@ -32,7 +53,7 @@
   </td>
 </tr>
 <tr>
-  <td class="footrow">
+  <td class="footrow" colspan="2">
     {if $user == ''}
       <a href="login.php"><img src="pix/key.png" border="0" width="16" height="16" align="middle" /> {$lang.login}</a>&nbsp;&nbsp;&nbsp;
       {$lang.notloggedin}
@@ -43,3 +64,4 @@
   </td>
 </tr>
 </table>
+-->
diff --git a/templates/header.tpl b/templates/header.tpl
index dd2b15b..23cd9e6 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -1,24 +1,50 @@
 <html>
 <head>
   <title>LDAPab - {$lang.ldapab}</title>
-  <link rel="stylesheet" type="text/css" href="templates/style.css" />
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
+  <link rel="stylesheet" type="text/css" href="templates/layout.css" />
+
+  <link rel="stylesheet" type="text/css" href="templates/style.css" />
+
   <script src="js/prototype.js" type="text/javascript"></script>
   <script src="js/scriptaculous.js" type="text/javascript"></script>
   <script src="js/formatDate.js" type="text/javascript"></script>
   <script src="js/gui.js" type="text/javascript"></script>
 
+  {if $LDAPERRORS != ''}
+  <script>
+    window.alert('{$lang.err_ldap}:\n\n{$LDAPERRORS|escape:quotes}');
+  </script>
+  {/if}
 </head>
 <body>
 
+<div id="ldapab">
+
+  <div id="titlerow">
+    <a href="{$home}" class="logo">LDAPab</a>
+    <span class="logosmall">- {$lang.ldapab}</span>
+  </div>
+
+  <div id="filterrow">
+    {include file="filter.tpl"}
+  </div>
+
+  <div id="toolbar">
+    {include file="toolbar.tpl"}
+  </div>
+
+
+  <div id="content">
+
+
+<!--
 <table width="100%">
 <tr>
-  <td class="headrow">
+  <td class="headrow" colspan="2">
     <table width="100%"><tr>
       <td align="left" valign="bottom">
-        <a href="{$home}" class="logo">LDAPab</a>
-        <span class="logosmall">- {$lang.ldapab}</span>
       </td>
       <td align="right" valign="bottom">
         <a href="help.php"><img src="pix/help.png" border="0" width="16" height="16" align="middle">{$lang.help}</a>
@@ -27,4 +53,7 @@
   </td>
 </tr>
 <tr>
+  <td width="30">
+  </td>
   <td>
+-->
diff --git a/templates/help.tpl b/templates/help.tpl
index efa29af..018aafa 100644
--- a/templates/help.tpl
+++ b/templates/help.tpl
@@ -1,3 +1,4 @@
+{include file="header.tpl"}
 
 <h2>Adding LDAP-Access to your Mailclient</h2>
 
@@ -21,7 +22,7 @@
 <h3>Private Addressbook</h3>
 
 {if $binddn}
-<p>To access your persanal addressdata use these settings:</p>
+<p>To access your personal address data use these settings:</p>
 <dl>
   <dt>LDAP-Server</dt>
   <dd><code>{$conf.ldapserver}</code></dd>
@@ -39,5 +40,4 @@
 <p>Login to see this data</p>
 {/if}
 
-
-<br><br>
+{include file="footer.tpl"}
diff --git a/templates/layout.css b/templates/layout.css
new file mode 100644
index 0000000..15d24ca
--- /dev/null
+++ b/templates/layout.css
@@ -0,0 +1,64 @@
+
+/* left side toolbar */
+
+div#toolbar {
+  float: left;
+  width: 2em;
+  text-align: center;
+}
+
+div#toolbar ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+div#toolbar li.sep {
+  height: 1em;
+}
+
+/* top row */
+
+div#filterrow {
+  padding: 0 0 0 3em;
+  border-bottom: 1px solid #ccc;
+}
+
+div#filterrow form {
+  display: inline;
+}
+
+div#filterrow div.x, div#filterrow ul.x, div#filterrow ul.x li {
+  display: inline;
+}
+
+div#filterrow ul.x {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  
+}
+
+div#filterrow div {
+  margin-left: 1em;
+}
+
+/* bottom row */
+
+div#footrow {
+  clear: left;
+  text-align: right;
+  padding: 0 1em 0 0;
+  border-top: 1px solid #ccc;
+}
+
+/* content */
+
+div#content {
+  margin-left: 2em;
+  padding: 0.5em 1em 2em 1em;
+  border-left: 1px solid #ccc;
+  min-height: 10em;
+  height: auto !important;
+  height: 10em;
+}
diff --git a/templates/ldaperror.tpl b/templates/ldaperror.tpl
deleted file mode 100644
index fbcea18..0000000
--- a/templates/ldaperror.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{if $LDAPERRORS != ''}
-<script>
-  window.alert('{$lang.err_ldap}:\n\n{$LDAPERRORS|escape:quotes}');
-</script>
-{/if}
diff --git a/templates/list.tpl b/templates/list.tpl
index fe16dfd..9c3b02e 100644
--- a/templates/list.tpl
+++ b/templates/list.tpl
@@ -1,4 +1,5 @@
-<br><br>
+{include file="header.tpl"}
+
 <table cellspacing="0" cellpadding="0" width="100%" align="center">
   {if $list == ''}
     <tr>
@@ -11,4 +12,5 @@
     {$list}
   {/if}
 </table>
-<br><br><br>
+
+{include file="footer.tpl"}
diff --git a/templates/login.tpl b/templates/login.tpl
index ccedd37..2a950da 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -1,3 +1,5 @@
+{include file="header.tpl"}
+
 
   <br /><br /><br />
   <form action="login.php" method="post" accept-charset="utf-8">
@@ -25,3 +27,5 @@
   </table>
   </form>
   <br /><br /><br />
+
+{include file="footer.tpl"}
diff --git a/templates/orgs.tpl b/templates/orgs.tpl
index 4aa3c07..0c030af 100644
--- a/templates/orgs.tpl
+++ b/templates/orgs.tpl
@@ -1,3 +1,5 @@
+{include file="header.tpl"}
+
 <table width="100%">
 {foreach from=$orgs item=org}
   <tr>
@@ -16,3 +18,5 @@
   </tr>
 {/foreach}
 </table>
+
+{include file="footer.tpl"}
diff --git a/templates/style.css b/templates/style.css
index 049be11..52e63ec 100644
--- a/templates/style.css
+++ b/templates/style.css
@@ -21,9 +21,10 @@ td    {background-color:#66CCFF:margin:3px}
 .buttonrow {border-top-width:1px;
             border-top-style:solid;
             border-top-color:#cccccc;}
-.filterrow {border-bottom-width:1px;
+
+/*.filterrow {border-bottom-width:1px;
             border-bottom-style:solid;
-            border-bottom-color:#cccccc;}
+            border-bottom-color:#cccccc;}*/
 
 .tableborder {border-width:1px; border-style:solid}
 
@@ -96,6 +97,8 @@ div.autocomplete {
   background-color: #fff;
   border: 1px solid #000;
   font-size: 80%;
+  margin: 0;
+  display: block;
 }
 
 div.autocomplete ul {
@@ -156,3 +159,7 @@ a.tc18 { font-size: 280%; }
 a.tc19 { font-size: 290%; }
 a.tc20 { font-size: 300%; }
 
+a.tag {
+  background: url(../pix/tag_blue.png) left center no-repeat;
+  padding-left: 18px;
+}
diff --git a/templates/tags.tpl b/templates/tags.tpl
index 203b334..c0befac 100644
--- a/templates/tags.tpl
+++ b/templates/tags.tpl
@@ -1,5 +1,8 @@
-<p>{$lang.tagcloud}</p>
+{include file="header.tpl"}
 
 <div class="tagcloud">
   {$tagcloud}
 </div>
+
+<p>{$lang.tagcloud}</p>
+{include file="footer.tpl"}
diff --git a/templates/toolbar.tpl b/templates/toolbar.tpl
new file mode 100644
index 0000000..b155388
--- /dev/null
+++ b/templates/toolbar.tpl
@@ -0,0 +1,78 @@
+<ul>
+
+  <!-- help -->
+  <li>
+    <a href="help.php"><img src="pix/help.png" border="0"
+       width="16" height="16" align="middle" title="{$lang.help}" /></a>
+  </li>
+
+  <!-- company list -->
+  <li>
+    <a href="orgs.php"><img src="pix/book_open.png" border="0"
+       width="16" height="16" align="middle" title="{$lang.orgs}" /></a>
+  </li>
+
+  <li class="sep"></li>
+
+  {if $user} <!-- new contact -->
+    <li>
+      <a href="entry.php?mode=edit"><img src="pix/page_add.png" border="0"
+         width="16" height="16" align="middle" title="{$lang.new}"></a>
+    </li>
+  {/if}
+
+  <li class="sep"></li>
+
+  {if $dn} <!-- begin contact page functions -->
+    {if $user} <!-- begin editing functions -->
+
+      <!-- edit/show, copy, delete -->
+      {if $smarty.request.mode == 'edit'}
+        <li>
+          <a href="entry.php?dn={$dn|escape:url}"><img src="pix/page_red.png"
+           border="0" width="16" height="16" align="middle" title="{$lang.show}" /></a>
+        </li>
+      {elseif $smarty.request.mode != 'copy'}
+        <li>
+          <a href="entry.php?dn={$dn|escape:url}&mode=edit"><img src="pix/page_edit.png"
+             border="0" width="16" height="16" align="middle" title="{$lang.edit}" /></a>
+        </li>
+        <li>
+          <a href="entry.php?dn={$dn|escape:url}&mode=copy"><img src="pix/page_copy.png"
+             border="0" width="16" height="16" align="middle" title="{$lang.copy}" /></a>
+        </li>
+        <li>
+          <a href="entry.php?dn={$dn|escape:url}&del=1" onclick="return confirm('{$lang.msg_reallydel}');"><img
+             src="pix/page_delete.png" border="0" width="16" height="16" align="middle"
+             title="{$lang.delete}" /></a>
+        </li>
+      {/if}
+
+    {/if} <!-- end editing functions -->
+
+    <!-- vcf export -->
+    <li>
+      <a href="entry.php?dn={$dn|escape:url}&mode=vcf"><img src="pix/vcard.png"
+         border="0" width="16" height="16" align="middle" title="{$lang.vcfexport}" /></a>
+    </li>
+
+    <li class="sep"></li>
+  {/if} <!-- end contact page functions -->
+
+
+  {if $list} <!-- export -->
+    <li>
+      <a href="index.php?filter={$filter|escape:url}&marker={$marker|escape:url}&search={$search|escape:url}&export=csv"><img src="pix/page_white_excel.png" border="0" width="16" height="16" align="middle" title="{$lang.csvexport}" /></a>
+    </li>
+  {/if}
+
+  {if $user} <!-- import -->
+    <li>
+      <a href="import.php"><img src="pix/page_in.png" border="0"
+         width="16" height="16" align="middle" title="{$lang.vcfimport}" /></a>
+    </li>
+  {/if}
+
+  
+
+</ul>
-- 
2.39.5