Merge pull request #1045 from Arantor/release-2.1

More cleanup of things we're not using any more

Themes/default/ManageAttachments.template.php

@@ -175,7 +175,7 @@ function template_maintenance()
 						}
 
 						function show_msg() {
-							$(\'#progress_msg\').html(\'<div><img src="', $settings['actual_images_url'], '/loading.gif" alt="loading.gif" width="35" height="35" />&nbsp; ', $txt['attachment_transfer_progress'] , '<\/div>\');
+							$(\'#progress_msg\').html(\'<div><img src="', $settings['actual_images_url'], '/loading_sm.gif" alt="', $txt['ajax_in_progress'], '" width="35" height="35" />&nbsp; ', $txt['attachment_transfer_progress'] , '<\/div>\');
 							show_progress();
 						}
 

Themes/default/css/index.css

@@ -761,7 +761,6 @@ p.para2 {
 	font-size: 1.6em;
 	padding: 8px;
 	width: 100%;
-	height: 66px;
 	line-height: 25px;
 	position: fixed;
 	top: 0;

Themes/default/scripts/script.js

@@ -313,7 +313,7 @@ function reqWin(desktopURL, alternateWidth, alternateHeight, noScrollbars)
 function reqOverlayDiv(desktopURL, sHeader, sIcon)
 {
 	// Set up our div details
-	var sAjax_indicator = '<div class="centertext"><img src="' + smf_images_url + '/loading.gif" ></div>';
+	var sAjax_indicator = '<div class="centertext"><img src="' + smf_images_url + '/loading_sm.gif" /></div>';
 	var sIcon = smf_images_url + '/' + (typeof(sIcon) == 'string' ? sIcon : 'helptopics.png');
 	var sHeader = typeof(sHeader) == 'string' ? sHeader : help_popup_heading_text;