From: Andreas Gohr Date: Wed, 25 Jan 2006 12:45:11 +0000 (+0100) Subject: changed layout, some HTML cleanup X-Git-Tag: 0.7.1~95 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=77c283456020d1fda4bd127badfac238491edf78;p=contagged changed layout, some HTML cleanup darcs-hash:20060125124511-6e07b-9f30580c4249dfd0a689ef8f378089b2fe0151fe.gz --- 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 += '
'; editor += ''; 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 0000000..b5ba31f Binary files /dev/null and b/pix/tag_blue.png differ 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"} +

if} + + + +