[3834] trunk/htdocs/system/installer: Properly quote font name with whitespace.

[svn-N...@habariproject.org]

Revision

3834

Author

rickc

Date

2009-11-27 02:02:04 +0000 (Fri, 27 Nov 2009)

Log Message

Properly quote font name with whitespace. Use the small warning icon rather than the fail icon for incorrect information. Get rid of annoying error message that pops up regarding passwords not matching even before the user has finished typing the password the second time. Extend the password help to tell the user both passwords must match.

Modified Paths

• trunk/htdocs/system/installer/db_setup.php
• trunk/htdocs/system/installer/script.js
• trunk/htdocs/system/installer/style.css

Diff

Modified: trunk/htdocs/system/installer/db_setup.php (3833 => 3834)

--- trunk/htdocs/system/installer/db_setup.php	2009-11-26 01:16:11 UTC (rev 3833)
+++ trunk/htdocs/system/installer/db_setup.php	2009-11-27 02:02:04 UTC (rev 3834)
@@ -191,7 +191,7 @@
 			<img class="status" src="<?php Site::out_url( 'habari' ); ?>/system/installer/images/ready.png" alt="">
 			<div class="warning"><?php echo elem_if_set( $form_errors, 'admin_pass'); ?></div>
 			<div class="help">
-				<?php _e('<strong>Password</strong> is the password of the initial user in Habari.'); ?>  <a href="#"><?php _e('Learn More...'); ?></a>
+				<?php _e('<strong>Password</strong> is the password of the initial user in Habari. Both password fields must match.'); ?>  <a href="#"><?php _e('Learn More...'); ?></a>
 			</div>
 		</div>
 

Modified: trunk/htdocs/system/installer/script.js (3833 => 3834)

--- trunk/htdocs/system/installer/script.js	2009-11-26 01:16:11 UTC (rev 3833)
+++ trunk/htdocs/system/installer/script.js	2009-11-27 02:02:04 UTC (rev 3834)
@@ -57,14 +57,14 @@
 		pass1 = $('#adminpass1');
 		pass2 = $('#adminpass2');
 
-		if ( pass1.val().length > 0 && pass2.val().length > 0 && pass1.val() != pass2.val() ) {
-			warningtext = 'The passwords do not match, try typing them again.';
-			pass1.parents('.inputfield').removeClass('invalid').removeClass('valid').addClass('invalid').find('.warning:hidden').html(warningtext).fadeIn();
-			installok = false;
-		}
-		else {
-			pass1.parents('.inputfield').removeClass('invalid').addClass('valid').find('.warning:visible').fadeOut();
-		}
+                if ( pass1.val().length > 0 && pass2.val().length > 0 && pass1.val() == pass2.val() ) {
+                    pass1.parents('.inputfield').removeClass('invalid').addClass('valid');
+                    installok = true;
+                }
+                else {
+					pass1.parents('.inputfield').removeClass('valid').addClass('invalid');
+					installok = false;
+                }
 
 		// Check other details have been entered
 		$('#sitename, #adminuser, #adminemail').each(function(){
@@ -72,7 +72,7 @@
 				$(this).parents('.inputfield').removeClass('invalid').addClass('valid').find('.warning:visible').fadeOut();
 			}
 			else {
-				$(this).parents('.inputfield').removeClass('valid');
+				$(this).parents('.inputfield').removeClass('valid').addClass('invalid');
 				installok = false;
 			}
 		});
@@ -245,7 +245,7 @@
 				installer.sqlite.validDBCredentials();
 			}
 		} else {
-			$('#databasefile').parents('.inputfield').removeClass('valid');
+			$('#databasefile').parents('.inputfield').removeClass('valid').addClass('invalid');
 			$('.installstep:eq(1)').removeClass('done');
 			$('#siteconfiguration, #pluginactivation, #install').removeClass('ready').removeClass('done').children('.options').fadeOut();
 			$('#siteconfiguration, #pluginactivation').children('.help-me').hide();

Modified: trunk/htdocs/system/installer/style.css (3833 => 3834)

--- trunk/htdocs/system/installer/style.css	2009-11-26 01:16:11 UTC (rev 3833)
+++ trunk/htdocs/system/installer/style.css	2009-11-27 02:02:04 UTC (rev 3834)
@@ -1,7 +1,7 @@
 /* @override style.css */
 
 body {
-	font-family: Helvetica Neue, Helvetica, Arial, Sans-Serif;
+	font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
 	padding: 0;
 	margin: 0;
 	}
@@ -161,7 +161,7 @@
 	}
 
 .invalid .status {
-	background: url(images/fail.png);
+        background: url(images/warningsmall.png) no-repeat center;
 	}
 
 .inputfield .warning {