aboutsummaryrefslogtreecommitdiff
path: root/mod/notifications
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-08-25 10:00:38 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-08-25 10:00:38 -0700
commitdccc333c765bb28da55b4a55d9c916acdb88413a (patch)
treebdd26a0b4cd85241a19b7fcb2c0770f0ac3eb9f0 /mod/notifications
parentec7b94a64aef23b85866ecdac8e8acc712d29bb6 (diff)
parent003cb81c7888f4d2fd763e5814027c6f8d71186f (diff)
downloadelgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.gz
elgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.bz2
Merge branch 'master' of github.com:brettp/Elgg
Diffstat (limited to 'mod/notifications')
-rw-r--r--mod/notifications/start.php4
-rw-r--r--mod/notifications/views/default/forms/notificationsettings/groupsave.php2
-rw-r--r--mod/notifications/views/default/forms/notificationsettings/save.php7
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/form.php2
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/forminternals.php8
5 files changed, 9 insertions, 14 deletions
diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index 0f1e11a57..c6701cc3e 100644
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -1,11 +1,11 @@
<?php
-
/**
* Elgg notifications plugin
*
* @package ElggNotifications
*/
+elgg_register_event_handler('init', 'system', 'notifications_plugin_init');
function notifications_plugin_init() {
@@ -187,5 +187,3 @@ function notifications_update_collection_notify($event, $object_type, $returnval
}
}
}
-
-elgg_register_event_handler('init', 'system', 'notifications_plugin_init', 1000);
diff --git a/mod/notifications/views/default/forms/notificationsettings/groupsave.php b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
index 2bf0d9628..61b94ff8b 100644
--- a/mod/notifications/views/default/forms/notificationsettings/groupsave.php
+++ b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
@@ -96,7 +96,7 @@ END;
</table>
<?php
}
- echo '<div class="mtm">';
+ echo '<div class="elgg-foot mtm">';
echo elgg_view('input/submit', array('value' => elgg_echo('save')));
echo '</div>';
diff --git a/mod/notifications/views/default/forms/notificationsettings/save.php b/mod/notifications/views/default/forms/notificationsettings/save.php
index 0306080b8..ff32d8558 100644
--- a/mod/notifications/views/default/forms/notificationsettings/save.php
+++ b/mod/notifications/views/default/forms/notificationsettings/save.php
@@ -5,4 +5,9 @@
echo elgg_view('notifications/subscriptions/personal');
echo elgg_view('notifications/subscriptions/collections');
-echo elgg_view('notifications/subscriptions/forminternals'); \ No newline at end of file
+echo elgg_view('notifications/subscriptions/forminternals');
+
+?>
+<div class="elgg-foot">
+<?php echo elgg_view('input/submit', array('value' => elgg_echo('save'))); ?>
+</div>
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index 008e98554..f2f6238f9 100644
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -8,4 +8,4 @@ echo elgg_view('subscriptions/form/additions',$vars);
// Display a description
-echo elgg_view_form('notificationsettings/save');
+echo elgg_view_form('notificationsettings/save', array('class' => 'elgg-form-alt'));
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index b059db487..106eadc54 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -324,12 +324,4 @@ if (!isset($vars['replacement'])) {
}
?>
-
- <div class="elgg-form-footer-alt">
-<?php
-echo elgg_view('input/submit', array(
- 'value' => elgg_echo('save'),
-));
-?>
- </p>
</div>