diff --git a/html/index.php b/html/index.php index c4f5ee22d291a31ba737e5ec20973dc474cf9909..6ca74ae787ab6170177437744d8f08a2511402f3 100644 --- a/html/index.php +++ b/html/index.php @@ -406,7 +406,7 @@ $smarty->assign ("cookies", "<b>"._("Warning").":<\/b> "._("Your browser has coo /* Set focus to the error button if we've an error message */ $focus= ""; if (session::is_set('errors') && session::get('errors') != ""){ - $focus= '<script language="JavaScript" type="text/javascript">'; + $focus= '<script type="text/javascript">'; $focus.= 'document.forms[0].error_accept.focus();'; $focus.= '</script>'; } diff --git a/html/main.php b/html/main.php index a180681a5973d803b5414c58bf2a19671341991d..d86fa3064ca52c12cadcaef7638f1dc41f2efe55 100644 --- a/html/main.php +++ b/html/main.php @@ -386,12 +386,12 @@ if ($error_collector != "") { /* Set focus to the error button if we've an error message */ $focus= ""; if (session::is_set('errors') && session::get('errors') != "") { - $focus= '<script language="JavaScript" type="text/javascript">'; + $focus= '<script type="text/javascript">'; $focus.= 'document.forms[0].error_accept.focus();'; $focus.= '</script>'; } -$focus= '<script language="JavaScript" type="text/javascript">'; +$focus= '<script type="text/javascript">'; $focus.= 'next_msg_dialog();'; $focus.= '</script>'; $smarty->assign("focus", $focus); diff --git a/html/setup.php b/html/setup.php index db2b05da914ace09400629408ccf538e435be346..5a14a84bf3891a501b7cce5280047b17e9d0d37e 100644 --- a/html/setup.php +++ b/html/setup.php @@ -78,7 +78,7 @@ if (isset($_POST['lang_selected'])) { /* Check for js */ if (!isset($_GET['js']) && !session::global_is_set('js')) { - echo '<script language="JavaScript" type="text/javascript">'; + echo '<script type="text/javascript">'; echo ' location = "setup.php?js=true";'; echo '</script>'; @@ -117,12 +117,12 @@ $header = $smarty->fetch(get_template_path('headers.tpl')); /* Set focus to the error button if we've an error message */ $focus= ""; if (session::is_set('errors') && session::get('errors') != ""){ - $focus= '<script language="JavaScript" type="text/javascript">'; + $focus= '<script type="text/javascript">'; $focus.= 'document.forms[0].error_accept.focus();'; $focus.= '</script>'; } -$focus= '<script language="JavaScript" type="text/javascript">'; +$focus= '<script type="text/javascript">'; $focus.= 'next_msg_dialog();'; $focus.= '</script>'; diff --git a/html/themes/default/datepicker.css b/html/themes/default/datepicker.css index b7733566511c3491cfaa47c69012316984fad060..a98842fd42a3ff26b88f7d9fd258d34fd26cf6cc 100644 --- a/html/themes/default/datepicker.css +++ b/html/themes/default/datepicker.css @@ -98,7 +98,6 @@ border:1px #CCE9FF solid; background:#E9F5FF; background-image:url(../../images/date_active.gif); background-repeat:no-repeat; -position:top left; width:21px; height:16px; line-height:16px; @@ -109,7 +108,6 @@ border:1px #CCE9FF solid; background:#E9F5FF; background-image:url(../../images/date_active.gif); background-repeat:no-repeat; -position:top left; } div.datepicker-calendar table tbody tr td.nclick,div.datepicker-calendar table tbody tr td.nclick_outbound { diff --git a/html/themes/default/lists.css b/html/themes/default/lists.css index 75e8e913d6139e4f46bb3ceec3726c852cc78349..ff507b9bcb83207f49c402d45f56342976f7bd5b 100644 --- a/html/themes/default/lists.css +++ b/html/themes/default/lists.css @@ -121,22 +121,6 @@ background-color:#FFF; cursor:default; } -tr.sortableListItemOdd ::-moz-selection,tr.sortableListItem ::-moz-selection { -background:transparent; -} - -tr.sortableListItemOdd ::selection,tr.sortableListItem ::selection { -background:transparent; -} - -tr.sortableListItemOdd code::-moz-selection,tr.sortableListItem code::-moz-selection { -background:transparent; -} - -tr.sortableListItemOdd code::selection,tr.sortableListItem code::selection { -background:transparent; -} - tr.sortableListItemOdd { background-color:#F5F5F5; cursor:move; diff --git a/html/themes/default/style.css b/html/themes/default/style.css index b7605019dc30fceb59e75e270443bf42a5f13ca2..128a7806ee6a46e6ac322d3777f457b9e9c86da8 100644 --- a/html/themes/default/style.css +++ b/html/themes/default/style.css @@ -23,6 +23,10 @@ td,p,b,th { font-size:12px; } +img { +border:none; +} + a:link { text-decoration:none; color:#00008F; @@ -243,6 +247,11 @@ width:auto; vertical-align:top; } +/* cellpadding="0" */ +table.framework > tbody > tr > td { +padding:0; +} + table.maintab { width:100%; height:100%; @@ -337,7 +346,7 @@ border-bottom:1px solid #B0B0B0; .item { text-align:left; white-space:nowrap; -font-family:bitstream vera sans, luxi sans, verdana, geneva, arial, helvetica, sans-serif; +font-family:"bitstream vera sans", "luxi sans", verdana, geneva, arial, helvetica, sans-serif; font-size:12px; padding-top:2px; } diff --git a/html/themes/default/tabs.css b/html/themes/default/tabs.css index 3a7e2b42c0df14de43c9357f9bd4a9d4c4e5a81f..131e05bd6b0a818c8f21ec5c96c0b809cbec03ab 100644 --- a/html/themes/default/tabs.css +++ b/html/themes/default/tabs.css @@ -1,4 +1,14 @@ +table.tabs_header { +width:100%; +border:none; +border-spacing:0px; +} + +table.tabs_header > tbody > tr > td { +padding:0; +} + div.tab_active { text-align:center; background-color:#f8f8f8; diff --git a/ihtml/themes/default/accountexpired.tpl b/ihtml/themes/default/accountexpired.tpl index dc5ff444bf756ad2a8e4e6b7b072d623b5be46af..7d8cb4f4dd8c9961943e96a5fc81c539c0db8659 100644 --- a/ihtml/themes/default/accountexpired.tpl +++ b/ihtml/themes/default/accountexpired.tpl @@ -6,7 +6,7 @@ <!-- Spacer for some browsers --> <div class='gosaLoginSpacer'></div> -<table summary="" class='gosaLoginMask' style="text-align:right;" align='center'> +<table class='gosaLoginMask' style="text-align:right;" align='center'> <tr> <td class='gosaAccountExpiredBack' style="width:550px;"> <div class='gosaAccountExpiredBack'> @@ -17,7 +17,7 @@ <!-- Formular data, containing a table to center fields --> <form action='index.php' method='post' name='mainform' onSubmit='js_check(this);return true;'> - <table summary="" style='vertical-align:middle; text-align:left;' cellspacing='7' align='center'> + <table style='vertical-align:middle; text-align:left;' cellspacing='7' align='center'> <tr> <td> <p> {t}Old password{/t}</p> @@ -62,7 +62,7 @@ </table> <!-- Place cursor in username field --> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page nextfield= "{$nextfield}"; focus_field({$nextfield}); diff --git a/ihtml/themes/default/framework.tpl b/ihtml/themes/default/framework.tpl index 9628f9262fd3c8b0caa7ef712626ef9eff21acb7..74c55b545bc6953d27f10da9193027b5ef088701 100644 --- a/ihtml/themes/default/framework.tpl +++ b/ihtml/themes/default/framework.tpl @@ -7,14 +7,14 @@ <div id="header_left"> <img id="fd_logo" class="optional" src="{filePath file="images/fd_logo.png"}" alt="FusionDirectory"/> <a class="maintitlebar" href="main.php?reset=1"> - <img src="{filePath file="images/home.png"}" border="0" alt="Main"/> {t}Main{/t} + <img src="{filePath file="images/home.png"}" alt="Main"/> {t}Main{/t} </a> <a class="maintitlebar logout" href="logout.php?request"> - <img src="{filePath file="images/sign_out.png"}" border="0" alt="Sign out"/> {t}Sign out{/t} + <img src="{filePath file="images/sign_out.png"}" alt="Sign out"/> {t}Sign out{/t} </a> <a class="plugtop"> - <img src="{$headline_image}" align="middle" alt="{t}{$headline}{/t}"/>{t}{$headline}{/t} + <img src="{$headline_image}" alt="{t}{$headline}{/t}"/>{t}{$headline}{/t} </a> </div> <div id="header_right"> @@ -25,7 +25,7 @@ </div> </div> - <table summary="" class="framework" cellspacing="0" cellpadding="0"> + <table class="framework"> <tbody> <tr> diff --git a/ihtml/themes/default/headers.tpl b/ihtml/themes/default/headers.tpl index 18cf304e69ccbe45433b8daaab68a02426422e72..9a6997cb1847506ac5c9a9f9ff6fa9e09efaee1d 100644 --- a/ihtml/themes/default/headers.tpl +++ b/ihtml/themes/default/headers.tpl @@ -1,36 +1,30 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> +<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>{if isset($title)}{$title}{else}FusionDirectory{/if}</title> - <meta name="generator" content="my hands"> - <meta name="description" content="FusionDirectory - Login"> - <meta name="author" lang="en" content="FusionDirectory Project"> - <meta name="viewport" content="width=device-width"> + <meta charset="utf-8"/> - <meta http-equiv="Expires" content="Mon, 26 Jul 1997 05:00:00 GMT"> - <meta http-equiv="Last-Modified" content="{$date} GMT"> - <meta http-equiv="Cache-Control" content="no-cache"> - <meta http-equiv="Pragma" content="no-cache"> - <meta http-equiv="Cache-Control" content="post-check=0, pre-check=0"> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <meta name="description" content="FusionDirectory - Login"/> + <meta name="author" lang="en" content="FusionDirectory Project"/> + <meta name="viewport" content="width=device-width"/> {include file={filePath file="css.tpl"}} - <link rel="stylesheet" type="text/css" href="{filePath file="printer.css"}" media="print"> + <link rel="stylesheet" type="text/css" href="{filePath file="printer.css"}" media="print"/> - <link rel="shortcut icon" href="favicon.ico"> + <link rel="shortcut icon" href="favicon.ico"/> - <script language="javascript" src="include/prototype.js" type="text/javascript"></script> - <script language="javascript" src="include/fusiondirectory.js" type="text/javascript"></script> + <script src="include/prototype.js" type="text/javascript"></script> + <script src="include/fusiondirectory.js" type="text/javascript"></script> {if $usePrototype == 'true'} - <script language="javascript" src="include/scriptaculous.js" type="text/javascript"></script> - <script language="javascript" src="include/builder.js" type="text/javascript"></script> - <script language="javascript" src="include/effects.js" type="text/javascript"></script> - <script language="javascript" src="include/dragdrop.js" type="text/javascript"></script> - <script language="javascript" src="include/controls.js" type="text/javascript"></script> - <script language="javascript" src="include/pulldown.js" type="text/javascript"></script> - <script language="javascript" src="include/datepicker.js" type="text/javascript"></script> + <script src="include/scriptaculous.js" type="text/javascript"></script> + <script src="include/builder.js" type="text/javascript"></script> + <script src="include/effects.js" type="text/javascript"></script> + <script src="include/dragdrop.js" type="text/javascript"></script> + <script src="include/controls.js" type="text/javascript"></script> + <script src="include/pulldown.js" type="text/javascript"></script> + <script src="include/datepicker.js" type="text/javascript"></script> {/if} </head> diff --git a/ihtml/themes/default/login.tpl b/ihtml/themes/default/login.tpl index 38eaf79e10b9fcdc81a0046a513a9f69cd0e5841..49b200015f70713ad564f24b64acdef0a213d4be 100644 --- a/ihtml/themes/default/login.tpl +++ b/ihtml/themes/default/login.tpl @@ -8,7 +8,7 @@ <div id="window_container"> <div id="window_div"> -<form action='index.php' method='post' name='mainform' onSubmit='js_check(this);return true;'> +<form action="index.php" method="post" name="mainform" onSubmit="js_check(this);return true;"> {$msg_dialogs} <div id="window_titlebar"> @@ -24,21 +24,20 @@ {if $lifetime}<b><font style="color:red";>{$lifetime}</font></b>{/if} </div> - <input id="focus" name="focus" type="image" src="images/empty.png" style="width:0px; height:0px;" /> <div> - <label for="username"><img class="center" align="middle" src="{$personal_img}" alt="{t}Username{/t}" title="{t}Username{/t}"/> </label> + <label for="username"><img class="center" src="{$personal_img}" alt="{t}Username{/t}" title="{t}Username{/t}"/> </label> <input type="text" name="username" id="username" maxlength="40" value="{$username}" title="{t}Username{/t}" onFocus="nextfield= 'password';" /> <br /> <br /> - <label for="password"><img class="center" align="middle" src="{$password_img}" alt="{t}Password{/t}" title="{t}Password{/t}" /> </label> + <label for="password"><img class="center" src="{$password_img}" alt="{t}Password{/t}" title="{t}Password{/t}" /> </label> <input type="password" name="password" id="password" maxlength="40" value="" title="{t}Password{/t}" onFocus="nextfield= 'login';" /> <br /> <a href="recovery.php">{t}I forgot my password{/t}</a> </div> <div> - <img class="center" align="middle" src="{$directory_img}" alt="{t}Directory{/t}" title="{t}Directory{/t}" /> + <img class="center" src="{$directory_img}" alt="{t}Directory{/t}" title="{t}Directory{/t}" /> <select name="server" title="{t}Directory{/t}" onchange="javascript:document.mainform.submit();"> {html_options options=$server_options selected=$server_id} </select> @@ -46,7 +45,7 @@ <!-- check, if cookies are enabled --> <p class="gosaLoginWarning"> - <script language="JavaScript" type="text/javascript"> + <script type="text/javascript"> <!-- document.cookie = "gosatest=empty;path=/"; if (document.cookie.indexOf( "gosatest=") > -1 ) @@ -77,7 +76,7 @@ </div> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- enable_keyPress = false; nextfield= "{$nextfield}"; diff --git a/ihtml/themes/default/logout.tpl b/ihtml/themes/default/logout.tpl index 4127650298f961e1436661630108f408550dbf7b..bdd14897c00881114e58977d76234f3f686fa3dc 100644 --- a/ihtml/themes/default/logout.tpl +++ b/ihtml/themes/default/logout.tpl @@ -13,7 +13,7 @@ </body> <!-- Place cursor --> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page focus_field('dummy'); --> diff --git a/ihtml/themes/default/msg_dialog.tpl b/ihtml/themes/default/msg_dialog.tpl index aee228af9c37470a2969861a09c2f07cb63d19c2..2dc7d6187a1e318db014eb9dda047975445c0b1c 100644 --- a/ihtml/themes/default/msg_dialog.tpl +++ b/ihtml/themes/default/msg_dialog.tpl @@ -63,7 +63,7 @@ </td><td style="font-size: 1.1em; font-weight:bold;">{$s_Title}</td></tr> </table> </div> - <table style="width:100%; border-top: solid 1px #BBBBBB;" cellspacing=0 cellpadding=2 summary="" border=0> + <table style="width:100%; border-top: solid 1px #BBBBBB;" cellspacing=0 cellpadding=2 border=0> <tr> <td style="width:100%;padding:7px; padding-bottom:14px"> {$s_Message} @@ -111,7 +111,7 @@ </table> </div> - <table style="z-index:250;width:100%; border-top: solid 1px #BBBBBB;" cellspacing=0 cellpadding=2 summary="" border=0> + <table style="z-index:250;width:100%; border-top: solid 1px #BBBBBB;" cellspacing=0 cellpadding=2 border=0> <tr> <td style="width:100%; padding:7px; padding-bottom:14px;"> {$s_Message} @@ -147,7 +147,7 @@ </tr> </table> </div> - <script language="JavaScript" type="text/javascript"> + <script type="text/javascript"> focus_field('MSG_OK{$i_ID}'); </script> diff --git a/ihtml/themes/default/password.tpl b/ihtml/themes/default/password.tpl index a1a85ce1084b55471f14d015c2c4ae1c652fb5c2..05acb63e8fbee4969146e8c79c21065256c12e4e 100644 --- a/ihtml/themes/default/password.tpl +++ b/ihtml/themes/default/password.tpl @@ -20,9 +20,9 @@ <style type="text/css">@import url('themes/default/password-style.css');</style> <link rel="shortcut icon" href="favicon.ico"> - <script language="javascript" src="include/prototype.js" type="text/javascript"></script> - <script language="javascript" src="include/fusiondirectory.js" type="text/javascript"></script> - <script language="javascript" src="include/pwdStrength.js" type="text/javascript"></script> + <script src="include/prototype.js" type="text/javascript"></script> + <script src="include/fusiondirectory.js" type="text/javascript"></script> + <script src="include/pwdStrength.js" type="text/javascript"></script> </head> <body style='height:100%; width:100%;'> @@ -103,7 +103,7 @@ </div> <!-- check, if cookies are enabled --> <p class="warning"> - <script language="JavaScript" type="text/javascript"> + <script type="text/javascript"> <!-- document.cookie = "gosatest=empty;path=/"; if (document.cookie.indexOf( "gosatest=") > -1 ) @@ -123,7 +123,7 @@ <table class="iesucks"><tr><td>{$errors}</td></tr></table> <!-- Place cursor in username field --> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page focus_field('error_accept','uid','directory', 'username', 'current_password'); next_msg_dialog(); diff --git a/ihtml/themes/default/recovery.tpl b/ihtml/themes/default/recovery.tpl index d5fea6be1b664ca45dae53f279581345746d02f5..a85f1e0b6c50a4745ec793220c50b1e82ae8b79a 100644 --- a/ihtml/themes/default/recovery.tpl +++ b/ihtml/themes/default/recovery.tpl @@ -159,7 +159,7 @@ </div> <!-- Place cursor in username field --> - <script language="JavaScript" type="text/javascript"> + <script type="text/javascript"> <!-- // First input field on page focus_field('error_accept','uid','directory', 'username', 'current_password'); next_msg_dialog(); diff --git a/ihtml/themes/default/remove.tpl b/ihtml/themes/default/remove.tpl index f1b1d2caff1fbee5071c8af0a356f90dc977ffa4..df96d5ad9886da8e0da7c100c617f9752f67dd2f 100644 --- a/ihtml/themes/default/remove.tpl +++ b/ihtml/themes/default/remove.tpl @@ -1,5 +1,5 @@ <div style="font-size:18px;"> - <img alt="" src="images/warning.png" align=top> {t}Warning{/t} + <img alt="" src="images/warning.png"/> {t}Warning{/t} </div> <p> {$intro} diff --git a/ihtml/themes/default/simple-filter.tpl b/ihtml/themes/default/simple-filter.tpl index 19fc36e010d0e0a868bc617692f6bc483d47021d..05e308deb94847f27b6444081471bbb50eae1477 100644 --- a/ihtml/themes/default/simple-filter.tpl +++ b/ihtml/themes/default/simple-filter.tpl @@ -1,6 +1,6 @@ <div class="contentboxh"> <p class="contentboxh"> - <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t} + <img src="images/launch.png" alt="[F]">{t}Filter{/t} </p> </div> @@ -13,11 +13,11 @@ {$SCOPE} - <table summary="" style="width:100%;border-top:1px solid #B0B0B0;"> + <table style="width:100%;border-top:1px solid #B0B0B0;"> <tr> <td> <label for="NAME"> - <img src="images/lists/search.png" align=middle> {t}Name{/t} + <img src="images/lists/search.png"/> {t}Name{/t} </label> </td> <td> @@ -26,9 +26,9 @@ </tr> </table> - <table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"> + <table width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"> <tr> - <td width="100%" align="right"> + <td style="width:100%;text-align:right;"> {$APPLY} </td> </tr> diff --git a/ihtml/themes/default/simple-list.tpl b/ihtml/themes/default/simple-list.tpl index d6e8b702ea9dff2d675530724f4f51288bc8acb3..8a6e6268ee73acd1aaffb2ec1a3a1c61570ae144 100644 --- a/ihtml/themes/default/simple-list.tpl +++ b/ihtml/themes/default/simple-list.tpl @@ -1,4 +1,4 @@ -<table summary="" class="listing_container"> +<table class="listing_container"> <tbody> <tr> <td class="list"> diff --git a/ihtml/themes/default/simple-remove.tpl b/ihtml/themes/default/simple-remove.tpl index 178e4166c603980bef0ff7e0964d5a10b096f3a7..08ad2caaedd9c5ba098d61e15b39df15fe0b5790 100644 --- a/ihtml/themes/default/simple-remove.tpl +++ b/ihtml/themes/default/simple-remove.tpl @@ -1,5 +1,5 @@ <div style="font-size:18px;"> - <img alt="" src="images/warning.png" align=top> {t}Warning{/t} + <img alt="" src="images/warning.png"> {t}Warning{/t} </div> <p> {$info} diff --git a/ihtml/themes/default/simpleplugin.tpl b/ihtml/themes/default/simpleplugin.tpl index 5a4d14d3551d98ac52a71dad45132a3e90a73f7b..e5f6aa7c0d714104296a175618a7ef6d04a9f6ab 100644 --- a/ihtml/themes/default/simpleplugin.tpl +++ b/ihtml/themes/default/simpleplugin.tpl @@ -7,7 +7,7 @@ <input name="{$hiddenPostedInput}" value="1" type="hidden"/> <!-- Place cursor --> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page focus_field('{$focusedField}'); --> diff --git a/ihtml/themes/default/snapshotdialog.tpl b/ihtml/themes/default/snapshotdialog.tpl index 7d1ade4d6fb44a913656a7e9a94f3a25589a9de8..1160818aaada0e322fc7ae1157f6ec92895a149a 100644 --- a/ihtml/themes/default/snapshotdialog.tpl +++ b/ihtml/themes/default/snapshotdialog.tpl @@ -13,7 +13,7 @@ <br> <p class="seperator"> </p> <br> -<table summary="" style="width:100%"> +<table style="width:100%"> {if !$restore_deleted} <tr> <td> @@ -56,7 +56,7 @@ <br> <p class="seperator"> </p> <br> -<table summary="" style="width:100%"> +<table style="width:100%"> <tr> <td> <b>{t}Object{/t}</b> @@ -89,7 +89,7 @@ <input type="submit" name="CancelSnapshot" value="{t}Cancel{/t}"> </div> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page document.mainform.CurrentDescription.focus(); --> diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc index a67397bc01cdfeb828ca79524a7fa39ca4049913..4bf46cd6bc141f8e95909e60a56d2b058d00ca2f 100644 --- a/include/class_CopyPasteHandler.inc +++ b/include/class_CopyPasteHandler.inc @@ -392,7 +392,7 @@ class CopyPasteHandler { */ function generatePasteIcon() { - $Copy_Paste = " <img class='center' src='images/lists/seperator.png' align='middle' alt='' height='16' width='1'> "; + $Copy_Paste = " <img class='center' src='images/lists/seperator.png' alt='' height='16' width='1'> "; if ($this->entries_queued()) { $img = "images/lists/paste.png"; diff --git a/include/class_acl.inc b/include/class_acl.inc index ed1c90a6c0eefb6b8f90a88101a3dce6022ea97e..5147ca1cbf125a631c70ce535db86c206dc4762e 100644 --- a/include/class_acl.inc +++ b/include/class_acl.inc @@ -467,9 +467,9 @@ class acl extends plugin if($this->acl_is_writeable("")){ $action.= "<input type='image' name='sortup_$key' alt='up' - title='"._("Up")."' src='images/lists/sort-up.png' align='top'>"; + title='"._("Up")."' src='images/lists/sort-up.png'/>"; $action.= "<input type='image' name='sortdown_$key' alt='down' - title='"._("Down")."' src='images/lists/sort-down.png'>"; + title='"._("Down")."' src='images/lists/sort-down.png'/>"; } if($this->acl_is_readable("")){ diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc index 156038f49b71d4fc81decbc3f6d9de5702f7cf0f..cebd59f63319040dd1827bfb32bf9fbe79553d42 100644 --- a/include/class_baseSelector.inc +++ b/include/class_baseSelector.inc @@ -187,7 +187,7 @@ class baseSelector { } $link = "onclick=\"\$('bs_rebase_".$this->pid."').value='".base64_encode($config->current['BASE'])."'; $('submit_tree_base_".$this->pid."').click();\""; - $this->tree = "<input class='base_selector' 'type='text' name='bs_input_".$this->pid."' id='bs_input_".$this->pid."' onkeydown=\"\$('bs_".$this->pid."').hide()\" onfocus=\"\$('bs_".$this->pid."').hide()\" onmouseover=\"Element.clonePosition(\$('bs_".$this->pid."'), 'bs_input_".$this->pid."', {setHeight: false, setWidth: false, offsetTop:(Element.getHeight('bs_input_".$this->pid."'))});\$('bs_".$this->pid."').show();\" onmouseout=\"rtimer= Element.hide.delay(0.25, 'bs_".$this->pid."')\" value=\"".preg_replace('/"/', '"', $this->pathMapping[$this->base])."\">"; + $this->tree = "<input class='base_selector' type='text' name='bs_input_".$this->pid."' id='bs_input_".$this->pid."' onkeydown=\"\$('bs_".$this->pid."').hide()\" onfocus=\"\$('bs_".$this->pid."').hide()\" onmouseover=\"Element.clonePosition(\$('bs_".$this->pid."'), 'bs_input_".$this->pid."', {setHeight: false, setWidth: false, offsetTop:(Element.getHeight('bs_input_".$this->pid."'))});\$('bs_".$this->pid."').show();\" onmouseout=\"rtimer= Element.hide.delay(0.25, 'bs_".$this->pid."')\" value=\"".preg_replace('/"/', '"', $this->pathMapping[$this->base])."\">"; // Autocompleter $this->tree .= "<div id='autocomplete_".$this->pid."' class='autocomplete'></div>". @@ -226,10 +226,10 @@ class baseSelector { } $this->tree .= "</li>\n"; } - $selected = $this->base == $base?" class='treeListSelected'":""; + $selected = ($this->base == $base?" class='treeListSelected'":""); $link = "onclick=\"\$('bs_rebase_".$this->pid."').value='".base64_encode($base)."';$('submit_tree_base_".$this->pid."').click();\""; $this->tree .= "<li><a$selected $link>". - "<img class='center' src='".$config->department_info[$base]['img']."'> ". + "<img class='center' src='".$config->department_info[$base]['img']."' alt='".$config->department_info[$base]['name']."'/> ". $this->gennonbreaks($config->department_info[$base]['name']). ($config->department_info[$base]['description'] == ''?'':' <span class="informal">['.$this->gennonbreaks($config->department_info[$base]['description']).']</span>'). "</a>"; @@ -239,14 +239,14 @@ class baseSelector { } // Close tree - for ($i = 0; $i < $last_indent; $i++) { + for ($i = 1; $i < $last_indent; $i++) { $this->tree .= "</li></ul>\n"; } $this->tree .= "</div>\n"; // Draw submitter if required if ($this->submitButton) { - $this->tree .= " <input class='center' type='image' src='images/lists/submit.png' align='middle' title='"._("Submit")."' name='submit_base_".$this->pid."' id='submit_base_".$this->pid."' alt='"._("Submit")."'>"; + $this->tree .= " <input class='center' type='image' src='images/lists/submit.png' title='"._("Submit")."' name='submit_base_".$this->pid."' id='submit_base_".$this->pid."' alt='"._("Submit")."'>"; } $this->tree .= "<input type='submit' style='display:none' name='submit_tree_base_".$this->pid."' id='submit_tree_base_".$this->pid."'>"; $this->tree .= "<input type='hidden' name='bs_rebase_".$this->pid."' id='bs_rebase_".$this->pid."'>"; diff --git a/include/class_divSelectBox.inc b/include/class_divSelectBox.inc index 93da2fb0cdc35c4ca30cc2ca948d4a8c1603316d..8b9033b5f114064e7405378353e3b46f6025563b 100644 --- a/include/class_divSelectBox.inc +++ b/include/class_divSelectBox.inc @@ -92,7 +92,6 @@ class divSelectBox $s_return .= '<div style="padding-right:1px;padding-bottom:2px;height:'.$this->height.';width:100%">'."\n"; $s_return .= '<div style="overflow: auto;width:100%;height:100%;">'."\n"; $s_return .= '<table '. - 'summary="'.$this->s_summary.'" '. 'class="listingTable"'. 'style="overflow:scroll; '. 'height:98%;'. diff --git a/include/class_divlist.inc b/include/class_divlist.inc index 02ac80ab7c9fbe1d0557fe175e5f8871998b01c1..5d0c83aeb15164684baed1592e7de8259a709d95 100644 --- a/include/class_divlist.inc +++ b/include/class_divlist.inc @@ -158,11 +158,11 @@ class divlist { function DrawList(){ $s_return = ""; if(!$this->force_height){ - $s_return.= "<table summary='".$this->s_summary."' style='width:". + $s_return.= "<table style='width:". $this->s_width.";height:".$this->s_height. "px;' cellspacing='0' id='t_scrolltable'>"; } else { - $s_return.= "<table summary='".$this->s_summary."' style='width:". + $s_return.= "<table style='width:". $this->s_width.";height:".$this->s_height. "px;' cellspacing='0' id='t_scrolltable_onlywidth'>"; } @@ -209,9 +209,9 @@ class divlist { // Using scrolltable? if($this->i_entriesPerPage == 0) { if(!$this->force_height) { - $s_return.= "\n<tr><td class='scrollhead'><table summary='' style='width:100%' cellspacing='0' id='t_scrollfoot'>"; + $s_return.= "\n<tr><td class='scrollhead'><table style='width:100%' cellspacing='0' id='t_scrollfoot'>"; } else { - $s_return.= "\n<tr><td class='scrollhead'><table summary='' style='width:100%' cellspacing='0' id='t_scrollfoot_onlywidth'>"; + $s_return.= "\n<tr><td class='scrollhead'><table style='width:100%' cellspacing='0' id='t_scrollfoot_onlywidth'>"; } } $s_return .= "<tr><td class='listfooter' style='border-bottom:0px;'>".$this->list_footer."</td>"; @@ -239,9 +239,9 @@ class divlist { // Using scrolltable? if($this->i_entriesPerPage == 0) { if(!$this->force_height) { - $s_return.= "\n<tr><td class='scrollhead'><table summary='' style='width:".$this->s_width.";' cellspacing='0' id='t_scrollhead'>"; + $s_return.= "\n<tr><td class='scrollhead'><table style='width:".$this->s_width.";' cellspacing='0' id='t_scrollhead'>"; } else { - $s_return.= "\n<tr><td class='scrollhead'><table summary='' style='width:".$this->s_width.";' cellspacing='0' id='t_scrollhead_onlywidth'>"; + $s_return.= "\n<tr><td class='scrollhead'><table style='width:".$this->s_width.";' cellspacing='0' id='t_scrollhead_onlywidth'>"; } } @@ -292,10 +292,10 @@ class divlist { // We need to construct a "body"-table that is width-of-scrollbar thinner than the "head"-table. if(!$this->force_height || $this->fix_list_for_plugins) { $s_return .= "\n<tr><td colspan='".$this->cols."' class='scrollbody'><div style='width:".$this->s_width.";height:".($this->s_height-20)."px;' id='d_scrollbody' class='scrollbody'>"; - $s_return .= "<table summary='' style='height:100%;width:581px;' cellspacing='0' id='t_scrollbody'>"; + $s_return .= "<table style='height:100%;width:581px;' cellspacing='0' id='t_scrollbody'>"; } else { $s_return .= "\n<tr><td colspan='".$this->cols."' class='scrollbody'><div style='width:".$this->s_width.";height:".($this->s_height-20)."px;' id='d_scrollbody_onlywidth' class='scrollbody'>"; - $s_return .= "<table summary='' style='height:100%;width:581px;' cellspacing='0' id='t_scrollbody_onlywidth'>"; + $s_return .= "<table style='height:100%;width:581px;' cellspacing='0' id='t_scrollbody_onlywidth'>"; } } diff --git a/include/class_listing.inc b/include/class_listing.inc index 46467f0a74ff251c8a831262691c2ad40a023b70..4478010eb3f5ae89a0769df781f97e8d84d9f81c 100644 --- a/include/class_listing.inc +++ b/include/class_listing.inc @@ -286,23 +286,23 @@ class listing { isset($config['sortType'])) { $this->sortAttribute = $config['sortAttribute']; $this->sortType = $config['sortType']; - $sorter = " <img border='0' title='".($this->sortDirection[$index]?_("Up"):_("Down"))."' src='images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png' align='top'>"; + $sorter = " <img title='".($this->sortDirection[$index]?_("Up"):_("Down"))."' src='images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png' alt='".($this->sortDirection[$index]?_('Sort up'):_('Sort down'))."'>"; } $sortable = (isset($config['sortAttribute'])); $link = "href='?plug=".$_GET['plug']."&PID=".$this->pid."&act=SORT_$index'"; if (isset($config['label'])) { if ($sortable) { - $this->header[$index] = "<th ".$this->colprops[$index]."><a $link>"._($config['label'])."$sorter</a></td>"; + $this->header[$index] = "<th ".$this->colprops[$index]."><a $link>"._($config['label'])."$sorter</a></th>"; } else { - $this->header[$index] = "<th ".$this->colprops[$index].">"._($config['label'])."</td>"; + $this->header[$index] = "<th ".$this->colprops[$index].">"._($config['label'])."</th>"; } $this->plainHeader[] = _($config['label']); } else { if ($sortable) { - $this->header[$index] = "<th ".$this->colprops[$index]."><a $link> $sorter</a></td>"; + $this->header[$index] = "<th ".$this->colprops[$index]."><a $link> $sorter</a></th>"; } else { - $this->header[$index] = "<th ".$this->colprops[$index]."> </td>"; + $this->header[$index] = "<th ".$this->colprops[$index]."> </th>"; } $this->plainHeader[] = ""; } @@ -337,7 +337,7 @@ class listing { } $result .= "<div id='d_scrollbody' style='width:100%;'>\n"; - $result .= "<table summary='$this->headline' style='width:100%;' id='t_scrolltable' class='listingTable'>\n"; + $result .= "<table style='width:100%;' id='t_scrolltable' class='listingTable'>\n"; $this->numColumns = count($this->colprops) + ($this->multiSelect?1:0); // Build list header @@ -466,7 +466,7 @@ class listing { $result .= $switch?"<input type='hidden' id='list_workaround'>":""; // Add scroll positioner - $result .= '<script type="text/javascript" language="javascript">'; + $result .= '<script type="text/javascript">'; $result .= '$("t_nscrollbody").scrollTop= '.$this->scrollPosition.';'; $result .= 'var box = $("t_nscrollbody").onscroll= function() {$("position_'.$this->pid.'").value= this.scrollTop;}'; $result .= '</script>'; @@ -488,7 +488,7 @@ class listing { $smarty->assign("BASE", $this->renderBase()); // Assign separator - $smarty->assign("SEPARATOR", "<img src='images/lists/seperator.png' alt='-' align='middle' height='16' width='1' class='center'>"); + $smarty->assign("SEPARATOR", "<img src='images/lists/seperator.png' alt='-' height='16' width='1' class='center'>"); // Assign summary $smarty->assign("HEADLINE", $this->headline); @@ -917,7 +917,7 @@ class listing { $type = $this->getObjectType($classes); if ($type) { $this->objectDnMapping[$dn] = $type; - $result = "<img class='center' title='".LDAP::fix($dn)."' src='".$this->objectTypes[$type]["image"]."'>"; + $result = "<img class='center' title='".LDAP::fix($dn)."' src='".$this->objectTypes[$type]["image"]."' alt='$type'/>"; if (!isset($this->objectTypeCount[$this->objectTypes[$type]['label']])) { $this->objectTypeCount[$this->objectTypes[$type]['label']] = 0; } @@ -998,7 +998,7 @@ class listing { if ($action['type'] == "entry") { $label = $this->processElementFilter($action['label'], $this->entries[$row], $row); $image = $this->processElementFilter($action['image'], $this->entries[$row], $row); - $result .= "<input class='center' type='image' src='$image' title='$label' ". + $result .= "<input class='center' type='image' src='$image' title='$label' alt='$label' ". "name='listing_".$action['name']."_$row' style='padding:1px'>"; } @@ -1102,7 +1102,7 @@ class listing { /* Draw root button */ if ($enableRoot) { - $result["ROOT"] = "<input class='center' type='image' src='images/lists/root.png' align='middle' ". + $result["ROOT"] = "<input class='center' type='image' src='images/lists/root.png' ". "title='"._("Go to root department")."' name='ROOT' alt='"._("Root")."'>"; } else { $result["ROOT"] = "<img src='images/lists/root_grey.png' class='center' alt='"._("Root")."'>"; @@ -1110,7 +1110,7 @@ class listing { /* Draw back button */ if ($enableBack) { - $result["BACK"] = "<input class='center' type='image' align='middle' src='images/lists/back.png' ". + $result["BACK"] = "<input class='center' type='image' src='images/lists/back.png' ". "title='"._("Go up one department")."' alt='"._("Up")."' name='BACK'>"; } else { $result["BACK"] = "<img src='images/lists/back_grey.png' class='center' alt='"._("Up")."'>"; @@ -1118,14 +1118,14 @@ class listing { /* Draw home button */ if ($enableHome) { - $result["HOME"] = "<input class='center' type='image' align='middle' src='images/lists/home.png' ". + $result["HOME"] = "<input class='center' type='image' src='images/lists/home.png' ". "title='"._("Go to users department")."' alt='"._("Home")."' name='HOME'>"; } else { $result["HOME"] = "<img src='images/lists/home_grey.png' class='center' alt='"._("Home")."'>"; } /* Draw reload button, this button is enabled everytime */ - $result["RELOAD"] = "<input class='center optional' type='image' src='images/lists/reload.png' align='middle' ". + $result["RELOAD"] = "<input class='center optional' type='image' src='images/lists/reload.png' ". "title='"._("Reload list")."' name='REFRESH' alt='"._("Submit")."'>"; return $result; @@ -1224,7 +1224,7 @@ class listing { $actions = &$this->xmlData['actionmenu']['action']; $result = "<input type='hidden' name='act' id='actionmenu' value=''><div style='display:none'><input type='submit' name='exec_act' id='exec_act' value=''></div>". "<ul class='level1' id='root'><li><a href='#'>"._("Actions")." <img ". - "border='0' class='center optional' src='images/lists/sort-down.png'/></a>"; + "class='center optional' src='images/lists/sort-down.png' alt='down arrow'/></a>"; // Build ul/li list $result .= $this->recurseActions($actions); @@ -1260,7 +1260,7 @@ class listing { // Fill image if set $img = ""; if (isset($action['image'])) { - $img = "<img border='0' class='center' src='".$action['image']."'> "; + $img = "<img class='center' src='".$action['image']."' alt='".$action['type']."'/> "; } if ($action['type'] == "separator") { @@ -1272,7 +1272,7 @@ class listing { if ($action['type'] == "sub" && isset($action['action'])) { $level++; if (isset($action['label'])) { - $result .= "<li$separator><a href='#'>$img"._($action['label'])." <img border='0' src='images/forward-arrow.png'></a>"; + $result .= "<li$separator><a href='#'>$img"._($action['label'])." <img src='images/forward-arrow.png' alt='forward arrow'/></a>"; } // Ensure we've an array of actions, this enables sub menus with only one action. @@ -1507,13 +1507,13 @@ class listing { if ($read) { // Copy entry if ($copy) { - $result .= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"copy\";document.getElementById(\"exec_act\").click();'><img src='images/lists/copy.png' alt='' border='0' class='center'> "._("Copy")."</a></li>"; + $result .= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"copy\";document.getElementById(\"exec_act\").click();'><img src='images/lists/copy.png' alt='copy' class='center'> "._("Copy")."</a></li>"; $separator = ""; } // Cut entry if ($cut) { - $result .= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"cut\";document.getElementById(\"exec_act\").click();'><img src='images/lists/cut.png' alt='' border='0' class='center'> "._("Cut")."</a></li>"; + $result .= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"cut\";document.getElementById(\"exec_act\").click();'><img src='images/lists/cut.png' alt='cut' class='center'> "._("Cut")."</a></li>"; $separator = ""; } } @@ -1521,9 +1521,9 @@ class listing { // Draw entries that allow pasting entries if ($paste) { if ($this->copyPasteHandler->entries_queued()) { - $result .= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"paste\";document.getElementById(\"exec_act\").click();'><img src='images/lists/paste.png' alt='' border='0' class='center'> "._("Paste")."</a></li>"; + $result .= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"paste\";document.getElementById(\"exec_act\").click();'><img src='images/lists/paste.png' alt='paste' class='center'> "._("Paste")."</a></li>"; } else { - $result .= "<li$separator><a href='#'><img src='images/lists/paste-grey.png' alt='' border='0' class='center'> "._("Paste")."</a></li>"; + $result .= "<li$separator><a href='#'><img src='images/lists/paste-grey.png' alt='paste' class='center'> "._("Paste")."</a></li>"; } } @@ -1589,9 +1589,9 @@ class listing { // Draw icons according to the restore flag if ($restore) { - $result .= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"restore\";document.getElementById(\"exec_act\").click();'><img src='images/lists/restore.png' alt='' border='0' class='center'> "._("Restore snapshots")."</a></li>"; + $result .= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"restore\";document.getElementById(\"exec_act\").click();'><img src='images/lists/restore.png' alt='restore' class='center'> "._("Restore snapshots")."</a></li>"; } else { - $result .= "<li$separator><a href='#'><img src='images/lists/restore_grey.png' alt='' border='0' class='center'> "._("Restore snapshots")."</a></li>"; + $result .= "<li$separator><a href='#'><img src='images/lists/restore_grey.png' alt='restore' class='center'> "._("Restore snapshots")."</a></li>"; } } @@ -1605,11 +1605,11 @@ class listing { $result = ""; // Draw entries - $result .= "<li$separator><a href='#'><img border='0' class='center' src='images/lists/export.png'> "._("Export list")." <img border='0' src='images/forward-arrow.png'></a><ul class='level3'>"; + $result .= "<li$separator><a href='#'><img class='center' src='images/lists/export.png' alt='export'> "._("Export list")." <img src='images/forward-arrow.png' alt='arrow'></a><ul class='level3'>"; // Export CVS as build in exporter foreach ($this->exporter as $action => $exporter) { - $result .= "<li><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"$action\";document.getElementById(\"exec_act\").click();'><img border='0' class='center' src='".$exporter['image']."'> ".$exporter['label']."</a></li>"; + $result .= "<li><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"$action\";document.getElementById(\"exec_act\").click();'><img class='center' src='".$exporter['image']."' alt='$action'> ".$exporter['label']."</a></li>"; } // Finalize list @@ -1643,7 +1643,7 @@ class listing { "alt='"._("Restore snapshot")."' name='listing_restore_$row' title='". _("Restore snapshot")."' style='padding:1px'>"; } else { - $result .= "<img src='images/lists/restore_grey.png' alt=' ' class='center' style='padding:1px'>"; + $result .= "<img src='images/lists/restore_grey.png' alt='restore' class='center' style='padding:1px'>"; } } diff --git a/include/class_msg_dialog.inc b/include/class_msg_dialog.inc index 8895bea5a3adf2b305356d30232d0c3f25bf534b..861e7987654e8845161711d0f476baf01013cd31 100644 --- a/include/class_msg_dialog.inc +++ b/include/class_msg_dialog.inc @@ -158,7 +158,7 @@ class msg_dialog $display .= $trace; } $display .= - "<table style='width:100%; border:2px solid red;' summary=''> + "<table style='width:100%; border:2px solid red;'> <tr><td style='vertical-align:top;padding:10px'> <img src='images/error.png' alt='{t}Error{/t}'> </td><td style='width:100%'> diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc index a7869da8dda9411b948801820b41950a5b893091..8a3025e1e9440192c76bd7062ced8b68f8506e43 100644 --- a/include/class_pluglist.inc +++ b/include/class_pluglist.inc @@ -278,7 +278,7 @@ class pluglist { continue; } $index = $this->get_index($info['CLASS']); - $href = "main.php?plug=$index&reset=1"; + $href = "main.php?plug=$index&reset=1"; if (isset($info['NAME'])) { $plHeadline = _($info['NAME']); } else { diff --git a/include/class_sortableListing.inc b/include/class_sortableListing.inc index 24f54e58b4d0c3128b83a76a3b434513fedacd42..232369ea9cbf7b33052b9d6f5388ccdce2ccb041 100644 --- a/include/class_sortableListing.inc +++ b/include/class_sortableListing.inc @@ -302,7 +302,7 @@ class sortableListing { public function render() { $result = "<div class='sortableListContainer' id='scroll_".$this->id."' style='min-width:".$this->width.";height: ".$this->height."'>\n"; - $result .= "<table summary='"._("Sortable list")."' border='0' cellpadding='0' cellspacing='0' width='100%' style='width:100%' ".(!empty($this->cssclass)?" class='".$this->cssclass."'":"").">\n"; + $result .= "<table cellpadding='0' style='width:100%;border-spacing:0px;border:none;' ".(!empty($this->cssclass)?" class='".$this->cssclass."'":"").">\n"; $action_width = 0; if (strpos($this->acl, 'w') === FALSE) { $edit_image = $this->editable?"<img class='center' src='images/lists/edit-grey.png' alt='"._("Edit")."'>":""; @@ -342,8 +342,8 @@ class sortableListing { $link = "href='?plug=".$_GET['plug']."&PID=".$this->id."&act=SORT_$i'"; $sorter = ""; if ($i == $this->sortColumn) { - $sorter = " <img border='0' title='".($this->sortDirection[$i]?_("Up"):_("Down"))."' - src='images/lists/sort-".($this->sortDirection[$i]?"up":"down").".png' align='top'>"; + $sorter = " <img title='".($this->sortDirection[$i]?_("Up"):_("Down"))."' + src='images/lists/sort-".($this->sortDirection[$i]?"up":"down").".png'/>"; } if ($this->reorderable) { @@ -416,7 +416,7 @@ class sortableListing { $result .= " <input type='hidden' name='reorder_".$this->id."' id='reorder_".$this->id."'>\n"; // Append script stuff if needed - $result .= '<script type="text/javascript" language="javascript">'; + $result .= '<script type="text/javascript">'; if ($this->reorderable) { $result .= ' function updateOrder(){'; $result .= ' var ampcharcode= \'%26\';'; diff --git a/include/class_tabs.inc b/include/class_tabs.inc index 5407b711ab688827d9a0e5f57a1a57bcacecd39b..d4f270946bf1522d401b898d74194f27822617d7 100644 --- a/include/class_tabs.inc +++ b/include/class_tabs.inc @@ -153,7 +153,7 @@ class tabs function execute() { /* Show object */ - $display = "<table summary=\"\" cellpadding=4 cellspacing=0 border=0 style=\"width:100%; background-color:#F8F8F8; border-style:solid; border-color:#AAA; border-top-width:0px; border-bottom-width:1px; border-left-width:1px; border-right-width:1px;\">\n"; + $display = '<table cellpadding="4" style="width:100%; background-color:#F8F8F8; border-style:solid; border-color:#AAA; border-top-width:0px; border-bottom-width:1px; border-left-width:1px; border-right-width:1px; border-spacing:0px;">'."\n"; $display .= "<tr><td>\n"; $display .= $this->by_object[$this->current]->execute(); @@ -209,11 +209,11 @@ class tabs { $display = ""; if (!$disabled) { - $display .= "<input type=\"hidden\" name=\"arg\" value=\"\">"; + $display .= '<input type="hidden" name="arg" value=""/>'; } - $display .= "<table summary=\"\" cellpadding=0 cellspacing=0 border=0 style=\"width:100%;\"><tr>"; - $index = 0; - $style = array("tab_left", "tab_active", "tab_near_active", "tab_right"); + $display .= '<table class="tabs_header"><tbody><tr>'; + $index = 0; + $style = array("tab_left", "tab_active", "tab_near_active", "tab_right"); foreach ($this->by_name as $class => $name) { /* Activate right tabs with style "tab_right" @@ -261,8 +261,9 @@ class tabs $display .= "<div class=\"$style[$index]$notify\"><a class=\"$style[$index]\" onclick=\"return true;\" href=\"javascript:document.mainform.arg.value='$class';document.mainform.submit();\">$title</a></div></td>"; } } - $display .= "<td style=\"vertical-align:bottom;\">\n"; - $display .= "<div class=\"tab_border\"> </div></td></tr></table>"; + + $display.= "<td style=\"vertical-align:bottom;\">\n"; + $display.= "<div class=\"tab_border\"> </div></td></tr></tbody></table>"; return $display; } diff --git a/include/functions.inc b/include/functions.inc index 28f938cd83a01efa5b93ca3ddb4dd88e86a0816b..8e6842a7354f43f553fe923d3432c5c46e2e1f77 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -1924,7 +1924,7 @@ function range_selector($dcnt, $start, $range = 25, $post_var = FALSE) if ($post_var) { $output .= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'> - <table summary='' width='100%'><tr><td style='width:25%'></td><td style='text-align:center;'>"; + <table width='100%'><tr><td style='width:25%'></td><td style='text-align:center;'>"; } else { $output .= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'>"; } @@ -1933,7 +1933,7 @@ function range_selector($dcnt, $start, $range = 25, $post_var = FALSE) if ($start > 0 ) { $output .= " <a href= \"main.php?plug=".validate($_GET['plug'])."&start=". ($start - $range)."\">". - "<img class=\"center\" alt=\"\" src=\"images/back.png\" border=0 align=\"middle\"></a>"; + '<img class="center" alt="back" src="images/back.png"/></a>'; } /* Draw pages */ @@ -1952,7 +1952,7 @@ function range_selector($dcnt, $start, $range = 25, $post_var = FALSE) if ($start < ($dcnt - $range)) { $output .= " <a href= \"main.php?plug=".validate($_GET['plug'])."&start=". ($start + $range)."\">". - "<img class=\"center\" alt=\"\" src=\"images/forward.png\" border=\"0\" align=\"middle\"></a>"; + '<img class="center" alt="forward" src="images/forward.png"/></a>'; } if ($post_var && $numpages) { @@ -1985,8 +1985,8 @@ function range_selector($dcnt, $start, $range = 25, $post_var = FALSE) */ function apply_filter() { - return '<table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;">'. - '<tr><td width="100%" align="right">'. + return '<table width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;">'. + '<tr><td style="width:100%;text-align:right;">'. '<input type="submit" name="apply" value="'._("Apply filter").'">'. '</td></tr></table>'; } diff --git a/include/functions_debug.inc b/include/functions_debug.inc index face794e516a6d8eef6e43b60f6d39aed8bee5f7..ba9705ba10e210d881c5bf9fe40dbe5e72b7e3ee 100644 --- a/include/functions_debug.inc +++ b/include/functions_debug.inc @@ -9,7 +9,7 @@ * License.......: Free to use. Postcardware ;) * *----------------------------------------------------------------------- -* +* * Functions in this library: * * print_a( array array [,int mode] ) @@ -49,7 +49,7 @@ * \file functions_debug.inc * Source code for print_a class * and helper function - */ + */ /*! * \brief print_a class and helper function @@ -81,7 +81,7 @@ class Print_a_class { /*! * \brief Print_a_class constructor - */ + */ function Print_a_class() { $this->export_hash = uniqid(''); } @@ -130,7 +130,7 @@ class Print_a_class { } # build a single table ... may be nested - $this->output .= '<table summary="" style="border:none;" cellspacing="1" '.( !$iteration && $this->export_flag ? 'onClick="document.getElementById(\'pa_form_'.$this->export_hash.'\').submit();" )' : '' ).'>'; + $this->output .= '<table style="border:none;" cellspacing="1" '.( !$iteration && $this->export_flag ? 'onClick="document.getElementById(\'pa_form_'.$this->export_hash.'\').submit();" )' : '' ).'>'; foreach( $array as $key => $value ) { $value_style = 'color:black;'; @@ -263,7 +263,7 @@ function _script_globals() { /*! * \brief Show the runtime - */ + */ function show_runtime() { $MICROTIME_END = microtime(); $MICROTIME_START = explode(' ', $GLOBALS['MICROTIME_START']); @@ -334,7 +334,7 @@ function show_vars($show_all_vars = FALSE, $show_object_vars = FALSE) { * \param string $sql_string * * \param boolean $simple_mode FALSE - */ + */ function pre($sql_string, $simple_mode = FALSE) { if(!$simple_mode) { diff --git a/include/php_setup.inc b/include/php_setup.inc index ee19737cde7f1140c3bcf4a8e0b05a616437180e..728f9ce5d18464409e4bf3b95fef7c52d3a3f56b 100644 --- a/include/php_setup.inc +++ b/include/php_setup.inc @@ -33,7 +33,7 @@ function html_trace($errstr = "") } $trace = debug_backtrace(); - $return_html = "<table summary=\"\" width=\"100%\" cellspacing=0 style='background-color:#402005;color:white;border:2px solid red'><tr><td colspan=3><h1 style='color:white'>"._("PHP error")." \"$errstr\"</h1></td></tr>"; + $return_html = "<table width=\"100%\" cellspacing=0 style='background-color:#402005;color:white;border:2px solid red'><tr><td colspan=3><h1 style='color:white'>"._("PHP error")." \"$errstr\"</h1></td></tr>"; $return_mailto = rawurlencode("=== Trace ==="); /* Generate trace history */ for ($index = 0, $c = count($trace); $index < $c; $index++) { @@ -198,10 +198,10 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline) $warning_path = (is_callable('get_template_path') ? get_template_path('images/warning.png') : 'images/warning.png'); $error_collector = " - <table summary=\"\" width=\"100%\" style='background-color:#E0E0E0;border-bottom:1px solid black;z-index:150;'> + <table width=\"100%\" style='background-color:#E0E0E0;border-bottom:1px solid black;z-index:150;'> <tr> <td> - <img alt=\"\" align=\"middle\" src='{$warning_path}'> + <img alt=\"\" src='{$warning_path}'> <font style='font-size:14px;font-weight:bold'>". _("Generating this page caused the PHP interpreter to raise some errors!")." </font> diff --git a/include/simpleplugin/systemSelect/systemSelect-filter.tpl b/include/simpleplugin/systemSelect/systemSelect-filter.tpl index 24fc714a1a643f1dcafafffe92f742184b658edc..7f3e01ad4ee59df3628d235d67f7af70fbcb0e2d 100644 --- a/include/simpleplugin/systemSelect/systemSelect-filter.tpl +++ b/include/simpleplugin/systemSelect/systemSelect-filter.tpl @@ -1,6 +1,6 @@ <div class="contentboxh"> <p class="contentboxh"> - <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t} + <img src="images/launch.png" alt="[F]">{t}Filter{/t} </p> </div> @@ -15,11 +15,11 @@ {$SCOPE} - <table summary="" style="width:100%;border-top:1px solid #B0B0B0;"> + <table style="width:100%;border-top:1px solid #B0B0B0;"> <tr> <td> <label for="NAME"> - <img src="images/lists/search.png" align=middle> {t}Name{/t} + <img src="images/lists/search.png"/> {t}Name{/t} </label> </td> <td> @@ -28,9 +28,9 @@ </tr> </table> - <table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"> + <table width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"> <tr> - <td width="100%" align="right"> + <td style="width:100%;text-align:right;"> {$APPLY} </td> </tr> diff --git a/plugins/admin/acl/acl-filter.tpl b/plugins/admin/acl/acl-filter.tpl index 8525f543fe7fa504683f978d2c49492b2a35a170..fbc4f23139c264385ee4944fef4b7775fc25c64d 100644 --- a/plugins/admin/acl/acl-filter.tpl +++ b/plugins/admin/acl/acl-filter.tpl @@ -1,6 +1,6 @@ <div class="contentboxh"> <p class="contentboxh"> - <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t} + <img src="images/launch.png" alt="[F]"/>{t}Filter{/t} </p> </div> @@ -16,7 +16,7 @@ <tr> <td> <label for="NAME"> - <img src="images/lists/search.png" align=middle> {t}Name{/t} + <img src="images/lists/search.png"/> {t}Name{/t} </label> </td> <td> @@ -25,9 +25,9 @@ </tr> </table> - <table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"> + <table style="width:100%;background:#EEEEEE;border-top:1px solid #B0B0B0;"> <tr> - <td width="100%" align="right"> + <td style="width:100%;text-align:right;"> {$APPLY} </td> </tr> diff --git a/plugins/admin/acl/remove.tpl b/plugins/admin/acl/remove.tpl index 8d54075aa0a8057c967d23a2bb3e91f5df4c4300..3e333737955c7ad36bdaa27eedd53d990d30c550 100644 --- a/plugins/admin/acl/remove.tpl +++ b/plugins/admin/acl/remove.tpl @@ -1,5 +1,5 @@ <div style="font-size:18px;"> - <img alt="" src="images/warning.png" align=top> {t}Warning{/t} + <img alt="" src="images/warning.png"> {t}Warning{/t} </div> <p> {$info} diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc index 546da4127ae974135ec2860290bccb6f59e01f1f..ba21e76593dd9027f6b0787502feadd2fa108963 100644 --- a/plugins/admin/departments/class_department.inc +++ b/plugins/admin/departments/class_department.inc @@ -394,7 +394,7 @@ class department extends plugin <head> <title></title> <style type="text/css">@import url("themes/default/style.css");</style> - <script language="javascript" src="include/focus.js" type="text/javascript"></script> + <script src="include/focus.js" type="text/javascript"></script> </head> <body style="background: none; margin:4px;" id="body" > '; diff --git a/plugins/admin/departments/country.tpl b/plugins/admin/departments/country.tpl index d2f5d81a85f7dbe078f2ca285ba951910b46f474..a2d4ad804007cfe08a24d67e0477b2a5f6f77cc0 100644 --- a/plugins/admin/departments/country.tpl +++ b/plugins/admin/departments/country.tpl @@ -5,7 +5,7 @@ <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4> <tr> <td style="vertical-align:top; width:50%"> - <h2><img class="center" alt="" align="middle" src="images/rightarrow.png"> {t}Properties{/t}</h2> + <h2><img class="center" alt="" src="images/rightarrow.png"> {t}Properties{/t}</h2> <table summary=""> <tr> <td><LABEL for="c">{t}Country name{/t}</LABEL>{$must}</td> diff --git a/plugins/admin/departments/dcObject.tpl b/plugins/admin/departments/dcObject.tpl index ee56c06579164a6b6b37ed3d55cc3af5aabac4fa..f083c1037c79a72790a1a2f88d1661594092fc5e 100644 --- a/plugins/admin/departments/dcObject.tpl +++ b/plugins/admin/departments/dcObject.tpl @@ -5,7 +5,7 @@ <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4> <tr> <td style="vertical-align:top; width:50%"> - <h2><img class="center" alt="" align="middle" src="images/rightarrow.png"> {t}Properties{/t}</h2> + <h2><img class="center" alt="" src="images/rightarrow.png"> {t}Properties{/t}</h2> <table summary=""> <tr> <td><LABEL for="dc">{t}Locality name{/t}</LABEL>{$must}</td> diff --git a/plugins/admin/departments/dep-filter.tpl b/plugins/admin/departments/dep-filter.tpl index 550553b47fca4c6712ae9da74a03334b1c2b9e09..e2707ff8c743739f1a4084858783dd7d803652a4 100644 --- a/plugins/admin/departments/dep-filter.tpl +++ b/plugins/admin/departments/dep-filter.tpl @@ -1,6 +1,6 @@ <div class="contentboxh"> <p class="contentboxh"> - <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t} + <img src="images/launch.png" alt="[F]">{t}Filter{/t} </p> </div> @@ -13,7 +13,7 @@ <tr> <td> <label for="NAME"> - <img src="images/lists/search.png" align=middle> {t}Name{/t} + <img src="images/lists/search.png"/> {t}Name{/t} </label> </td> <td> @@ -22,9 +22,9 @@ </tr> </table> - <table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"> + <table style="width:100%;background:#EEEEEE;border-top:1px solid #B0B0B0;"> <tr> - <td width="100%" align="right"> + <td style="width:100%;text-align:right;"> {$APPLY} </td> </tr> diff --git a/plugins/admin/departments/dep_move_confirm.tpl b/plugins/admin/departments/dep_move_confirm.tpl index b5ad190669191c401f5550eecdc0982d54395a12..c540c1292f367454686d0b364e782d459a28bbf5 100644 --- a/plugins/admin/departments/dep_move_confirm.tpl +++ b/plugins/admin/departments/dep_move_confirm.tpl @@ -1,5 +1,5 @@ <div style="font-size:18px;"> - <img alt="" src="images/warning.png" align=top> {t}Warning{/t} - {t}You are currently moving/renaming this department.{/t} + <img alt="" src="images/warning.png"/> {t}Warning{/t} - {t}You are currently moving/renaming this department.{/t} </div> <p> {t}Modifying a departments naming attribute 'ou' or base may corrupt acls and snapshot entries for all entire objects.{/t} @@ -8,7 +8,7 @@ {t}FusionDirectory can NOT fix this for you, yet.{/t} </p> <p> -{t}Before you confirm this action, ensure that everything will be as expected, possibly the best solution is a backup.{/t} +{t}Before you confirm this action, ensure that everything will be as expected, possibly the best solution is a backup.{/t} </p> <p class="plugbottom"> diff --git a/plugins/admin/departments/domain.tpl b/plugins/admin/departments/domain.tpl index a614f77f217e47000ae3edae5fe2beeca6a346ba..746dd3b42c47471a2acaec2818fd9e4a73655556 100644 --- a/plugins/admin/departments/domain.tpl +++ b/plugins/admin/departments/domain.tpl @@ -5,7 +5,7 @@ <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4> <tr> <td style="vertical-align:top; width:50%"> - <h2><img class="center" alt="" align="middle" src="images/rightarrow.png"> {t}Properties{/t}</h2> + <h2><img class="center" alt="" src="images/rightarrow.png"> {t}Properties{/t}</h2> <table summary=""> <tr> <td><LABEL for="dc">{t}Domain name{/t}</LABEL>{$must}</td> diff --git a/plugins/admin/departments/generic.tpl b/plugins/admin/departments/generic.tpl index be8386450d5412fa0221f27b14f4aeee1f2f17f8..d97b05e517287924d5a8b0e3d864ca754c6e124b 100644 --- a/plugins/admin/departments/generic.tpl +++ b/plugins/admin/departments/generic.tpl @@ -1,12 +1,12 @@ <!--//////////////////// // ORGANIZATIONAL UNIT (ou) //////////////////// --> -<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4> +<table style="width:100%; vertical-align:top; text-align:left;" cellpadding=4> <tr> <td style="vertical-align:top; width:50%"> - <h2><img class="center" alt="" align="middle" src="images/rightarrow.png"> {t}Properties{/t}</h2> + <h2><img class="center" alt="" src="images/rightarrow.png"> {t}Properties{/t}</h2> - <table summary=""> + <table> <tr> <td><LABEL for="ou">{t}Name of department{/t}</LABEL>{$must}</td> <td> @@ -76,9 +76,9 @@ </td> <td> - <h2><img class="center" alt="" align="middle" src="plugins/departments/images/department.png"> {t}Location{/t}</h2> + <h2><img class="center" alt="" src="plugins/departments/images/department.png"> {t}Location{/t}</h2> - <table summary="" style="width:100%"> + <table style="width:100%"> <tr> <td><LABEL for="st">{t}State{/t}</LABEL></td> <td> @@ -128,7 +128,7 @@ <!-- Place cursor --> <input type='hidden' name='dep_generic_posted' value='1'> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page focus_field('ou'); --> diff --git a/plugins/admin/departments/locality.tpl b/plugins/admin/departments/locality.tpl index 0f929aa0d2fb8ad20060b4cd5a11009d9c7de3d8..3c24bb25a3240ddb9b6ad5cbc19b84e5d8eed244 100644 --- a/plugins/admin/departments/locality.tpl +++ b/plugins/admin/departments/locality.tpl @@ -5,7 +5,7 @@ <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4> <tr> <td style="vertical-align:top; width:50%"> - <h2><img class="center" alt="" align="middle" src="images/rightarrow.png"> {t}Properties{/t}</h2> + <h2><img class="center" alt="" src="images/rightarrow.png"> {t}Properties{/t}</h2> <table summary=""> <tr> <td><LABEL for="l">{t}Locality name{/t}</LABEL>{$must}</td> diff --git a/plugins/admin/departments/organization.tpl b/plugins/admin/departments/organization.tpl index 18c987682a465e9710206144c12a8f3abbb36406..6c1b13c8c34cebe5314da430652d27bd4fba2c19 100644 --- a/plugins/admin/departments/organization.tpl +++ b/plugins/admin/departments/organization.tpl @@ -1,12 +1,12 @@ <!--//////////////////// // ORGANIZATION (o) //////////////////// --> -<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4> +<table style="width:100%; vertical-align:top; text-align:left;" cellpadding=4> <tr> <td style="vertical-align:top; width:50%"> - <h2><img class="center" alt="" align="middle" src="images/rightarrow.png"> {t}Properties{/t}</h2> + <h2><img class="center" alt="" src="images/rightarrow.png"> {t}Properties{/t}</h2> - <table summary=""> + <table> <tr> <td><LABEL for="o">{t}Name of organization{/t}</LABEL>{$must}</td> <td> @@ -75,9 +75,9 @@ </td> <td> - <h2><img class="center" alt="" align="middle" src="plugins/departments/images/department.png"> {t}Location{/t}</h2> + <h2><img class="center" alt="" src="plugins/departments/images/department.png"> {t}Location{/t}</h2> - <table summary="" style="width:100%"> + <table style="width:100%"> <tr> <td><LABEL for="st">{t}State{/t}</LABEL></td> <td> @@ -127,7 +127,7 @@ <!-- Place cursor --> <input type='hidden' name='dep_generic_posted' value='1'> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page focus_field('o'); --> diff --git a/plugins/admin/departments/remove.tpl b/plugins/admin/departments/remove.tpl index 6e55563897c18b3b5bb2c3b0689c3b22f15c2d70..2f2275f06996244e2bb7e3a3e3d19158e53f7380 100644 --- a/plugins/admin/departments/remove.tpl +++ b/plugins/admin/departments/remove.tpl @@ -1,5 +1,5 @@ <div style="font-size:18px;"> - <img alt="" src="images/warning.png" align=top> {t}Warning{/t} + <img alt="" src="images/warning.png"/> {t}Warning{/t} </div> <p> {$info} diff --git a/plugins/admin/groups/generic.tpl b/plugins/admin/groups/generic.tpl index 5f6bd129f6908fd4b1cac9ccb88662a6840ad420..54f0f9790b06da0d9105cd21c02262d9b47cb87f 100644 --- a/plugins/admin/groups/generic.tpl +++ b/plugins/admin/groups/generic.tpl @@ -1,7 +1,7 @@ -<table summary="" style="width:100%;"> +<table style="width:100%;"> <tr> <td style="width:50%; vertical-align:top;"> - <table summary="" style="width:100%"> + <table style="width:100%"> <tr> <td><LABEL for="cn">{t}Group name{/t}</LABEL>{$must}</td> <td> @@ -149,7 +149,7 @@ <td style="vertical-align:top;"> - <table summary="" style="width:100%"> + <table style="width:100%"> <tr> <td style="vertical-align:top; width:50%"> <b><LABEL for="members">{t}Group members{/t}</LABEL></b> @@ -180,7 +180,7 @@ <input type="hidden" name="groupedit" value="1"> <!-- Place cursor --> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page focus_field('cn'); --> diff --git a/plugins/admin/groups/paste_generic.tpl b/plugins/admin/groups/paste_generic.tpl index 7de63d67bb5eff2b090696ec3a478384e0c97402..c705cdb1ef8ad08d411bab0403212d2c1fd02818 100644 --- a/plugins/admin/groups/paste_generic.tpl +++ b/plugins/admin/groups/paste_generic.tpl @@ -10,7 +10,7 @@ </tr> <tr> <td> - <input type=checkbox name='force_gid' value='1' {$used} title='{t}Normally IDs are autogenerated, select to specify manually{/t}' + <input type=checkbox name='force_gid' value='1' {$used} title='{t}Normally IDs are autogenerated, select to specify manually{/t}' onclick='changeState("gidNumber")'> <LABEL for='gidNumber'>{t}Force GID{/t}</LABEL> </td> @@ -20,6 +20,6 @@ </tr> </table> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> focus_field('cn'); </script> diff --git a/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl b/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl index ac5d0561c192e0951d06a23889a26f924ab2ab56..e86084c937783b553917cdc374f26414b62adf0e 100644 --- a/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl +++ b/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl @@ -1,6 +1,6 @@ <div class="contentboxh"> <p class="contentboxh"> - <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t} + <img src="images/launch.png" alt="[F]">{t}Filter{/t} </p> </div> @@ -16,7 +16,7 @@ <tr> <td> <label for="NAME"> - <img src="images/lists/search.png" align=middle> {t}Name{/t} + <img src="images/lists/search.png"/> {t}Name{/t} </label> </td> <td> @@ -25,9 +25,9 @@ </tr> </table> - <table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"> + <table style="width:100%;background:#EEEEEE;border-top:1px solid #B0B0B0;"> <tr> - <td width="100%" align="right"> + <td style="width:100%;text-align:right;"> {$APPLY} </td> </tr> diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc index 80135bb0f2a98a1f8f8332265ea33726536206fc..b0ebe27c841c3445cd2381039b0eb140b52c20f0 100644 --- a/plugins/admin/ogroups/class_ogroup.inc +++ b/plugins/admin/ogroups/class_ogroup.inc @@ -265,7 +265,7 @@ class ogroup extends plugin /* Do we represent a valid group? */ if (!$this->is_account){ - $display= "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\"> <b>". + $display= "<img alt=\"\" src=\"images/small-error.png\"> <b>". msgPool::noValidExtension("object group")."</b>"; return ($display); } diff --git a/plugins/admin/ogroups/generic.tpl b/plugins/admin/ogroups/generic.tpl index f5758bc4a5a89db1be84e78cdd45fa437a95cc7e..c2f42d9cdc8d024bed0e42712ab47d78850b2432 100644 --- a/plugins/admin/ogroups/generic.tpl +++ b/plugins/admin/ogroups/generic.tpl @@ -1,8 +1,8 @@ -<table summary="" style="width:100%;"> +<table style="width:100%;"> <tr> <td style="width:50%; vertical-align:top"> <input type="hidden" name="ogroupedit" value="1"> - <table summary=""> + <table> <tr> <td><LABEL for="cn">{t}Group name{/t}</LABEL>{$must}</td> <td> @@ -33,7 +33,7 @@ </table> <p class="seperator"> </p> - <h2><img alt="" class="center" align="middle" src="images/lists/locked.png" /> {t}System trust{/t}</h2> + <h2><img alt="" class="center" src="images/lists/locked.png" /> {t}System trust{/t}</h2> {t}Trust mode{/t} {render acl=$trustmodeACL} <select name="trustmode" id="trustmode" size=1 @@ -81,7 +81,7 @@ </table> <!-- Place cursor --> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page focus_field('cn'); --> diff --git a/plugins/admin/ogroups/objectSelect/selectObject-filter.tpl b/plugins/admin/ogroups/objectSelect/selectObject-filter.tpl index d24f1f233637f5c1eb99ca02c3c4f8fdd6323a06..e633f5634a24bd7f50c389fca3bd250ba6ff33e6 100644 --- a/plugins/admin/ogroups/objectSelect/selectObject-filter.tpl +++ b/plugins/admin/ogroups/objectSelect/selectObject-filter.tpl @@ -1,6 +1,6 @@ <div class="contentboxh"> <p class="contentboxh"> - <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t} + <img src="images/launch.png" alt="[F]">{t}Filter{/t} </p> </div> @@ -25,7 +25,7 @@ <tr> <td> <label for="NAME"> - <img src="images/lists/search.png" align=middle> {t}Name{/t} + <img src="images/lists/search.png"/> {t}Name{/t} </label> </td> <td> @@ -34,9 +34,9 @@ </tr> </table> - <table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"> + <table style="width:100%;background:#EEEEEE;border-top:1px solid #B0B0B0;"> <tr> - <td width="100%" align="right"> + <td style="width:100%;text-align:right;"> {$APPLY} </td> </tr> diff --git a/plugins/admin/ogroups/ogroup-filter.tpl b/plugins/admin/ogroups/ogroup-filter.tpl index 95b7abed4dbdefe14d41f3555a79d1fad6d2c433..11d09ab0b4c6bc4754a72b1df6a7e0f798069b7a 100644 --- a/plugins/admin/ogroups/ogroup-filter.tpl +++ b/plugins/admin/ogroups/ogroup-filter.tpl @@ -1,6 +1,6 @@ <div class="contentboxh"> <p class="contentboxh"> - <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t} + <img src="images/launch.png" alt="[F]">{t}Filter{/t} </p> </div> @@ -24,7 +24,7 @@ <tr> <td> <label for="NAME"> - <img src="images/lists/search.png" align=middle> {t}Name{/t} + <img src="images/lists/search.png"/> {t}Name{/t} </label> </td> <td> @@ -33,9 +33,9 @@ </tr> </table> - <table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"> + <table style="width:100%;background:#EEEEEE;border-top:1px solid #B0B0B0;"> <tr> - <td width="100%" align="right"> + <td style="width:100%;text-align:right;"> {$APPLY} </td> </tr> diff --git a/plugins/admin/ogroups/ogroup_objects.tpl b/plugins/admin/ogroups/ogroup_objects.tpl index cd8d3960e1661763f1e01fe53217344e0a2eab64..fb481ad7f3443279db794b5382de6073f1dc6d8b 100644 --- a/plugins/admin/ogroups/ogroup_objects.tpl +++ b/plugins/admin/ogroups/ogroup_objects.tpl @@ -17,7 +17,7 @@ </td> <td style="vertical-align:top;"> <div class="contentboxh" style="height:20px;"> - <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" align="right" alt="[F]"><b>{t}Filters{/t}</b></p> + <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" alt="[F]"/><b>{t}Filters{/t}</b></p> </div> <div class="contentboxb"> <table summary="" style="width:100%;border-top:1px solid #B0B0B0; background-color:#F8F8F8"> @@ -25,7 +25,7 @@ </table> <p class="contentboxb" style="border-top:1px solid #B0B0B0; background-color:#F8F8F8"> {foreach from=$checkboxes item=item key=key} - <input type='checkbox' {if $item.C} checked {/if} class="center" onClick="document.mainform.submit();" + <input type='checkbox' {if $item.C} checked {/if} class="center" onClick="document.mainform.submit();" name="{$key}" value="1" title="{$item.T}">{$item.L}<br> {/foreach} </p> @@ -33,11 +33,11 @@ <input type=checkbox name="subtrees" value="1" {$subtrees} onClick="mainform.submit()" title="{t}Select to search within subtrees{/t}">{t}Search in subtrees{/t}<br> </p> - <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$tree_image}" align=middle title="{t}Display objects of department{/t}"> + <table width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$tree_image}" align=middle title="{t}Display objects of department{/t}"> <select name="dselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}"> {html_options options=$deplist selected=$dselect} </select></td></tr></table> - <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td style="width:18px"><img alt="" src="{$search_image}" align=middle title="{t}Display objects matching{/t}"></td> + <table width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td style="width:18px"><img alt="" src="{$search_image}" align=middle title="{t}Display objects matching{/t}"></td> <td><input type='text' name='regex' maxlength='20' style="width:99%" value='{$regex}' title='{t}Regular expression for matching object names{/t}' onChange="mainform.submit()"></td></tr></table> {$apply} </div> diff --git a/plugins/admin/ogroups/paste_generic.tpl b/plugins/admin/ogroups/paste_generic.tpl index da73dc797d4ac54a3d2f721915f6e59f81e12589..555a227f6bfd13f88c96b060cd3fa0beb3265220 100644 --- a/plugins/admin/ogroups/paste_generic.tpl +++ b/plugins/admin/ogroups/paste_generic.tpl @@ -4,11 +4,11 @@ <LABEL for="cn">{t}Group name{/t}</LABEL>{$must} </td> <td> - <input type='text' id='cn' name='cn' value='{$cn}' size='40' title='{t}Please enter the new object group name{/t}'> + <input type='text' id='cn' name='cn' value='{$cn}' size='40' title='{t}Please enter the new object group name{/t}'> </td> </tr> </table> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> focus_field('cn'); </script> diff --git a/plugins/admin/ogroups/remove.tpl b/plugins/admin/ogroups/remove.tpl index b875c3fb71a23c6cd17b27cd6b8e1e50b19c4967..8b63d314bbf235817f828493ce72d7e9b16e59d7 100644 --- a/plugins/admin/ogroups/remove.tpl +++ b/plugins/admin/ogroups/remove.tpl @@ -1,5 +1,5 @@ <div style="font-size:18px;"> - <img alt="" src="images/warning.png" align=top> {t}Warning{/t} + <img alt="" src="images/warning.png"/> {t}Warning{/t} </div> <p> {$info} diff --git a/plugins/admin/ogroups/trust_machines.tpl b/plugins/admin/ogroups/trust_machines.tpl index 13a515f6db2099278bb71383f8da82cced0d64b2..626572e54a0b21ad1d90ee355c2ca80ba280f1dd 100644 --- a/plugins/admin/ogroups/trust_machines.tpl +++ b/plugins/admin/ogroups/trust_machines.tpl @@ -16,18 +16,18 @@ </td> <td style="vertical-align:top; width:350px"> <div class="contentboxh" style="height:20px;"> - <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" align="right" alt="[F]"><b>{ + <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" alt="[F]"><b>{ t}Filters{/t}</b></p> </div> <div class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"> <table summary="" style="width:100%;"> {$alphabet} </table> - <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$tree_image}" align=middle> {t}Display systems of department{/t}</td> + <table width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$tree_image}"/> {t}Display systems of department{/t}</td> <td><select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}"> {html_options options=$deplist selected=$depselect} </select></td></tr></table> - <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$search_image}" align=middle> {t}Display systems matching{/t}</td> + <table width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$search_image}"/> {t}Display systems matching{/t}</td> <td><input type='text' name='regex' maxlength='20' value='{$regex}' title='{t}Regular expression for matching addresses{/t}' onChange="mainform.submit()"></td></tr></table> {$apply} </div> diff --git a/plugins/admin/users/password.tpl b/plugins/admin/users/password.tpl index fce0175525a8f3a0d20520a45f25f4527af90003..f9410049f2ea7c533497f5337445eeca7048fab8 100644 --- a/plugins/admin/users/password.tpl +++ b/plugins/admin/users/password.tpl @@ -12,7 +12,7 @@ {if !$proposalEnabled} - <table summary="" style="vertical-align:top; text-align:left;" cellpadding=4 border=0> + <table style="vertical-align:top; text-align:left;" cellpadding=4 border=0> <tr> <td><b><LABEL for="new_password">{t}New password{/t}</LABEL></b></td> <td><input type="password" id="new_password" name="new_password" onFocus="nextfield= 'repeated_password';" onkeyup="testPasswordCss(document.getElementById('new_password').value);"></td> @@ -32,7 +32,7 @@ {else} - <table summary="{t}Password input dialog{/t}" cellpadding=4 border=0> + <table cellpadding="4" border="0"> <tr> <td> <input type='radio' value='1' name='proposalSelected' id='proposalSelected' onClick='updateFields();' @@ -95,7 +95,7 @@ </p> {literal} -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> nextfield= 'current_password'; focus_field('current_password'); diff --git a/plugins/admin/users/remove.tpl b/plugins/admin/users/remove.tpl index 8d54075aa0a8057c967d23a2bb3e91f5df4c4300..ab19bd8592cc43c7ea9359758245dfbb1a93b01e 100644 --- a/plugins/admin/users/remove.tpl +++ b/plugins/admin/users/remove.tpl @@ -1,5 +1,5 @@ <div style="font-size:18px;"> - <img alt="" src="images/warning.png" align=top> {t}Warning{/t} + <img alt="" src="images/warning.png"/> {t}Warning{/t} </div> <p> {$info} diff --git a/plugins/admin/users/template.tpl b/plugins/admin/users/template.tpl index e94da7d1c628ad248352f1c5465522d3461e1f7b..c8ae0eb0f720a9217956b43cbc660ba005c7b1d7 100644 --- a/plugins/admin/users/template.tpl +++ b/plugins/admin/users/template.tpl @@ -10,7 +10,7 @@ <br> -<table summary="" style="vertical-align:top; text-align:left;" cellpadding=4 border=0> +<table style="vertical-align:top; text-align:left;" cellpadding=4 border=0> <tr> <td><b><LABEL for="template">{t}Template{/t}</LABEL></b></td> <td> @@ -53,7 +53,7 @@ <!-- Place cursor --> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page focus_field('sn'); --> diff --git a/plugins/admin/users/templatize.tpl b/plugins/admin/users/templatize.tpl index 3b17a8d58063fc14f8e8bab8a38d86915d6f699e..811152a18857cb9447ded60f0853cc19ff7bf53c 100644 --- a/plugins/admin/users/templatize.tpl +++ b/plugins/admin/users/templatize.tpl @@ -10,7 +10,7 @@ <br> {if $templates} -<table summary="" style="vertical-align:top; text-align:left;" cellpadding=4 border=0> +<table style="vertical-align:top; text-align:left;" cellpadding=4 border=0> <tr> <td><b><LABEL for="template">{t}Template{/t}</LABEL></b></td> <td> @@ -39,7 +39,7 @@ <!-- Place cursor --> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page focus_field('template'); --> diff --git a/plugins/admin/users/user-filter.tpl b/plugins/admin/users/user-filter.tpl index 987860c98e7141b453c34ba5c9ca5a1ef9c0e3eb..5d69203b7cba27b820d74db379dcea2e74d6e5a2 100644 --- a/plugins/admin/users/user-filter.tpl +++ b/plugins/admin/users/user-filter.tpl @@ -1,27 +1,27 @@ <div class="contentboxh"> <p class="contentboxh"> - <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t} + <img src="images/launch.png" alt="[F]"/>{t}Filter{/t} </p> </div> <div class="contentboxb"> -{$TEMPLATES} <LABEL for='TEMPLATES'>{t}Show templates{/t}</LABEL><br> -{$FUNCTIONAL} <LABEL for='FUNCTIONAL'>{t}Show functional users{/t}</LABEL><br> -{$POSIX} <LABEL for='POSIX'>{t}Show POSIX users{/t}</LABEL><br> +{$TEMPLATES} <label for='TEMPLATES'>{t}Show templates{/t}</label><br/> +{$FUNCTIONAL} <label for='FUNCTIONAL'>{t}Show functional users{/t}</label><br/> +{$POSIX} <label for='POSIX'>{t}Show POSIX users{/t}</label><br/> {if $USE_MAIL} - {$MAIL} <LABEL for='MAIL'>{t}Show Mail users{/t}</LABEL><br> + {$MAIL} <label for='MAIL'>{t}Show Mail users{/t}</label><br/> {/if} -{$SAMBA} <LABEL for='SAMBA'>{t}Show Samba users{/t}</LABEL><br> +{$SAMBA} <label for='SAMBA'>{t}Show Samba users{/t}</label><br/> - <div style="border-top:1px solid #AAAAAA"></div> + <div style="width:100%;border-top:1px solid #AAAAAA"></div> {$SCOPE} - <table summary="" style="width:100%;border-top:1px solid #B0B0B0;"> + <table style="width:100%;border-top:1px solid #B0B0B0;"> <tr> <td> <label for="NAME"> - <img src="images/lists/search.png" align=middle> {t}Name{/t} + <img src="images/lists/search.png" alt='search'/> {t}Name{/t} </label> </td> <td> @@ -30,9 +30,9 @@ </tr> </table> - <table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"> + <table style="width:100%;background:#EEEEEE;border-top:1px solid #B0B0B0;"> <tr> - <td width="100%" align="right"> + <td style="width:100%;text-align:right;"> {$APPLY} </td> </tr> diff --git a/plugins/personal/generic/password.tpl b/plugins/personal/generic/password.tpl index bb270384804cbeae985ad15a0497de37a2e349e5..29d5c27275912db9a2fd7b4d1b44b5c686f08388 100644 --- a/plugins/personal/generic/password.tpl +++ b/plugins/personal/generic/password.tpl @@ -12,20 +12,20 @@ {if !$proposalEnabled} - <table summary="" style="vertical-align:top; text-align:left;" cellpadding=4 border=0> + <table style="vertical-align:top; text-align:left;" cellpadding=4 border=0> <tr> <td><b><LABEL for="current_password">{t}Current password{/t}</LABEL></b></td> - <td><input id="current_password" type="password" name="current_password" + <td><input id="current_password" type="password" name="current_password" onFocus="nextfield= 'new_password';"></td> </tr> <tr> <td><b><LABEL for="new_password">{t}New password{/t}</LABEL></b></td> - <td><input id="new_password" type="password" name="new_password" + <td><input id="new_password" type="password" name="new_password" onFocus="nextfield= 'repeated_password';" onkeyup="testPasswordCss(document.getElementById('new_password').value);"></td> </tr> <tr> <td><b><LABEL for="repeated_password">{t}Repeat new password{/t}</LABEL></b></td> - <td><input id="repeated_password" type="password" name="repeated_password" + <td><input id="repeated_password" type="password" name="repeated_password" onFocus="nextfield= 'password_finish';"></td> </tr> <tr> @@ -39,10 +39,10 @@ {else} - <table cellpadding=4 border=0 summary="{t}Password change dialog{/t}"> + <table cellpadding="4" border="0"> <tr> <td><b><LABEL for="current_password">{t}Current password{/t}</LABEL></b></td> - <td><input id="current_password" type="password" name="current_password" + <td><input id="current_password" type="password" name="current_password" onFocus="nextfield= 'new_password';"></td> </tr> <tr> @@ -70,12 +70,12 @@ </tr> <tr> <td style='padding-left:40px;'><b><LABEL for="new_password">{t}New password{/t}</LABEL></b></td> - <td><input id="new_password" type="password" name="new_password" + <td><input id="new_password" type="password" name="new_password" onFocus="nextfield= 'repeated_password';" onkeyup="testPasswordCss(document.getElementById('new_password').value);"></td> </tr> <tr> <td style='padding-left:40px;'><b><LABEL for="repeated_password">{t}Repeat new password{/t}</LABEL></b></td> - <td><input id="repeated_password" type="password" name="repeated_password" + <td><input id="repeated_password" type="password" name="repeated_password" onFocus="nextfield= 'password_finish';"></td> </tr> <tr> @@ -101,7 +101,7 @@ <input type="hidden" name="ignore"> <!-- Place cursor --> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page nextfield= 'current_password'; focus_field('current_password'); diff --git a/plugins/personal/password/password.tpl b/plugins/personal/password/password.tpl index f0810d196d00d2978c58752a21f5cb287fdae51f..0ce1fcdc5025561096eeb1930e0aaac535ce027c 100644 --- a/plugins/personal/password/password.tpl +++ b/plugins/personal/password/password.tpl @@ -17,7 +17,7 @@ {if !$proposalEnabled} - <table summary="" style="vertical-align:top; text-align:left;" cellpadding=4 border=0> + <table style="vertical-align:top; text-align:left;" cellpadding=4 border=0> <tr> <td><b><LABEL for="current_password">{t}Current password{/t}</LABEL></b></td> <td><input id="current_password" type="password" name="current_password" @@ -44,7 +44,7 @@ {else} - <table cellpadding=4 border=0 summary="{t}Password change dialog{/t}"> + <table cellpadding="4" border="0"> <tr> <td><b><LABEL for="current_password">{t}Current password{/t}</LABEL></b></td> <td><input id="current_password" type="password" name="current_password" @@ -106,7 +106,7 @@ <input type="hidden" name="ignore"> {literal} -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> nextfield= 'current_password'; focus_field('current_password'); diff --git a/plugins/personal/posix/groupSelect/group-filter.tpl b/plugins/personal/posix/groupSelect/group-filter.tpl index 175838af2762c34f5581c07379495da95ec3c86e..8df3794023ac144db7f70f4edd06922ed26de164 100644 --- a/plugins/personal/posix/groupSelect/group-filter.tpl +++ b/plugins/personal/posix/groupSelect/group-filter.tpl @@ -25,9 +25,9 @@ </tr> </table> - <table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;"> + <table style="width:100%;background:#EEEEEE;border-top:1px solid #B0B0B0;"> <tr> - <td width="100%" align="right"> + <td style="width:100%;text-align:right;"> {$APPLY} </td> </tr> diff --git a/setup/setup_ldap.tpl b/setup/setup_ldap.tpl index c183ad4861f9b740d150fc3d006b0f2d2e4d55e2..6df2e22f7591fe9e3112461bcbced67938c2e937 100644 --- a/setup/setup_ldap.tpl +++ b/setup/setup_ldap.tpl @@ -6,7 +6,7 @@ <p> <b>{t}Please choose the LDAP user to be used by FusionDirectory{/t}</b> </p> - <select name='admin_to_use' size=20 style="width:100%; margin-bottom:10px;"> + <select name='admin_to_use' size=20 style="width:100%; margin-bottom:10px;"> {html_options options=$resolved_users selected=$admin} </select> <input type='text' value='{$resolve_filter}' name='resolve_filter'> @@ -16,8 +16,8 @@ <input type='submit' value='{t}Apply{/t}' name='use_selected_user'> <input type='submit' value='{t}Cancel{/t}' name='resolve_user'> </div> - </div> - + </div> + <div style="clear:both;"></div> {else} @@ -51,12 +51,12 @@ </div> </div> <div class='step4_container'> - <div class='step4_name'> + <div class='step4_name'> {t}Base{/t} </div> <div class='step4_value'> {if $namingContextsCount >= 1} - <select name='base'> + <select name='base'> {html_options values=$namingContexts output=$namingContexts selected=$base} </select> {else} @@ -69,7 +69,7 @@ <b>{t}Authentication{/t}</b> </p> <div class='step4_container'> - <div class='step4_name'> + <div class='step4_name'> {t}Admin DN{/t} </div> <div class='step4_value'> @@ -80,7 +80,7 @@ </div> <div class='step4_container'> - <div class='step4_name'> + <div class='step4_name'> </div> <div class='step4_value'> <input onClick='document.mainform.submit();' {if $append_base_to_admin_dn} checked {/if} type='checkbox' name='append_base_to_admin_dn' value='1'> {t}Automatically append LDAP base to admin DN{/t} @@ -128,7 +128,7 @@ </div> <!-- Place cursor --> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page focus_field('location'); --> diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl index 4c4e91f1f516a4f4268900ed0d4dae1d469754ba..c5eb7ea2b75703b2c77d2a7ec904c28290272ba6 100644 --- a/setup/setup_migrate.tpl +++ b/setup/setup_migrate.tpl @@ -266,7 +266,7 @@ </table> <!-- Place cursor --> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // First input field on page focus_field('new_user_password'); -->