From: <vv...@us...> - 2012-02-02 22:35:38
|
Revision: 4864 http://web-erp.svn.sourceforge.net/web-erp/?rev=4864&view=rev Author: vvs2012 Date: 2012-02-02 22:35:31 +0000 (Thu, 02 Feb 2012) Log Message: ----------- xhtml cleanup Modified Paths: -------------- trunk/Logout.php trunk/includes/Login.php trunk/includes/header.inc Modified: trunk/Logout.php =================================================================== --- trunk/Logout.php 2012-02-02 09:51:09 UTC (rev 4863) +++ trunk/Logout.php 2012-02-02 22:35:31 UTC (rev 4864) @@ -7,32 +7,33 @@ include('includes/session.inc'); ?> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title><?php echo $_SESSION['CompanyRecord']['coyname'];?> - <?php echo _('Log Off'); ?></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="stylesheet" href="css/<?php echo $theme;?>/login.css" type="text/css" /> </head> -<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"> +<body> <div id="container"> <div id="login_logo"></div> <div id="login_box"> - <form action=" <?php echo $rootpath;?>/index.php" name="loginform" method="post"> + <form action="<?php echo $rootpath;?>/index.php" id="loginform" method="post"> + <p> <?php echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; ?> <span><?php echo _('Thank you for using webERP'); ?></span> - <br /> - <input class="button" type="submit" value="<?php echo _('Login'); ?>" name="SubmitUser" /> + </p> + <p><input class="button" type="submit" value="<?php echo _('Login'); ?>" name="SubmitUser" /></p> </form> </div> </div> -</body> -</html> - <?php // Cleanup session_unset(); Modified: trunk/includes/Login.php =================================================================== --- trunk/includes/Login.php 2012-02-02 09:51:09 UTC (rev 4863) +++ trunk/includes/Login.php 2012-02-02 22:35:31 UTC (rev 4864) @@ -10,8 +10,10 @@ $demo_text = _('Please login here'); } ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>webERP Login screen</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> @@ -31,9 +33,10 @@ <div id="container"> <div id="login_logo"></div> <div id="login_box"> - <form action="<?php echo htmlspecialchars($_SERVER['PHP_SELF']);?>" name="loginform" method="post"> - <input type="hidden" name="FormID" value="<?php echo $_SESSION['FormID']; ?>" /> + <form action="<?php echo htmlspecialchars($_SERVER['PHP_SELF']);?>" id="loginform" method="post"> + <p><input type="hidden" name="FormID" value="<?php echo $_SESSION['FormID']; ?>" /> <span><?php echo _('Company'); ?>:</span> + <?php if ($AllowCompanySelectionBox == true){ echo '<select name="CompanyNameField">'; @@ -42,7 +45,7 @@ foreach ($Companies as $CompanyEntry){ if (is_dir('companies/' . $CompanyEntry) AND $CompanyEntry != '..' AND $CompanyEntry != '' AND $CompanyEntry!='.svn' AND $CompanyEntry!='.'){ if ($CompanyEntry==$DefaultCompany) { - echo '<option selected value="' . $CompanyEntry . '">' . $CompanyEntry . '</option>'; + echo '<option selected="selected" value="' . $CompanyEntry . '">' . $CompanyEntry . '</option>'; } else { echo '<option value="' . $CompanyEntry . '">' . $CompanyEntry . '</option>'; } @@ -53,13 +56,13 @@ echo '<input type="text" name="CompanyNameField" value="' . $DefaultCompany . '" />'; } ?> - <br /> - <span><?php echo _('User name'); ?>:</span><br /> - <input type="text" name="UserNameEntryField"/><br /> - <span><?php echo _('Password'); ?>:</span><br /> - <input type="password" name="Password"><br /> + + <span><?php echo _('User name'); ?>:</span> + <input type="text" name="UserNameEntryField" /> + <span><?php echo _('Password'); ?>:</span> + <input type="password" name="Password" /></p> <div id="demo_text"><?php echo $demo_text;?></div> - <input class="button" type="submit" value="<?php echo _('Login'); ?>" name="SubmitUser" /> + <p><input class="button" type="submit" value="<?php echo _('Login'); ?>" name="SubmitUser" /></p> </form> </div> </div> Modified: trunk/includes/header.inc =================================================================== --- trunk/includes/header.inc 2012-02-02 09:51:09 UTC (rev 4863) +++ trunk/includes/header.inc 2012-02-02 22:35:31 UTC (rev 4864) @@ -52,9 +52,9 @@ echo '<td align="left" style="width:100%;" class="quick_menu_left">'; // Use icons for company and user data, saves screen realestate, use ALT tag in case theme icon not avail. echo '<img src="'.$rootpath.'/css/'.$theme.'/images/company.png" title="' . _('Company') . '" alt="' . _('Company') . '"></img>'; - echo ' ' . stripslashes($_SESSION['CompanyRecord']['coyname']) . ' <a href="' . $rootpath . '/UserSettings.php"><img src="'.$rootpath.'/css/'.$theme.'/images/user.png" title="User" alt="' . _('User') . '"> </img>' . stripslashes($_SESSION['UsersRealName']) . '</a>'; + echo ' ' . stripslashes($_SESSION['CompanyRecord']['coyname']) . ' <a href="' . $rootpath . '/UserSettings.php"><img src="'.$rootpath.'/css/'.$theme.'/images/user.png" title="User" alt="' . _('User') . '"></img>' . stripslashes($_SESSION['UsersRealName']) . '</a>'; // Make the title text a class, can be set to display:none is some themes - echo '<br /><font class="header_title"> ' . $title . '</font></td>'; + echo '<br /><p class="header_title"> ' . $title . '</p></td>'; echo '<td class="quick_menu_tabs">'; echo '<table cellpadding="0" cellspacing="0" class="quick_menu_tabs"><tr>'; echo '<td class="quick_menu_tab" align="center"><a accesskey="1" href="' . $rootpath . '/index.php"><span style="text-decoration:underline;">1</span> ' . _('Main Menu') . '</a></td>'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |