14 files changed, 112 insertions, 115 deletions

diff --git a/views/default/forms/admin/menu/save.php b/views/default/forms/admin/menu/save.php
index 92a0784df..1a67ffcc4 100644
--- a/views/default/forms/admin/menu/save.php
+++ b/views/default/forms/admin/menu/save.php
@@ -64,7 +64,7 @@ $custom_items = elgg_get_config('site_custom_menu_items');
 $name_str = elgg_echo('name');
 $url_str = elgg_echo('admin:plugins:label:website');
 
-echo '<ul class="elgg-simple-list">';
+echo '<ul class="elgg-list elgg-list-simple">';
 
 if (is_array($custom_items)) {
 	foreach ($custom_items as $title => $url) {
diff --git a/views/default/forms/admin/site/regenerate_secret.php b/views/default/forms/admin/site/regenerate_secret.php
new file mode 100644
index 000000000..af269b801
--- /dev/null
+++ b/views/default/forms/admin/site/regenerate_secret.php
@@ -0,0 +1,24 @@
+<?php
+
+$strength = $vars['strength'];
+
+?>
+<p><?php echo elgg_echo('admin:site:secret:intro'); ?></p>
+
+<table class="elgg-table">
+	<tr>
+		<th><?php echo elgg_echo('site_secret:current_strength'); ?></th>
+		<td class="elgg-strength-<?php echo $strength; ?>">
+			<h4><?php echo elgg_echo("site_secret:strength:$strength"); ?></h4>
+			<div><?php echo elgg_echo("site_secret:strength_msg:$strength"); ?></div>
+		</td>
+	</tr>
+</table>
+
+<div class="elgg-foot">
+	<?php echo elgg_view('input/submit', array(
+			'value' => elgg_echo('admin:site:secret:regenerate'),
+			'class' => 'elgg-requires-confirmation elgg-button elgg-button-submit',
+		)); ?>
+	<p class="elgg-text-help mts"><?php echo elgg_echo('admin:site:secret:regenerate:help'); ?></p>
+</div>
diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php
index e12764092..14b74e4f9 100644
--- a/views/default/forms/admin/site/update_advanced.php
+++ b/views/default/forms/admin/site/update_advanced.php
@@ -19,26 +19,32 @@ foreach (array('wwwroot', 'path', 'dataroot') as $field) {
 $form_body .= "<div>" . elgg_echo('admin:site:access:warning') . "<br />";
 $form_body .= "<label>" . elgg_echo('installation:sitepermissions') . "</label>";
 $form_body .= elgg_view('input/access', array(
+	'options_values' => array(
+		ACCESS_PRIVATE => elgg_echo("PRIVATE"),
+		ACCESS_FRIENDS => elgg_echo("access:friends:label"),
+		ACCESS_LOGGED_IN => elgg_echo("LOGGED_IN"),
+		ACCESS_PUBLIC => elgg_echo("PUBLIC")
+	),
 	'name' => 'default_access',
 	'value' => elgg_get_config('default_access'),
 )) . "</div>";
 $form_body .= "<div>" . elgg_echo('installation:allow_user_default_access:description') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
-	'options' => array(elgg_echo('installation:allow_user_default_access:label') => elgg_echo('installation:allow_user_default_access:label')),
+	'options' => array(elgg_echo('installation:allow_user_default_access:label') => 1),
 	'name' => 'allow_user_default_access',
-	'value' => (elgg_get_config('allow_user_default_access') ? elgg_echo('installation:allow_user_default_access:label') : ""),
+	'value' => (elgg_get_config('allow_user_default_access') ? 1 : 0),
 )) . "</div>";
 $form_body .= "<div>" . elgg_echo('installation:simplecache:description') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
-	'options' => array(elgg_echo('installation:simplecache:label') => elgg_echo('installation:simplecache:label')),
+	'options' => array(elgg_echo('installation:simplecache:label') => 1),
 	'name' => 'simplecache_enabled',
-	'value' => (elgg_get_config('simplecache_enabled') ? elgg_echo('installation:simplecache:label') : ""),
+	'value' => (elgg_get_config('simplecache_enabled') ? 1 : 0),
 )) . "</div>";
-$form_body .= "<div>" . elgg_echo('installation:viewpathcache:description') . "<br />";
+$form_body .= "<div>" . elgg_echo('installation:systemcache:description') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
-	'options' => array(elgg_echo('installation:viewpathcache:label') => elgg_echo('installation:viewpathcache:label')),
-	'name' => 'viewpath_cache_enabled',
-	'value' => (elgg_get_config('viewpath_cache_enabled') ? elgg_echo('installation:viewpathcache:label') : ""),
+	'options' => array(elgg_echo('installation:systemcache:label') => 1),
+	'name' => 'system_cache_enabled',
+	'value' => (elgg_get_config('system_cache_enabled') ? 1 : 0),
 )) . "</div>";
 
 $debug_options = array('0' => elgg_echo('installation:debug:none'), 'ERROR' => elgg_echo('installation:debug:error'), 'WARNING' => elgg_echo('installation:debug:warning'), 'NOTICE' => elgg_echo('installation:debug:notice'));
@@ -52,9 +58,9 @@ $form_body .= '</div>';
 
 // control new user registration
 $options = array(
-	'options' => array(elgg_echo('installation:registration:label') => elgg_echo('installation:registration:label')),
+	'options' => array(elgg_echo('installation:registration:label') => 1),
 	'name' => 'allow_registration',
-	'value' => elgg_get_config('allow_registration') ? elgg_echo('installation:registration:label') : '',
+	'value' => elgg_get_config('allow_registration') ? 1 : 0,
 );
 $form_body .= '<div>' . elgg_echo('installation:registration:description');
 $form_body .= '<br />' .elgg_view('input/checkboxes', $options) . '</div>';
@@ -62,28 +68,25 @@ $form_body .= '<br />' .elgg_view('input/checkboxes', $options) . '</div>';
 // control walled garden
 $walled_garden = elgg_get_config(walled_garden);
 $options = array(
-	'options' => array(elgg_echo('installation:walled_garden:label') => elgg_echo('installation:walled_garden:label')),
+	'options' => array(elgg_echo('installation:walled_garden:label') => 1),
 	'name' => 'walled_garden',
-	'value' => $walled_garden ? elgg_echo('installation:walled_garden:label') : '',
+	'value' => $walled_garden ? 1 : 0,
 );
 $form_body .= '<div>' . elgg_echo('installation:walled_garden:description');
 $form_body .= '<br />' . elgg_view('input/checkboxes', $options) . '</div>';
 
 $form_body .= "<div>" . elgg_echo('installation:httpslogin') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
-	'options' => array(elgg_echo('installation:httpslogin:label') => elgg_echo('installation:httpslogin:label')),
+	'options' => array(elgg_echo('installation:httpslogin:label') => 1),
 	'name' => 'https_login',
-	'value' => (elgg_get_config('https_login') ? elgg_echo('installation:httpslogin:label') : "")
+	'value' => (elgg_get_config('https_login') ? 1 : 0)
 )) . "</div>";
 
 $form_body .= "<div>" . elgg_echo('installation:disableapi') . "<br />";
-$on = elgg_echo('installation:disableapi:label');
 $disable_api = elgg_get_config('disable_api');
-if ($disable_api) {
-	$on = (disable_api ?  "" : elgg_echo('installation:disableapi:label'));
-}
+$on = $disable_api ?  0 : 1;
 $form_body .= elgg_view("input/checkboxes", array(
-	'options' => array(elgg_echo('installation:disableapi:label') => elgg_echo('installation:disableapi:label')),
+	'options' => array(elgg_echo('installation:disableapi:label') => 1),
 	'name' => 'api',
 	'value' => $on,
 ));
@@ -91,8 +94,8 @@ $form_body .= "</div>";
 
 $form_body .= elgg_view('input/hidden', array('name' => 'settings', 'value' => 'go'));
 
-$form_body .= '<div class="elgg-divide-top">';
+$form_body .= '<div class="elgg-foot">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
 $form_body .= '</div>';
 
-echo $form_body;
\ No newline at end of file
+echo $form_body;
diff --git a/views/default/forms/admin/site/update_basic.php b/views/default/forms/admin/site/update_basic.php
index 66722aef2..88870bc60 100644
--- a/views/default/forms/admin/site/update_basic.php
+++ b/views/default/forms/admin/site/update_basic.php
@@ -24,7 +24,7 @@ $form_body .= elgg_view("input/dropdown", array(
 	'options_values' => $languages,
 )) . "</div>";
 
-$form_body .= '<div class="elgg-divide-top">';
+$form_body .= '<div class="elgg-foot">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
 $form_body .= '</div>';
 
diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 1f39ff73c..3e798cb27 100644
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -6,13 +6,26 @@
  */
 
 elgg_load_js('jquery.imgareaselect');
+elgg_load_js('elgg.avatar_cropper');
 elgg_load_css('jquery.imgareaselect');
 
-$master_image = $vars['entity']->getIconUrl('master');
+$master_img = elgg_view('output/img', array(
+	'src' => $vars['entity']->getIconUrl('master'),
+	'alt' => elgg_echo('avatar'),
+	'class' => 'mrl',
+	'id' => 'user-avatar-cropper',
+));
+
+$preview_img = elgg_view('output/img', array(
+	'src' => $vars['entity']->getIconUrl('master'),
+	'alt' => elgg_echo('avatar'),
+));
 
 ?>
 <div class="clearfix">
-	<img id="user-avatar" class="mrl" src="<?php echo $master_image; ?>" alt="<?php echo elgg_echo('avatar'); ?>" />
+	<?php echo $master_img; ?>
+	<div id="user-avatar-preview-title"><label><?php echo elgg_echo('avatar:preview'); ?></label></div>
+	<div id="user-avatar-preview"><?php echo $preview_img; ?></div>
 </div>
 <div class="elgg-foot">
 <?php
@@ -27,47 +40,3 @@ echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
 
 ?>
 </div>
-<!-- grab the required js for icon cropping -->
-<?php //@todo JS 1.8: no ?>
-<script type="text/javascript">
-
-	// display a preview of the users cropped section
-	function preview(img, selection) {
-		// catch for the first click on the image
-		if (selection.width == 0 || selection.height == 0) {
-			return;
-		}
-
-		var origWidth = $("#user-avatar").width(); //get the width of the users master photo
-		var origHeight = $("#user-avatar").height(); //get the height of the users master photo
-		var scaleX = 100 / selection.width;
-		var scaleY = 100 / selection.height;
-		$('#user-avatar-preview > img').css({
-			width: Math.round(scaleX * origWidth) + 'px',
-			height: Math.round(scaleY * origHeight) + 'px',
-			marginLeft: '-' + Math.round(scaleX * selection.x1) + 'px',
-			marginTop: '-' + Math.round(scaleY * selection.y1) + 'px'
-		});
-	}
-
-	function selectChange(img, selection) {
-		// populate the form with the correct coordinates once a user has cropped their image
-		$('input[name=x1]').val(selection.x1);
-		$('input[name=x2]').val(selection.x2);
-		$('input[name=y1]').val(selection.y1);
-		$('input[name=y2]').val(selection.y2);
-	}
-
-	$(document).ready(function() {
-		$('<div id="user-avatar-preview"><img src="<?php echo $master_image; ?>" /></div>').insertAfter($('#user-avatar'));
-		$('<div id="user-avatar-preview-title"><label><?php echo elgg_echo('avatar:preview'); ?></label></div>').insertBefore($('#user-avatar-preview'));
-
-		// init the cropping
-		$('#user-avatar').imgAreaSelect({
-			selectionOpacity: 0,
-			aspectRatio: '1:1',
-			onSelectEnd: selectChange,
-			onSelectChange: preview
-		});
-	});
-</script>
diff --git a/views/default/forms/login.php b/views/default/forms/login.php
index 91e9cda42..d2c6e6221 100644
--- a/views/default/forms/login.php
+++ b/views/default/forms/login.php
@@ -9,36 +9,40 @@
 
 <div>
 	<label><?php echo elgg_echo('loginusername'); ?></label>
-	<?php echo elgg_view('input/text', array('name' => 'username')); ?>
+	<?php echo elgg_view('input/text', array(
+		'name' => 'username',
+		'class' => 'elgg-autofocus',
+		));
+	?>
 </div>
 <div>
 	<label><?php echo elgg_echo('password'); ?></label>
 	<?php echo elgg_view('input/password', array('name' => 'password')); ?>
 </div>
 
-<?php echo elgg_view('login/extend'); ?>
+<?php echo elgg_view('login/extend', $vars); ?>
 
 <div class="elgg-foot">
-	<?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
-
-	<label class="right mtm">
+	<label class="mtm float-alt">
 		<input type="checkbox" name="persistent" value="true" />
 		<?php echo elgg_echo('user:persistent'); ?>
 	</label>
 	
+	<?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
+	
 	<?php 
-	if ($vars['returntoreferer']) { 
+	if (isset($vars['returntoreferer'])) {
 		echo elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true'));
 	}
 	?>
 
-	<ul class="elgg-menu elgg-menu-footer mtm">
+	<ul class="elgg-menu elgg-menu-general mtm">
 	<?php
 		if (elgg_get_config('allow_registration')) {
 			echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'register">' . elgg_echo('register') . '</a></li>';
 		}
 	?>
-		<li><a href="<?php echo elgg_get_site_url(); ?>forgotpassword">
+		<li><a class="forgot_link" href="<?php echo elgg_get_site_url(); ?>forgotpassword">
 			<?php echo elgg_echo('user:password:lost'); ?>
 		</a></li>
 	</ul>
diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php
index dc7b2fef7..116529905 100644
--- a/views/default/forms/plugins/settings/save.php
+++ b/views/default/forms/plugins/settings/save.php
@@ -17,11 +17,11 @@ if ($type != 'user') {
 	$type = '';
 }
 
-if (elgg_view_exists("{$type}settings/$plugin_id/edit")) {
+if (elgg_view_exists("plugins/$plugin_id/{$type}settings")) {
+	echo elgg_view("plugins/$plugin_id/{$type}settings", $vars);
+} elseif (elgg_view_exists("{$type}settings/$plugin_id/edit")) {
 	elgg_deprecated_notice("{$type}settings/$plugin_id/edit was deprecated in favor of plugins/$plugin_id/{$type}settings", 1.8);
 	echo elgg_view("{$type}settings/$plugin_id/edit", $vars);
-} else {
-	echo elgg_view("plugins/$plugin_id/{$type}settings", $vars);
 }
 
 echo '<div class="elgg-foot">';
diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php
index 222935344..cb0a37ca4 100644
--- a/views/default/forms/profile/edit.php
+++ b/views/default/forms/profile/edit.php
@@ -13,12 +13,15 @@
 </div>
 <?php
 
+$sticky_values = elgg_get_sticky_values('profile:edit');
+
 $profile_fields = elgg_get_config('profile_fields');
 if (is_array($profile_fields) && count($profile_fields) > 0) {
 	foreach ($profile_fields as $shortname => $valtype) {
 		$metadata = elgg_get_metadata(array(
 			'guid' => $vars['entity']->guid,
-			'metadata_name' => $shortname
+			'metadata_name' => $shortname,
+			'limit' => false
 		));
 		if ($metadata) {
 			if (is_array($metadata)) {
@@ -39,6 +42,14 @@ if (is_array($profile_fields) && count($profile_fields) > 0) {
 			$access_id = ACCESS_DEFAULT;
 		}
 
+		// sticky form values take precedence over saved ones
+		if (isset($sticky_values[$shortname])) {
+			$value = $sticky_values[$shortname];
+		}
+		if (isset($sticky_values['accesslevel'][$shortname])) {
+			$access_id = $sticky_values['accesslevel'][$shortname];
+		}
+
 ?>
 <div>
 	<label><?php echo elgg_echo("profile:{$shortname}") ?></label>
@@ -58,6 +69,9 @@ if (is_array($profile_fields) && count($profile_fields) > 0) {
 <?php
 	}
 }
+
+elgg_clear_sticky_form('profile:edit');
+
 ?>
 <div class="elgg-foot">
 <?php
diff --git a/views/default/forms/profile/fields/add.php b/views/default/forms/profile/fields/add.php
index bd58ae381..2087ec299 100644
--- a/views/default/forms/profile/fields/add.php
+++ b/views/default/forms/profile/fields/add.php
@@ -20,10 +20,10 @@ $type_control = elgg_view('input/dropdown', array('name' => 'type', 'options_val
 $submit_control = elgg_view('input/submit', array('name' => elgg_echo('add'), 'value' => elgg_echo('add')));
 
 $formbody = <<< END
-		<div class="elgg-foot">$label_text: $label_control
-		$type_text: $type_control
+		<div>$label_text: $label_control</div>
+		<div class="elgg-foot">$type_text: $type_control
 		$submit_control</div>
 END;
 
-echo autop(elgg_echo('profile:explainchangefields'));
+echo elgg_autop(elgg_echo('profile:explainchangefields'));
 echo $formbody;
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
deleted file mode 100644
index c0bb1b7f4..000000000
--- a/views/default/forms/profile/fields/reset.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Reset profile fields form
- */
-
-echo '<div class="elgg-foot">';
-$params = array(
-	'value' => elgg_echo('profile:resetdefault'),
-	'class' => 'elgg-button-cancel',
-);
-echo elgg_view('input/submit', $params);
-echo '</div>';
diff --git a/views/default/forms/register.php b/views/default/forms/register.php
index 6e18cd53d..c0ee66f76 100644
--- a/views/default/forms/register.php
+++ b/views/default/forms/register.php
@@ -6,6 +6,8 @@
  * @subpackage Core
  */
 
+elgg_load_js('elgg.register');
+
 $password = $password2 = '';
 $username = get_input('u');
 $email = get_input('e');
@@ -23,6 +25,7 @@ if (elgg_is_sticky_form('register')) {
 	echo elgg_view('input/text', array(
 		'name' => 'name',
 		'value' => $name,
+		'class' => 'elgg-autofocus',
 	));
 	?>
 </div>
@@ -65,19 +68,13 @@ if (elgg_is_sticky_form('register')) {
 
 <?php
 // view to extend to add more fields to the registration form
-echo elgg_view('register/extend');
+echo elgg_view('register/extend', $vars);
 
 // Add captcha hook
-echo elgg_view('input/captcha');
+echo elgg_view('input/captcha', $vars);
 
 echo '<div class="elgg-foot">';
 echo elgg_view('input/hidden', array('name' => 'friend_guid', 'value' => $vars['friend_guid']));
 echo elgg_view('input/hidden', array('name' => 'invitecode', 'value' => $vars['invitecode']));
 echo elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('register')));
 echo '</div>';
-?>
-<script type="text/javascript">
-	$(function() {
-		$('input[name=name]').focus();
-	});
-</script>
\ No newline at end of file
diff --git a/views/default/forms/user/passwordreset.php b/views/default/forms/user/passwordreset.php
index 3c89776f6..5946fa7c0 100644
--- a/views/default/forms/user/passwordreset.php
+++ b/views/default/forms/user/passwordreset.php
@@ -3,7 +3,7 @@
  * Reset user password form
  */
 
-echo autop(elgg_echo('user:resetpassword:reset_password_confirm'));
+echo elgg_autop(elgg_echo('user:resetpassword:reset_password_confirm'));
 
 echo elgg_view('input/hidden', array(
 	'name' => 'u',
diff --git a/views/default/forms/user/requestnewpassword.php b/views/default/forms/user/requestnewpassword.php
index 22357e728..c90971eaf 100644
--- a/views/default/forms/user/requestnewpassword.php
+++ b/views/default/forms/user/requestnewpassword.php
@@ -11,16 +11,14 @@
 	<?php echo elgg_echo('user:password:text'); ?>
 </div>
 <div>
-	<label><?php echo elgg_echo('username'); ?></label><br />
-	<?php echo elgg_view('input/text', array('name' => 'username')); ?>
+	<label><?php echo elgg_echo('loginusername'); ?></label><br />
+	<?php echo elgg_view('input/text', array(
+		'name' => 'username',
+		'class' => 'elgg-autofocus',
+		));
+	?>
 </div>
 <?php echo elgg_view('input/captcha'); ?>
 <div class="elgg-foot">
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('request'))); ?>
 </div>
-<?php //@todo JS 1.8: no ?>
-<script type="text/javascript">
-	$(document).ready(function() {
-		$('input[name=username]').focus();
-	});
-</script>
\ No newline at end of file
diff --git a/views/default/forms/widgets/save.php b/views/default/forms/widgets/save.php
index 4ba911cb5..6959b2a82 100644
--- a/views/default/forms/widgets/save.php
+++ b/views/default/forms/widgets/save.php
@@ -14,7 +14,7 @@ $custom_form_section = elgg_view($edit_view, array('entity' => $widget));
 
 $access = '';
 if ($show_access) {
-	$access = elgg_view('input/access', array(
+	$access = elgg_echo('access') . ': ' . elgg_view('input/access', array(
 		'name' => 'params[access_id]',
 		'value' => $widget->access_id,
 	));
@@ -38,4 +38,4 @@ $body = <<<___END
 	</div>
 ___END;
 
-echo $body;
\ No newline at end of file
+echo $body;