Merge pull request #1060 from Arantor/release-2.1

MOAR SPRITES!

Sources/ManageSmileys.php

@@ -392,8 +392,7 @@ function EditSmileySets()
 				),
 				'data' => array(
 					'function' => create_function('$rowData', '
-						global $settings;
-						return $rowData[\'selected\'] ? \'<img src="\' . $settings[\'images_url\'] . \'/icons/field_valid.png" alt="*" class="icon" />\' : \'\';
+						return $rowData[\'selected\'] ? \'<span class="field_icons valid"></span>\' : \'\';
 					'),
 					'class' => 'centercol',
 				),

Themes/default/Profile.template.php

@@ -3143,14 +3143,14 @@ function template_authentication_method()
 								</dt>
 								<dd>
 									<input type="password" name="passwrd1" id="smf_autov_pwmain" size="30" tabindex="', $context['tabindex']++, '" class="input_password" />
-									<span id="smf_autov_pwmain_div" style="display: none;"><img id="smf_autov_pwmain_img" class="centericon" src="', $settings['images_url'], '/icons/field_invalid.png" alt="*" /></span>
+									<span id="smf_autov_pwmain_div" style="display: none;"><span id="smf_autov_pwmain_img" class="field_icons invalid centericon"></span></span>
 								</dd>
 								<dt>
 									<em>', $txt['verify_pass'], ':</em>
 								</dt>
 								<dd>
 									<input type="password" name="passwrd2" id="smf_autov_pwverify" size="30" tabindex="', $context['tabindex']++, '" class="input_password" />
-									<span id="smf_autov_pwverify_div" style="display: none;"><img id="smf_autov_pwverify_img" class="centericon" src="', $settings['images_url'], '/icons/field_valid.png" alt="*" /></span>
+									<span id="smf_autov_pwverify_div" style="display: none;"><span id="smf_autov_pwverify_img" class="field_icons valid"></span></span>
 								</dd>
 							</dl>
 						</dd>

Themes/default/Register.template.php

@@ -101,7 +101,7 @@ function template_registration_form()
 							<input type="text" name="user" id="smf_autov_username" size="30" tabindex="', $context['tabindex']++, '" maxlength="25" value="', isset($context['username']) ? $context['username'] : '', '" class="input_text" />
 							<span id="smf_autov_username_div" style="display: none;">
 								<a id="smf_autov_username_link" href="#">
-									<img id="smf_autov_username_img" src="', $settings['images_url'], '/icons/field_check.png" alt="*" />
+									<span id="smf_autov_username_img" class="field_icons check"></span>
 								</a>
 							</span>
 						</dd>
@@ -143,7 +143,7 @@ function template_registration_form()
 						<dd>
 							<input type="password" name="passwrd1" id="smf_autov_pwmain" size="30" tabindex="', $context['tabindex']++, '" class="input_password" />
 							<span id="smf_autov_pwmain_div" style="display: none;">
-								<img id="smf_autov_pwmain_img" src="', $settings['images_url'], '/icons/field_invalid.png" alt="*" />
+								<span id="smf_autov_pwmain_img" class="field_icons invalid"></span>
 							</span>
 						</dd>
 					</dl>
@@ -152,7 +152,7 @@ function template_registration_form()
 						<dd>
 							<input type="password" name="passwrd2" id="smf_autov_pwverify" size="30" tabindex="', $context['tabindex']++, '" class="input_password" />
 							<span id="smf_autov_pwverify_div" style="display: none;">
-								<img id="smf_autov_pwverify_img" src="', $settings['images_url'], '/icons/field_valid.png" alt="*" />
+								<span id="smf_autov_pwverify_img" class="field_icons valid"></span>
 							</span>
 						</dd>
 					</dl>';

Themes/default/Reminder.template.php

@@ -100,14 +100,14 @@ function template_set_password()
 					<dd>
 						<input type="password" name="passwrd1" id="smf_autov_pwmain" size="22" class="input_password" />
 						<span id="smf_autov_pwmain_div" style="display: none;">
-							<img id="smf_autov_pwmain_img" src="', $settings['images_url'], '/icons/field_invalid.png" alt="*" />
+							<span id="smf_autov_pwmain_img" class="field_icons invalid"></span>
 						</span>
 					</dd>
 					<dt>', $txt['verify_pass'], ': </dt>
 					<dd>
 						<input type="password" name="passwrd2" id="smf_autov_pwverify" size="22" class="input_password" />
 						<span id="smf_autov_pwverify_div" style="display: none;">
-							<img id="smf_autov_pwverify_img" src="', $settings['images_url'], '/icons/field_invalid.png" alt="*" />
+							<span id="smf_autov_pwverify_img" class="field_icons invalid"></span>
 						</span>
 					</dd>
 				</dl>
@@ -157,14 +157,14 @@ function template_ask()
 					<dd>
 						<input type="password" name="passwrd1" id="smf_autov_pwmain" size="22" class="input_password" />
 						<span id="smf_autov_pwmain_div" style="display: none;">
-							<img id="smf_autov_pwmain_img" src="', $settings['images_url'], '/icons/field_invalid.png" alt="*" />
+							<span id="smf_autov_pwmain_img" class="field_icons invalid"></span>
 						</span>
 					</dd>
 					<dt>', $txt['verify_pass'], ': </dt>
 					<dd>
 						<input type="password" name="passwrd2" id="smf_autov_pwverify" size="22" class="input_password" />
 						<span id="smf_autov_pwverify_div" style="display: none;">
-							<img id="smf_autov_pwverify_img" src="', $settings['images_url'], '/icons/field_valid.png" alt="*" />
+							<span id="smf_autov_pwverify_img" class="field_icons valid"></span>
 						</span>
 					</dd>';
 

Themes/default/css/index.css

@@ -2828,6 +2828,22 @@ fieldset.merge_options {
 	text-align: center;
 }
 
+.field_icons {
+	width: 16px;
+	height: 16px;
+	display: inline-block;
+	background: url(../images/field_icons.png) no-repeat 0 0;
+}
+.field_icons.valid {
+	background-position: 0 0;
+}
+.field_icons.check {
+	background-position: -16px 0;
+}
+.field_icons.invalid {
+	background-position: -32px 0;
+}
+
 /* Additional register fields */
 dl.register_form {
 	margin: 0;

Themes/default/scripts/register.js

@@ -159,7 +159,7 @@ function smfRegister(formID, passwordDifficultyLevel, regTextStrings)
 			stringIndex = 'password_valid';
 
 		// Set the image.
-		setVerificationImage(verificationFields['pwmain'][2], isValid, textStrings[stringIndex] ? textStrings[stringIndex] : '');
+		setVerificationImage(verificationFields['pwmain'][0], isValid, textStrings[stringIndex] ? textStrings[stringIndex] : '');
 		verificationFields['pwmain'][1].className = verificationFields['pwmain'][5] + ' ' + (isValid ? 'valid_input' : 'invalid_input');
 
 		// As this has changed the verification one may have too!
@@ -179,7 +179,7 @@ function smfRegister(formID, passwordDifficultyLevel, regTextStrings)
 		// Check and set valid status!
 		var isValid = verificationFields['pwmain'][1].value == verificationFields['pwverify'][1].value && refreshMainPassword(true);
 		var alt = textStrings[isValid == 1 ? 'password_valid' : 'password_no_match'] ? textStrings[isValid == 1 ? 'password_valid' : 'password_no_match'] : '';
-		setVerificationImage(verificationFields['pwverify'][2], isValid, alt);
+		setVerificationImage(verificationFields['pwverify'][0], isValid, alt);
 		verificationFields['pwverify'][1].className = verificationFields['pwverify'][5] + ' ' + (isValid ? 'valid_input' : 'invalid_input');
 
 		return true;
@@ -196,7 +196,7 @@ function smfRegister(formID, passwordDifficultyLevel, regTextStrings)
 			verificationFields['username'][1].className = verificationFields['username'][5];
 		// Check the image is correct.
 		var alt = textStrings['username_check'] ? textStrings['username_check'] : '';
-		setVerificationImage(verificationFields['username'][2], 'check', alt);
+		setVerificationImage(verificationFields['username'][0], 'check', alt);
 
 		// Check the password is still OK.
 		refreshMainPassword();
@@ -243,23 +243,24 @@ function smfRegister(formID, passwordDifficultyLevel, regTextStrings)
 		var alt = textStrings[isValid == 1 ? 'username_valid' : 'username_invalid'] ? textStrings[isValid == 1 ? 'username_valid' : 'username_invalid'] : '';
 
 		verificationFields['username'][1].className = verificationFields['username'][5] + ' ' + (isValid == 1 ? 'valid_input' : 'invalid_input');
-		setVerificationImage(verificationFields['username'][2], isValid == 1, alt);
+		setVerificationImage(verificationFields['username'][0], isValid == 1, alt);
 
 		ajax_indicator(false);
 	}
 
 	// Set the image to be the correct type.
-	function setVerificationImage(imageHandle, imageIcon, alt)
+	function setVerificationImage(fieldID, imageIcon, alt)
 	{
-		if (!imageHandle)
+		if (!fieldID)
 			return false;
 		if (!alt)
 			alt = '*';
 
-		var curImage = imageIcon ? (imageIcon == 'check' ? 'field_check.png' : 'field_valid.png') : 'field_invalid.png';
-		imageHandle.src = smf_images_url + '/icons/' + curImage;
-		imageHandle.alt = alt;
-		imageHandle.title = alt;
+		$('#' + fieldID + '_img').removeClass('valid check invalid').attr('alt', alt).attr('title', alt);
+		if (imageIcon)
+			$('#' + fieldID + '_img').addClass(imageIcon == 'check' ? 'check' : 'valid');
+		else
+			$('#' + fieldID + '_img').addClass('invalid');
 
 		return true;
 	}