Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merging volunteer rally and volunteer shifts modules.
  • Loading branch information
jhedstrom committed Dec 3, 2010
1 parent 0a1c4dd commit c178064
Show file tree
Hide file tree
Showing 9 changed files with 353 additions and 23 deletions.
2 changes: 1 addition & 1 deletion volunteer_shifts/volunteer-shifts-box.js
@@ -1,6 +1,6 @@
// $Id$
Drupal.behaviors.volunteerRallyBox = function (context) {
$('input.volunteer-rally-box').bind('click', function () {
$('input.volunteer-shifts-box').bind('click', function () {
this.focus();
this.select();
});
Expand Down
8 changes: 4 additions & 4 deletions volunteer_shifts/volunteer-shifts-event-details.tpl.php
Expand Up @@ -11,18 +11,18 @@
* $capacity - shift capacity
*/
?>
<div class="volunteer-rally-event-details">
<div class="volunteer-shifts-event-details">
<div>
<label><?php print t('Date'); ?>:</label>
<span class="volunteer-rally-event-date"><?php print $date; ?></span>
<span class="volunteer-shifts-event-date"><?php print $date; ?></span>
</div>
<div>
<label><?php print t('Start time'); ?>:</label>
<span class="volunteer-rally-event-start"><?php print $start_time; ?></span>
<span class="volunteer-shifts-event-start"><?php print $start_time; ?></span>
</div>
<div>
<label><?php print t('End time'); ?>:</label>
<span class="volunteer-rally-event-end"><?php print $end_time; ?></span>
<span class="volunteer-shifts-event-end"><?php print $end_time; ?></span>
</div>
<label><?php print t('Capacity'); ?>:</label>
<?php print $capacity; ?>
Expand Down
Expand Up @@ -8,7 +8,7 @@
* $remaining: Remaining shift capacity
*/
?>
<div class="volunteer-rally-remaining-capacity field">
<div class="volunteer-shifts-remaining-capacity field">
<div class="field-label-inline-first"><?php print t('Available slots'); ?>:</div>
<span class="capacity-number remaining-capacity<?php print empty($remaining) ? ' remaining-capacity-0' : ''; ?>"><?php print $remaining; ?></span>
</div>
2 changes: 1 addition & 1 deletion volunteer_shifts/volunteer-shifts-shift-capacity.tpl.php
Expand Up @@ -9,6 +9,6 @@
* $remaining: Remaining shift capacity
*/
?>
<span class="volunteer-rally-shift-capacity">
<span class="volunteer-shifts-shift-capacity">
<span class="capacity-number remaining-capacity<?php print empty($remaining) ? ' remaining-capacity-0' : ''; ?>"><?php print $remaining; ?></span>/<span class="capacity-number total-capacity"><?php print $total; ?></span>
</span>
4 changes: 2 additions & 2 deletions volunteer_shifts/volunteer-shifts-signup.css
@@ -1,9 +1,9 @@
/* $Id$ */
.volunteer-rally-event-details {
.volunteer-shifts-event-details {
padding-left: 0.5em;
padding-top: 0.5em;
}
.volunteer-rally-event-details label {
.volunteer-shifts-event-details label {
float: left;
clear: left;
text-align: right;
Expand Down
8 changes: 4 additions & 4 deletions volunteer_shifts/volunteer_shifts.box.inc
Expand Up @@ -8,7 +8,7 @@ function volunteer_shifts_default_box() {
$box = new stdClass;
$box->disabled = FALSE; /* Edit this to true to make a default box disabled initially */
$box->api_version = 1;
$box->delta = 'volunteer_rally_site_message';
$box->delta = 'volunteer_shifts_site_message';
$box->plugin_key = 'simple';
$box->title = '';
$box->description = 'Sitewide message for authenticated users';
Expand All @@ -17,11 +17,11 @@ function volunteer_shifts_default_box() {
'format' => '1',
);

$export['volunteer_rally_site_message'] = $box;
$export['volunteer_shifts_site_message'] = $box;
$box = new stdClass;
$box->disabled = FALSE; /* Edit this to true to make a default box disabled initially */
$box->api_version = 1;
$box->delta = 'volunteer_rally_welcome_message';
$box->delta = 'volunteer_shifts_welcome_message';
$box->plugin_key = 'simple';
$box->title = 'Welcome';
$box->description = 'Welcome message';
Expand All @@ -31,6 +31,6 @@ To get started, sign in or register using the buttons below. ',
'format' => '1',
);

$export['volunteer_rally_welcome_message'] = $box;
$export['volunteer_shifts_welcome_message'] = $box;
return $export;
}
12 changes: 6 additions & 6 deletions volunteer_shifts/volunteer_shifts.context.inc
Expand Up @@ -26,14 +26,14 @@ function volunteer_shifts_context_default_contexts() {
$context->reactions = array(
'block' => array(
'blocks' => array(
'boxes-volunteer_rally_welcome_message' => array(
'boxes-volunteer_shifts_welcome_message' => array(
'module' => 'boxes',
'delta' => 'volunteer_rally_welcome_message',
'delta' => 'volunteer_shifts_welcome_message',
'region' => 'sidebar_second',
'weight' => 0,
),
'volunteer_rally-simple_login' => array(
'module' => 'volunteer_rally',
'volunteer_shifts-simple_login' => array(
'module' => 'volunteer_shifts',
'delta' => 'simple_login',
'region' => 'sidebar_second',
'weight' => 1,
Expand Down Expand Up @@ -76,9 +76,9 @@ function volunteer_shifts_context_default_contexts() {
'region' => 'sidebar_second',
'weight' => 0,
),
'boxes-volunteer_rally_site_message' => array(
'boxes-volunteer_shifts_site_message' => array(
'module' => 'boxes',
'delta' => 'volunteer_rally_site_message',
'delta' => 'volunteer_shifts_site_message',
'region' => 'content_top',
'weight' => 0,
),
Expand Down
6 changes: 3 additions & 3 deletions volunteer_shifts/volunteer_shifts.info
Expand Up @@ -10,10 +10,10 @@ dependencies[] = "number"
dependencies[] = "optionwidgets"
dependencies[] = "search"
dependencies[] = "strongarm"
dependencies[] = "volunteer_rally"
dependencies[] = "volunteer_shifts"
description = "Create and schedule volunteer shifts"
features[box][] = "volunteer_rally_site_message"
features[box][] = "volunteer_rally_welcome_message"
features[box][] = "volunteer_shifts_site_message"
features[box][] = "volunteer_shifts_welcome_message"
features[content][] = "shift-field_shift_capacity"
features[content][] = "shift-field_shift_date"
features[content][] = "shift-field_shift_signup_status"
Expand Down

0 comments on commit c178064

Please sign in to comment.