From 9a42a8048b8de4ab96afff9d21f49d79e8bacb17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernigaud@laposte.net>
Date: Tue, 18 Jun 2013 13:51:46 +0200
Subject: [PATCH] Fixes: #2510 Adapted HTML code to be valid
Replace font by divs, removed summaries, a few other cleans
---
contrib/smarty/plugins/block.render.php | 30 +++++++++----------
html/main.php | 4 +--
html/themes/default/plugin.css | 6 ++++
html/themes/default/style.css | 2 +-
html/themes/default/tabs.css | 12 ++++++++
ihtml/themes/default/login.tpl | 2 +-
ihtml/themes/default/logout.tpl | 22 +++++++-------
ihtml/themes/default/recovery.tpl | 4 +--
include/class_acl.inc | 2 +-
include/class_divSelectBox.inc | 8 ++---
include/class_msgPool.inc | 2 +-
include/class_tabs.inc | 5 ++--
include/php_setup.inc | 4 +--
.../admin/departments/class_department.inc | 2 +-
plugins/admin/departments/country.tpl | 10 +++----
plugins/admin/departments/dcObject.tpl | 10 +++----
plugins/admin/departments/dep-filter.tpl | 4 +--
plugins/admin/departments/domain.tpl | 10 +++----
plugins/admin/departments/locality.tpl | 4 +--
plugins/personal/password/password.tpl | 2 +-
setup/class_setupStep_Ldap.inc | 6 ++--
setup/class_setupStep_Migrate.inc | 16 +++++-----
setup/setup_feedback.tpl | 22 +++++++-------
setup/setup_frame.tpl | 2 +-
setup/setup_schema.tpl | 6 ++--
25 files changed, 107 insertions(+), 90 deletions(-)
diff --git a/contrib/smarty/plugins/block.render.php b/contrib/smarty/plugins/block.render.php
index 83a8fea8e..4cbad7342 100644
--- a/contrib/smarty/plugins/block.render.php
+++ b/contrib/smarty/plugins/block.render.php
@@ -2,7 +2,7 @@
function smarty_block_render($params, $text, &$smarty)
{
- /* Skip closing tag </render> */
+ /* Skip closing tag </render> */
if(empty($text)) {
return("");
}
@@ -15,14 +15,14 @@ function smarty_block_render($params, $text, &$smarty)
/* Debug output */
if (session::is_set('DEBUGLEVEL') && session::get('DEBUGLEVEL') & DEBUG_ACL ){
- echo "<font color='blue' size='2'> ".$acl."</font>";
+ echo "<div style='color:blue;font-size:2;'> ".$acl."</div>";
}
/* Parameter : checkbox, checked
- * If the parameter 'checkbox' is given, we create a html checkbox in front
- * of the current object.
+ * If the parameter 'checkbox' is given, we create a html checkbox in front
+ * of the current object.
* The parameter 'checked' specifies whether the box is checked or not.
* The checkbox disables or enables the current object.
*/
@@ -30,30 +30,30 @@ function smarty_block_render($params, $text, &$smarty)
/* Detect name and id of the current object */
$use_text = preg_replace("/\n/"," ",$text);
- $name = preg_replace('/^.* name[ ]*=[ ]*("|\')([^\"\' ]*).*$/i',"\\2",$use_text);
+ $name = preg_replace('/^.* name[ ]*=[ ]*("|\')([^\"\' ]*).*$/i',"\\2",$use_text);
/* Detect id */
if(preg_match("/ id=(\"|')[^\"']*(\"|')/i",$text)){
- $id = preg_replace('/^.* id[ ]*=[ ]*("|\')([^\"\' ]*).*$/i',"\\2",$use_text);
+ $id = preg_replace('/^.* id[ ]*=[ ]*("|\')([^\"\' ]*).*$/i',"\\2",$use_text);
}else{
$id = "";
}
-
+
/* Is the box checked? */
isset($params['checked'])&&$params['checked'] ? $check = " checked " : $check = "";
- /* If name isset, we have a html input field */
+ /* If name isset, we have a html input field */
if(!empty($name)){
/* Print checkbox */
- echo "<input type='checkbox' name='use_".$name."' ".$check."
+ echo "<input type='checkbox' name='use_".$name."' ".$check."
onClick=\"changeState('".$name."');\" class='center'>";
/* Disable current object, if checkbox isn't checked */
if($check == ""){
$text = preg_replace("/name=/i"," disabled name=",$text);
}
-
+
/* Add id to current entry, if it is missing */
if($id == ""){
$text = preg_replace("/name=/i"," id=\"".$name."\" name=",$text);
@@ -81,8 +81,8 @@ function smarty_block_render($params, $text, &$smarty)
"class='list1nohighlightdisabled'",
"class='list1nohighlightdisabled'",
"class='sortableListItemDisabled'");
-
- if(!preg_match("/ disabled /",$text)){
+
+ if(!preg_match('/ disabled(="disabled")?( |\/?>)/', $text)){
$from [] = "/name=/i" ;
$to [] = "disabled name=";
}
@@ -95,14 +95,14 @@ function smarty_block_render($params, $text, &$smarty)
$new = "src=\"".$params['disable_picture']."\"";
$text = preg_replace($syn,$new,$text);
}
- }
+ }
/* Read only */
if(preg_match("/r/i",$acl)){
- return(preg_replace("/GOSA_LINE_BREAK/","\n",$text));
+ return(preg_replace("/GOSA_LINE_BREAK/","\n",$text));
}
- /* No acls */
+ /* No acls */
if(preg_match("/type['\"= ].*submit/",$text)){
$text = preg_replace("/submit/","button",$text);
}else{
diff --git a/html/main.php b/html/main.php
index d86fa3064..c5e1a3082 100644
--- a/html/main.php
+++ b/html/main.php
@@ -292,7 +292,7 @@ if (isset($_GET['reset'])) {
/* show web frontend */
$smarty->assign ("date", date("l, dS F Y H:i:s O"));
$smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
-$smarty->assign ("must", "<font class=\"must\">*</font>");
+$smarty->assign ("must", '<span class="must">*</span>');
if (isset($plug)) {
$plug= "?plug=$plug";
} else {
@@ -305,7 +305,7 @@ if (session::global_get('js') == FALSE) {
}
if ($ui->ignore_acl_for_current_user()) {
- $smarty->assign ("username", "<font color='#FF0000';>"._("User ACL checks disabled")."</font> ".$ui->username);
+ $smarty->assign ("username", "<div style='color:#FF0000;'>"._("User ACL checks disabled")."</div> ".$ui->username);
} else {
$smarty->assign ("username", $ui->username);
}
diff --git a/html/themes/default/plugin.css b/html/themes/default/plugin.css
index a3033402e..0f58fb70e 100644
--- a/html/themes/default/plugin.css
+++ b/html/themes/default/plugin.css
@@ -68,6 +68,12 @@ clear:both;
/* Simple Plugin specific things */
+.plugin_sections:after {
+content: "";
+display: block;
+clear: both;
+}
+
.plugin_section {
display:block;
float:left;
diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index 128a7806e..542fb3e84 100644
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -180,7 +180,7 @@ margin-bottom:0;
text-align:left;
}
-font.must {
+.must {
color:red;
font-family:arial,helvetica,sans-serif;
}
diff --git a/html/themes/default/tabs.css b/html/themes/default/tabs.css
index 131e05bd6..077a5458a 100644
--- a/html/themes/default/tabs.css
+++ b/html/themes/default/tabs.css
@@ -9,6 +9,18 @@ table.tabs_header > tbody > tr > td {
padding:0;
}
+div.tab_content {
+padding:4px;
+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;
+}
+
div.tab_active {
text-align:center;
background-color:#f8f8f8;
diff --git a/ihtml/themes/default/login.tpl b/ihtml/themes/default/login.tpl
index 49b200015..0c4fd9d61 100644
--- a/ihtml/themes/default/login.tpl
+++ b/ihtml/themes/default/login.tpl
@@ -21,7 +21,7 @@
<div class="optional">
{t}Please use your username and your password to log into the site administration system.{/t}<br />
{if $ssl}<b>{$ssl}</b>{/if}
- {if $lifetime}<b><font style="color:red";>{$lifetime}</font></b>{/if}
+ {if $lifetime}<b><div style="color:red;">{$lifetime}</div></b>{/if}
</div>
<div>
diff --git a/ihtml/themes/default/logout.tpl b/ihtml/themes/default/logout.tpl
index bdd14897c..52d958c77 100644
--- a/ihtml/themes/default/logout.tpl
+++ b/ihtml/themes/default/logout.tpl
@@ -1,22 +1,22 @@
-<body style="background-color: white;background-image:none;">
+<body style="background-color: white;">
-<form action='index.php' method='post' name='mainform'>
-<div style="margin-left:10%; margin-right:10%; margin-top:5%; border:2px solid red;padding-left:10px;padding-right:10px;padding-top:5px;padding-bottom:20px;">
- <h1>{t}Your FusionDirectory session has expired!{/t}</h1>
- <p>
- {t}The last interaction with the FusionDirectory web interface has been some time ago in the past. For security reasons, the session has been closed. To continue with administrative tasks, please sign in again.{/t}
- </p>
- <br>
- <center><input type="submit" name="dummy" value="{t}Sign in again{/t}"></center>
-</div>
+<form action="index.php" method="post" name="mainform">
+ <div style="margin-left:10%; margin-right:10%; margin-top:5%; border:2px solid red;padding-left:10px;padding-right:10px;padding-top:5px;padding-bottom:20px;">
+ <h1>{t}Your FusionDirectory session has expired!{/t}</h1>
+ <p>
+ {t}The last interaction with the FusionDirectory web interface has been some time ago in the past. For security reasons, the session has been closed. To continue with administrative tasks, please sign in again.{/t}
+ </p>
+ <br/>
+ <div style="text-align: center;"><input type="submit" name="dummy" value="{t}Sign in again{/t}"/></div>
+ </div>
</form>
-</body>
<!-- Place cursor -->
<script type="text/javascript">
<!-- // First input field on page
focus_field('dummy');
-->
</script>
+</body>
</html>
diff --git a/ihtml/themes/default/recovery.tpl b/ihtml/themes/default/recovery.tpl
index a85f1e0b6..fd92e1bbd 100644
--- a/ihtml/themes/default/recovery.tpl
+++ b/ihtml/themes/default/recovery.tpl
@@ -51,7 +51,7 @@
Dummy recuperation method
</li>
<li>
- <font color="red">{t}If none of the above methods suits you, contact your administrator to change your password{/t}</font>
+ <div style="color:red;">{t}If none of the above methods suits you, contact your administrator to change your password{/t}</div>
</li>
{/if}
</ul>
@@ -59,7 +59,7 @@
{elseif $step==3}
<p class="infotext">
{t}Informations to reset password for {$uid} have been sent to email address {$address_mail}{/t}<br/>
- <font color="red">{t}Warning : this email is only valid for {$delay_allowed} minutes.{/t}</font>
+ <div style="color:red;">{t}Warning : this email is only valid for {$delay_allowed} minutes.{/t}</div>
</p>
{elseif $step==4}
<p class="infotext">
diff --git a/include/class_acl.inc b/include/class_acl.inc
index 5147ca1cb..d3f2158a2 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -1117,7 +1117,7 @@ class acl extends plugin
$summary.= $cn.", ";
}
} else {
- $summary.= "<font color='red'><i>"._("inactive")." - "._("No members")."</i></font>";
+ $summary.= "<div style='color:red;'><i>"._("inactive")." - "._("No members")."</i></div>";
}
}
return (preg_replace('/, $/', '', $summary));
diff --git a/include/class_divSelectBox.inc b/include/class_divSelectBox.inc
index 8b9033b5f..5b5dca625 100644
--- a/include/class_divSelectBox.inc
+++ b/include/class_divSelectBox.inc
@@ -90,12 +90,12 @@ class divSelectBox
{
$s_return = '';
$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 .= '<div style="overflow:auto; width:100%; height:100%;">'."\n";
$s_return .= '<table '.
- 'class="listingTable"'.
+ 'class="listingTable" '.
'style="overflow:scroll; '.
- 'height:98%;'.
- 'width:100%;'.
+ 'height:98%; '.
+ 'width:100%; '.
'padding-right:1px; '.
'padding-bottom:2px;"'.
">\n";
diff --git a/include/class_msgPool.inc b/include/class_msgPool.inc
index cf93bb87e..411dee77e 100644
--- a/include/class_msgPool.inc
+++ b/include/class_msgPool.inc
@@ -430,7 +430,7 @@ class msgPool {
if (preg_match("$regex", $currentChar)){
$result.= $currentChar;
} else {
- $result.= "<font style='color:red;text-decoration:underline;'>".($currentChar)."</font>";
+ $result.= "<div style='color:red;text-decoration:underline;'>".($currentChar)."</div>";
$mismatch.= $currentChar;
}
}
diff --git a/include/class_tabs.inc b/include/class_tabs.inc
index d4f270946..fa04def09 100644
--- a/include/class_tabs.inc
+++ b/include/class_tabs.inc
@@ -153,8 +153,7 @@ class tabs
function execute()
{
/* Show object */
- $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 = '<div class="tab_content">'."\n";
$display .= $this->by_object[$this->current]->execute();
$modal_dialog = $this->by_object[$this->current]->is_modal_dialog();
@@ -163,7 +162,7 @@ class tabs
$tabs = $this->gen_tabs($modal_dialog);
/* Footer for tabbed dialog */
- $display = $tabs.$display."</td></tr></table>";
+ $display = $tabs.$display.'</div>';
return $display;
}
diff --git a/include/php_setup.inc b/include/php_setup.inc
index 728f9ce5d..ab919c330 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -202,9 +202,9 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
<tr>
<td>
<img alt=\"\" src='{$warning_path}'>
- <font style='font-size:14px;font-weight:bold'>".
+ <div style='font-size:14px;font-weight:bold'>".
_("Generating this page caused the PHP interpreter to raise some errors!")."
- </font>
+ </div>
</td>
<td align=right>
<a href=\"mailto:bugs@fusiondirectory.org?subject=FusionDirectory%20bugreport&body=%BUGBODY%\">
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index ba21e7659..f00f3113f 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -439,7 +439,7 @@ class department extends plugin
$this->update_acls($object, $dst, TRUE);
if (!$this->copy($src, $dst)) {
- echo "<font color='#FF0000'><br>".sprintf(_("FAILED to copy %s, aborting operation"), LDAP::fix($src))."</font>";
+ echo "<div style='color:#FF0000'><br/>".sprintf(_("FAILED to copy %s, aborting operation"), LDAP::fix($src))."</div>";
return FALSE;
}
echo "<script language=\"javascript\" type=\"text/javascript\">scrollDown2();</script>";
diff --git a/plugins/admin/departments/country.tpl b/plugins/admin/departments/country.tpl
index a2d4ad804..0cf4533e3 100644
--- a/plugins/admin/departments/country.tpl
+++ b/plugins/admin/departments/country.tpl
@@ -2,11 +2,11 @@
// COUNTRY (c)
//////////////////// -->
-<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="" src="images/rightarrow.png"> {t}Properties{/t}</h2>
- <table summary="">
+ <table>
<tr>
<td><LABEL for="c">{t}Country name{/t}</LABEL>{$must}</td>
<td>
@@ -43,14 +43,14 @@
title='{$manager}'>
{/render}
{render acl=$managerACL}
- <input type='image' src='images/lists/edit.png' name='editManager' class='center'>
+ <input type='image' src='images/lists/edit.png' name='editManager' class='center' alt="edit"/>
{/render}
{if $manager!=""}
{render acl=$managerACL}
- <img src='images/info_small.png' title='{$manager}' class='center'>
+ <img src='images/info_small.png' title='{$manager}' class='center' alt="info"/>
{/render}
{render acl=$managerACL}
- <input type='image' src='images/lists/trash.png' name='removeManager' class='center'>
+ <input type='image' src='images/lists/trash.png' name='removeManager' class='center' alt="trash"/>
{/render}
{/if}
</td>
diff --git a/plugins/admin/departments/dcObject.tpl b/plugins/admin/departments/dcObject.tpl
index f083c1037..47fbb4881 100644
--- a/plugins/admin/departments/dcObject.tpl
+++ b/plugins/admin/departments/dcObject.tpl
@@ -2,11 +2,11 @@
// LOCALITY (l)
//////////////////// -->
-<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="" src="images/rightarrow.png"> {t}Properties{/t}</h2>
- <table summary="">
+ <table>
<tr>
<td><LABEL for="dc">{t}Locality name{/t}</LABEL>{$must}</td>
<td>
@@ -43,14 +43,14 @@
title='{$manager}'>
{/render}
{render acl=$managerACL}
- <input type='image' src='images/lists/edit.png' name='editManager' class='center'>
+ <input type='image' src='images/lists/edit.png' name='editManager' class='center' alt="edit"/>
{/render}
{if $manager!=""}
{render acl=$managerACL}
- <img src='images/info_small.png' title='{$manager}' class='center'>
+ <img src='images/info_small.png' title='{$manager}' class='center' alt="info"/>
{/render}
{render acl=$managerACL}
- <input type='image' src='images/lists/trash.png' name='removeManager' class='center'>
+ <input type='image' src='images/lists/trash.png' name='removeManager' class='center' alt="trash"/>
{/render}
{/if}
</td>
diff --git a/plugins/admin/departments/dep-filter.tpl b/plugins/admin/departments/dep-filter.tpl
index e2707ff8c..3c2cdfe20 100644
--- a/plugins/admin/departments/dep-filter.tpl
+++ b/plugins/admin/departments/dep-filter.tpl
@@ -9,11 +9,11 @@
<div style="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"/> {t}Name{/t}
+ <img src="images/lists/search.png" alt="search"/> {t}Name{/t}
</label>
</td>
<td>
diff --git a/plugins/admin/departments/domain.tpl b/plugins/admin/departments/domain.tpl
index 746dd3b42..07c724d5b 100644
--- a/plugins/admin/departments/domain.tpl
+++ b/plugins/admin/departments/domain.tpl
@@ -2,11 +2,11 @@
// LOCALITY (l)
//////////////////// -->
-<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="" src="images/rightarrow.png"> {t}Properties{/t}</h2>
- <table summary="">
+ <table>
<tr>
<td><LABEL for="dc">{t}Domain name{/t}</LABEL>{$must}</td>
<td>
@@ -43,14 +43,14 @@
title='{$manager}'>
{/render}
{render acl=$managerACL}
- <input type='image' src='images/lists/edit.png' name='editManager' class='center'>
+ <input type='image' src='images/lists/edit.png' name='editManager' class='center' alt="edit">
{/render}
{if $manager!=""}
{render acl=$managerACL}
- <img src='images/info_small.png' title='{$manager}' class='center'>
+ <img src='images/info_small.png' title='{$manager}' class='center' alt="info"/>
{/render}
{render acl=$managerACL}
- <input type='image' src='images/lists/trash.png' name='removeManager' class='center'>
+ <input type='image' src='images/lists/trash.png' name='removeManager' class='center' alt="trash"/>
{/render}
{/if}
</td>
diff --git a/plugins/admin/departments/locality.tpl b/plugins/admin/departments/locality.tpl
index 3c24bb25a..d686bd12d 100644
--- a/plugins/admin/departments/locality.tpl
+++ b/plugins/admin/departments/locality.tpl
@@ -2,11 +2,11 @@
// LOCALITY (l)
//////////////////// -->
-<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="" src="images/rightarrow.png"> {t}Properties{/t}</h2>
- <table summary="">
+ <table>
<tr>
<td><LABEL for="l">{t}Locality name{/t}</LABEL>{$must}</td>
<td>
diff --git a/plugins/personal/password/password.tpl b/plugins/personal/password/password.tpl
index 0ce1fcdc5..0ac411d68 100644
--- a/plugins/personal/password/password.tpl
+++ b/plugins/personal/password/password.tpl
@@ -11,7 +11,7 @@
<hr>
{if $passwordExpired}
- <b><font color='red'>{t}Your Password has expired. Please choose a new password!{/t}</font></b>
+ <b><div style='color:red;'>{t}Your Password has expired. Please choose a new password!{/t}</div></b>
<hr>
{/if}
diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc
index 3951d69a5..ed326f462 100644
--- a/setup/class_setupStep_Ldap.inc
+++ b/setup/class_setupStep_Ldap.inc
@@ -118,14 +118,14 @@ class Step_Ldap extends setup_step
if (!empty($this->admin)) {
$str = sprintf(_("Bind as user '%s' failed!"), $this->admin, $this->connection);
}
- return "<font color='red'>".$str."</font>";
+ return "<div style='color:red;'>".$str."</div>";
} else {
if (empty($this->admin)) {
$str = sprintf(_("Anonymous bind to server '%s' succeeded."), $this->connection);
- return "<font color='blue'>".$str."</font> <font color='red'>"._("Please specify user and password!")."</font>";
+ return "<div style='color:blue;'>".$str."</div> <div style='color:red;'>"._("Please specify user and password!")."</div>";
} else {
$str = sprintf(_("Bind as user '%s' to server '%s' succeeded!"), $this->admin, $this->connection);
- return "<font color='green'>".$str."</font>";
+ return "<div style='color:green;'>".$str."</div>";
}
}
}
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 1151d21fe..bea70f6b6 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -246,7 +246,7 @@ class Step_Migrate extends setup_step
if ($this->check_uidNumbers) {
$this->checks['uidNumber_usage']['STATUS'] = FALSE;
- $this->checks['uidNumber_usage']['STATUS_MSG'] = "<font style='color:#F0A500'>"._("Warning")."</font>";
+ $this->checks['uidNumber_usage']['STATUS_MSG'] = "<div style='color:#F0A500'>"._("Warning")."</div>";
$this->checks['uidNumber_usage']['ERROR_MSG'] =
sprintf(_("Found %s duplicate values for attribute 'uidNumber'."), count($this->check_uidNumbers));
return FALSE;
@@ -298,7 +298,7 @@ class Step_Migrate extends setup_step
if ($this->check_gidNumbers) {
$this->checks['gidNumber_usage']['STATUS'] = FALSE;
- $this->checks['gidNumber_usage']['STATUS_MSG'] = "<font style='color:#F0A500'>"._("Warning")."</font>";
+ $this->checks['gidNumber_usage']['STATUS_MSG'] = "<div style='color:#F0A500'>"._("Warning")."</div>";
$this->checks['gidNumber_usage']['ERROR_MSG'] =
sprintf(_("Found %s duplicate values for attribute 'gidNumber'."), count($this->check_gidNumbers));
return FALSE;
@@ -369,7 +369,7 @@ class Step_Migrate extends setup_step
if (count($this->outside_groups)) {
$this->checks['outside_groups']['STATUS'] = FALSE;
- $this->checks['outside_groups']['STATUS_MSG'] = "<font style='color:#F0A500'>"._("Warning")."</font>";
+ $this->checks['outside_groups']['STATUS_MSG'] = "<div style='color:#F0A500'>"._("Warning")."</div>";
$this->checks['outside_groups']['ERROR_MSG'] =
sprintf(_("Found %s groups outside the configured tree '%s'."), count($this->outside_groups), $group_ou);
$this->checks['outside_groups']['ERROR_MSG'] .= " <input type='submit' name='outside_groups_dialog' value='"._("Move")."...'>";
@@ -446,7 +446,7 @@ class Step_Migrate extends setup_step
if (count($this->outside_users)) {
$this->checks['outside_users']['STATUS'] = FALSE;
- $this->checks['outside_users']['STATUS_MSG'] = "<font style='color:#F0A500'>"._("Warning")."</font>";
+ $this->checks['outside_users']['STATUS_MSG'] = "<div style='color:#F0A500'>"._("Warning")."</div>";
$this->checks['outside_users']['ERROR_MSG'] =
sprintf(_("Found %s user(s) outside the configured tree '%s'."), count($this->outside_users), $people_ou);
$this->checks['outside_users']['ERROR_MSG'] .= "<input type='submit' name='outside_users_dialog' value='"._("Move")."...'>";
@@ -586,7 +586,7 @@ class Step_Migrate extends setup_step
$this->checks['users_visible']['ERROR_MSG'] = "";
} else {
$this->checks['users_visible']['STATUS'] = FALSE;
- $this->checks['users_visible']['STATUS_MSG'] = "<font style='color:#F0A500'>"._("Warning")."</font>";
+ $this->checks['users_visible']['STATUS_MSG'] = "<div style='color:#F0A500'>"._("Warning")."</div>";
$this->checks['users_visible']['ERROR_MSG'] = sprintf(_("Found %s user(s) that will not be visible in FusionDirectory or which are incomplete."),
count($this->users_to_migrate));
$this->checks['users_visible']['ERROR_MSG'] .= "<input type='submit' name='users_visible_migrate' value='"._("Migrate")."...'>";
@@ -2333,7 +2333,7 @@ class Step_Migrate extends setup_step
}
$this->checks['old_style_devices']['STATUS'] = FALSE;
- $this->checks['old_style_devices']['STATUS_MSG'] = "<font style='color:#F0A500'>"._("Warning")."</font>";
+ $this->checks['old_style_devices']['STATUS_MSG'] = "<div style='color:#F0A500'>"._("Warning")."</div>";
$this->checks['old_style_devices']['ERROR_MSG'] =
sprintf(_("There are %s devices that need to be migrated."), count($this->device)).
"<input type='submit' name='device_dialog' value='"._("Migrate")."'>";
@@ -2489,7 +2489,7 @@ class Step_Migrate extends setup_step
*/
if (count($this->service)) {
$this->checks['old_style_services']['STATUS'] = FALSE;
- $this->checks['old_style_services']['STATUS_MSG'] = "<font style='color:#F0A500'>"._("Warning")."</font>";
+ $this->checks['old_style_services']['STATUS_MSG'] = "<div style='color:#F0A500'>"._("Warning")."</div>";
$this->checks['old_style_services']['ERROR_MSG'] =
sprintf(_("There are %s services that need to be migrated."),
count($this->service)).
@@ -2789,7 +2789,7 @@ class Step_Migrate extends setup_step
*/
if (count($this->menu)) {
$this->checks['old_style_menus']['STATUS'] = FALSE;
- $this->checks['old_style_menus']['STATUS_MSG'] = "<font style='color:#F0A500'>"._("Warning")."</font>";
+ $this->checks['old_style_menus']['STATUS_MSG'] = "<div style='color:#F0A500'>"._("Warning")."</div>";
$this->checks['old_style_menus']['ERROR_MSG'] = sprintf(_("There are %s application menus which have to be migrated."),
count($this->menu))."<input type='submit' name='menu_dialog' value='"._("Migrate")."'>";
} else {
diff --git a/setup/setup_feedback.tpl b/setup/setup_feedback.tpl
index d6928f6e7..932757850 100644
--- a/setup/setup_feedback.tpl
+++ b/setup/setup_feedback.tpl
@@ -1,20 +1,20 @@
{if $feedback_send}
- <div class='default' style='margin:12px; '>
- <font color='green'>{t}Feedback successfully send{/t}</font>
- </div>
+ <div class='default' style='margin:12px; '>
+ <div style='color:green;'>{t}Feedback successfully send{/t}</div>
+ </div>
{else}
-
-<div class='default' style='margin:12px; '>
+
+<div class='default' style='margin:12px; '>
<h2>{$additional_info}</h2>
<h2>
<input {if $subscribe} checked {/if} type='checkbox' name='subscribe' value='1' class='center'> {t}Subscribe to the fusiondirectory-users mailinglist{/t}
</h2>
- <table>
+ <table>
<tr>
<td>
{t}Organization{/t}
@@ -36,7 +36,7 @@
{t}Mail address{/t}{$must}
</td>
<td>
- <input name='eMail' type='text' value='{$eMail}' style='width:300px;'>
+ <input name='eMail' type='text' value='{$eMail}' style='width:300px;'>
</td>
</tr>
</table>
@@ -50,10 +50,10 @@
{t}When checking this option, FusionDirectory will try to connect http://www.fusiondirectory.org in order to submit your form anonymously.{/t}
</p>
<b>{t}Generic{/t}</b>
- <table>
+ <table>
<tr>
<td style='vertical-align:top'>
- {t}Did the setup procedure help you to get started?{/t}
+ {t}Did the setup procedure help you to get started?{/t}
</td>
<td>
<input {if $get_started} checked {/if} type='radio' name='get_started' value='1'>{t}Yes{/t}
@@ -78,10 +78,10 @@
<br>
<input {if !$first_use} checked {/if} type='radio' name='first_use' value='0'>{t}No{/t},
{t}I use it since{/t}
- <select name='use_since' title='{t}Select the year since when you are using FusionDirectory{/t}'>
+ <select name='use_since' title='{t}Select the year since when you are using FusionDirectory{/t}'>
{html_options options=$years}
</select>
- </td>
+ </td>
</tr>
<tr>
<td style='vertical-align:top'>
diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index 62b460b7b..10112c1c4 100644
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -13,7 +13,7 @@
<div class='setup_navigation'>
<div style='padding:4px'>
- <img src='images/setup/fai.png' class='center' alt='{t}Installation{/t}'> <font style="font-size:24px;">{t}Setup{/t}</font>
+ <img src='images/setup/fai.png' class='center' alt='{t}Installation{/t}'> <div style="font-size:24px;">{t}Setup{/t}</div>
</div>
{$navigation}
</div>
diff --git a/setup/setup_schema.tpl b/setup/setup_schema.tpl
index 4e3f7e6f1..e1b149f0b 100644
--- a/setup/setup_schema.tpl
+++ b/setup/setup_schema.tpl
@@ -17,10 +17,10 @@
</p>
<div>
{if $failed_checks == 0}
- <font style="color:green">{t}Schema check succeeded{/t}</font>
+ <div style="color:green">{t}Schema check succeeded{/t}</div>
{else}
<img src='images/small_warning.png' class='center'>
- <font style="color:red">{t}Schema check failed{/t}</font>
+ <div style="color:red">{t}Schema check failed{/t}</div>
{/if}
@@ -39,7 +39,7 @@
{if !$checks[$key].STATUS}
<br>
{if $checks[$key].IS_MUST_HAVE}
- <font color='red'>{$checks[$key].MSG}</font>
+ <div style='color:red'>{$checks[$key].MSG}</div>
{else}
{$checks[$key].MSG}
{/if}
--
GitLab