From: Cindy Qi Li <cli@ocad.ca>
Date: Thu, 15 Sep 2011 16:00:54 +0000 (-0400)
Subject: Issue-4845: Merged in branch 'gsoc11_benj' for the enhanced mobile theme.
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=atutor.git;a=commitdiff_plain;h=b074c7dbbdf6ffc4a8a9cd13de0c42048bea5eba

Issue-4845: Merged in branch 'gsoc11_benj' for the enhanced mobile theme.
---

b074c7dbbdf6ffc4a8a9cd13de0c42048bea5eba
diff --cc docs/admin/config_edit.php
index 54cffa063,0d65eaf64..690a33adc
--- a/docs/admin/config_edit.php
+++ b/docs/admin/config_edit.php
@@@ -141,260 -141,7 +141,6 @@@ if (!isset($_POST['submit'])) 
  }
  ?>
  
- <form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="form">
- <div class="input-form">
- 	<div class="row">
- 		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="sitename"><?php echo _AT('site_name'); ?></label><br />
- 		<input type="text" name="site_name" size="40" maxlength="60" id="sitename" value="<?php if (!empty($_POST['site_name'])) { echo $stripslashes(htmlspecialchars($_POST['site_name'])); } else { echo $_config['site_name']; } ?>" />
- 	</div>
- 
- 	<div class="row">
- 		<label for="home_url"><?php echo _AT('home_url'); ?></label><br />
- 
- 		<input type="text" name="home_url" size="50" maxlength="60" id="home_url" value="<?php if (!empty($_POST['home_url'])) { echo $stripslashes(htmlspecialchars($_POST['home_url'])); } else { echo $_config['home_url']; } ?>"  />
- 	</div>
- 
- 	<div class="row">
- 		<label for="default_lang"><?php echo _AT('default_language'); ?></label><br />
- 
- 		<?php if (!empty($_POST['default_language'])) { 
- 				$select_lang = $_POST['default_language']; 
- 			} else { 
- 				$select_lang = $_config['default_language'];
- 			} ?>
- 		<?php if ($disabled): ?>
- 			<select name="default_language" id="default_lang" disabled="disabled"><option><?php echo $select_lang; ?></option></select>
- 		<?php else: ?>
- 			<?php $languageManager->printDropdown($select_lang, 'default_language', 'default_lang'); ?>
- 		<?php endif; ?>
- 	</div>
- 
- 	<div class="row">
- 		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="cemail"><?php echo _AT('contact_email'); ?></label><br />
- 		<input type="text" name="contact_email" id="cemail" size="40" value="<?php if (!empty($_POST['email'])) { echo $stripslashes(htmlspecialchars($_POST['email'])); } else { echo $_config['contact_email']; } ?>"  />
- 	</div>
- 
- 	<div class="row">
- 		<label for="time_zone"><?php echo _AT('time_zone'); ?></label><br />
- 
- 		<?php
- 
- 
- 		// Replace this hack to use the PHP timezone functions when the PHP requirement is raised to 5.3
- 		global $utc_timezones; // set in include/lib/constants.inc.php
- 		$local_offset = ((date(Z)/3600));
- 		echo '<select name="time_zone" id="time_zone">';	
- 			echo '<option value="0">'._AT('none').'</option>';
- 		foreach ($utc_timezones as $zone => $offset){
- 			if(($offset[1]) == $_config['time_zone']){
- 			echo '<option value="'.($offset[1]).'" selected="selected">'.$offset[1].'</option>';
- 			}else{
- 			echo '<option value="'.($offset[1]).'">'.$offset[1].'</option>';
- 
- 			}
- 		}
- 		echo "</select>";
- 
- 
- 		//echo '<input type="text" name="time_zone" value="'.$_config['time_zone'].'" size="5" maxlength="5"/> ';
- 
- 		// If PHP 5+ generate a list of timezones
- /*
- 		if(phpversion() >= 5){
- 			$timezone_names = timezone_identifiers_list();
- 		}else{
- 		// if less than PHP version 5, read a text file to generate the menu
- 			$timezone_names = file("timezones.txt");
- 		}
- 
- 		echo '<select name="time_zone">';
- 		foreach($timezone_names as $timezone_name){
- 			if($timezone_name == $_config{'time_zone'}){
- 				$selected = ' selected="selected"';
- 			}
- 			echo '<option'.$selected.'>'.$timezone_name.'</option>';
- 			$selected = '';
- 		}
- 		echo '</select>';
- */
- echo AT_date(_AT('server_date_format'), '', AT_DATE_MYSQL_DATETIME);
- ?>
- 	</div>
- 
- 	<div class="row">
- 		<label for="maxfile"><?php echo _AT('maximum_file_size'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['max_file_size']; ?>)<br />
- 		<input type="text" size="10" name="max_file_size" id="maxfile" value="<?php if (!empty($_POST['max_file_size'])) { echo $stripslashes(htmlspecialchars($_POST['max_file_size'])); } else { echo $_config['max_file_size']; } ?>"  /> <?php echo _AT('bytes'); ?>
- 	</div>
- 
- 	<div class="row">
- 		<label for="maxcourse"><?php echo _AT('maximum_course_size'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['max_course_size']; ?>)<br />
- 		<input type="text" size="10" name="max_course_size" id="maxcourse" value="<?php if (!empty($_POST['max_course_size'])) { echo $stripslashes(htmlspecialchars($_POST['max_course_size'])); } else { echo $_config['max_course_size']; } ?>"  /> <?php echo _AT('bytes'); ?>
- 	</div>
- 
- 	<div class="row">
- 		<label for="float"><?php echo _AT('maximum_course_float'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['max_course_float']; ?>)<br />
- 		<input type="text" size="10" name="max_course_float" id="float" value="<?php if (!empty($_POST['max_course_float'])) { echo $stripslashes(htmlspecialchars($_POST['max_course_float'])); } else { echo $_config['max_course_float']; } ?>"  /> <?php echo _AT('bytes'); ?>
- 	</div>
- 
- 	<div class="row">
- 		<label for="maximum_login_attempt"><?php echo _AT('maximum_login_attempt'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['max_login']; ?>)<br />
- 		<input type="text" size="10" name="max_login" id="maximum_login_attempt" value="<?php if (!empty($_POST['max_login'])) { echo $stripslashes(htmlspecialchars($_POST['max_login'])); } else { echo $_config['max_login']; } ?>"  /> <?php echo _AT('times'); ?>
- 	</div>
- 	
- 	<div class="row">
- 		<?php echo _AT('display_name_format'); ?> (<?php echo _AT('default'); ?>: <?php echo _AT($display_name_formats[$_config_defaults['display_name_format']], _AT('login_name'), _AT('first_name'), _AT('second_name'), _AT('last_name')); ?>)<br />
- 		<?php foreach ($display_name_formats as $key => $value): ?>
- 			<input type="radio" name="display_name_format" value="<?php echo $key; ?>" id="dnf<?php echo $key; ?>" <?php if ($_config['display_name_format'] == $key) { echo 'checked="checked"'; }?> /><label for="dnf<?php echo $key; ?>"><?php echo _AT($value, _AT('login_name'), _AT('first_name'), _AT('second_name'), _AT('last_name')); ?></label><br />
- 		<?php endforeach; ?>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('master_list_authentication'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['master_list'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="master_list" value="1" id="ml_y" <?php if ($_config['master_list']) { echo 'checked="checked"'; }?>  /><label for="ml_y"><?php echo _AT('enable'); ?></label> 
- 
- 		<input type="radio" name="master_list" value="0" id="ml_n" <?php if(!$_config['master_list']) { echo 'checked="checked"'; }?>  /><label for="ml_n"><?php echo  _AT('disable'); ?></label>
- 	</div>
- 	<div class="row">
- 		<?php echo _AT('allow_registration'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['allow_registration'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="allow_registration" value="1" id="reg_y" <?php if($_config['allow_registration']) { echo 'checked="checked"'; }?>  /><label for="reg_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="allow_registration" value="0" id="reg_n" <?php if(!$_config['allow_registration']) { echo 'checked="checked"'; }?>  /><label for="reg_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 	<div class="row">
- 		<?php echo _AT('allow_browse'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['allow_browse'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="allow_browse" value="1" id="browse_y" <?php if($_config['allow_browse']) { echo 'checked="checked"'; }?>  /><label for="browse_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="allow_browse" value="0" id="browse_n" <?php if(!$_config['allow_browse']) { echo 'checked="checked"'; }?>  /><label for="browse_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('allow_instructor_registration'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['allow_instructor_registration'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="allow_instructor_registration" value="1" id="enrollreg_y" <?php if($_config['allow_instructor_registration']) { echo 'checked="checked"'; }?>  /><label for="enrollreg_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="allow_instructor_registration" value="0" id="enrollreg_n" <?php if(!$_config['allow_instructor_registration']) { echo 'checked="checked"'; }?>  /><label for="enrollreg_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 	<div class="row">		
- 		<?php echo _AT('use_captcha'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['use_captcha'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<?php if (extension_loaded('gd')): ?>
- 		<input type="radio" name="use_captcha" value="1" id="use_captcha_y" <?php if($_config['use_captcha']) { echo 'checked="checked"'; }?>  /><label for="use_captcha_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="use_captcha" value="0" id="use_captcha_n" <?php if(!$_config['use_captcha']) { echo 'checked="checked"'; }?>  /><label for="use_captcha_n"><?php echo _AT('disable'); ?></label>
- 		<?php else: ?>
- 		<input type="radio" name="use_captcha" value="1" id="use_captcha_y" disabled="disabled" /><label for="use_captcha_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="use_captcha" value="0" id="use_captcha_n" checked="checked" /><label for="use_captcha_n"><?php echo _AT('disable'); ?></label>
- 		<?php endif; ?>
- 	</div>
- 	<div class="row">
- 		<?php echo _AT('allow_unenroll'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['allow_unenroll'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="allow_unenroll" value="1" id="ene_y" <?php if($_config['allow_unenroll']) { echo 'checked="checked"'; }?>  /><label for="ene_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="allow_unenroll" value="0" id="ene_n" <?php if(!$_config['allow_unenroll']) { echo 'checked="checked"'; }?>  /><label for="ene_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('require_email_confirmation'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['email_confirmation'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="email_confirmation" value="1" id="ec_y" <?php if ($_config['email_confirmation']) { echo 'checked="checked"'; }?>  /><label for="ec_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="email_confirmation" value="0" id="ec_n" <?php if(!$_config['email_confirmation']) { echo 'checked="checked"'; }?>  /><label for="ec_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 		
- 	<div class="row">
- 		<?php echo _AT('allow_instructor_requests'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['allow_instructor_requests'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="allow_instructor_requests" value="1" id="air_y" <?php if($_config['allow_instructor_requests']) { echo 'checked="checked"'; }?>  /><label for="air_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="allow_instructor_requests" value="0" id="air_n" <?php if(!$_config['allow_instructor_requests']) { echo 'checked="checked"'; }?>  /><label for="air_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('instructor_request_email_notification'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['email_notification'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="email_notification" value="1" id="en_y" <?php if ($_config['email_notification']) { echo 'checked="checked"'; }?>  /><label for="en_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="email_notification" value="0" id="en_n" <?php if(!$_config['email_notification']) { echo 'checked="checked"'; }?>  /><label for="en_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('auto_approve_instructors'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['auto_approve_instructors'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="auto_approve_instructors" value="1" id="aai_y" <?php if($_config['auto_approve_instructors']) { echo 'checked="checked"'; }?>  /><label for="aai_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="auto_approve_instructors" value="0" id="aai_n" <?php if(!$_config['auto_approve_instructors']) { echo 'checked="checked"'; }?>  /><label for="aai_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('theme_specific_categories'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['theme_categories'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="theme_categories" value="1" id="tc_y" <?php if($_config['theme_categories']) { echo 'checked="checked"'; }?>  /><label for="tc_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="theme_categories" value="0" id="tc_n" <?php if(!$_config['theme_categories']) { echo 'checked="checked"'; }?>  /><label for="tc_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('user_contributed_notes'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['user_notes'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="user_notes" value="1" id="un_y" <?php if($_config['user_notes']) { echo 'checked="checked"'; }?>  /><label for="un_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="user_notes" value="0" id="un_n" <?php if(!$_config['user_notes']) { echo 'checked="checked"'; }?>  /><label for="un_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 
- 	<div class="row">
- 		<label for="ext"><?php echo _AT('illegal_file_extensions'); ?></label><br />
- 		<textarea name="illegal_extentions" cols="24" id="ext" rows="2" class="formfield" ><?php if ($_config['illegal_extentions']) { echo str_replace('|',' ',$_config['illegal_extentions']); }?></textarea>
- 	</div>
- 
- 	<div class="row">
- 		<label for="cache"><?php echo _AT('cache_directory'); ?></label><br />
- 		<input type="text" name="cache_dir" id="cache" size="40" value="<?php if (!empty($_POST['cache_dir'])) { echo $stripslashes(htmlspecialchars($_POST['cache_dir'])); } else { echo $_config['cache_dir']; } ?>"  />
- 	</div>
- 
- 	<div class="row">
- 		<label for="latex_server"><?php echo _AT('latex_server'); ?></label><br />
- 		<input type="text" name="latex_server" id="latex_server" size="40" value="<?php if (!empty($_POST['latex_server'])) { echo $stripslashes(htmlspecialchars($_POST['latex_server'])); } else { echo $_config['latex_server']; } ?>"  />
- 	</div>
- 
- 	<div class="row">
- 		<label for="course_backups"><?php echo _AT('course_backups'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['course_backups']; ?>)<br />
- 		<input type="text" size="2" name="course_backups" id="course_backups" value="<?php if (!empty($_POST['course_backups'])) { echo $stripslashes(htmlspecialchars($_POST['course_backups'])); } else { echo $_config['course_backups']; } ?>"  />
- 	</div>
- 
- 	<div class="row">
- 		<label for="sent_msgs_ttl"><?php echo _AT('sent_msgs_ttl_text'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['sent_msgs_ttl']; ?>)<br />
- 		<input type="text" size="3" name="sent_msgs_ttl" id="sent_msgs_ttl" value="<?php if (!empty($_POST['sent_msgs_ttl'])) { echo intval($_POST['sent_msgs_ttl']); } else { echo $_config['sent_msgs_ttl']; } ?>"  />
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('auto_check_new_version'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['check_version'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="check_version" value="1" id="cv_y" <?php if($_config['check_version']) { echo 'checked="checked"'; }?>  /><label for="cv_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="check_version" value="0" id="cv_n" <?php if(!$_config['check_version']) { echo 'checked="checked"'; }?>  /><label for="cv_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('file_storage_version_control'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['fs_versioning'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="fs_versioning" value="1" id="cf_y" <?php if($_config['fs_versioning']) { echo 'checked="checked"'; }?>  /><label for="cf_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="fs_versioning" value="0" id="cf_n" <?php if(!$_config['fs_versioning']) { echo 'checked="checked"'; }?>  /><label for="cf_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 
- 	<div class="row">
- 		<input type="hidden" name="old_enable_mail_queue" value="<?php echo $_config['enable_mail_queue']; ?>" />
- 		<?php echo _AT('enable_mail_queue'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['enable_mail_queue'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<?php echo _AT('mail_queue_cron'); ?><br />
- 		<?php if (!$_config['last_cron'] || (time() - (int) $_config['last_cron'] > 2 * 60 * 60)): ?>
- 			<input type="radio" name="enable_mail_queue" value="1" disabled="disabled" id="mq_y"  /><label for="mq_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="enable_mail_queue" value="0" id="mq_n" checked="checked" /><label for="mq_n"><?php echo _AT('disable'); ?></label>
- 		<?php else: ?>
- 			<input type="radio" name="enable_mail_queue" value="1" id="mq_y" <?php if($_config['enable_mail_queue']) { echo 'checked="checked"'; }?>  /><label for="mq_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="enable_mail_queue" value="0" id="mq_n" <?php if(!$_config['enable_mail_queue']) { echo 'checked="checked"'; }?>  /><label for="mq_n"><?php echo _AT('disable'); ?></label>
- 		<?php endif; ?>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('auto_install_languages'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['auto_install_languages'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<?php echo _AT('auto_install_languages_cron'); ?><br />
- 		<?php if (!$_config['last_cron'] || (time() - (int) $_config['last_cron'] > 2 * 60 * 60)): ?>
- 			<input type="radio" name="auto_install_languages" value="1" disabled="disabled" /><?php echo _AT('enable'); ?> <input type="radio" name="auto_install_languages" value="0" id="ai_n" checked="checked" /><label for="ai_n"><?php echo _AT('disable'); ?></label>
- 		<?php else: ?>
- 			<input type="radio" name="auto_install_languages" value="1" id="ai_y" <?php if($_config['auto_install_languages']) { echo 'checked="checked"'; }?>  /><label for="ai_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="auto_install_languages" value="0" id="ai_n" <?php if(!$_config['auto_install_languages']) { echo 'checked="checked"'; }?>  /><label for="ai_n"><?php echo _AT('disable'); ?></label>
- 		<?php endif; ?>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('pretty_url'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['pretty_url'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="pretty_url" value="1" id="pu_y" <?php if($_config['pretty_url']) { echo 'checked="checked"'; }?> onclick="apache_mod_rewrite_toggler(true);"/><label for="pu_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="pretty_url" value="0" id="pu_n" <?php if(!$_config['pretty_url']) { echo 'checked="checked"'; }?> onclick="apache_mod_rewrite_toggler(false);"/><label for="pu_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('course_dir_name'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['course_dir_name'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 		<input type="radio" name="course_dir_name" value="1" id="cdn_y" <?php if($_config['course_dir_name']) { echo 'checked="checked"'; }?> /><label for="cdn_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="course_dir_name" value="0" id="cdn_n" <?php if(!$_config['course_dir_name']) { echo 'checked="checked"'; }?>  /><label for="cdn_n"><?php echo _AT('disable'); ?></label>
- 	</div>
- 
- 	<div class="row">
- 		<?php echo _AT('apache_mod_rewrite'); ?><br />
- 		<?php if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules())): ?>
- 			<?php echo _AT('mod_rewrite'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['apache_mod_rewrite'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 			<input type="radio" name="apache_mod_rewrite" value="1" id="mr_y" <?php if($_config['apache_mod_rewrite']) { echo 'checked="checked"'; }?> /><label for="mr_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="apache_mod_rewrite" value="0" id="mr_n" <?php if(!$_config['apache_mod_rewrite']) { echo 'checked="checked"'; }?>  /><label for="mr_n"><?php echo _AT('disable'); ?></label>
- 		<?php else: ?>
- 			<?php echo _AT('mod_rewrite'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['apache_mod_rewrite'] ? _AT('enable') : _AT('disable')); ?>)<br />
- 			<input type="radio" name="apache_mod_rewrite" value="1" id="mr_y" disabled="disabled" /><label for="mr_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="apache_mod_rewrite" value="0" id="mr_n" checked="checked" /><label for="mr_n"><?php echo _AT('disable'); ?></label>
- 		<?php endif; ?>
- 	</div>
- 
- 	<div class="row buttons">
- 			<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s"  />
- 		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>"  />
- 	</div>
- </div>
- </form>
- 
--
  <script type="text/javascript">
  	function apache_mod_rewrite_toggler(enabled){
  		var obj_y = document.getElementById('mr_y');
diff --cc docs/admin/index.php
index b44fc4eeb,f2276610f..d9061b164
--- a/docs/admin/index.php
+++ b/docs/admin/index.php
@@@ -42,6 -42,6 +42,7 @@@ if (isset($_POST['social_submit'])) 
  	}
  	$_config['just_social'] = $_POST['just_social'];
  }
++
  require(AT_INCLUDE_PATH.'header.inc.php');
  
  if ($_config['check_version']) {
@@@ -50,246 -50,114 +51,119 @@@
  		$msg->printFeedbacks('ATUTOR_UPDATE_AVAILABLE');
  	}
  }
- 
- ?>
- 
- <div class="container" style="width: 40%; float: right; padding-top: 4px; padding-left: 10px;">
- 	<div class="input-form" style="width: 98%;">
- 			<div class="row">
- 				<h3><?php echo _AT('social_switch'); ?></h3>
- 				<p><?php echo _AT('social_switch_text'); ?></p>
- 			</div>
- 			<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
- 			<div class="row">
- 			<?php echo _AT('social_switch'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['just_social'] ? _AT('just_social') : _AT('social_and_lms')); ?>)<br />
- 			<input type="radio" name="just_social" value="1" id="social_y" <?php if($_config['just_social']) { echo 'checked="checked"'; }?>  /><label for="social_y"><?php echo _AT('just_social'); ?></label> <br /><input type="radio" name="just_social" value="0" id="social_n" <?php if(!$_config['just_social']) { echo 'checked="checked"'; }?>  /><label for="social_n"><?php echo _AT('social_and_lms'); ?></label>
- 			</div>
- 
- 			<div class="row buttons">
- 				<input type="submit" name="social_submit" value="<?php echo _AT('save'); ?>" />
- 			</div>
- 			</form>
- 
- 	</div>
- 	<div class="input-form" style="width: 98%;">
- 			<div class="row">
- 				<h3><?php echo _AT('donate'); ?></h3>
- 				<p><?php echo _AT('donate_text'); ?></p>
- 			</div>
- 
- 			<div style="text-align:center;">
- 				<a href="http://www.atutor.ca/payment/index.php?project=ATutor-Donation"><img src="<?php echo $_base_href; ?>/images/donate.gif" height="28" width="136" border="0" alt="<?php echo _AT('donate'); ?>" /></a><br /><br />
- 			</div>
- 	</div>
- 	<?php if ($_config['allow_instructor_requests'] && admin_authenticate(AT_ADMIN_PRIV_USERS, AT_PRIV_RETURN)): ?> 
- 		<?php
- 			$sql	= "SELECT COUNT(*) AS cnt FROM ".TABLE_PREFIX."instructor_approvals";
+ if ($_config['allow_instructor_requests'] && admin_authenticate(AT_ADMIN_PRIV_USERS, AT_PRIV_RETURN)){
+ 	$sql	= "SELECT COUNT(*) AS cnt FROM ".TABLE_PREFIX."instructor_approvals";
  			$result = mysql_query($sql, $db);
  			$row    = mysql_fetch_assoc($result);
- 		?>
- 	<div class="input-form" style="width: 98%;">
- 		<form method="get" action="mods/_core/users/instructor_requests.php">
- 			<div class="row">
- 				<h3><?php echo _AT('instructor_requests'); ?></h3>
- 				<p><?php echo _AT('instructor_requests_text', $row['cnt']); ?></p>
- 			</div>
+ 			$instructor_row[] = $row;
+ 			$savant->assign('row_instructor', $instructor_row);
+ }
+ 
  
- 			<div class="row buttons">
- 				<input type="submit" name="submit" value="<?php echo _AT('view'); ?>" />
- 			</div>
- 		</form>
- 	</div>
- 	<?php endif; ?>
  
- 	<?php 
 -	$update_server = "update.atutor.ca"; 
++$update_server = "update.atutor.ca"; 
 +
++$file = fsockopen ($update_server, 80, $errno, $errstr, 15);
 +
- 	$update_server = "update.atutor.ca"; 
++if ($file) 
++{
++	// get patch list
++	$patch_folder = "http://" . $update_server . '/patch/' . str_replace('.', '_', VERSION) . '/';
  
--	$file = fsockopen ($update_server, 80, $errno, $errstr, 15);
++	$patch_list_xml = @file_get_contents($patch_folder . 'patch_list.xml');
  	
--	if ($file) 
++	if ($patch_list_xml) 
  	{
--		// get patch list
--		$patch_folder = "http://" . $update_server . '/patch/' . str_replace('.', '_', VERSION) . '/';
--
--		$patch_list_xml = @file_get_contents($patch_folder . 'patch_list.xml');
++		require_once('../mods/_standard/patcher/classes/PatchListParser.class.php');
++		$patchListParser = new PatchListParser();
++		$patchListParser->parse($patch_list_xml);
++		$patch_list_array = $patchListParser->getMyParsedArrayForVersion(VERSION);
  		
--		if ($patch_list_xml) 
--		{
--			require_once('../mods/_standard/patcher/classes/PatchListParser.class.php');
--			$patchListParser = new PatchListParser();
--			$patchListParser->parse($patch_list_xml);
--			$patch_list_array = $patchListParser->getMyParsedArrayForVersion(VERSION);
--			
--			if (count($patch_list_array)) {
--				foreach ($patch_list_array as $row_num => $patch) {
--					$patch_ids .= '\'' . $patch['atutor_patch_id'] . '\', ';
--				}
--					
--				$sql = "select count(distinct atutor_patch_id) cnt_installed_patches from ".TABLE_PREFIX."patches " .
--				       "where atutor_patch_id in (" . substr($patch_ids, 0, -2) .")".
--				       " and status like '%Installed'";
--			
--				$result = mysql_query($sql, $db) or die(mysql_error());
--				$row = mysql_fetch_assoc($result);
- 				
- 				$cnt = count($patch_list_array) - $row['cnt_installed_patches'];
- 	
- 				if ($cnt > 0)
- 				{
- 		?>
- 	<div class="input-form" style="width: 98%;">
- 		<form method="get" action="mods/_standard/patcher/index_admin.php">
- 			<div class="row">
- 				<h3><?php echo _AT('available_patches'); ?></h3>
- 				<p><?php echo _AT('available_patches_text', $cnt); ?></p>
- 			</div>
- 
- 			<div class="row buttons">
- 				<input type="submit" name="submit" value="<?php echo _AT('view'); ?>" />
- 			</div>
- 		</form>
- 	</div>
- 	<?php 
- 				}
- 			}
- 		}
- 	} 
- 
- 	?>
- 
- 	<div class="input-form" style="width: 98%">
- 		<?php
- 			if (!isset($_config['db_size']) || ($_config['db_size_ttl'] < time())) {
- 				$_config['db_size'] = 0;
- 				$sql = 'SHOW TABLE STATUS';
- 				$result = mysql_query($sql, $db);
- 				while($row = mysql_fetch_assoc($result)) {
- 					$_config['db_size'] += $row['Data_length']+$row['Index_length'];
- 				}
- 
- 				$sql = "REPLACE INTO ".TABLE_PREFIX."config VALUES ('db_size', '{$_config['db_size']}')";
- 				mysql_query($sql, $db);
- 
- 				// get disk usage if we're on *nix
- 				if (DIRECTORY_SEPARATOR == '/') {
- 					$du = @shell_exec('du -sk '.escapeshellcmd(AT_CONTENT_DIR));
- 					if ($du) {
- 						$_config['du_size'] = (int) $du;
- 						$sql = "REPLACE INTO ".TABLE_PREFIX."config VALUES ('du_size', '{$_config['du_size']}')";
- 						mysql_query($sql, $db);
- 					}
- 				}
- 
- 				$ttl = time() + 24 * 60 * 60; // every 1 day.
- 				$sql = "REPLACE INTO ".TABLE_PREFIX."config VALUES ('db_size_ttl', '$ttl')";
- 				mysql_query($sql, $db);
++		if (count($patch_list_array)) {
++			foreach ($patch_list_array as $row_num => $patch) {
++				$patch_ids .= '\'' . $patch['atutor_patch_id'] . '\', ';
 +			}
- 
- 			$sql = "SELECT COUNT(*) AS cnt FROM ".TABLE_PREFIX."courses";
- 			$result = mysql_query($sql, $db);
- 			$row = mysql_fetch_assoc($result);
- 			$num_courses = $row['cnt'];
- 
- 			$sql = "SELECT COUNT(*) AS cnt FROM ".TABLE_PREFIX."members";
- 			$result = mysql_query($sql, $db);
- 			$row = mysql_fetch_assoc($result);
- 			$num_users = $row['cnt'];
- 
- 			$sql = "SELECT COUNT(*) AS cnt FROM ".TABLE_PREFIX."admins";
- 			$result = mysql_query($sql, $db);
+ 				
 -				$cnt = count($patch_list_array) - $row['cnt_installed_patches'];
 -				$savant->assign('cnt', $cnt);
 -	
 -				if ($cnt > 0)
 -				{
 -	
++			$sql = "select count(distinct atutor_patch_id) cnt_installed_patches from ".TABLE_PREFIX."patches " .
++			       "where atutor_patch_id in (" . substr($patch_ids, 0, -2) .")".
++			       " and status like '%Installed'";
++		
++			$result = mysql_query($sql, $db) or die(mysql_error());
 +			$row = mysql_fetch_assoc($result);
- 			$num_users += $row['cnt'];
- 
- 			$sql = "SELECT VERSION()";
- 			$result = mysql_query($sql, $db);
- 			$row = mysql_fetch_array($result);
- 			$mysql_version = $row[0];
- 		?>
++			
++			$cnt = count($patch_list_array) - $row['cnt_installed_patches'];
++			$savant->assign('cnt', $cnt);
 +
- 		<div class="row">
- 			<h3><?php echo _AT('statistics_information'); ?></h3>
++			if ($cnt > 0)
++			{
 +
- 			<dl class="col-list">
- 				<?php if ($_config['db_size']): ?>
- 					<dt><?php echo _AT('database'); ?>:</dt>
- 					<dd><?php echo number_format($_config['db_size']/AT_KBYTE_SIZE/AT_KBYTE_SIZE,2); ?> <acronym title="<?php echo _AT('megabytes'); ?>"><?php echo _AT('mb'); ?></acronym></dd>
- 				<?php endif; ?>
 +
- 				<?php if ($_config['du_size']): ?>
- 					<dt><?php echo _AT('disk_usage'); ?>:</dt>
- 					<dd><?php echo number_format($_config['du_size']/AT_KBYTE_SIZE,2); ?> <acronym title="<?php echo _AT('megabytes'); ?>"><?php echo _AT('mb'); ?></acronym></dd>
- 				<?php endif; ?>
  
- 				<dt><?php echo _AT('courses'); ?>:</dt>
- 				<dd><?php echo $num_courses; ?></dd>
 -	
 -				}
+ 			}
+ 		}
 -	} 
++	}
++} 
++
+ if (!isset($_config['db_size']) || ($_config['db_size_ttl'] < time())) {
 -				$_config['db_size'] = 0;
 -				$sql = 'SHOW TABLE STATUS';
 -				$result = mysql_query($sql, $db);
 -				while($row = mysql_fetch_assoc($result)) {
 -					$_config['db_size'] += $row['Data_length']+$row['Index_length'];
 -				
 -				}
++	$_config['db_size'] = 0;
++	$sql = 'SHOW TABLE STATUS';
++	$result = mysql_query($sql, $db);
++	while($row = mysql_fetch_assoc($result)) {
++		$_config['db_size'] += $row['Data_length']+$row['Index_length'];
++	
++	}
  
- 				<dt><?php echo _AT('users'); ?>:</dt>
- 				<dd><?php echo $num_users; ?></dd>
 -				$sql = "REPLACE INTO ".TABLE_PREFIX."config VALUES ('db_size', '{$_config['db_size']}')";
 -				mysql_query($sql, $db);
++	$sql = "REPLACE INTO ".TABLE_PREFIX."config VALUES ('db_size', '{$_config['db_size']}')";
++	mysql_query($sql, $db);
 +
- 				<dt><?php echo _AT('atutor_version'); ?>:</dt>
-                 <?php
-                     require('../svn.php');
-                     if (!empty($svn_data)) {
-                         $svn_data   = explode("\n", $svn_data);
-                         if (substr($svn_data[1], 0, 1) == 'r') {
-                             $svn_data = $svn_data[1];
-                         } else if (substr($svn_data[2], 0, 1) == 'r') {
-                             $svn_data = $svn_data[2];
-                         }
++	// get disk usage if we're on *nix
++	if (DIRECTORY_SEPARATOR == '/') {
++		$du = @shell_exec('du -sk '.escapeshellcmd(AT_CONTENT_DIR));
++		if ($du) {
++			$_config['du_size'] = (int) $du;
++			$sql = "REPLACE INTO ".TABLE_PREFIX."config VALUES ('du_size', '{$_config['du_size']}')";
++			mysql_query($sql, $db);
+ 			
 -				// get disk usage if we're on *nix
 -				if (DIRECTORY_SEPARATOR == '/') {
 -					$du = @shell_exec('du -sk '.escapeshellcmd(AT_CONTENT_DIR));
 -					if ($du) {
 -						$_config['du_size'] = (int) $du;
 -						$sql = "REPLACE INTO ".TABLE_PREFIX."config VALUES ('du_size', '{$_config['du_size']}')";
 -						mysql_query($sql, $db);
 -						
 -					}
 -				}
 -
 -				$ttl = time() + 24 * 60 * 60; // every 1 day.
 -				$sql = "REPLACE INTO ".TABLE_PREFIX."config VALUES ('db_size_ttl', '$ttl')";
 -				mysql_query($sql, $db);
 -				
 -			}
++		}
++	}
  
-                         if (count($svn_data) > 1) {
-                             $build = 'unknown';
-                             $build_date = date('Y-m-d H:i:s');
-                         } else {
-                             $svn_data   = explode(' ', $svn_data);
 -			$sql = "SELECT COUNT(*) AS cnt FROM ".TABLE_PREFIX."courses";
 -			$result = mysql_query($sql, $db);
 -			$row = mysql_fetch_assoc($result);
 -			$num_courses = $row['cnt'];
 -			$savant->assign('num_courses', $num_courses);
++	$ttl = time() + 24 * 60 * 60; // every 1 day.
++	$sql = "REPLACE INTO ".TABLE_PREFIX."config VALUES ('db_size_ttl', '$ttl')";
++	mysql_query($sql, $db);
++	
++}
  
-                             $build      = $svn_data[0];
-                             $build_date = $svn_data[4] .' '. $svn_data[5];
-                         }
-                         $build_str = '(' . $build . ' - '.$build_date . ')';
-                     }
-                 ?>
- 				<dd><?php echo _AT('atutor_version_text', VERSION . $build_str, urlencode(VERSION)); ?></dd>
 -			$sql = "SELECT COUNT(*) AS cnt FROM ".TABLE_PREFIX."members";
 -			$result = mysql_query($sql, $db);
 -			$row = mysql_fetch_assoc($result);
 -			$num_users = $row['cnt'];
 -			$savant->assign('num_users', $num_users);
++$sql = "SELECT COUNT(*) AS cnt FROM ".TABLE_PREFIX."courses";
++$result = mysql_query($sql, $db);
++$row = mysql_fetch_assoc($result);
++$num_courses = $row['cnt'];
++$savant->assign('num_courses', $num_courses);
  
- 				<dt><?php echo _AT('php_version'); ?>:</dt>
- 				<dd><?php echo PHP_VERSION; ?></dd>
 -			$sql = "SELECT COUNT(*) AS cnt FROM ".TABLE_PREFIX."admins";
 -			$result = mysql_query($sql, $db);
 -			$row = mysql_fetch_assoc($result);
 -			$num_users += $row['cnt'];
 -			
++$sql = "SELECT COUNT(*) AS cnt FROM ".TABLE_PREFIX."members";
++$result = mysql_query($sql, $db);
++$row = mysql_fetch_assoc($result);
++$num_users = $row['cnt'];
++$savant->assign('num_users', $num_users);
  
- 				<dt><?php echo _AT('mysql_version'); ?>:</dt>
- 				<dd><?php echo $mysql_version; ?></dd>
 -			$sql = "SELECT VERSION()";
 -			$result = mysql_query($sql, $db);
 -			$row = mysql_fetch_array($result);
 -			$mysql_version = $row[0];
++$sql = "SELECT COUNT(*) AS cnt FROM ".TABLE_PREFIX."admins";
++$result = mysql_query($sql, $db);
++$row = mysql_fetch_assoc($result);
++$num_users += $row['cnt'];
 +
- 				<dt><?php echo _AT('os'); ?>:</dt>
- 				<dd><?php echo @php_uname('s') . ' ' . @php_uname('r'); ?></dd>
- 			</dl>
- 		</div>
- 	</div>
 +
- </div>
++$sql = "SELECT VERSION()";
++$result = mysql_query($sql, $db);
++$row = mysql_fetch_array($result);
++$mysql_version = $row[0];
  
- <div class="admin_container" style="width: 55%;">
- 	<?php
- 	$path_length = strlen($_base_path);
+ $savant->assign('path_length', $path_length);
+ $savant->assign('pages', $_pages);
+ $savant->assign('db_size', $_config['db_size']);
+ $savant->assign('du_size', $_config['du_size']);
+ $savant->assign('row', $row);
 +
- 	echo '<ol id="tools" style="margin-right: 0px;">';
- 	foreach ($_top_level_pages as $page_info) {
- 		echo '<li class="top-tool"><a href="' . $page_info['url'] . '">' . $page_info['title'] . '</a>  ';
+ $savant->display('admin/index.tmpl.php');
 -require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
 +
- 		$page_info['url'] = substr($page_info['url'], $path_length);
++require(AT_INCLUDE_PATH.'footer.inc.php'); 
 +
- 		if ($_pages[$page_info['url']]['children']) {
- 			echo '<ul class="child-top-tool">';
- 			foreach ($_pages[$page_info['url']]['children'] as $child) {
- 				// check whether the page is set to be available for mobile themes. @see include/lib/menu_pages.php
- 				if (page_available($child)) {
- 					echo ' <li class="child-tool"><a href="'.$child.'">'._AT($_pages[$child]['title_var']).'</a></li>';
- 				}
- 			}
- 			echo '</ul>';
- 		}
- 		echo '</li>';
- 	}
- 	echo '</ol>';
- ?>
- </div>
- <?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
++?>
diff --cc docs/confirm.php
index 35b1d6f73,a49f51f79..2c5bec491
--- a/docs/confirm.php
+++ b/docs/confirm.php
@@@ -162,26 -162,10 +162,9 @@@ if (isset($_REQUEST['auto_login'])
  	}
  }
  
--require(AT_INCLUDE_PATH.'header.inc.php'); ?>
++require(AT_INCLUDE_PATH.'header.inc.php'); 
  
- <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
 -
 -
 -<?php
+ $savant->display('confirm.tmpl.php');
 -require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
 +
- <div class="input-form" style="max-width: 400px">
- 	<div class="row">
- 		<p><?php echo _AT('send_confirmation'); ?></p>
- 	</div>
- 
- 	<div class="row">
- 		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="email"><?php echo _AT('email'); ?></label><br />
- 		<input type="text" name="email" id="email" size="50" />
- 		<input type="hidden" name="en_id" id="en_id" value="<?php echo AT_print($_REQUEST['en_id'], 'input.email'); ?>" size="50" />
- 	</div>
- 
- 	<div class="row buttons">
- 		<input type="submit" name="submit" value="<?php echo _AT('send'); ?>" /> 
- 		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
- 	</div>
- </div>
- </form>
- 
- <?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
++require(AT_INCLUDE_PATH.'footer.inc.php'); 
++?>
diff --cc docs/include/vitals.inc.php
index f642bde10,4d183a800..193216b00
--- a/docs/include/vitals.inc.php
+++ b/docs/include/vitals.inc.php
@@@ -13,7 -13,7 +13,7 @@@
  
  if (!defined('AT_INCLUDE_PATH')) { exit; }
  
--define('AT_DEVEL', 1);
++define('AT_DEVEL', 0);
  define('AT_ERROR_REPORTING', E_ALL ^ E_NOTICE); // default is E_ALL ^ E_NOTICE, use E_ALL or E_ALL + E_STRICT for developing
  define('AT_DEVEL_TRANSLATE', 0);
  
@@@ -1422,7 -1350,9 +1422,8 @@@ function is_mobile_device() 
  	return ((stripos($http_user_agent, IPOD_DEVICE) !== false && stripos($http_user_agent, IPOD_DEVICE) >= 0) ||
  			(stripos($http_user_agent, IPHONE_DEVICE) !== false && stripos($http_user_agent, IPHONE_DEVICE) >= 0) ||
  	        (stripos($http_user_agent, BLACKBERRY_DEVICE) !== false && stripos($http_user_agent, BLACKBERRY_DEVICE) >= 0) ||
 - 		  (stripos($http_user_agent, IPAD_DEVICE) !== false && stripos($http_user_agent, IPAD_DEVICE) >= 0) ||
++	        (stripos($http_user_agent, IPAD_DEVICE) !== false && stripos($http_user_agent, IPAD_DEVICE) >= 0) ||
  	        (stripos($http_user_agent, ANDROID_DEVICE) !== false && stripos($http_user_agent, ANDROID_DEVICE) >= 0)) 
 -	      
  	        ? true : false;
  }
  
@@@ -1434,6 -1364,8 +1435,8 @@@ function get_mobile_device_type() 
  		return IPHONE_DEVICE;
  	} else if (stripos($http_user_agent, BLACKBERRY_DEVICE) !== false && stripos($http_user_agent, BLACKBERRY_DEVICE) >= 0) {
  		return BLACKBERRY_DEVICE;
 -			} else if (stripos($http_user_agent, IPAD_DEVICE) !== false && stripos($http_user_agent, IPAD_DEVICE) >= 0) {
++	} else if (stripos($http_user_agent, IPAD_DEVICE) !== false && stripos($http_user_agent, IPAD_DEVICE) >= 0) {
+ 		return IPAD_DEVICE;
  	} else if (stripos($http_user_agent, ANDROID_DEVICE) !== false && stripos($http_user_agent, ANDROID_DEVICE) >= 0) {
  		return ANDROID_DEVICE;
  	} else {
diff --cc docs/mods/_core/enrolment/html/enrollment.inc.php
index 8dc73a88e,34a56859d..d30c9e5e8
--- a/docs/mods/_core/enrolment/html/enrollment.inc.php
+++ b/docs/mods/_core/enrolment/html/enrollment.inc.php
@@@ -266,146 -266,8 +266,6 @@@ require(AT_INCLUDE_PATH.'header.inc.php
  
  ?>
  
- <form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
- 	<input type="hidden" name="tab" value="<?php echo $current_tab; ?>"/>
- 	<input type="hidden" name="course_id" value="<?php echo $course_id; ?>"/>
- 	<div class="input-form">
- 	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('search'); ?></legend>
- 		<?php if (admin_authenticate(AT_ADMIN_PRIV_ENROLLMENT, TRUE)): ?>
- 			<div class="row">
- 				<label for="course"><?php echo _AT('course'); ?></label><br/>
- 				<select name="course_id" id="course">
- 				<?php
- 				$sql = "SELECT course_id, title FROM ".TABLE_PREFIX."courses ORDER BY title";
- 				$result = mysql_query($sql, $db);
- 				while ($courses_row = mysql_fetch_assoc($result)) {
- 					if ($courses_row['course_id'] == $course_id) {
- 						echo '<option value="'.$courses_row['course_id'].'" selected="selected">'.validate_length($courses_row['title'], 45,VALIDATE_LENGTH_FOR_DISPLAY).'</option>';
- 					} else {
- 						echo '<option value="'.$courses_row['course_id'].'">'.validate_length($courses_row['title'],45,VALIDATE_LENGTH_FOR_DISPLAY).'</option>';
- 					}
- 				}
- 				?></select>
- 			</div>
- 		<?php endif; ?>
- 
- 		<div class="row">
- 			<label for="search"><?php echo _AT('search'); ?> (<?php echo _AT('login_name').', '._AT('first_name').', '._AT('second_name').', '._AT('last_name') .', '._AT('email'); ?>)</label><br />
- 			<input type="text" name="search" id="search" size="40" value="<?php echo htmlspecialchars($_GET['search']); ?>" />
- 			<br/>
- 			<?php echo _AT('search_match'); ?>:
- 			<input type="radio" name="match" value="all" id="match_all" <?php echo $checked_match_all; ?> /><label for="match_all"><?php echo _AT('search_all_words'); ?></label> <input type="radio" name="match" value="one" id="match_one" <?php echo $checked_match_one; ?> /><label for="match_one"><?php echo _AT('search_any_word'); ?></label>
- 		</div>
- 
- 		<div class="row buttons">
- 			<input type="submit" name="filter" value="<?php echo _AT('filter'); ?>" />
- 			<input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>" />
- 		</div>
- 	</fieldset>
- 	</div>
- </form>
- 
- <?php print_paginator($page, $tab_counts[$current_tab], $page_string_w_tab . SEP . $order .'='. $col, $results_per_page); ?>
- 
- <form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="selectform">
- <input type="hidden" name="tab" value="<?php echo $current_tab; ?>" />
- <input type="hidden" name="course_id" value="<?php echo $course_id; ?>"/>
- 
- <ul id="etabbed-list">
- 	<?php for ($i = 0; $i< $num_tabs; $i++): ?>
- 		<?php if ($current_tab == $i): ?>
- 			<li class="prefs_tab_selected"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?tab=<?php echo $i.$page_string; ?>" class="active"><strong><?php echo _AT($tabs[$i]); ?> - <?php echo $tab_counts[$i]; ?></strong></a></li>
- 		<?php else: ?>
- 			<li class="prefs_tab"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?tab=<?php echo $i.$page_string; ?>"><?php echo _AT($tabs[$i]); ?> - <?php echo $tab_counts[$i]; ?></a></li>
- 		<?php endif; ?>
- 	<?php endfor; ?>
- </ul>
- 
- 
- <table class="data" style="width:95%;" summary="" rules="cols" >
- <colgroup>
- 	<?php if ($col == 'login'): ?>
- 		<col />
- 		<col class="sort" />
- 		<col span="4" />
- 	<?php elseif($col == 'first_name'): ?>
- 		<col span="2" />
- 		<col class="sort" />
- 		<col span="3" />
- 	<?php elseif($col == 'second_name'): ?>
- 		<col span="3" />
- 		<col class="sort" />
- 		<col span="2" />
- 	<?php elseif($col == 'last_name'): ?>
- 		<col span="4" />
- 		<col class="sort" />
- 		<col />
- 	<?php elseif($col == 'email'): ?>
- 		<col span="5" />
- 		<col class="sort" />
- 	<?php endif; ?>
- </colgroup>
- <thead>
- <tr>
- 	<th scope="col" align="left"><input type="checkbox" value="<?php echo _AT('select_all'); ?>" id="all" title="<?php echo _AT('select_all'); ?>" name="selectall" onclick="CheckAll();" /></th>
- 
- 	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $orders[$order]; ?>=login<?php echo $page_string_w_tab;?>"><?php echo _AT('login_name'); ?></a></th>
- 
- 	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $orders[$order]; ?>=first_name<?php echo $page_string_w_tab;?>"><?php echo _AT('first_name'); ?></a></th>
- 
- 	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $orders[$order]; ?>=second_name<?php echo $page_string_w_tab;?>"><?php echo _AT('second_name'); ?></a></th>
- 
- 	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $orders[$order]; ?>=last_name<?php echo $page_string_w_tab;?>"><?php echo _AT('last_name'); ?></a></th>
- 
- 	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $orders[$order]; ?>=email<?php echo $page_string_w_tab;?>"><?php echo _AT('email'); ?></a></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- 	<td colspan="6">
- 		<?php if ($current_tab == 0): ?>
- 			<input type="submit" name="role"     value="<?php echo _AT('privileges');  ?>" /> 
- 			<input type="submit" name="unenroll" value="<?php echo _AT('remove');    ?>" /> 
- 			<input type="submit" name="alumni"   value="<?php echo _AT('mark_alumni'); ?>" />
- 		<?php elseif ($current_tab == 1): ?>
- 			<input type="submit" name="role" value="<?php echo _AT('privileges'); ?>" /> 
- 			<input type="submit" name="unenroll" value="<?php echo _AT('remove'); ?>" /> 
- 
- 		<?php elseif ($current_tab == 2): ?>
- 			<input type="submit" name="enroll"   value="<?php echo _AT('enroll'); ?>" /> 
- 			<input type="submit" name="unenroll" value="<?php echo _AT('remove'); ?>" />
- 		
- 		<?php elseif ($current_tab == 3): ?>
- 			<input type="submit" name="enroll" value="<?php echo _AT('enroll'); ?>" /> 
- 			<input type="submit" name="unenroll" value="<?php echo _AT('remove'); ?>" />
- 
- 		<?php elseif ($current_tab == 4): ?>
- 			<input type="submit" name="enroll"   value="<?php echo _AT('enroll'); ?>" /> 
--
- 		<?php endif; ?></td>
- </tr>
- </tfoot>
- <tbody>
- <?php if ($tab_counts[$current_tab]): ?>
- 	<?php while ($row = mysql_fetch_assoc($enrollment_result)): ?>
- 		<tr onmousedown="document.selectform['m<?php echo $row['member_id']; ?>'].checked = !document.selectform['m<?php echo $row['member_id']; ?>'].checked; togglerowhighlight(this, 'm<?php echo $row['member_id']; ?>');" id="rm<?php echo $row['member_id']; ?>">
- 			<td><input type="checkbox" name="id[]" value="<?php echo $row['member_id']; ?>" id="m<?php echo $row['member_id']; ?>" onmouseup="this.checked=!this.checked" title="<?php echo AT_print($row['login'], 'members.login'); ?>" /></td>
- 			<td><?php echo AT_print($row['login'], 'members.login'); ?></td>
- 			<td><?php echo AT_print($row['first_name'], 'members.name'); ?></td>
- 			<td><?php echo AT_print($row['second_name'], 'members.name'); ?></td>
- 			<td><?php echo AT_print($row['last_name'], 'members.name'); ?></td>
- 			<td><?php echo AT_print($row['email'], 'members.email'); ?></td>
- 		</tr>
- 	<?php endwhile; ?>
- <?php else: ?>
- 	<tr>
- 		<td colspan="6"><?php echo _AT('none_found'); ?></td>
- 	</tr>
- <?php endif; ?>
- </tbody>
- </table>
- </form>
--
  <script language="JavaScript" type="text/javascript">
  //<!--
  function CheckAll() {
@@@ -427,4 -289,31 +287,32 @@@ function togglerowhighlight(obj, boxid
  }
  //-->
  </script>
- <?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
+ <?php 
+ 
+ $savant->assign('current_tab', $current_tab);
+ $savant->assign('course_id', $course_id);
+ $sql = "SELECT course_id, title FROM ".TABLE_PREFIX."courses ORDER BY title";
+ $result = mysql_query($sql, $db);
+ $savant->assign('result', $result);
+ $savant->assign('checked_match_all', $checked_match_all);
+ $savant->assign('checked_match_one', $checked_match_one);
+ $savant->assign('page', $page);
+ $savant->assign('tab_counts', $tab_counts);
+ $savant->assign('page_string_w_tab', $page_string_w_tab);
+ $savant->assign('order', $order);
+ $savant->assign('orders', $orders);
+ $savant->assign('col', $col);
+ $savant->assign('cols', $cols);
+ $savant->assign('results_per_page', $results_per_page);
+ $savant->assign('num_tabs', $num_tabs);
+ $savant->assign('tabs', $tabs);
+ $savant->assign('enrollment_result', $enrollment_result);
+ if($_SESSION['is_admin'] == 0 && $_SESSION['privileges'] == AT_ADMIN_PRIV_ADMIN) {
+ 	$savant->display('admin/courses/enrollment.tmpl.php');
+ }
+ if($_SESSION['is_admin'] == 1){
+ 	$savant->display('instructor/enrolment/index.tmpl.php');
+ }
+ 
 -require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
++require(AT_INCLUDE_PATH.'footer.inc.php'); 
++?>
diff --cc docs/mods/_core/users/instructor_requests.php
index 6d5eb6413,f5fa8d6f1..6487ec214
--- a/docs/mods/_core/users/instructor_requests.php
+++ b/docs/mods/_core/users/instructor_requests.php
@@@ -164,51 -81,8 +164,10 @@@ require(AT_INCLUDE_PATH.'header.inc.php
  $sql	= "SELECT M.login, M.first_name, M.last_name, M.email, M.member_id, A.* FROM ".TABLE_PREFIX."members M, ".TABLE_PREFIX."instructor_approvals A WHERE A.member_id=M.member_id ORDER BY M.login";
  $result = mysql_query($sql, $db);
  $num_pending = mysql_num_rows($result);
- ?>
- 
- <form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
- <table class="data" summary="" rules="cols">
- <thead>
- <tr>
- 	<th scope="col">&nbsp;</th>
- 	<th scope="col"><?php echo _AT('login_name');     ?></th>
- 	<th scope="col"><?php echo _AT('first_name');   ?></th>
- 	<th scope="col"><?php echo _AT('last_name');    ?></th>
- 	<th scope="col"><?php echo _AT('email');        ?></th>
- 	<th scope="col"><?php echo _AT('notes');        ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- 	<td colspan="6">
- 	<input type="hidden" name="auth_publicKey" value="<?php echo $publicKey; ?>" />
- 	<input type="hidden" name="auth_timestamp" value="<?php echo $timestamp; ?>" />
- 	<input type="hidden" name="auth_token" value="<?php echo at_sign_request($timestamp, $publicKey); ?>" />
- 	<input type="submit" name="deny" value="<?php echo _AT('deny'); ?>" /> 
- 	<input type="submit" name="approve" value="<?php echo _AT('approve'); ?>" /></td>
- </tr>
- </tfoot>
- <tbody>
- <?php
- 	if ($row = mysql_fetch_assoc($result)) {
- 		do {
- 			echo '<tr onmousedown="document.form[\'i'.$row['member_id'].'\'].checked = true;rowselect(this);" id="r_'.$row['member_id'].'">';
- 			echo '<td><input type="radio" name="id" value="'.$row['member_id'].'" id="i'.$row['member_id'].'" /></td>';
- 			echo '<td><label for="i'.$row['member_id'].'">'.AT_print($row['login'], 'members.login').'</label></td>';
- 			echo '<td>'.AT_print($row['first_name'], 'members.first_name').'</td>';
- 			echo '<td>'.AT_print($row['last_name'], 'members.last_name').'</td>';
- 			echo '<td>'.AT_print($row['email'], 'members.email').'</td>';
- 			
- 			echo '<td>'.AT_print($row['notes'], 'instructor_approvals.notes').'</td>';
- 
- 			echo '</tr>';
- 		} while ($row = mysql_fetch_assoc($result));
- 	} else {
- 		echo '<tr><td colspan="6">'._AT('none_found').'</td></tr>';
- 	}
- ?>
- </tbody>
- </table>
- </form>
  
- <?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
+ $savant->assign('result', $result);
+ $savant->assign('num_pending', $num_pending);
+ $savant->display('admin/users/instructor_requests.tmpl.php');
 -require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
++
++require(AT_INCLUDE_PATH.'footer.inc.php'); 
++?>
diff --cc docs/mods/_standard/patcher/module.php
index 7f9e41c43,c51cab590..2def6fe81
--- a/docs/mods/_standard/patcher/module.php
+++ b/docs/mods/_standard/patcher/module.php
@@@ -23,7 -23,7 +23,7 @@@ if (admin_authenticate(AT_ADMIN_PRIV_PA
  	$this->_pages['mods/_standard/patcher/index_admin.php']['title_var'] = 'patcher';
  	$this->_pages['mods/_standard/patcher/index_admin.php']['parent']    = AT_NAV_ADMIN;
  	$this->_pages['mods/_standard/patcher/index_admin.php']['avail_in_mobile']   = false;
- 	
 -
++
  	$this->_pages['mods/_standard/patcher/index_admin.php']['children'] = array('mods/_standard/patcher/myown_patches.php','mods/_standard/patcher/patch_create.php');
  	$this->_pages['mods/_standard/patcher/myown_patches.php']['title_var'] = 'myown_patches';
  	$this->_pages['mods/_standard/patcher/myown_patches.php']['parent']   = 'mods/_standard/patcher/index_admin.php';
diff --cc docs/themes/default/styles.css
index 5a847c14b,efb76dd29..60f7e6b13
--- a/docs/themes/default/styles.css
+++ b/docs/themes/default/styles.css
@@@ -10,18 -10,19 +10,18 @@@ html,body
  	margin-left:.8em;
  	float:left;
  }
- /* main body attributes */
+ /* main body attributes STARTED HERE */
  body {
  	font-family: Verdana, Helevetica, Arial, sans-serif;
 +	font-size:.8em;
  	margin:0px;
 -	margin-top: -10px;
 -	background-color: #EDE7C2;
 +	background-color: #F2F9FA;
  }
  .page_wrapper{
 -	border:1px solid #aaaaaa;
 -	width:97%;
 +/*	border:1px solid #aaaaaa;*/
 +	width:100%;
  	margin-left:auto;
  	margin-right:auto;
 -	margin-top:1em;
  	background-color: #ffffff;
  	border-radius: 1em 1em 1em 1em;
  	-moz-border-radius: 1em 1em 1em 1em;
@@@ -2496,445 -2507,11 +2496,449 @@@ float:right
  img.fl-col{
  height:3.5em;
  width:3.5em;
 -font-size:100%;
 +/*font-size:100%;*/
 +}
 +
 +
 +/*  Photo Album Styles 
 + * 
 + * 
 + * 
 + * 
 + */
 +div.topbar{
 +	float:left;
 +	width: 95%;
 +}
 +div.paginator{
 +	float: right;
 +	margin: 0px;
 +}
 +.paginator ul li{
 +	list-style: none;
 +}
 +.paginator li{
 +	padding-right: 0.5em;
 +	float: left;
 +}
 +
 +div.summary{
 +	float: left;
 +	margin-top: 0.5em;
 +	width:70%;
 +}
 +
 +div.album_panel{
 +	float: left;
 +	background: #F7F7F7;
 +	border: 1px solid #D2D2D2;	
 +	width: 96%;
 +	border-radius:.5em;
 +	-moz-border-radius: .5em .5em .5em .5em;
 +/*	-moz-box-shadow:.2em .2em .1em #999999;
 +    box-shadow: .2em .2em .1em #999999;*/
 +	padding:.3em;
 +}
 +div.album_panel div.photo_wrapper {
 +	/* This class is to fix the problem where the images shift
 +	 * to the right when there is a border upon selection 
 +	 */
 +	height: 150px;
 +	float: left;
 +}
 +div.album_panel .photo_frame{
 +	float: left;
 +	margin: 0.2em;
 +	min-height: 140px;
 +	min-width: 140px;
 +	text-align: center;
 +}
 +div.album_panel .photo_frame a:focus, div.album_panel .photo_frame a:hover{
 +	cursor: pointer;
 +	float:left;
 +	min-width: 140px;
 +	min-height: 140px;
 +	background: #FCE6C9;
 +}
 +div.album_panel .photo_frame img{
 +	background: #FFFFFF;
 +	border: 1px solid #D2D2D2;
 +	padding: 0.2em;
 +}
 +div.album_panel .album_description{
 +	margin: 0.5em;
 +	width: 95%;
 +	float: left;
 +}
 +
 +div.search_bar {
 +	/* background-image: url('images/search_bg.png');
 +	background-repeat: no-repeat; */
 +	background-color:#ffffff;
 +	border:thin solid #cccccc;
 +	margin-left: 0.5em;
 +	margin-top: 0.5em;
 +	height: 27px;
 +	width: 180px;
 +	float: left;
 +	border-radius:.5em;
 +	-moz-border-radius:.8em .8em .8em .8em;
 +/*		-moz-box-shadow:.2em .2em .1em #999999;
 +    box-shadow: .2em .2em .1em #999999;*/
 +}
 +div.search_bar .s{
 +	float: left;
 +	border: 0px;
 +	margin-top: 0.3em;
 +	margin-left: 0.5em;
 +	width: 148px;
 +}
 +div.search_bar .s_img{
 +	float: right;
 +	border: 0px;
 +	margin-top: 0.375em;	
 +	margin-top: -1.4em\9; /* the \9 to accomodate IE 7&8 */
 +	margin-right: 0.4em;
 +}
 +
 +div.album {
 +	background: #FFFFFF;
 +	padding:1em;
 +	border: 1px solid #D2D2D2;	
 +	width: 95%;
 +	margin: 0.5em;
 +	float: left;
 +	border-radius:.5em .5em .5em .5em;
 +	-moz-border-radius: .5em .5em .5em .5em;
 +/*		-moz-box-shadow:.2em .2em .1em #999999;
 +    box-shadow: .2em .2em .1em #999999;*/
 +}
 +div.album .image{
 +	float: left;
 +	margin: 0.5em;
 +	min-width: 140px;
 +}
 +div.album img{
 +	border-width: 0px;
 +}
 +div.album .image img.no-image {
 +	float: left;
 +	width: 130px;
 +	height: 97px;
 +	background-color: #EFEFEF;
 +}
 +div.album .info{
 +	float: left;
 +	width: 70%;
 +}
 +div.album .info span{
 +	float: left;
 +	color: #666666;
 +}
 +div.album .info p{
 +	font-size: 0.85em;
 +	margin: 0;
 +}
 +div.album .search_photo_frame{
 +	float: left;
 +	margin: 0.2em;
 +	min-height: 160px;
 +	max-height: 160px;
 +	max-width: 140px;
 +	text-align: center;
 +	border: 1px solid #d3d3d3;
 +	overflow: hidden;
 +}
 +div.album .search_slider{
 +	float: left;
 +	overflow: hidden;
 +	position: relative;	/* ie7 */
 +}
 +div.album .search_slider_left{
 +	float: left;
 +	width: 10%;
 +}
 +div.album .search_slider_right{
 +	float: right;
 +	text-align: right;
 +	width: 10%;
 +}
 +div.album .search_slider ul {
 +	list-style-type: none;
 +	margin: 0;
 +	padding: 0;
 +	width: 99999px;
 +	position: relative;
 +}
 +div.album .search_slider ul li{
 +	float: left;
 +}
 +div.album .search_slider_a{
 +	width: 80%;
 +}
 +div.album .search_slider_p{
 +	width: 730px;	/* 146 per frame, 5 frame per row */
 +}
 +div.album .search_slider_p ul li{
 +/*	height: 576px;	/* 144 per frame, 4 row */
 +	width: 730px;	/* 146 per frame, 5 frame per row */
 +}
 +div.album .search_paginator {
 +	width: 100%;
 +}
 +
 +div.add_photo{
 +	float: left;
 +	background: #F7F7F7;
 +	border: 1px solid #D2D2D2;	
 +	width: 96%;
 +	border-radius:.5em;
 +	-moz-border-radius: .3em .3em .3em .3em;
 +	margin-bottom:.2em;
 +}
 +div.add_photo ul{
 +	margin: 0px;
 +	padding: 0px;
 +}
 +div.add_photo .toggle_uploader{
 +	width: 95%;
 +	margin: 0.5em;
 +}
 +div.add_photo div#ajax_uploader{
 +	display: none;
 +	margin-top: 0.5em;
 +}
 +div.add_photo .files .tn {
 +	max-height: 30px;
 +}
 +div.add_photo img{
 +	border: 0;
 +}
 +div.add_photo ul li{
 +	float: left;
 +	padding: 0.2em;
 +	list-style: none;
 +	width: 100%;
 +	height: 100%;
 +	border-bottom: 1px solid #ddd;
 +/*	display: inline; */
 +}
 +div.add_photo p.memory_usage {
 +	float: right;
 +	font-size: 0.9em;
 +	color: #5B5B5B;
 +}
 +
 +div.add_profile_photo{
 +	float: left;
 +	background: #F7F7F7;
 +	border: 1px solid #D2D2D2;	
 +	width: 96%;
 +	border-radius:.5em;
 +	-moz-border-radius: .5em .5em .5em .5em;
 +/*		-moz-box-shadow:.2em .2em .1em #999999;
 +    box-shadow: .2em .2em .1em #999999;*/
 +	margin-bottom:.2em;
 +
 +}
 +div.add_profile_photo .profile_photo{    
 +	float: left;    
 +	padding: 0.5em;
 +
 +}
 +div.add_profile_photo .uploader{    
 +	float: left;    
 +	width: 50%;
 +	padding: 0.5em;
 +	border-bottom: 1px solid #ddd;
 +}	
 +
 +div.photo_panel{
 +	background: #F7F7F7;
 +	float: left;
 +	border: 1px solid #D2D2D2;
 +	text-align: center;
 +	width: 95%;
 +	padding: 0.5em;
 +	border-radius:.5em;
 +	-moz-border-radius: .5em .5em .5em .5em;
 +}
 +div.photo_panel img{
 +	background: #FFFFFF;
 +	border: 1px solid #D2D2D2;
 +	padding: 0.2em;
 +}
 +div.photo_panel div.ordering{
 +	float:left;
 +}
 +div.photo_panel div.paginator{
 +	float:right;
 +}
 +div.photo_panel .flc-inlineEditable{
 +	width: 604px;
 +	margin: 0 auto;
 +	padding-top: 0.5em;
 +	padding-bottom: 0.5em;
 +}
 +div.comment_panel{
 +	background: #FFFFFF;
 +	float: left;
 +	border: 1px solid #D2D2D2;
 +	width: 95%;
 +	padding:.5em;
 +	border-radius: .3em .3em .3em .3em;
 +	-moz-border-radius: .3em .3em .3em .3em;
 +/*		-moz-box-shadow:.2em .2em .1em #999999;
 +    box-shadow: .2em .2em .1em #999999;*/
 +	margin-top:.2em;
 +}
 +div.comment_panel .comment_feeds{
 +	float: left;
 +	width: 50%;
 +}
 +div.comment_panel .photo_actions{
 +	margin: 0.5em;
 +	max-width: 49%;
 +	background: #F7F7F7;
 +	float:right;
 +	padding:1em;
 +	border:thin solid #cccccc;
 +	border-radius:.3em;
 +	-moz-border-radius: .3em .3em .3em .3em;
 +}
 +.row textarea#comment_template, textarea#comment_template active{
 +	background-color:#eeeeee;
 +	border:thin solid #eeeeee;
 +	border:thin solid #cccccc;
 +	padding:.2em;
 +	border-radius:.3em;
 +	-moz-border-radius: .3em .3em .3em .3em;
 +}
 +.row textarea#comment{
 +	background-color:#ffffff;
 +	border:thin solid #eeeeee;
 +	border:thin solid #cccccc;
 +	padding:.2em;
 +	border-radius:.3em;
 +	-moz-border-radius: .3em .3em .3em .3em;
 +}
 +div.comment_panel textarea{
 +	width:100%;
 +}
 +
 +div.comment_box{
 +	float:left;
 +	width:100%;
 +	margin: 0.5em;
 +	padding-top: 0.5em;
 +	padding-bottom: 0.5em;
 +	background: #F7F7F7;
 +}
 +div.comment_box .comment_actions{
 +	float: left;
 +	margin-top: 1em;
 +	font-size: 0.8em; 
 +	color: #666666;
 +}
 +
 +div.edit_photo_frame{
 +	width: 95%;	
 +	float: left;
 +	padding: 0.2em;
 +	background: #F7F7F7;
 +	border:thin solid #cccccc;
 +	border-radius:.5em;
 +	-moz-border-radius: .5em .5em .5em .5em;
 +}
 +div.edit_photo_box{	
 +	float: left;
 +	border: 1px solid #D2D2D2;
 +	background: white;
 +	margin: 0.2em;
 +	margin-bottom: 0.8em;
 +	padding: 0.8em;
 +	width: 94%;
 +	border-radius:.3em;
 +	-moz-border-radius: .3em .3em .3em .3em;
 +}
 +div.edit_photo_box .info{
 +	float: left;
 +	width: 60%;
 +}
 +
 +.info textarea{
 +	background-color: #eeeeee;
 +	border:thin solid #cccccc;
 +	border-radius:.3em;
 +	-moz-border-radius: .3em .3em .3em .3em;
 +	margin-top:.2em;
 +}
 +div.edit_photo_box .info textarea.alt_text{
 +	height: 2.5em;
 +}
 +div.edit_photo_box .info textarea{
 +	width: 100%;
 +}
 +div.edit_photo_box .action{
 +	float: right;
 +	background: #F7F7F7;
 +	min-width: 140px;
 +	padding:.2em;
 +	border:thin solid #cccccc;
 +	border-radius:.3em;
 +	-moz-border-radius: .3em .3em .3em .3em;
 +}
 +
 +
 +/* FLUID Image Reorderer */
 +.fl-imageReorderer-item {
 +}
 +.fl-reorderer-movable-hover a{
 +	cursor: pointer;
 +	background-color: #ECEECC;
 +}
 +.fl-reorderer-movable-dragging a{
 +	background-color: #ECEECC;
 +}
 +.fl-reorderer-dropMarker {
 +	border: 2px solid red;
 +	min-height: 100px;
 +	float: left;
 +}
 +.fl-reorderer-avatar {
 +	opacity: 0.6;
 +	filter:alpha(opacity=60);
 +}
 +
 +
 +/* FLUID Simple Inline Editor */
 +.fl-inlineEdit-invitation {
 +   background-color: #FFECB3 !important;
 +   border: 1px solid #CCC !important;
 +}
 +.fl-inlineEdit-focus {
 +    border: 2px solid #777777;
 +}
 +
 +
 +.pa_tool_link{
 +
 +text-decoration:none;
 +}
 +
 +.pa_tool_image{
 +vertical-align:middle;
 +margin-right:.5em;
  }
- 
+ /*social networking box on admin page */
+ #social_networking{
+ padding: 1em;
+ margin: 0;
+ }
  
 +/* End Photo Album Styles
 + * 
 + * 
 + * 
 + * 
-  */
++ */