diff options
18 files changed, 141 insertions, 139 deletions
diff --git a/engine/lib/languages.php b/engine/lib/languages.php index 3065495f0..16169282d 100644 --- a/engine/lib/languages.php +++ b/engine/lib/languages.php @@ -229,7 +229,7 @@ function get_installed_translations() { $installed = array(); foreach ($CONFIG->translations as $k => $v) { - $installed[$k] = elgg_echo($k, $k); + $installed[$k] = elgg_echo($k, array(), $k); if (isadminloggedin()) { $completeness = get_language_completeness($k); if (($completeness < 100) && ($k != 'en')) { diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php index 8cca13689..2a8802037 100644 --- a/mod/notifications/views/default/notifications/subscriptions/collections.php +++ b/mod/notifications/views/default/notifications/subscriptions/collections.php @@ -13,10 +13,12 @@ } </script> -<div class="notification_friends"> -<h3> - <?php echo elgg_echo('notifications:subscriptions:friends:title'); ?> -</h3> +<div class="elgg-module elgg-info-module"> + <div class="elgg-head"> + <h3> + <?php echo elgg_echo('notifications:subscriptions:friends:title'); ?> + </h3> + </div> <p class="margin-none"> <?php echo elgg_echo('notifications:subscriptions:friends:description'); ?> </p> diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php index b7a34f98e..654cb01c1 100644 --- a/mod/notifications/views/default/notifications/subscriptions/form.php +++ b/mod/notifications/views/default/notifications/subscriptions/form.php @@ -4,13 +4,9 @@ */ - echo elgg_view('subscriptions/form/additions',$vars); +echo elgg_view('subscriptions/form/additions',$vars); // Display a description -?> -<div class="user-settings notifications"> -<?php - echo elgg_view('input/form',array( 'body' => elgg_view('notifications/subscriptions/personal') . @@ -21,4 +17,3 @@ echo elgg_view('input/form',array( )); ?> -</div> diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php index 0576bc7b9..d24cd2cd1 100644 --- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php +++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php @@ -1,8 +1,10 @@ -<div class="notifications_per_user"> - <h3> - <?php echo elgg_echo('notifications:subscriptions:title'); ?> - </h3> +<div class="elgg-module elgg-info-module"> + <div class="elgg-head"> + <h3> + <?php echo elgg_echo('notifications:subscriptions:title'); ?> + </h3> + </div> <p> <?php echo elgg_echo('notifications:subscriptions:description'); ?> </p> diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php index b5328e5ab..17db168c3 100644 --- a/mod/notifications/views/default/notifications/subscriptions/groupsform.php +++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php @@ -19,8 +19,8 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) { ?> -<div class="user-settings margin-top"> - +<div class="elgg-module elgg-info-module"> + <div class="elgg-body"> <?php echo elgg_view('notifications/subscriptions/jsfuncs',$vars); ?> @@ -98,4 +98,5 @@ END; } ?> <input type="submit" value="<?php echo elgg_echo('save'); ?>" /> + </div> </div> diff --git a/mod/notifications/views/default/notifications/subscriptions/personal.php b/mod/notifications/views/default/notifications/subscriptions/personal.php index 46c932f0b..c1b379236 100644 --- a/mod/notifications/views/default/notifications/subscriptions/personal.php +++ b/mod/notifications/views/default/notifications/subscriptions/personal.php @@ -4,10 +4,12 @@ global $NOTIFICATION_HANDLERS; ?> <div class="notification_personal"> -<div class="notification_methods"> - <h3> - <?php echo elgg_echo('notifications:subscriptions:personal:title'); ?> - </h3> +<div class="elgg-module elgg-info-module"> + <div class="elgg-head"> + <h3> + <?php echo elgg_echo('notifications:subscriptions:personal:title'); ?> + </h3> + </div> </div> <table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%"> <tr> diff --git a/views/default/core/dashboard/blurb.php b/views/default/core/dashboard/blurb.php index 0f5b60011..91a7fb4c5 100644 --- a/views/default/core/dashboard/blurb.php +++ b/views/default/core/dashboard/blurb.php @@ -5,8 +5,8 @@ */ ?> -<div class="elgg-col-2of3" id="dashboard-info"> - <div class="elgg-inner"> +<div class="elgg-col elgg-col-2of3" id="dashboard-info"> + <div class="elgg-inner pas mhs mbl"> <p> <?php echo elgg_echo("dashboard:nowidgets"); ?> </p> diff --git a/views/default/core/settings/account/default_access.php b/views/default/core/settings/account/default_access.php index e7c280198..3fbf3d32d 100644 --- a/views/default/core/settings/account/default_access.php +++ b/views/default/core/settings/account/default_access.php @@ -13,16 +13,20 @@ if ($vars['config']->allow_user_default_access) { $default_access = $vars['config']->default_access; } ?> -<div class="user-settings access"> - <h3><?php echo elgg_echo('default_access:settings'); ?></h3> - <p> +<div class="elgg-module elgg-info-module"> + <div class="elgg-head"> + <h3><?php echo elgg_echo('default_access:settings'); ?></h3> + </div> + <div class="elgg-body"> + <p> <?php echo elgg_echo('default_access:label'); ?>: <?php echo elgg_view('input/access',array('internalname' => 'default_access', 'value' => $default_access)); ?> - </p> + </p> + </div> </div> <?php } diff --git a/views/default/core/settings/account/email.php b/views/default/core/settings/account/email.php index 396f8e79b..b0d69eb82 100644 --- a/views/default/core/settings/account/email.php +++ b/views/default/core/settings/account/email.php @@ -10,16 +10,18 @@ $user = elgg_get_page_owner(); if ($user) { ?> -<div class="user-settings email"> -<h3><?php echo elgg_echo('email:settings'); ?></h3> -<p> - <?php echo elgg_echo('email:address:label'); ?>: - <?php - - echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email)); - - ?> -</p> +<div class="elgg-module elgg-info-module"> + <div class="elgg-head"> + <h3><?php echo elgg_echo('email:settings'); ?></h3> + </div> + <div class="elgg-body"> + <p> + <?php echo elgg_echo('email:address:label'); ?>: + <?php + echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email)); + ?> + </p> + </div> </div> <?php }
\ No newline at end of file diff --git a/views/default/core/settings/account/language.php b/views/default/core/settings/account/language.php index ada133791..45d121c15 100644 --- a/views/default/core/settings/account/language.php +++ b/views/default/core/settings/account/language.php @@ -11,22 +11,22 @@ $user = elgg_get_page_owner(); if ($user) { ?> -<div class="user-settings language"> -<h3><?php echo elgg_echo('user:set:language'); ?></h3> -<p> - - <?php echo elgg_echo('user:language:label'); ?>: <?php - - $value = $CONFIG->language; - if ($user->language) { - $value = $user->language; - } - - echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations())); - - ?> - -</p> +<div class="elgg-module elgg-info-module"> + <div class="elgg-head"> + <h3><?php echo elgg_echo('user:set:language'); ?></h3> + </div> + <div class="elgg-body"> + <p> + <?php echo elgg_echo('user:language:label'); ?>: + <?php + echo elgg_view("input/pulldown", array( + 'internalname' => 'language', + 'value' => $value, + 'options_values' => get_installed_translations() + )); + ?> + </p> + </div> </div> <?php }
\ No newline at end of file diff --git a/views/default/core/settings/account/notifications.php b/views/default/core/settings/account/notifications.php index afb142ebe..1a54b1a98 100644 --- a/views/default/core/settings/account/notifications.php +++ b/views/default/core/settings/account/notifications.php @@ -10,8 +10,11 @@ global $NOTIFICATION_HANDLERS; $notification_settings = get_user_notification_settings(elgg_get_page_owner_guid()); ?> -<div class="user-settings notifications"> -<h3><?php echo elgg_echo('notifications:usersettings'); ?></h3> +<div class="elgg-module elgg-info-module"> + <div class="elgg-head"> + <h3><?php echo elgg_echo('notifications:usersettings'); ?></h3> + </div> + <div class="elgg-body"> <p><?php echo elgg_echo('notifications:methods'); ?> @@ -48,4 +51,5 @@ $notification_settings = get_user_notification_settings(elgg_get_page_owner_guid } ?> </table> + </div> </div>
\ No newline at end of file diff --git a/views/default/core/settings/account/password.php b/views/default/core/settings/account/password.php index 0bd7f38f8..8e200754e 100644 --- a/views/default/core/settings/account/password.php +++ b/views/default/core/settings/account/password.php @@ -10,33 +10,36 @@ $user = elgg_get_page_owner(); if ($user) { ?> -<div class="user-settings password"> -<h3><?php echo elgg_echo('user:set:password'); ?></h3> +<div class="elgg-module elgg-info-module"> + <div class="elgg-head"> + <h3><?php echo elgg_echo('user:set:password'); ?></h3> + </div> + <div class="elgg-body"> + <?php + // only make the admin user enter current password for changing his own password. + if (!isadminloggedin() || isadminloggedin() && $user->guid == get_loggedin_userid()) { + ?> + <p> + <?php echo elgg_echo('user:current_password:label'); ?>: + <?php + echo elgg_view('input/password', array('internalname' => 'current_password')); + ?> + </p> + <?php } ?> - <?php - // only make the admin user enter current password for changing his own password. - if (!isadminloggedin() || isadminloggedin() && $user->guid == get_loggedin_userid()) { - ?> - <p> - <?php echo elgg_echo('user:current_password:label'); ?>: - <?php - echo elgg_view('input/password', array('internalname' => 'current_password')); - ?> - </p> - <?php } ?> + <p> + <?php echo elgg_echo('user:password:label'); ?>: + <?php + echo elgg_view('input/password', array('internalname' => 'password')); + ?> + </p> - <p> - <?php echo elgg_echo('user:password:label'); ?>: - <?php - echo elgg_view('input/password', array('internalname' => 'password')); - ?> - </p> - - <p> - <?php echo elgg_echo('user:password2:label'); ?>: <?php - echo elgg_view('input/password', array('internalname' => 'password2')); - ?> - </p> + <p> + <?php echo elgg_echo('user:password2:label'); ?>: <?php + echo elgg_view('input/password', array('internalname' => 'password2')); + ?> + </p> + </div> </div> <?php }
\ No newline at end of file diff --git a/views/default/core/settings/statistics/numentities.php b/views/default/core/settings/statistics/numentities.php index 10d2b7c68..dce668ae9 100644 --- a/views/default/core/settings/statistics/numentities.php +++ b/views/default/core/settings/statistics/numentities.php @@ -11,9 +11,12 @@ $entity_stats = get_entity_statistics(get_loggedin_userid()); if ($entity_stats) { ?> -<div class="user-settings statistics"> - <h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3> - <table class="styled"> +<div class="elgg-module elgg-info-module"> + <div class="elgg-head"> + <h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3> + </div> + <div class="elgg-body"> + <table class="styled"> <?php foreach ($entity_stats as $k => $entry) { foreach ($entry as $a => $b) { @@ -41,7 +44,8 @@ END; } } ?> - </table> + </table> + </div> </div> <?php }
\ No newline at end of file diff --git a/views/default/core/settings/statistics/online.php b/views/default/core/settings/statistics/online.php index dc24130cd..728248442 100644 --- a/views/default/core/settings/statistics/online.php +++ b/views/default/core/settings/statistics/online.php @@ -16,13 +16,16 @@ if ($log) { } ?> -<div class="user-settings details"> - <h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3> - - <table class="styled"> - <tr class="odd"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr> - <tr class="even"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr> - <tr class="odd"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:membersince'); ?></td><td><?php echo date("r",$user->time_created); ?></td></tr> - <tr class="even"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:lastlogin'); ?></td><td><?php echo date("r",$logged_in); ?></td></tr> - </table> +<div class="elgg-module elgg-info-module"> + <div class="elgg-head"> + <h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3> + </div> + <div class="elgg-body"> + <table class="styled"> + <tr class="odd"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr> + <tr class="even"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr> + <tr class="odd"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:membersince'); ?></td><td><?php echo date("r",$user->time_created); ?></td></tr> + <tr class="even"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:lastlogin'); ?></td><td><?php echo date("r",$logged_in); ?></td></tr> + </table> + </div> </div>
\ No newline at end of file diff --git a/views/default/core/settings/tools/plugin.php b/views/default/core/settings/tools/plugin.php index 981d8d937..8fcc87bee 100644 --- a/views/default/core/settings/tools/plugin.php +++ b/views/default/core/settings/tools/plugin.php @@ -23,11 +23,19 @@ if ($user_guid) { if (elgg_view("usersettings/{$plugin}/edit")) { ?> -<div class="user-settings"> - <h3><?php echo elgg_echo($plugin); ?></h3> - - <div id="<?php echo $plugin; ?>_settings"> - <?php echo elgg_view("object/plugin", array('plugin' => $plugin, 'entity' => find_plugin_usersettings($plugin, $user_guid), 'prefix' => 'user')) ?> +<div class="elgg-module elgg-info-module"> + <div class="elgg-head"> + <h3><?php echo elgg_echo($plugin); ?></h3> + </div> + <div class="elgg-body"> + <div id="<?php echo $plugin; ?>_settings"> + <?php echo elgg_view("object/plugin", array( + 'plugin' => $plugin, + 'entity' => find_plugin_usersettings($plugin, $user_guid), + 'prefix' => 'user' + )); + ?> + </div> </div> </div> <?php diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index b4f8c7429..ca03afd10 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -9,13 +9,12 @@ /* *************************************** Form Elements *************************************** */ -/* default elgg core input field classes */ label { font-weight: bold; color: #333333; font-size: 110%; } -input { +input, textarea { font: 120% Arial, Helvetica, sans-serif; padding: 5px; border: 1px solid #cccccc; @@ -23,8 +22,12 @@ input { -webkit-border-radius: 5px; -moz-border-radius: 5px; } +textarea { + height: 200px; + width: 98%; +} input[type="text"], textarea { - width: 96%; + width: 98%; } input[type="password"] { width: 200px; @@ -34,16 +37,6 @@ input[type="text"]:focus, input[type="password"]:focus { background: #e4ecf5; color:#333333; } -textarea { - font: 120% Arial, Helvetica, sans-serif; - border: solid 1px #cccccc; - padding: 5px; - color:#666666; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - height: 200px; - width: 96%; -} textarea.monospace { font-family: Monaco,"Courier New",Courier,monospace; font-size: 13px; diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php index 87b012b22..73d237b47 100644 --- a/views/default/css/elements/misc.php +++ b/views/default/css/elements/misc.php @@ -255,39 +255,23 @@ /* *************************************** USER SETTINGS *************************************** */ -.user-settings { - margin-bottom:20px; -} -.user-settings h3 { - background:#e4e4e4; - color:#333333; - padding:5px; - margin-top:10px; - margin-bottom:10px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; -} -.user-settings label { - color:#333333; - font-size:100%; - font-weight:normal; -} -.user-settings table.styled { +table.styled { width:100%; } -.user-settings table.styled { +table.styled { border-top:1px solid #cccccc; } -.user-settings table.styled td { +table.styled td { padding:2px 4px 2px 4px; border-bottom:1px solid #cccccc; } -.user-settings table.styled td.column-one { +table.styled td.column-one { width:200px; } -.user-settings table.styled tr:hover { +table.styled tr:hover { background: #E4E4E4; } + .add-user form { width:300px; } @@ -475,12 +459,6 @@ .user-picker-entry .delete-button { margin-right:10px; } -#dashboard-info { - float: left; - margin-bottom: 15px; -} #dashboard-info .elgg-inner { - margin: 0 5px; border: 2px solid #dedede; - padding: 5px; } diff --git a/views/default/css/screen.php b/views/default/css/screen.php index ec8336d9e..93c08c83d 100644 --- a/views/default/css/screen.php +++ b/views/default/css/screen.php @@ -20,6 +20,7 @@ if ($old_css_view != "{$CONFIG->viewpath}") { * CSS reset * spacing * grid + * base *******************************************************************************/ echo elgg_view('css/elements/reset', $vars); |