From f04f9423d630b18806748d0bc7bd931f70878cbc Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sat, 7 Jun 2008 10:43:43 +0000
Subject: [PATCH] *** empty log message ***

---
 CHANGELOG.txt                          |  19 ++
 admin/change_current_user_password.php | 106 +++++++
 install.html                           | 409 +++++++++----------------
 sql/alter2.sql                         |   1 +
 sql/en_US-demo.sql                     |   5 +-
 sql/en_US-new.sql                      |   3 +-
 themes/aqua/default.css                | 102 +++++-
 themes/aqua/renderer.php               |  13 +-
 themes/cool/default.css                |  27 +-
 themes/cool/renderer.php               |  13 +-
 themes/default/default.css             |   2 +-
 themes/default/renderer.php            |   8 +-
 update.html                            |  21 +-
 13 files changed, 433 insertions(+), 296 deletions(-)
 create mode 100644 admin/change_current_user_password.php
 create mode 100644 sql/alter2.sql

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b113bbb5..e432679e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,25 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+07-Jun-2008 Joe Hunt
+! Changed install.html and update.html
+$ install.html
+  update.html
++ New files, change_current_user_password.php and alter2.sql
+$ /admin/change_current_user_password.php
+  /sql/alter2.sql
+! Changed some files for layout
+$ /lang/en_US/stylesheet.css
+  /themes/aqua/default.css
+  /themes/aqua/renderer.php
+  /themes/cool/default.css
+  /themes/cool/renderer.php
+  /themes/default/default.css
+  /themes/default/renderer.php
+! Changed install sql scripts
+$ /sql/en_US-demo.sql
+  /sql/en_US-new.sql
+  
 07-Jun-2008 Janusz Dobrowolski
 + Added ajax functionality and ui hints to sales form entry pages.
 $ /sales/sales_order_entry.php
diff --git a/admin/change_current_user_password.php b/admin/change_current_user_password.php
new file mode 100644
index 00000000..817c94f6
--- /dev/null
+++ b/admin/change_current_user_password.php
@@ -0,0 +1,106 @@
+<?php
+
+$page_security=1;
+$path_to_root="..";
+include_once($path_to_root . "/includes/session.inc");
+
+page(_("Change password"));
+
+include_once($path_to_root . "/includes/date_functions.inc");
+include_once($path_to_root . "/includes/ui.inc");
+
+include_once($path_to_root . "/admin/db/users_db.inc");
+
+$selected_id = $_SESSION["wa_current_user"]->username;
+
+
+if (isset($_GET['UpdatedID']))
+{
+    display_notification_centered(_("Your password has been updated."));
+}
+
+function can_process()
+{
+
+   	if (strlen($_POST['password']) < 4)
+   	{
+  		display_error( _("The password entered must be at least 4 characters long."));
+		set_focus('password');
+   		return false;
+   	}
+
+   	if (strstr($_POST['password'], $_POST['user_id']) != false)
+   	{
+   		display_error( _("The password cannot contain the user login."));
+		set_focus('password');
+   		return false;
+   	}
+
+   	if ($_POST['password'] != $_POST['passwordConfirm'])
+   	{
+   		display_error( _("The passwords entered are not the same."));
+		set_focus('password');
+   		return false;
+   	}
+
+	return true;
+}
+
+if (isset($_POST['UPDATE_ITEM']))
+{
+
+	if (can_process())
+	{
+    	if (isset($selected_id))
+    	{
+    		if ($_POST['password'] != "")
+    			update_user_password($_POST['user_id'], md5($_POST['password']));
+
+			unset($selected_id);
+    		meta_forward($_SERVER['PHP_SELF'], "UpdatedID=1");
+    	}
+	}
+}
+
+start_form();
+
+start_table($table_style);
+
+if (isset($selected_id))
+{
+	//editing an existing User
+
+	$myrow = get_user($selected_id);
+
+	$_POST['user_id'] = $myrow["user_id"];
+	hidden('selected_id', $selected_id);
+	hidden('user_id', $_POST['user_id']);
+
+	label_row(_("User login:"), $_POST['user_id']);
+
+}
+$_POST['password'] = "";
+$_POST['passwordConfirm'] = "";
+
+start_row();
+label_cell(_("Password:"));
+label_cell("<input type='password' name='password' size=22 maxlength=20 value='" . $_POST['password'] . "'>");
+end_row();
+
+start_row();
+label_cell(_("Repeat password:"));
+label_cell("<input type='password' name='passwordConfirm' size=22 maxlength=20 value='" . $_POST['passwordConfirm'] . "'>");
+end_row();
+
+if (isset($selected_id))
+{
+	table_section_title(_("Enter your new password in the fields."));
+}
+
+end_table(1);
+
+submit_add_or_update_center(!isset($selected_id));
+
+end_form();
+end_page();
+?>
diff --git a/install.html b/install.html
index 3e50b71a..bf8a0832 100644
--- a/install.html
+++ b/install.html
@@ -1,320 +1,191 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-<head>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><title>FrontAccounting</title>
 
-
-  <title>FrontAccounting</title>
 </head>
 
-
-
 <body>
-
-<div><strong><span style="FONT-SIZE: 20pt"><span style="COLOR: rgb(204,102,0); FONT-STYLE: italic"  >Front</span>Accounting Installation</span></strong></div>
-
+<div><strong><span style="font-size: 20pt;"><span style="color: rgb(204, 102, 0); font-style: italic;">Front</span>Accounting
+Installation</span></strong></div>
 <h2>Pre-requisites</h2>
-
-
-<ul style="MARGIN-TOP: 0pt" type="disc">
-
-
-  <li>A working HTTP web server eg. <em><strong>Apache, IIS</strong></em>.
-
-
-  <li><strong><em>PHP</em></strong> installed on the web server.
-
-
-  <li>A working <strong><em>MySQL</em></strong> server - with <strong><em>innodb</em></strong> tables
-  enabled (see notes below)
-
-
-  <li><strong><em>Adobe Acrobat Reader</em></strong> - for viewing the PDF reports before printing them out. </li>
-
-
+<ul style="margin-top: 0pt;" type="disc">
+<li>A working HTTP web server eg. <em><strong>Apache,
+IIS</strong></em>. </li>
+<li><strong><em>PHP</em></strong>
+installed on the web server. </li>
+<li>A working <strong><em>MySQL</em></strong>
+server - with <strong><em>innodb</em></strong>
+tables enabled (see notes below) </li>
+<li><strong><em>Adobe Acrobat Reader</em></strong>
+- for viewing the PDF reports before printing them out. </li>
 </ul>
-
-
 <h2>Important Notes</h2>
-
-
 <ul>
-
-
-  <li>One critical aspect of the PHP installation is the setting of <strong><em>session.auto_start</em></strong> in the php.ini file. Some rpm distributions of PHP have the default setting of <strong><em>session.auto_start =   1</em></strong>.
+<li>One critical aspect of the PHP installation is the setting
+of <strong><em>session.auto_start</em></strong>
+in the php.ini file. Some rpm distributions of PHP have the default
+setting of <strong><em>session.auto_start = 1</em></strong>.
 This starts a new session at the beginning of each script. However,
 this makes it impossible to instantiate any class objects that the
 system relies on. Classes are used extensively by this system. When
 sessions are required they are started by the system and this setting
 of <strong><em>session.auto_start</em></strong>
-  can and should be set to 0.
-
-
-  <li><strong><em>Innodb</em></strong> tables must be enabled in the MySQL
-  server. These tables allow database transactions which are a critical
-  component of the software. This is enabled by default in the newer versions of
-  MySQL. If you need to enable it yourself, consult the MySQL manual.
-
-
-  <li>FrontAccounting is implemented and tested with MySQL. Generally
+can and should be set to 0. </li>
+<li><strong><em>Innodb</em></strong>
+tables must be enabled in the MySQL server. These tables allow database
+transactions which are a critical component of the software. This is
+enabled by default in the newer versions of MySQL. If you need to
+enable it yourself, consult the MySQL manual. </li>
+<li>FrontAccounting is implemented and tested with MySQL.
+Generally
 it should work with other databases, but this is not supported in any
 way at the moment. </li>
-
-
 </ul>
-
-
 <h2>Copying all the project files to the correct directory</h2>
-
-
 <ul>
-
-
-  <li>You must obviously have downloaded the project
-  archive to be reading this file.
-
-
-  <li>All the files inside this archive should be copied to
-  a directory under the web server root directory.
-
-
-  <li>For example, create a folder called <strong>/account</strong>, and extract the archive into this folder. </li>
-
-
+<li>You must obviously have downloaded the project archive to
+be reading this file. </li>
+<li>All the files inside this archive should be copied to a
+directory under the web server root directory. </li>
+<li>For example, create a folder called <strong>/account</strong>,
+and extract the archive into this folder. </li>
 </ul>
-
-
 <h2>Installation Steps (automatic, recommended)</h2>
-
-
 <ol>
-
-
-  <li>If you have the option to create multiple databases on your host, create one, fi. <strong>frontacc</strong>,
-  otherwise write down the database name for your account. At the same time look
-  up the username and password for the database. You will need these
-  informations during the wizard install.
-
-
-  <li>Enter <strong><em>your_url/account/install</em></strong> (or whatever
-  directory you entered). This will run the install wizard, setup a drill
-  company and populating with initial data. You can later on create your own
-  real company. It is a good idea to get familiar with the system before
-  starting your own company.&nbsp;
-  <li>After successfully install, remove or rename your install directory for safety reasons. You don't need it any more.</li>
-
-
+<li>If you have the option to create multiple databases on your
+host, create one, fi. <strong>frontacc</strong>, otherwise
+write down the database name for your account. At the same time look up
+the username and password for the database. You will need these
+informations during the wizard install. </li>
+<li>Enter <strong><em>your_url/account/install</em></strong>
+(or whatever directory you entered). This will run the install wizard,
+setup a drill company and populating with initial data. You can later
+on create your own real company. It is a good idea to get familiar with
+the system before starting your own company.&nbsp; </li>
+<li>After successfully install, remove or rename your install
+directory for safety reasons. You don't need it any more.</li>
 </ol>
-
-
-<h2>Installation Steps (manuel, for advanced users, not recommended)</h2>
-
-
-<p><br >
-
+<h2>Installation Steps (manuel, for advanced users, not
+recommended)</h2>
+<p><br />
 </p>
-
-
 <ol>
-
-
-  <li>
-
-    <h3>Creating the Database</h3>
-
-
-
-    <ol>
-
-
-      <li>NOTE : As FrontAccounting is still heavily under
-    development, the database structure will ALWAYS change between releases, so
-    if you have a database that you created for a previous release of
-    FrontAccounting, it WILL NOT WORK after installing a new release. You may
-    run the script, update_db.php and select the appropriate script, f.i.
-    alter.sql (from release 1.XX to release 2.0).
-
-
-      <li>We strongly suggest using a GUI to manage your database(s) and database users. If you don’t have any, download <a href="http://www.phpmyadmin.net/"><strong>phpMyAdmin</strong></a>.
-
-
-      <li>Create a database with a name of your choice. The default in config_db.php is ‘<strong><em>frontacc</em></strong>’, but of course you can select
-    whatever name you desire.
-
-
-      <li>Populate the database you have created. There are two scripts
+<li>
+<h3>Creating the Database</h3>
+<ol>
+<li>NOTE : As FrontAccounting is still heavily under
+development, the database structure will ALWAYS change between
+releases, so if you have a database that you created for a previous
+release of FrontAccounting, it WILL NOT WORK after installing a new
+release. You may run the script, update_db.php and select the
+appropriate script, f.i. alter.sql&nbsp; and alter2.sql (from
+release 1.XX to release 2.0). </li>
+<li>We strongly suggest using a GUI to manage your
+database(s) and database users. If you don&#8217;t have any, download <a href="http://www.phpmyadmin.net/"><strong>phpMyAdmin</strong></a>.
+</li>
+<li>Create a database with a name of your choice. The
+default in config_db.php is &#8216;<strong><em>frontacc</em></strong>&#8217;,
+but of course you can select whatever name you desire. </li>
+<li>Populate the database you have created. There are two
+scripts
 are provided to populate the database (both inside the folder /sql) :
-
-
-        <ol>
-
-
-          <li><strong><em>en_US-demo.sql</em></strong>. This has a minimal
-      amount of demonstration data set up so that transactions can be tried to
-      see how the system works.
-
-
-          <li><strong><em>en_US-new.sql</em></strong>. This script has
+<ol>
+<li><strong><em>en_US-demo.sql</em></strong>.
+This has a minimal amount of demonstration data set up so that
+transactions can be tried to see how the system works. </li>
+<li><strong><em>en_US-new.sql</em></strong>.
+This script has
 only the basic data necessary to start a new company system off. If you
 wish to set up your company on FrontAccounting then this is the script
 to use. </li>
-
-
-
-        </ol>
-
-
-      <li>Now that the database is created you will need to
-    set up a database user to access this database. DO NOT USE THE USER ‘ROOT’.
-    Set up a new user and give that user full privileges over the database
-    ‘frontacc’.
-      <li>After successfully install, remove or rename your install directory <strong><em>your_url/account/install</em></strong> (or
-whatever directory you entered) for safety reasons. You don't need it any more.</li>
-
-
-
-    </ol>
-
-
-  <li>
-
-    <h3>Editing config_db.php</h3>
-
-
-
-    <ol>
-
-
-      <li><strong><em>config_db.php</em></strong> contains connection
-    information for the database. These must be set to your local settings or
-    you will not be able to access FrontAccounting.
-
-
-      <li>FrontAccounting allows multiple connections, you
-    can enter as many connections as you have separate entities (most people
-    will use only one).
-
-
-      <li><strong>$db_connections</strong> is an array of connections –
-    for each connection :
-
-
-      <li>“<strong>name</strong>” is the
-    name of the connection, this is the name that will be displayed to the user
-
-
-      <li>“<strong>host</strong>” is the
-    computer IP address or name where the database is. The default is localhost
-    assuming that the web server is also the sql server.
-
-
-      <li>“<strong>dbuse</strong>r” is
-    the user name under which the database should be accessed. NB, again, do not
-    use the user ROOT. A user with appropriate privileges must be set up.
-
-
-      <li>“<strong>dbpassword</strong>”
-    is the password for “dbuser”. You would have entered this when you created
-    “dbuser”.
-
-
-      <li>“<strong>dbname</strong>” is
-    the name of the database. The provided scripts use the name OpenAccounting.
-
-
-      <li>“<strong>tbpref</strong>” is the table prefix for
+</ol>
+</li>
+<li>Now that the database is created you will need to set
+up a database user to access this database. DO NOT USE THE USER &#8216;ROOT&#8217;.
+Set up a new user and give that user full privileges over the database
+&#8216;frontacc&#8217;. </li>
+<li>After successfully install, remove or rename your
+install directory <strong><em>your_url/account/install</em></strong>
+(or
+whatever directory you entered) for safety reasons. You don't need it
+any more.</li>
+</ol>
+</li>
+<li>
+<h3>Editing config_db.php</h3>
+<ol>
+<li><strong><em>config_db.php</em></strong>
+contains connection information for the database. These must be set to
+your local settings or you will not be able to access FrontAccounting. </li>
+<li>FrontAccounting allows multiple connections, you can
+enter as many connections as you have separate entities (most people
+will use only one). </li>
+<li><strong>$db_connections</strong> is an
+array of connections &#8211; for each connection : </li>
+<li>&#8220;<strong>name</strong>&#8221; is the name of the
+connection, this is the name that will be displayed to the user </li>
+<li>&#8220;<strong>host</strong>&#8221; is the computer IP
+address or name where the database is. The default is localhost
+assuming that the web server is also the sql server. </li>
+<li>&#8220;<strong>dbuse</strong>r&#8221; is the user name
+under which the database should be accessed. NB, again, do not use the
+user ROOT. A user with appropriate privileges must be set up. </li>
+<li>&#8220;<strong>dbpassword</strong>&#8221; is the
+password for &#8220;dbuser&#8221;. You would have entered this when you created
+&#8220;dbuser&#8221;. </li>
+<li>&#8220;<strong>dbname</strong>&#8221; is the name of
+the database. The provided scripts use the name OpenAccounting. </li>
+<li>&#8220;<strong>tbpref</strong>&#8221; is the table
+prefix for
 the tables. If you only have access to one database, you must use table
 prefix to separate the companies. Table prefix is set by a table prefix
 counter inside config_db.php, fi. 0_ for the first company.</li>
-
-
-
-    </ol>
-
-
-  </li>
-
-
 </ol>
-
-
+</li>
+</ol>
 <h2>&nbsp;Logging In For the First Time</h2>
-
-
 <ol>
-
-
-  <li>Pleae ensure that the folder <strong>/company/0</strong> on the server is <strong>writable</strong>.
-
-
-  <li>Open a browser and enter the URL for the web server
-  directory where FrontAccounting is installed.
-
-
-  <li>Enter the user name:&nbsp; '<strong>admin</strong>'
-
-
-  <li>Enter the password: '<strong>password</strong>'
-
-
-  <li>(NB : enter without quotation marks).
-
-
-  <li>
-
-    <div>You can set up additional user accounts from the System Setup
+<li>Pleae ensure that the folder <strong>/company/0</strong>
+on the server is <strong>writable</strong>. </li>
+<li>Open a browser and enter the URL for the web server
+directory where FrontAccounting is installed. </li>
+<li>Enter the user name:&nbsp; '<strong>admin</strong>'
+</li>
+<li>Enter the password: '<strong>password</strong>'
+</li>
+<li>(NB : enter without quotation marks). </li>
+<li>
+<div>You can set up additional user accounts from the System
+Setup
 tab. Be careful not to delete the demonstration user until a new user
 has been set up. If there are no users defined the next time you try to
 login you won't be able to. The only way then to create a user to login
 with is to manually edit the SQL table "users" to insert a user.</div>
-
-
-  </li>
-
-
+</li>
 </ol>
-
-
 <h2>Setting Up Company Specific Data</h2>
-
-
 <ol>
-
-
-  <li>All the standing configuration data is defined from the Setup tab
+<li>All the standing configuration data is defined from the
+Setup tab
 and each link should be reviewed to enter appropriate data for the
 business. Setup wizards that guide you through this process has been
-implemented and we strongly recommend you to use this approach, see <strong><em>Installation steps (automatic, recommended)</em></strong> . </li>
-
-
+implemented and we strongly recommend you to use this approach, see <strong><em>Installation
+steps (automatic, recommended)</em></strong> . </li>
 </ol>
-
-
 <h2>Troubleshooting</h2>
-
-
 <ol>
-
-
-  <li>If FrontAccounting is installed locally, you may have the <strong><em>session save path</em></strong> not set correctly. Normally this is set in your php.ini (for Windows). The entry is called <strong><em>session.save_path</em></strong>. Make sure this is set to
-  a directory that actually exists. The default is set to /tmp, which may not be
-  valid.
-
-
-  <li>If you are installing FrontAccounting onto a shared
-  server, you may have to set the session save path within FrontAccounting. At
-  the top of config.php (in release 2.0 this has moved to /includes/session.inc)
-  you will find this line :
-
-
-  <li>Uncomment this line and set the path to a directory that exists
+<li>If FrontAccounting is installed locally, you may have the <strong><em>session
+save path</em></strong> not set correctly. Normally this is
+set in your php.ini (for Windows). The entry is called <strong><em>session.save_path</em></strong>.
+Make sure this is set to a directory that actually exists. The default
+is set to /tmp, which may not be valid. </li>
+<li>If you are installing FrontAccounting onto a shared server,
+you may have to set the session save path within FrontAccounting. At
+the top of config.php (in release 2.0 this has moved to
+/includes/session.inc) you will find this line : </li>
+<li>Uncomment this line and set the path to a directory that
+exists
 on your server. Make sure that you have read/write privileges on this
 directory. </li>
-
-
 </ol>
-
-
 <p>&nbsp;</p>
-
-</body>
-</html>
+</body></html>
\ No newline at end of file
diff --git a/sql/alter2.sql b/sql/alter2.sql
new file mode 100644
index 00000000..df5cd922
--- /dev/null
+++ b/sql/alter2.sql
@@ -0,0 +1 @@
+ALTER TABLE `0_users` ADD `show_hints` TINYINT(1) DEFAULT '0' NOT NULL AFTER `show_codes` ;
diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 20f2783b..514e2da7 100644
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -938,6 +938,7 @@ CREATE TABLE `0_users` (
   `percent_dec` smallint(6) NOT NULL default '1',
   `show_gl` tinyint(1) NOT NULL default '1',
   `show_codes` tinyint(1) NOT NULL default '0',
+  `show_hints` tinyint(1) NOT NULL default '0',
   `last_visit_date` datetime default NULL,
   PRIMARY KEY  (`user_id`)
 ) TYPE=MyISAM ;
@@ -1922,8 +1923,8 @@ INSERT INTO `0_tax_types` VALUES ('3', '25', '2664', '2682', 'VAT', '1');
 
 ### Data of table `0_users` ###
 
-INSERT INTO `0_users` VALUES('demouser', '5f4dcc3b5aa765d61d8327deb882cf99', 'Demo User', 1, '999-999-999', 'demo@demo.nu', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 3, 1, 1, 0, '2008-02-06 19:02:35');
-INSERT INTO `0_users` VALUES('admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'adm@adm.com', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, '2008-03-20 10:52:46');
+INSERT INTO `0_users` VALUES('demouser', '5f4dcc3b5aa765d61d8327deb882cf99', 'Demo User', 1, '999-999-999', 'demo@demo.nu', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 3, 1, 1, 0, 0, '2008-02-06 19:02:35');
+INSERT INTO `0_users` VALUES('admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'adm@adm.com', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, 0, '2008-03-20 10:52:46');
 
 ### Data of table `0_wo_issue_items` ###
 
diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 22e0e090..9cd561fa 100644
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -1106,6 +1106,7 @@ CREATE TABLE IF NOT EXISTS `0_users` (
   `percent_dec` smallint(6) NOT NULL default '1',
   `show_gl` tinyint(1) NOT NULL default '1',
   `show_codes` tinyint(1) NOT NULL default '0',
+  `show_hints` tinyint(1) NOT NULL default '0',
   `last_visit_date` datetime default NULL,
   PRIMARY KEY  (`user_id`)
 ) TYPE=MyISAM;
@@ -1440,5 +1441,5 @@ INSERT INTO `0_sys_types` VALUES(40, 'Dimension', 1, '1');
 -- Dumping data for table `0_users`
 --
 
-INSERT INTO `0_users` VALUES('admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'adm@adm.com', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, '2008-04-04 12:34:29');
+INSERT INTO `0_users` VALUES('admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'adm@adm.com', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, 0, '2008-04-04 12:34:29');
 
diff --git a/themes/aqua/default.css b/themes/aqua/default.css
index eb454f62..e42e9907 100644
--- a/themes/aqua/default.css
+++ b/themes/aqua/default.css
@@ -29,7 +29,7 @@ tr, td, th {
 	line-height: 19px;
 }
 
-tr {
+table {
 	text-align: left;
 }
 
@@ -182,7 +182,7 @@ div.tabs a {
 div.tabs a.selected {
 	border-top: 1px solid #8cacbb;
 	border-right: 1px solid #8cacbb;
-	border-bottom:  1px solid #dee7ec;
+	border-bottom:  1px solid #a7d6ce;
 	border-left: 1px solid #8cacbb;
 	font-weight: normal;
 	background: #a7d6ce;
@@ -359,3 +359,101 @@ input.amount {
    text-decoration:underline;
    cursor: pointer;
 }
+
+.navibutton[disabled] {
+  color:#808080;
+  cursor: auto;
+}
+.navibutton {
+   color:#0000FF;
+   padding: 3px;
+   background-color:transparent;
+   border-style:none;
+   text-decoration:underline;
+   cursor: pointer;
+}
+
+.navibar {
+    padding: 3px;
+    border: 1px solid #cccccc;
+    border-collapse: collapse;
+    background-color: #dee7ec;
+}
+
+
+.listsubmit {
+    display: none;
+}
+
+ul.ajaxtabs{
+	padding: 3px 0 0 0;
+	margin: 3px 3px 0 3px;
+	font: 12px Tahoma,Verdana;
+	font-weight: bold;
+}
+
+ul.ajaxtabs li{
+	list-style: none;
+	margin: 0;
+	display: inline;
+}
+
+ul.ajaxtabs li input{
+    background-color: #dee7ec;
+/*	background-repeat: repeat-x;
+	background-position: top; */
+	padding: 3px 8px;
+	margin: 0px;
+	border-top: 1px solid #8cacbb;
+	border-right: 1px solid #8cacbb;
+	border-bottom: none;
+	border-left: none;
+	font-weight: bold;
+}
+
+ul.ajaxtabs li input:hover{
+	border-top: 1px solid #8cacbb;
+	color:#FFFFFF;
+}
+div.spaceBox{
+	background-color: #8cacbb;
+	height:8px;
+	border-bottom: 1px solid #8cacbb;
+	border-left: 1px solid #8cacbb;
+	border-right:1px solid #8cacbb;
+	margin: 0 3px 0px 3px
+}
+
+div.contentBox{
+	border: 1px solid #8cacbb;
+	margin: 0 3px 3px 3px
+}
+
+ul.ajaxtabs li input.current, ul.ajaxtabs li input.current:hover{
+	border-left: 1px solid #8cacbb;
+	background-color: #8cacbb;
+	color:#FFFFFF;
+}
+#hints {
+  font-size: 13px;
+  padding: 5px;
+  border-bottom: 1px solid #8cacbb;
+  margin: -4px -2px -2px;
+  border: 1px solid #8cacbb;
+/*  display: none;*/
+  background-color: #FFFFE0;
+  white-space: nowrap;
+/*
+  position: absolute;
+  left: 0;
+  left: -900px;
+  filter:alpha(opacity=0);
+  -moz-opacity:0;
+  border: 1px solid black;
+  height: 200px;
+  text-align: center;
+  width:200px;
+  z-index: 100;
+  padding: 5px;
+*/
+}
diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 924c82e2..ad4cd21e 100644
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -47,18 +47,25 @@
 
 				echo "<table class=logoutBar>";
 				echo "<tr><td class=headingtext3>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
+				echo "  <td class='logoutBarRight'><a href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
+				echo "  <a href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
+
 				if ($help_base_url != null)
 				{
-					echo "<td align=right ><a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a></td>";
+					echo "<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
 				}
-				echo "<td class=logoutBarRight><a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>";
+				echo "<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
 				echo "</td></tr></table>";
 			}
 			echo "</td></tr></table>";
 
 			if ($title && !$no_menu && !$is_index)
 			{
-				echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td></tr></table></center>";
+				echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td>"
+				."<td align=right>"
+				.(user_hints() ? "<span id='hints'></span>" : '')
+				."</td>"
+				."</tr></table></center>";
 			}
 
 			if (!$is_index)
diff --git a/themes/cool/default.css b/themes/cool/default.css
index 3281ea0b..e2920334 100644
--- a/themes/cool/default.css
+++ b/themes/cool/default.css
@@ -29,7 +29,7 @@ tr, td, th {
 	line-height: 19px;
 }
 
-tr {
+table {
 	text-align: left;
 }
 
@@ -383,7 +383,7 @@ input.amount {
     padding: 3px;
     border: 1px solid #cccccc;
     border-collapse: collapse;
-    background-color: #788da1;
+    background-color: #dee7ec;
 }
 
 
@@ -440,3 +440,26 @@ ul.ajaxtabs li input.current, ul.ajaxtabs li input.current:hover{
 	background-color: #8cacbb;
 	color:#FFFFFF;
 }
+#hints {
+  font-size: 13px;
+  padding: 5px;
+  border-bottom: 1px solid #8cacbb;
+  margin: -4px -2px -2px;
+  border: 1px solid #8cacbb;
+/*  display: none;*/
+  background-color: #FFFFE0;
+  white-space: nowrap;
+/*
+  position: absolute;
+  left: 0;
+  left: -900px;
+  filter:alpha(opacity=0);
+  -moz-opacity:0;
+  border: 1px solid black;
+  height: 200px;
+  text-align: center;
+  width:200px;
+  z-index: 100;
+  padding: 5px;
+*/
+}
diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index 924c82e2..ad4cd21e 100644
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -47,18 +47,25 @@
 
 				echo "<table class=logoutBar>";
 				echo "<tr><td class=headingtext3>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
+				echo "  <td class='logoutBarRight'><a href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
+				echo "  <a href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
+
 				if ($help_base_url != null)
 				{
-					echo "<td align=right ><a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a></td>";
+					echo "<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
 				}
-				echo "<td class=logoutBarRight><a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>";
+				echo "<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
 				echo "</td></tr></table>";
 			}
 			echo "</td></tr></table>";
 
 			if ($title && !$no_menu && !$is_index)
 			{
-				echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td></tr></table></center>";
+				echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td>"
+				."<td align=right>"
+				.(user_hints() ? "<span id='hints'></span>" : '')
+				."</td>"
+				."</tr></table></center>";
 			}
 
 			if (!$is_index)
diff --git a/themes/default/default.css b/themes/default/default.css
index e6ee37f5..635f419c 100644
--- a/themes/default/default.css
+++ b/themes/default/default.css
@@ -29,7 +29,7 @@ tr, td, th {
 	line-height: 19px;
 }
 
-tr {
+table {
 	text-align: left;
 }
 
diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index c60aec74..51cbc8e4 100644
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -46,11 +46,15 @@
 
 				echo "<table class=logoutBar>";
 				echo "<tr><td class=headingtext3>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
+
+				echo "  <td class='logoutBarRight'><a href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
+				echo "  <a href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
+
 				if ($help_base_url != null)
 				{
-					echo "<td align=right ><a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a></td>";
+					echo "<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
 				}
-				echo "<td class=logoutBarRight><a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>";
+				echo "<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
 				echo "</td></tr></table>";
 			}
 			echo "</td></tr></table>";
diff --git a/update.html b/update.html
index 9cfa0e56..daa8eb2b 100644
--- a/update.html
+++ b/update.html
@@ -1,13 +1,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-
-<head>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head>
   <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" />
 
 
-  <title>FrontAccounting Update</title>
+  <title>FrontAccounting Update</title></head>
 
-</head>
 
 <body>
 <div><strong><span style="font-size: 20pt;"><span style="color: rgb(204, 102, 0); font-style: italic;">Front</span>Accounting&nbsp;Update</span></strong></div>
@@ -52,12 +49,14 @@ process earlier). </li>
     </ol>
   </li>
   <li>If there are changes to the database structure, please run the script <strong><em>update_db.php</em></strong>
-from FrontAccounting root installation, Enter the database user and the password and choose the update script from the local harddisk.</li>
-  <li><strong>When updating release 1.XX to release 2.0, you must run the update_db.php script and select the file <em>- alter.sql -</em> that are located in the sql folder. You <em>must</em> do this, before entering FrontAccounting!
-Enter the database user and the password and choose the alter.sql script. <br>You must also manuelly ensure that you have write permission to the new folder /company/0.</strong></li>
+from FrontAccounting root installation, Enter the database user and the
+password and choose the update script from the local harddisk.</li>
+  <li><strong>When updating release 1.XX to release 2.0, you must run the update_db.php script and select the file <em>- alter.sql -</em> that are located in the sql folder. You <em>must</em>
+do this, before entering FrontAccounting!
+Enter the database user and the password and choose the alter.sql
+script. &nbsp;Do the same for the alter2.sql script. If you have
+already updated release 2.0, you can just run the alter2.sql script.<br />You must also manuelly ensure that you have write permission to the new folder /company/0.</strong></li>
 </ul>
 
 <p>&nbsp;</p>
-</body>
-
-</html>
+</body></html>
\ No newline at end of file
-- 
2.30.2