Skip to content

Commit

Permalink
Merge pull request #2 from misd-service-development/calendar
Browse files Browse the repository at this point in the history
Add calendar view and update dependencies
  • Loading branch information
JeebsUK authored May 29, 2019
2 parents 3b874af + 0f8a912 commit c21bbc4
Show file tree
Hide file tree
Showing 14 changed files with 399 additions and 2 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Changelog
=========

2.2

20 May 2019

Added calendar view and updated dependencies.


2.1

10 April 2019
Expand Down
Empty file modified LICENSE.txt
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion README.md
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Drupal 7 University of Cambridge event feature
==============================================

This feature adds an event content type and basic views.
This feature adds an event content type and basic views including a calendar.
Empty file modified cambridge_events.features.fe_block_settings.inc
100755 → 100644
Empty file.
Empty file modified cambridge_events.features.field_base.inc
100755 → 100644
Empty file.
Empty file modified cambridge_events.features.field_instance.inc
100755 → 100644
Empty file.
3 changes: 3 additions & 0 deletions cambridge_events.features.inc
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
* Implements hook_ctools_plugin_api().
*/
function cambridge_events_ctools_plugin_api($module = NULL, $api = NULL) {
if ($module == "field_group" && $api == "field_group") {
return array("version" => "1");
}
if ($module == "strongarm" && $api == "strongarm") {
return array("version" => "1");
}
Expand Down
Empty file modified cambridge_events.field_group.inc
100755 → 100644
Empty file.
10 changes: 9 additions & 1 deletion cambridge_events.info
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,31 @@ name = Events
description = Adds an event content type and views.
core = 7.x
package = University of Cambridge
version = 7.x-2.1
version = 7.x-2.2
project = cambridge_events
dependencies[] = body_field_definition
dependencies[] = calendar
dependencies[] = cambridge_image_styles
dependencies[] = ctools
dependencies[] = date
dependencies[] = date_popup
dependencies[] = date_repeat_field
dependencies[] = date_views
dependencies[] = email
dependencies[] = fe_block
dependencies[] = features
dependencies[] = field_group
dependencies[] = image
dependencies[] = link
dependencies[] = media
dependencies[] = options
dependencies[] = smart_trim
dependencies[] = strongarm
dependencies[] = taxonomy
dependencies[] = text
dependencies[] = views
stylesheets[all][] = css/events.css
features[ctools][] = field_group:field_group:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[fe_block_settings][] = views-events-block
Expand Down Expand Up @@ -53,5 +60,6 @@ features[variable][] = node_options_event
features[variable][] = node_preview_event
features[variable][] = node_submitted_event
features[variable][] = pathauto_node_event_pattern
features[views_view][] = event_calendar
features[views_view][] = events
features_exclude[dependencies][cambridge_staff] = cambridge_staff
Empty file modified cambridge_events.install
100755 → 100644
Empty file.
Empty file modified cambridge_events.module
100755 → 100644
Empty file.
Empty file modified cambridge_events.strongarm.inc
100755 → 100644
Empty file.
316 changes: 316 additions & 0 deletions cambridge_events.views_default.inc
100755 → 100644

Large diffs are not rendered by default.

63 changes: 63 additions & 0 deletions css/events.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
.events-calendar-block {
padding: 10px;
}

.calendar-calendar td {
text-align: center;
}

.calendar-calendar tr td.today {
border: 2px solid #404040;
background-color: white;
}

.calendar-calendar th.days {
border: none;
background-color: #404040;
color: white;
padding-top: 5px;
padding-bottom: 5px;
}

.events-calendar-block .date-nav-wrapper .date-prev,
.events-calendar-block .date-nav-wrapper .date-next {
background-color: transparent;
}

.events-calendar-block .date-nav-wrapper .date-prev a,
.events-calendar-block .date-nav-wrapper .date-next a {
font-size: 18px;
}

.events-calendar-block .item-list ul li.date-prev,
.events-calendar-block .item-list ul li.date-next {
margin: 0;
}

.events-calendar-block .date-nav-wrapper .date-nav {
margin-bottom: -10px;
}

.campl-theme-1 .calendar-calendar th.days {
background: #004e8f;
}

.campl-theme-2 .calendar-calendar th.days {
background: #0c5963;
}

.campl-theme-3 .calendar-calendar th.days {
background: #612d70;
}

.campl-theme-4 .calendar-calendar th.days {
background: #355918;
}

.campl-theme-5 .calendar-calendar th.days {
background: #ab3901;
}

.campl-theme-6 .calendar-calendar th.days {
background: #a51137;
}

0 comments on commit c21bbc4

Please sign in to comment.