From bf00633c600eb33574cc8e364ce1af72335af526 Mon Sep 17 00:00:00 2001 From: pete Date: Mon, 15 Mar 2010 10:56:29 +0000 Subject: Updated Notifications to new UI. git-svn-id: http://code.elgg.org/elgg/trunk@5387 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../graphics/icon_notifications_site.gif | Bin 0 -> 456 bytes mod/notifications/groups.php | 2 +- mod/notifications/index.php | 2 +- mod/notifications/languages/en.php | 10 +-- .../views/default/notifications/css.php | 70 ++++++++++++--------- .../notifications/settings/usersettings.php | 3 - .../notifications/subscriptions/collections.php | 20 +++--- .../default/notifications/subscriptions/form.php | 4 +- .../notifications/subscriptions/forminternals.php | 20 +++--- .../notifications/subscriptions/groupsform.php | 12 ++-- .../notifications/subscriptions/personal.php | 6 +- 11 files changed, 76 insertions(+), 73 deletions(-) create mode 100644 mod/notifications/graphics/icon_notifications_site.gif delete mode 100644 mod/notifications/views/default/notifications/settings/usersettings.php (limited to 'mod') diff --git a/mod/notifications/graphics/icon_notifications_site.gif b/mod/notifications/graphics/icon_notifications_site.gif new file mode 100644 index 000000000..d12ca08b1 Binary files /dev/null and b/mod/notifications/graphics/icon_notifications_site.gif differ diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php index a425845cf..c742f858d 100644 --- a/mod/notifications/groups.php +++ b/mod/notifications/groups.php @@ -34,7 +34,7 @@ )); // Insert it into the correct canvas layout - $body = elgg_view_layout('two_column_left_sidebar','',$body); + $body = elgg_view_layout('one_column_with_sidebar', $body); // Draw the page page_draw(elgg_echo('notifications:subscriptions:changesettings:groups'),$body); diff --git a/mod/notifications/index.php b/mod/notifications/index.php index 79365842c..47e4baad9 100644 --- a/mod/notifications/index.php +++ b/mod/notifications/index.php @@ -31,7 +31,7 @@ )); // Insert it into the correct canvas layout - $body = elgg_view_layout('two_column_left_sidebar','',$body); + $body = elgg_view_layout('one_column_with_sidebar', $body); // Draw the page page_draw(elgg_echo('notifications:subscriptions:changesettings'),$body); diff --git a/mod/notifications/languages/en.php b/mod/notifications/languages/en.php index 05c7da86a..8573bbb32 100644 --- a/mod/notifications/languages/en.php +++ b/mod/notifications/languages/en.php @@ -7,18 +7,18 @@ 'notifications:subscriptions:personal:description' => 'Receive notifications when actions are performed on your content', 'notifications:subscriptions:personal:title' => 'Personal notifications', - 'notifications:subscriptions:collections:title' => 'Toggle friends collections', - 'notifications:subscriptions:collections:description' => 'To toggle settings for members of your friends collections, use the icons below. This will affect the corresponding users in the main notification settings panel at the bottom of the page. ', - 'notifications:subscriptions:collections:edit' => 'To edit your friends collections, click here.', + 'notifications:subscriptions:collections:title' => 'Friends', + 'notifications:subscriptions:collections:description' => 'The following is an automatic collection made up of your friends. To receive updates select below. This will affect the corresponding users in the main notification settings panel at the bottom of the page. ', + 'notifications:subscriptions:collections:edit' => 'To edit your shared access notifications, click here.', 'notifications:subscriptions:changesettings' => 'Notifications', 'notifications:subscriptions:changesettings:groups' => 'Group notifications', 'notification:method:email' => 'Email', 'notifications:subscriptions:title' => 'Notifications per user', - 'notifications:subscriptions:description' => 'To receive notifications from your friends when they create new content, find them below and select the notification method you would like to use.', + 'notifications:subscriptions:description' => 'To receive notifications from your friends (on an individual basis) when they create new content, find them below and select the notification method you would like to use.', - 'notifications:subscriptions:groups:description' => 'To receive notifications when new content is added to a group you are a member of, find it below and select the notification method you would like to use.', + 'notifications:subscriptions:groups:description' => 'To receive notifications when new content is added to a group you are a member of, find it below and select the notification method(s) you would like to use.', 'notifications:subscriptions:success' => 'Your notifications settings have been saved.', diff --git a/mod/notifications/views/default/notifications/css.php b/mod/notifications/views/default/notifications/css.php index 5c855d842..bd6067c85 100644 --- a/mod/notifications/views/default/notifications/css.php +++ b/mod/notifications/views/default/notifications/css.php @@ -1,15 +1,13 @@ - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.org/ - */ - +/** + * Elgg notifications CSS + * + * @package notifications + * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 + * @author Curverider + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.org/ + */ ?> #notificationstable td.namefield { @@ -23,12 +21,14 @@ line-height: 1.1em; padding:5px 0 5px 0; } -#notificationstable td.namefield img { - padding:6px 10px 6px 3px; - float:left; -} #notificationstable td.namefield p.namefieldlink { - margin:9px 0 0 0; + margin:5px 0 0 0; +} +#notificationstable td.namefield a img { + float:left; + width:25px; + height:25px; + margin:5px 10px 5px 5px; } #notificationstable td.emailtogglefield, #notificationstable td.smstogglefield { @@ -53,27 +53,39 @@ display: block; outline: none; } +#notificationstable td.sitetogglefield { + width:50px; + text-align: center; + vertical-align: middle; +} +#notificationstable td.sitetogglefield input { + margin-right:36px; + margin-top:5px; +} +#notificationstable td.sitetogglefield a { + width:46px; + height:24px; + cursor: pointer; + display: block; + outline: none; +} #notificationstable td.emailtogglefield a.emailtoggleOff { background: url(mod/notifications/graphics/icon_notifications_email.gif) no-repeat right 2px; } #notificationstable td.emailtogglefield a.emailtoggleOn { background: url(mod/notifications/graphics/icon_notifications_email.gif) no-repeat right -36px; } - -.notification_collections, -.notification_personal { - margin-bottom: 25px; +#notificationstable td.sitetogglefield a.sitetoggleOff { + background: url(mod/notifications/graphics/icon_notifications_site.gif) no-repeat right 2px; } -/* -.settings_form .friends_picker_container h3 { - color:#999999; - font-size:3em; - margin:0 0 20px; - text-align:left; - background: none; - border-bottom: none; +#notificationstable td.sitetogglefield a.sitetoggleOn { + background: url(mod/notifications/graphics/icon_notifications_site.gif) no-repeat right -37px; +} +.notification_friends, +.notification_personal, +.notifications_per_user { + margin-bottom: 25px; } -*/ diff --git a/mod/notifications/views/default/notifications/settings/usersettings.php b/mod/notifications/views/default/notifications/settings/usersettings.php deleted file mode 100644 index 15c5adc7f..000000000 --- a/mod/notifications/views/default/notifications/settings/usersettings.php +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php index 8fe49e672..87906bf76 100644 --- a/mod/notifications/views/default/notifications/subscriptions/collections.php +++ b/mod/notifications/views/default/notifications/subscriptions/collections.php @@ -13,16 +13,14 @@ } - +

-
-

+

-

- +
$foo) { if ($i > 0) - echo ""; + echo ""; ?> 0) $fields .= ""; + if ($i > 0) $fields .= ""; $fields .= <<< END guid)) { foreach($collections as $collection) { $members = get_members_of_access_collection($collection->id, true); @@ -117,7 +118,7 @@ END; $collectionschecked[$method] = ''; } } - if ($i > 0) $fields .= ""; + if ($i > 0) $fields .= ""; $fields .= <<< END
        @@ -85,7 +83,10 @@ END;  
   @@ -136,6 +137,7 @@ END; } } +*/ ?>
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php index d96d6b7a7..8ad0110bf 100644 --- a/mod/notifications/views/default/notifications/subscriptions/form.php +++ b/mod/notifications/views/default/notifications/subscriptions/form.php @@ -18,8 +18,7 @@ // Display a description ?> -
-
+ -
\ No newline at end of file diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php index 9030d20a8..97fe77cac 100644 --- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php +++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php @@ -1,7 +1,9 @@ + +

-

+

- +
$foo) { if ($i > 0) - echo ""; + echo ""; ?> 0) $fields .= ""; + if ($i > 0) $fields .= ""; $fields .= <<< END
        @@ -303,13 +305,9 @@ END; } ?> - - - -
-
+
-
- +
+ \ No newline at end of file diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php index cf7f44906..4beefb943 100644 --- a/mod/notifications/views/default/notifications/subscriptions/groupsform.php +++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php @@ -12,11 +12,8 @@ $subsbig[$method] = $tmparray; } -?> - -
-
- +echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings:groups')); ?> +
@@ -33,7 +30,7 @@ if (isset($vars['groups']) && !empty($vars['groups'])) { ?> - +
$foo) { if ($i > 0) - echo ""; + echo ""; ?> - \ No newline at end of file diff --git a/mod/notifications/views/default/notifications/subscriptions/personal.php b/mod/notifications/views/default/notifications/subscriptions/personal.php index 6779fde73..d8ce0e97e 100644 --- a/mod/notifications/views/default/notifications/subscriptions/personal.php +++ b/mod/notifications/views/default/notifications/subscriptions/personal.php @@ -9,14 +9,14 @@ -
    
+
$foo) { if ($i > 0) - echo ""; + echo ""; ?> 0) $fields .= ""; + if ($i > 0) $fields .= ""; $fields .= <<< END
        -- cgit v1.2.3