diff options
Diffstat (limited to 'views/default/core/settings')
| -rw-r--r-- | views/default/core/settings/account/email.php | 2 | ||||
| -rw-r--r-- | views/default/core/settings/account/name.php | 2 | ||||
| -rw-r--r-- | views/default/core/settings/account/password.php | 12 | ||||
| -rw-r--r-- | views/default/core/settings/statistics/numentities.php | 2 | ||||
| -rw-r--r-- | views/default/core/settings/statistics/online.php | 11 |
5 files changed, 11 insertions, 18 deletions
diff --git a/views/default/core/settings/account/email.php b/views/default/core/settings/account/email.php index bb809958d..4bcdbb100 100644 --- a/views/default/core/settings/account/email.php +++ b/views/default/core/settings/account/email.php @@ -10,7 +10,7 @@ $user = elgg_get_page_owner_entity(); if ($user) { $title = elgg_echo('email:settings'); - $content = elgg_echo('email:address:label') . ' :<br /> '; + $content = elgg_echo('email:address:label') . ': '; $content .= elgg_view('input/email', array( 'name' => 'email', 'value' => $user->email, diff --git a/views/default/core/settings/account/name.php b/views/default/core/settings/account/name.php index af1b9a1a7..e356146a3 100644 --- a/views/default/core/settings/account/name.php +++ b/views/default/core/settings/account/name.php @@ -9,7 +9,7 @@ $user = elgg_get_page_owner_entity(); if ($user) { $title = elgg_echo('user:name:label'); - $content = elgg_echo('name') . ' :<br />'; + $content = elgg_echo('name') . ': '; $content .= elgg_view('input/text', array( 'name' => 'name', 'value' => $user->name, diff --git a/views/default/core/settings/account/password.php b/views/default/core/settings/account/password.php index f17f605c1..4857034b2 100644 --- a/views/default/core/settings/account/password.php +++ b/views/default/core/settings/account/password.php @@ -14,17 +14,17 @@ if ($user) { // only make the admin user enter current password for changing his own password. $admin = ''; if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) { - $admin .= elgg_echo('user:current_password:label') . ' :<br />'; - $admin .= elgg_view('input/password', array('name' => 'current_password', 'placeholder' => '••••••')); + $admin .= elgg_echo('user:current_password:label') . ': '; + $admin .= elgg_view('input/password', array('name' => 'current_password')); $admin = "<p>$admin</p>"; } - $password = elgg_echo('user:password:label') . ' :<br />'; - $password .= elgg_view('input/password', array('name' => 'password', 'placeholder' => '••••••')); + $password = elgg_echo('user:password:label') . ': '; + $password .= elgg_view('input/password', array('name' => 'password')); $password = "<p>$password</p>"; - $password2 = elgg_echo('user:password2:label') . ' :<br />'; - $password2 .= elgg_view('input/password', array('name' => 'password2', 'placeholder' => '••••••')); + $password2 = elgg_echo('user:password2:label') . ': '; + $password2 .= elgg_view('input/password', array('name' => 'password2')); $password2 = "<p>$password2</p>"; $content = $admin . $password . $password2; diff --git a/views/default/core/settings/statistics/numentities.php b/views/default/core/settings/statistics/numentities.php index ce1705a2e..3782fd8bc 100644 --- a/views/default/core/settings/statistics/numentities.php +++ b/views/default/core/settings/statistics/numentities.php @@ -7,7 +7,7 @@ */ // Get entity statistics -$entity_stats = get_entity_statistics(elgg_get_logged_in_user_guid()); +$entity_stats = get_entity_statistics(elgg_get_page_owner_guid()); if ($entity_stats) { $rows = ''; diff --git a/views/default/core/settings/statistics/online.php b/views/default/core/settings/statistics/online.php index ce7ff35fb..1385ff60f 100644 --- a/views/default/core/settings/statistics/online.php +++ b/views/default/core/settings/statistics/online.php @@ -6,14 +6,7 @@ * @subpackage Core */ -$user = elgg_get_logged_in_user_entity(); - -$logged_in = 0; -$log = get_system_log($user->guid, "login", "", 'user', '', 1); - -if ($log) { - $logged_in = $log[0]->time_created; -} +$user = elgg_get_page_owner_entity(); $label_name = elgg_echo('usersettings:statistics:label:name'); $label_email = elgg_echo('usersettings:statistics:label:email'); @@ -21,7 +14,7 @@ $label_member_since = elgg_echo('usersettings:statistics:label:membersince'); $label_last_login = elgg_echo('usersettings:statistics:label:lastlogin'); $time_created = date("r", $user->time_created); -$last_login = date("r", $logged_in); +$last_login = date("r", $user->last_login); $title = elgg_echo('usersettings:statistics:yourdetails'); |