using the info module for user settings

git-svn-id: http://code.elgg.org/elgg/trunk@7808 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index 3065495f034609ae3c8adf151cd0a491c9ee5cc2..16169282d9f6b6b927c7c2aade45142c10f25863 100644 (file)
--- 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 8cca1368974976ebc1eb6dc32fd5d3916f4961ca..2a88020370ebd907fe65f3a5c623ddfc0fe82f3e 100644 (file)
--- 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 b7a34f98ea38f4eab0b01325128c29526ee68e2e..654cb01c1ffc4e018324b2cafb7d797d856b91c0 100644 (file)
--- 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 0576bc7b99aa700bef505c1446e536c3fc607172..d24cd2cd164a13fccc5f376b2dadf98202af96a4 100644 (file)
--- 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 b5328e5abf55fac493e9b87bfcf49fb90e486df9..17db168c382f003d7ad73fd203fc5448930cdf3f 100644 (file)
--- 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 46c932f0bc344b493b8e08cb492f9d11da21c384..c1b37923687d59405fc42e0119b4c20f74d93bf1 100644 (file)
--- 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 0f5b600117a39df0c6711b79dfcb228c14d0f2a1..91a7fb4c5ac3e0d757f572ba75dc9b24f6606816 100644 (file)
--- 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 e7c2801989acfabccf10e6fad451c5431129a2ea..3fbf3d32de792b2f3185205067c0333bf0a33d53 100644 (file)
--- 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 396f8e79b196ff32affa24e6ea7dfd1472020a2d..b0d69eb820ae95ed5424d119d1b6d20066558d20 100644 (file)
--- 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 ada13379192da8c1274dc840c371bf2a09625243..45d121c15f3dfcdbfa23c1a1b456d3ff3f325209 100644 (file)
--- 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 afb142ebe697f9ed74a08fa51bd7202978779d65..1a54b1a98150ed686f3c5e4c5a71636c8db5d67c 100644 (file)
--- 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 0bd7f38f80baab1484a714a882f5e5ec6f30b3a4..8e200754ee6e6cda5923afadf905edf5198fc114 100644 (file)
--- 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 10d2b7c68cff0d6b2d94d59f739637bdedcad4cc..dce668ae92e69773c5319cb2648dd5f406bcf19a 100644 (file)
--- 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 dc24130cd23d717489c6cfdfb642b3e17739521f..7282484424e3e54583cc08f59833ffd49b986f59 100644 (file)
--- 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 981d8d93711b9e5e146a54959c760d78198b15f1..8fcc87beecfafbe474df092a3fb750bc4a19c3a2 100644 (file)
--- 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 b4f8c7429618096f27b490a56eda75c8e513f34a..ca03afd105f6e0a52108722dd1486036909e93b3 100644 (file)
--- 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 87b012b22a25e5e91e7806c9a98fa2bd7d7fa64c..73d237b47afdab4ca4e8ba0f46728d1c77afde1d 100644 (file)
--- 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 ec8336d9ece34f7aacd5bd5c296b92e9685498a0..93c08c83d82ee9a956160ed3c040651ce576f60b 100644 (file)
--- 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);