diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a564559..a6a58533 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+# University of Helsinki Courses v1.115
+Päiväys: 24.05.2018
+
+## Lisäykset
+ - DOO-3469: Google event tracking: Opinnot-sivun välilehdet.
+
+## Muutokset
+ - DOO-3509: Google Analytics: IP-osoitteiden anonymisointi.
+ - DOO-3467: Moodle-alueen luontipainikkeen tekstimuutoksia.
+ - DOO-3554: Rajatut sisällöt näkyviin vain vahvistetusti ilmoittautuneille
+ käytettäessä automaattista vahvistamista.
+ - DOO-3404: Kurssihierarkian esittämisen visuaalisia muutoksia.
+ - DOO-3553: Moodle-alueen luonnin käyttökokemusparannuksia.
+
+## Korjaukset
+ - DOO-3477: Opetuskiel(i)en visuaalisia korjauksia.
+ - DOO-3473: Palautettiin luetteloiden muotoilu jakso- ja toteutussivuilla.
+
+## Päivitykset
+ - DOO-3059: Styleguiden päivittäminen uusimpaan versioon.
+ - DOO-3542: Kielivalinta kurssiupotuksille.
+
+
# University of Helsinki Courses v1.114
Päiväys: 25.04.2018
diff --git a/build-uh_coursepages.make b/build-uh_coursepages.make
index b589b443..974f1f94 100644
--- a/build-uh_coursepages.make
+++ b/build-uh_coursepages.make
@@ -336,5 +336,5 @@ projects[hy_cookie_consent][download][revision] = 909f20821c323240142962df38fb40
projects[uh_courses_embed][type] = module
projects[uh_courses_embed][download][type] = git
projects[uh_courses_embed][download][url] = "git://github.com/UH-StudentServices/uh_courses_embed.git"
-projects[uh_courses_embed][download][branch] = master
-projects[uh_courses_embed][download][revision] = 1d0b22cfa68127248842ee2438af3412bd644897
+projects[uh_courses_embed][download][branch] = drupal7
+projects[uh_courses_embed][download][revision] = ee5124a54f083953c08a557f6dc3e120e86b6ac8
diff --git a/modules/uhc_activemq_connector/uhc_activemq_connector.info b/modules/uhc_activemq_connector/uhc_activemq_connector.info
index d454116f..f69e3f66 100644
--- a/modules/uhc_activemq_connector/uhc_activemq_connector.info
+++ b/modules/uhc_activemq_connector/uhc_activemq_connector.info
@@ -2,5 +2,5 @@ name = UHC ActiveMQ Connector
description = This module is deprecated.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_activemq_connector
diff --git a/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.info b/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.info
index c1651ee2..08f487ab 100644
--- a/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.info
+++ b/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.info
@@ -2,7 +2,7 @@ name = UHC Analytics and Tracking
description = Specifies statistics/analytics for portal.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_analytics_and_tracking
dependencies[] = ctools
dependencies[] = facetapi
@@ -19,5 +19,6 @@ features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
features[variable][] = google_analytics_reports_api_cache_length
features[variable][] = googleanalytics_pages
+features[variable][] = googleanalytics_tracker_anonymizeip
features[views_view][] = uhc_google_analytics_reports_page
files[] = plugins/uhc_google_analytics_reports_plugin_argument_default_google_analytics_reports_path.inc
diff --git a/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.module b/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.module
index 2646672a..d256b020 100644
--- a/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.module
+++ b/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.module
@@ -190,6 +190,24 @@ function uhc_analytics_and_tracking_google_analytics_et_api() {
'action' => 'click',
);
+ // Horizontal tabs on studies landing page: Course catalogue.
+ $selectors[] = array(
+ 'event' => 'click',
+ 'selector' => '.node-type-studies-landing-page #course-catalogue + .horizontal-tabs a',
+ 'category' => 'Studies landing page: Course catalogue tabs',
+ 'label' => '!text',
+ 'action' => 'click',
+ );
+
+ // Horizontal tabs on studies landing page: Summer course catalogue.
+ $selectors[] = array(
+ 'event' => 'click',
+ 'selector' => '.node-type-studies-landing-page #course-catalogue-summer ~ .clearfix .horizontal-tabs a',
+ 'category' => 'Studies landing page: Summer course catalogue tabs',
+ 'label' => '!text',
+ 'action' => 'click',
+ );
+
return $selectors;
}
diff --git a/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.strongarm.inc b/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.strongarm.inc
index e7d5aa9a..412ec34a 100644
--- a/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.strongarm.inc
+++ b/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.strongarm.inc
@@ -21,6 +21,13 @@ node/add*
user/*/*';
$export['googleanalytics_pages'] = $strongarm;
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'googleanalytics_tracker_anonymizeip';
+ $strongarm->value = 1;
+ $export['googleanalytics_tracker_anonymizeip'] = $strongarm;
+
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
diff --git a/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.views_default.inc b/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.views_default.inc
index 3f7407bb..6cc862a0 100644
--- a/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.views_default.inc
+++ b/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.views_default.inc
@@ -61,13 +61,13 @@ function uhc_analytics_and_tracking_views_default_views() {
'empty_column' => 0,
),
);
- /* Field: Page tracking calculated metrics: Avg. Time on Page */
+ /* Field: Page Tracking: Avg. Time on Page */
$handler->display->display_options['fields']['avgTimeOnPage']['id'] = 'avgTimeOnPage';
$handler->display->display_options['fields']['avgTimeOnPage']['table'] = 'google_analytics';
$handler->display->display_options['fields']['avgTimeOnPage']['field'] = 'avgTimeOnPage';
$handler->display->display_options['fields']['avgTimeOnPage']['date_format'] = 'long';
$handler->display->display_options['fields']['avgTimeOnPage']['second_date_format'] = 'long';
- /* Contextual filter: Page tracking dimensions: Page */
+ /* Contextual filter: Page Tracking: Page */
$handler->display->display_options['arguments']['pagePath']['id'] = 'pagePath';
$handler->display->display_options['arguments']['pagePath']['table'] = 'google_analytics';
$handler->display->display_options['arguments']['pagePath']['field'] = 'pagePath';
@@ -116,20 +116,20 @@ function uhc_analytics_and_tracking_views_default_views() {
$handler->display->display_options['empty']['area_text_custom']['empty'] = TRUE;
$handler->display->display_options['empty']['area_text_custom']['content'] = 'Page doesn\'t have any statistics.';
$handler->display->display_options['defaults']['fields'] = FALSE;
- /* Field: Page tracking metrics: Pageviews */
+ /* Field: Page Tracking: Pageviews */
$handler->display->display_options['fields']['pageviews']['id'] = 'pageviews';
$handler->display->display_options['fields']['pageviews']['table'] = 'google_analytics';
$handler->display->display_options['fields']['pageviews']['field'] = 'pageviews';
$handler->display->display_options['fields']['pageviews']['precision'] = '0';
$handler->display->display_options['fields']['pageviews']['separator'] = '';
- /* Field: Page tracking metrics: Unique Pageviews */
+ /* Field: Page Tracking: Unique Pageviews */
$handler->display->display_options['fields']['uniquePageviews']['id'] = 'uniquePageviews';
$handler->display->display_options['fields']['uniquePageviews']['table'] = 'google_analytics';
$handler->display->display_options['fields']['uniquePageviews']['field'] = 'uniquePageviews';
$handler->display->display_options['fields']['uniquePageviews']['label'] = 'Unique pageviews';
$handler->display->display_options['fields']['uniquePageviews']['precision'] = '0';
$handler->display->display_options['fields']['uniquePageviews']['separator'] = '';
- /* Field: Page tracking calculated metrics: Avg. Time on Page */
+ /* Field: Page Tracking: Avg. Time on Page */
$handler->display->display_options['fields']['avgTimeOnPage']['id'] = 'avgTimeOnPage';
$handler->display->display_options['fields']['avgTimeOnPage']['table'] = 'google_analytics';
$handler->display->display_options['fields']['avgTimeOnPage']['field'] = 'avgTimeOnPage';
@@ -138,7 +138,7 @@ function uhc_analytics_and_tracking_views_default_views() {
$handler->display->display_options['fields']['avgTimeOnPage']['custom_date_format'] = 'i:s';
$handler->display->display_options['fields']['avgTimeOnPage']['second_date_format'] = 'long';
$handler->display->display_options['defaults']['arguments'] = FALSE;
- /* Contextual filter: Page tracking dimensions: Page */
+ /* Contextual filter: Page Tracking: Page */
$handler->display->display_options['arguments']['pagePath']['id'] = 'pagePath';
$handler->display->display_options['arguments']['pagePath']['table'] = 'google_analytics';
$handler->display->display_options['arguments']['pagePath']['field'] = 'pagePath';
diff --git a/modules/uhc_autofill_metadata/uhc_autofill_metadata.info b/modules/uhc_autofill_metadata/uhc_autofill_metadata.info
index 9aa425c4..74658d1f 100644
--- a/modules/uhc_autofill_metadata/uhc_autofill_metadata.info
+++ b/modules/uhc_autofill_metadata/uhc_autofill_metadata.info
@@ -2,7 +2,7 @@ name = UHC Autofill Metadata
description = Fetches user metadata from Shibboleth integration.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_autofill_metadata
dependencies[] = ctools
dependencies[] = features
diff --git a/modules/uhc_autofill_metadata/uhc_autofill_metadata.module b/modules/uhc_autofill_metadata/uhc_autofill_metadata.module
index 7e23a043..7e64bbf3 100644
--- a/modules/uhc_autofill_metadata/uhc_autofill_metadata.module
+++ b/modules/uhc_autofill_metadata/uhc_autofill_metadata.module
@@ -252,7 +252,9 @@ function uhc_autofill_metadata_get_enrollments($personal_unique_code) {
if (isset($enrollment_data['status']) && $enrollment_data['status'] == 200 && !empty($enrollment_data['data'])) {
foreach ($enrollment_data['data'] as $enrollment) {
if (isset($enrollment['course_id'])) {
- $enrollments[] = $enrollment['course_id'];
+ if (uhc_autofill_metadata_is_enrollment_confirmed($enrollment)) {
+ $enrollments[] = $enrollment['course_id'];
+ }
}
}
}
@@ -260,19 +262,51 @@ function uhc_autofill_metadata_get_enrollments($personal_unique_code) {
return $enrollments;
}
+/**
+ * An enrollment is considered confirmed if automatic confirmation is not
+ * enabled or automatic confirmation is enabled and the confirmation time is in
+ * the past.
+ *
+ * @param array $enrollment
+ * @return bool Is the enrollment confirmed?
+ */
+function uhc_autofill_metadata_is_enrollment_confirmed($enrollment) {
+ return empty($enrollment['automatic_enabled'])
+ || $enrollment['automatic_enabled'] != 'true'
+ || uhc_autofill_metadata_has_enrollment_confirmation_time_passed($enrollment);
+}
+
+/**
+ * Parses enrollment confirmation end time and returns whether it has passed.
+ *
+ * @param array $enrollment
+ * @return bool Has the enrollment confirmation time passed?
+ */
+function uhc_autofill_metadata_has_enrollment_confirmation_time_passed($enrollment) {
+ $end_date = !empty($enrollment['automatic_end_date']) ? date_create($enrollment['automatic_end_date']) : NULL;
+ $end_time = !empty($enrollment['automatic_end_time']) ? $enrollment['automatic_end_time'] : NULL;
+ $end_time_hours_minutes_seconds = isset($end_time) ? str_split($end_time, 2) : NULL;
+
+ if (isset($end_date, $end_time_hours_minutes_seconds)) {
+ date_add($end_date, date_interval_create_from_date_string("$end_time_hours_minutes_seconds[0] hours"));
+ date_add($end_date, date_interval_create_from_date_string("$end_time_hours_minutes_seconds[1] minutes"));
+ date_add($end_date, date_interval_create_from_date_string("$end_time_hours_minutes_seconds[2] seconds"));
+ }
+
+ return isset($end_date) && $end_date->getTimestamp() <= REQUEST_TIME;
+}
+
/**
* Returns enrollment information for the given user identified by personal
* unique code.
*
* @param string $personal_unique_code
* Personal unique code, typically student number.
- * @param bool $filter_relevant_only
- * If TRUE, filters enrollments that are relevant for students.
* @return array|NULL
* Enrollment information (if found), NULL if not found or empty array if an error
* occured.
*/
-function uhc_autofill_metadata_get_enrollment_data($personal_unique_code, $filter_relevant_only = FALSE) {
+function uhc_autofill_metadata_get_enrollment_data($personal_unique_code) {
// For easier debugging, we can fake our enrollment response by using this
// Drupal variable (if it's set).
@@ -308,35 +342,9 @@ function uhc_autofill_metadata_get_enrollment_data($personal_unique_code, $filte
}
}
- // When enrollment data is available and we want to filter relevant courses
- if ($filter_relevant_only === TRUE && !empty($enrollment_data)) {
- $enrollment_data = uhc_autofill_metadata_get_enrollment_filtered($enrollment_data);
- }
-
return $enrollment_data;
}
-/**
- * Fiters non-relevant enrollments out and returns relevant courses.
- *
- * @param array $enrollments
- * @return array
- * Returns $enrollments without non-relevant courses.
- */
-function uhc_autofill_metadata_get_enrollment_filtered(array $enrollments) {
- $return = $enrollments;
- $return['data'] = array();
- for ($i = 0; $i < count($enrollments['data']); $i++) {
- if (!empty($enrollments['data'][$i]['end_date'])) {
- if (strtotime($enrollments['data'][$i]['end_date']) > REQUEST_TIME) {
- // When end date is in the future, append enrollment to unfiltered list
- $return['data'][] = $enrollments['data'][$i];
- }
- }
- }
- return $return;
-}
-
function uhc_autofill_metadata_set_enrollments($account, $enrollments) {
if ($enrollments !== FALSE) {
$account->field_enrollments[LANGUAGE_NONE] = array();
diff --git a/modules/uhc_autologin/uhc_autologin.info b/modules/uhc_autologin/uhc_autologin.info
index 71993362..8dfafb49 100644
--- a/modules/uhc_autologin/uhc_autologin.info
+++ b/modules/uhc_autologin/uhc_autologin.info
@@ -2,6 +2,6 @@ name = UHC Autologin
description = Provides autologin services.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_autologin
dependencies[] = shib_auth
diff --git a/modules/uhc_avatar/uhc_avatar.info b/modules/uhc_avatar/uhc_avatar.info
index 991e58f2..5753c809 100644
--- a/modules/uhc_avatar/uhc_avatar.info
+++ b/modules/uhc_avatar/uhc_avatar.info
@@ -2,5 +2,5 @@ name = UHC Avatar
description = Provides avatar (user image) related functionality
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_avatar
diff --git a/modules/uhc_cache_warmer/uhc_cache_warmer.info b/modules/uhc_cache_warmer/uhc_cache_warmer.info
index 679d7c42..fec5e033 100644
--- a/modules/uhc_cache_warmer/uhc_cache_warmer.info
+++ b/modules/uhc_cache_warmer/uhc_cache_warmer.info
@@ -2,5 +2,5 @@ name = UHC Cache Warmer
description = Provides a drush command for generating a hub pages file for the cache_warmer module.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_cache_warmer
diff --git a/modules/uhc_comment/uhc_comment.info b/modules/uhc_comment/uhc_comment.info
index cf580496..1a7b6604 100644
--- a/modules/uhc_comment/uhc_comment.info
+++ b/modules/uhc_comment/uhc_comment.info
@@ -2,7 +2,7 @@ name = UHC Comment
description = Configures comments for this portal.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_comment
dependencies[] = comment
dependencies[] = ctools
diff --git a/modules/uhc_contact_card/uhc_contact_card.info b/modules/uhc_contact_card/uhc_contact_card.info
index cb0b895d..a8a560a3 100644
--- a/modules/uhc_contact_card/uhc_contact_card.info
+++ b/modules/uhc_contact_card/uhc_contact_card.info
@@ -2,7 +2,7 @@ name = UHC Contact card
description = Provides Contact Card content type
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_contact_card
dependencies[] = ctools
dependencies[] = email
diff --git a/modules/uhc_content_administration_feature/uhc_content_administration_feature.info b/modules/uhc_content_administration_feature/uhc_content_administration_feature.info
index ba7de87a..6922c9cb 100644
--- a/modules/uhc_content_administration_feature/uhc_content_administration_feature.info
+++ b/modules/uhc_content_administration_feature/uhc_content_administration_feature.info
@@ -1,7 +1,7 @@
name = UHC Content Administration
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_content_administration_feature
dependencies[] = actions_permissions
dependencies[] = admin_menu
diff --git a/modules/uhc_course/uhc_course.info b/modules/uhc_course/uhc_course.info
index 20cfbcfe..2aa16dbf 100644
--- a/modules/uhc_course/uhc_course.info
+++ b/modules/uhc_course/uhc_course.info
@@ -1,7 +1,7 @@
name = UHC Course
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course
dependencies[] = ctools
dependencies[] = entity_token
diff --git a/modules/uhc_course/uhc_course.module b/modules/uhc_course/uhc_course.module
index 89a7c458..805ca55a 100644
--- a/modules/uhc_course/uhc_course.module
+++ b/modules/uhc_course/uhc_course.module
@@ -264,7 +264,7 @@ function theme_oodi_field($variables) {
if (empty($variables['value'])) {
return NULL;
}
- return '
' . $variables['title'] . '
' . $variables['value'] . '
';
+ return '' . $variables['title'] . '
' . $variables['value'] . '
';
}
/**
diff --git a/modules/uhc_course_collaboration/uhc_course_collaboration.info b/modules/uhc_course_collaboration/uhc_course_collaboration.info
index dcf99c7e..14795746 100644
--- a/modules/uhc_course_collaboration/uhc_course_collaboration.info
+++ b/modules/uhc_course_collaboration/uhc_course_collaboration.info
@@ -2,7 +2,7 @@ name = UHC Course Collaboration
description = Organic Groups for course implementation nodes
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_collaboration
dependencies[] = ctools
dependencies[] = features
diff --git a/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.info b/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.info
index a47715cd..26ffb870 100644
--- a/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.info
+++ b/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.info
@@ -2,7 +2,7 @@ name = UHC Course Collaboration Private
description = Extends collaboration by providing option to share content privately.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_collaboration_private
dependencies[] = comment_og
dependencies[] = conditional_fields
diff --git a/modules/uhc_course_hierarchy/uhc_course_hierarchy.info b/modules/uhc_course_hierarchy/uhc_course_hierarchy.info
index 1eeb4660..902b5c71 100644
--- a/modules/uhc_course_hierarchy/uhc_course_hierarchy.info
+++ b/modules/uhc_course_hierarchy/uhc_course_hierarchy.info
@@ -2,7 +2,7 @@ name = UHC Course Hierarchy
description = Shows the hierarchy for users in course implementation pages.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_hierarchy
php = 5.4
dependencies[] = uhc_autofill_metadata
diff --git a/modules/uhc_course_hierarchy/uhc_course_hierarchy.module b/modules/uhc_course_hierarchy/uhc_course_hierarchy.module
index 9da920a9..acebd618 100644
--- a/modules/uhc_course_hierarchy/uhc_course_hierarchy.module
+++ b/modules/uhc_course_hierarchy/uhc_course_hierarchy.module
@@ -201,6 +201,7 @@ function uhc_course_hierarchy_get_course_children(stdClass $node) {
// Second loop, we generate link items. Use children path if user has
// access, otherwise use previously defined fallback path.
$items = array();
+ $link_options = array('attributes' => array('class' => array('button--action-before', 'icon--arrow-right', 'theme-transparent')));
foreach ($children as $child) {
// If user has no rights to path and it does not contain grandchildren,
// then do not render an link item. See DOO-2338.
@@ -212,7 +213,7 @@ function uhc_course_hierarchy_get_course_children(stdClass $node) {
// CSS styling for grouping reasons.
$path = $access ? $child['uri']['path'] : $fallback_path;
$items[] = array(
- 'data' => l($child['label'], $path),
+ 'data' => l($child['label'], $path, $link_options),
'class' => uhc_course_hierarchy_get_attributes($child['node']),
'children' => $grandchildren,
);
diff --git a/modules/uhc_course_implementation/uhc_course_implementation.info b/modules/uhc_course_implementation/uhc_course_implementation.info
index c3349892..e2950196 100644
--- a/modules/uhc_course_implementation/uhc_course_implementation.info
+++ b/modules/uhc_course_implementation/uhc_course_implementation.info
@@ -2,7 +2,7 @@ name = UHC Course implementation
description = This feature provides content type for course implementations
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_implementation
dependencies[] = ctools
dependencies[] = date
diff --git a/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.info b/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.info
index d7c7a391..45ffbf2b 100644
--- a/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.info
+++ b/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.info
@@ -2,7 +2,7 @@ name = UHC Course Implementation Activity
description = Tracks activity of course implementation.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_implementation_activity
dependencies[] = comment
dependencies[] = ctools
diff --git a/modules/uhc_course_implementation_activity_mece/uhc_course_implementation_activity_mece.info b/modules/uhc_course_implementation_activity_mece/uhc_course_implementation_activity_mece.info
index 43b1bc19..a763ff06 100644
--- a/modules/uhc_course_implementation_activity_mece/uhc_course_implementation_activity_mece.info
+++ b/modules/uhc_course_implementation_activity_mece/uhc_course_implementation_activity_mece.info
@@ -2,7 +2,7 @@ name = UHC Course Implementation Activity MECE
description = Sends all activity notifications to Message Center.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_implementation_activity_mece
dependencies[] = uh_mece_notifications
dependencies[] = uhc_course_implementation
diff --git a/modules/uhc_course_implementation_inherited_fields/uhc_course_implementation_inherited_fields.info b/modules/uhc_course_implementation_inherited_fields/uhc_course_implementation_inherited_fields.info
index f34706ed..e711412e 100644
--- a/modules/uhc_course_implementation_inherited_fields/uhc_course_implementation_inherited_fields.info
+++ b/modules/uhc_course_implementation_inherited_fields/uhc_course_implementation_inherited_fields.info
@@ -2,7 +2,7 @@ name = UHC Course Implementation Inherited Fields
description = Holds field values that comes from course from the time when course implementation was active.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_implementation_inherited_fields
dependencies[] = ctools
dependencies[] = ds
diff --git a/modules/uhc_course_implementation_source/uhc_course_implementation_source.info b/modules/uhc_course_implementation_source/uhc_course_implementation_source.info
index 38746e28..9fd6fc8c 100644
--- a/modules/uhc_course_implementation_source/uhc_course_implementation_source.info
+++ b/modules/uhc_course_implementation_source/uhc_course_implementation_source.info
@@ -2,7 +2,7 @@ name = UHC Course Implementation Source
description = Provides the source data for course implementation.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_implementation_source
files[] = includes/UHCCourseImplementationMessageProcessor.inc
files[] = migrate/CourseImplementationDestinationNode.inc
diff --git a/modules/uhc_course_material/uhc_course_material.info b/modules/uhc_course_material/uhc_course_material.info
index b6b9bb5a..974e4f10 100644
--- a/modules/uhc_course_material/uhc_course_material.info
+++ b/modules/uhc_course_material/uhc_course_material.info
@@ -1,7 +1,7 @@
name = UHC Course material
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_material
dependencies[] = ctools
dependencies[] = entityreference
diff --git a/modules/uhc_course_material_dnd/uhc_course_material_dnd.info b/modules/uhc_course_material_dnd/uhc_course_material_dnd.info
index d946a872..aced5331 100644
--- a/modules/uhc_course_material_dnd/uhc_course_material_dnd.info
+++ b/modules/uhc_course_material_dnd/uhc_course_material_dnd.info
@@ -2,6 +2,6 @@ name = UHC Course Material Drag 'N Drop
description = Provides UX for drag and dropping materials to a course implementation.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_material_dnd
dependencies[] = uhc_course_material
diff --git a/modules/uhc_course_material_sort/uhc_course_material_sort.info b/modules/uhc_course_material_sort/uhc_course_material_sort.info
index 2792ac5c..1e30f23f 100644
--- a/modules/uhc_course_material_sort/uhc_course_material_sort.info
+++ b/modules/uhc_course_material_sort/uhc_course_material_sort.info
@@ -2,7 +2,7 @@ name = UHC Course Material Sort
description = Provides Alphabetical sorting for course material.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_material_sort
dependencies[] = behavior_weights
dependencies[] = uhc_course_material
diff --git a/modules/uhc_course_source/uhc_course_source.info b/modules/uhc_course_source/uhc_course_source.info
index 0f7bc6cf..2357e9e4 100644
--- a/modules/uhc_course_source/uhc_course_source.info
+++ b/modules/uhc_course_source/uhc_course_source.info
@@ -2,7 +2,7 @@ name = UHC Course Source
description = Provides the source data for courses.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_source
files[] = includes/UHCCourseMessageProcessor.inc
files[] = migrate/CourseNodeMigration.inc
diff --git a/modules/uhc_course_tasks_and_material/uhc_course_tasks_and_material.info b/modules/uhc_course_tasks_and_material/uhc_course_tasks_and_material.info
index f5116678..4c9de1b4 100644
--- a/modules/uhc_course_tasks_and_material/uhc_course_tasks_and_material.info
+++ b/modules/uhc_course_tasks_and_material/uhc_course_tasks_and_material.info
@@ -2,7 +2,7 @@ name = UHC Course tasks and material
description = Provide content type for tasks and material - used on courses
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_course_tasks_and_material
dependencies[] = ctools
dependencies[] = entityreference
diff --git a/modules/uhc_css_js_aggregation/uhc_css_js_aggregation.info b/modules/uhc_css_js_aggregation/uhc_css_js_aggregation.info
index 1af84959..aaa6d19a 100644
--- a/modules/uhc_css_js_aggregation/uhc_css_js_aggregation.info
+++ b/modules/uhc_css_js_aggregation/uhc_css_js_aggregation.info
@@ -2,7 +2,7 @@ name = UHC CSS/JS Aggregation
description = Advanced CSS/JS aggregation settings
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
dependencies[] = advagg
dependencies[] = advagg_mod
dependencies[] = ctools
diff --git a/modules/uhc_date_format/uhc_date_format.info b/modules/uhc_date_format/uhc_date_format.info
index 64fcb873..c3cf4324 100644
--- a/modules/uhc_date_format/uhc_date_format.info
+++ b/modules/uhc_date_format/uhc_date_format.info
@@ -2,7 +2,7 @@ name = UHC Date format
description = Date formats
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_date_format
dependencies[] = ctools
dependencies[] = strongarm
diff --git a/modules/uhc_dev_feature/uhc_dev_feature.info b/modules/uhc_dev_feature/uhc_dev_feature.info
index 60c903c2..6d3c0379 100644
--- a/modules/uhc_dev_feature/uhc_dev_feature.info
+++ b/modules/uhc_dev_feature/uhc_dev_feature.info
@@ -2,7 +2,7 @@ name = UHC Dev
description = Useful views etc. for development phase.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_dev_feature
dependencies[] = views
features[ctools][] = views:views_default:3.0
diff --git a/modules/uhc_doo_theme_features/uhc_doo_theme_features.info b/modules/uhc_doo_theme_features/uhc_doo_theme_features.info
index 5ac3c0eb..a6c81973 100644
--- a/modules/uhc_doo_theme_features/uhc_doo_theme_features.info
+++ b/modules/uhc_doo_theme_features/uhc_doo_theme_features.info
@@ -2,7 +2,7 @@ name = UHC DOO theme
description = Theme settings for DOO project which override and extend the main theme feature which was included in the main theme settings.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_doo_theme_features
dependencies[] = block
dependencies[] = context
diff --git a/modules/uhc_ds/uhc_ds.info b/modules/uhc_ds/uhc_ds.info
index 13caf1de..531988ce 100644
--- a/modules/uhc_ds/uhc_ds.info
+++ b/modules/uhc_ds/uhc_ds.info
@@ -2,7 +2,7 @@ name = UHC Display Suite
description = Display settings for UHC subsite.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_ds
dependencies[] = ctools
dependencies[] = date_views
diff --git a/modules/uhc_elisa_chat/uhc_elisa_chat.info b/modules/uhc_elisa_chat/uhc_elisa_chat.info
index d86ff88a..cb68f837 100644
--- a/modules/uhc_elisa_chat/uhc_elisa_chat.info
+++ b/modules/uhc_elisa_chat/uhc_elisa_chat.info
@@ -2,5 +2,5 @@ name = UHC Elisa Chat
description = Adds Elisa Chat to specified pages.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_elisa_chat
diff --git a/modules/uhc_environment/uhc_environment.info b/modules/uhc_environment/uhc_environment.info
index 2aac39e1..8fc31f3f 100644
--- a/modules/uhc_environment/uhc_environment.info
+++ b/modules/uhc_environment/uhc_environment.info
@@ -2,5 +2,5 @@ name = UHC Environment
description = Appends an multilingual message about current environment.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
dependencies[] = site_status_message
diff --git a/modules/uhc_event/uhc_event.info b/modules/uhc_event/uhc_event.info
index b1ffd006..3dfe2f22 100644
--- a/modules/uhc_event/uhc_event.info
+++ b/modules/uhc_event/uhc_event.info
@@ -2,7 +2,7 @@ name = UHC Event
description = Provides event content type
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_event
dependencies[] = ctools
dependencies[] = date
diff --git a/modules/uhc_exam_results/uhc_exam_results.info b/modules/uhc_exam_results/uhc_exam_results.info
index cdb1a2c8..cc2dfdd8 100644
--- a/modules/uhc_exam_results/uhc_exam_results.info
+++ b/modules/uhc_exam_results/uhc_exam_results.info
@@ -2,7 +2,7 @@ name = UHC Exam results
description = Provides Exam results content type
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
dependencies[] = ctools
dependencies[] = features
dependencies[] = file
diff --git a/modules/uhc_favorites/uhc_favorites.info b/modules/uhc_favorites/uhc_favorites.info
index c191a92c..52e24cb6 100644
--- a/modules/uhc_favorites/uhc_favorites.info
+++ b/modules/uhc_favorites/uhc_favorites.info
@@ -2,7 +2,7 @@ name = UHC Favorites
description = Provides ability to put courses into your favorites and send them via email.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_favorites
dependencies[] = favoritewidget
dependencies[] = node
diff --git a/modules/uhc_feedback/uhc_feedback.info b/modules/uhc_feedback/uhc_feedback.info
index 2439c1d0..2566a8bf 100644
--- a/modules/uhc_feedback/uhc_feedback.info
+++ b/modules/uhc_feedback/uhc_feedback.info
@@ -2,7 +2,7 @@ name = UHC Feedback
description = Provides UHC customization to feedback contrib module
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_feedback
dependencies[] = conditional_fields
dependencies[] = ctools
diff --git a/modules/uhc_field_base/uhc_field_base.info b/modules/uhc_field_base/uhc_field_base.info
index a1ee13c0..5df5b19a 100644
--- a/modules/uhc_field_base/uhc_field_base.info
+++ b/modules/uhc_field_base/uhc_field_base.info
@@ -2,7 +2,7 @@ name = UHC Field Base
description = Specifies what fields this installation has. Does not hold instance information as they're specified by the modules.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_field_base
dependencies[] = ctools
dependencies[] = date
diff --git a/modules/uhc_genetics/uhc_genetics.info b/modules/uhc_genetics/uhc_genetics.info
index 03911b9a..82f17280 100644
--- a/modules/uhc_genetics/uhc_genetics.info
+++ b/modules/uhc_genetics/uhc_genetics.info
@@ -2,5 +2,5 @@ name = UHC Genetics
description = This module is deprecated.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_genetics
diff --git a/modules/uhc_leiki/uhc_leiki.info b/modules/uhc_leiki/uhc_leiki.info
index 006ee562..63d86bc6 100644
--- a/modules/uhc_leiki/uhc_leiki.info
+++ b/modules/uhc_leiki/uhc_leiki.info
@@ -2,5 +2,5 @@ name = UHC Leiki
description = Integrates with Leiki service.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_leiki
diff --git a/modules/uhc_liftups/uhc_liftups.info b/modules/uhc_liftups/uhc_liftups.info
index 7543e151..a08609a5 100644
--- a/modules/uhc_liftups/uhc_liftups.info
+++ b/modules/uhc_liftups/uhc_liftups.info
@@ -2,7 +2,7 @@ name = UHC Liftups
description = Provides ability to create promotional liftups.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_liftups
dependencies[] = ctools
dependencies[] = date
diff --git a/modules/uhc_locale/uhc_locale.info b/modules/uhc_locale/uhc_locale.info
index 2ceca9ac..8a728491 100644
--- a/modules/uhc_locale/uhc_locale.info
+++ b/modules/uhc_locale/uhc_locale.info
@@ -2,7 +2,7 @@ name = UHC Locale
description = Settings for languages and translations
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_locale
dependencies[] = ctools
dependencies[] = features
diff --git a/modules/uhc_migrate_message_notifications/uhc_migrate_message_notifications.info b/modules/uhc_migrate_message_notifications/uhc_migrate_message_notifications.info
index 27820ddd..119efbaa 100644
--- a/modules/uhc_migrate_message_notifications/uhc_migrate_message_notifications.info
+++ b/modules/uhc_migrate_message_notifications/uhc_migrate_message_notifications.info
@@ -2,7 +2,7 @@ name = UHC Migrate Message Notifications
description = Send notifications about configured messages.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_migrate_message_notifications
dependencies[] = uhc_migrate_message_report
files[] = includes/UHCMigrateMessageScannerService.inc
diff --git a/modules/uhc_migrate_message_report/uhc_migrate_message_report.info b/modules/uhc_migrate_message_report/uhc_migrate_message_report.info
index 77a1b39e..89578d6e 100644
--- a/modules/uhc_migrate_message_report/uhc_migrate_message_report.info
+++ b/modules/uhc_migrate_message_report/uhc_migrate_message_report.info
@@ -2,7 +2,7 @@ name = UHC Migrate Message Report
description = Reports of migrate messages.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_migrate_message_report
dependencies[] = uhc_course_implementation_source
files[] = includes/MigrateSQLMapWithCreated.inc
diff --git a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.info b/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.info
index 6cec2485..9d6122b6 100644
--- a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.info
+++ b/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.info
@@ -2,5 +2,5 @@ name = UHC Molecular Biosciences
description = This module is deprecated.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_molecular_biosciences
diff --git a/modules/uhc_moodi/js/uhc_moodi_copy_moodle_url.js b/modules/uhc_moodi/js/uhc_moodi_copy_moodle_url.js
deleted file mode 100644
index aa0af8da..00000000
--- a/modules/uhc_moodi/js/uhc_moodi_copy_moodle_url.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @license GPL, or GNU General Public License, version 3
- * @license http://opensource.org/licenses/GPL-3.0
- * @see README.md how to contribute to this project
- */
-(function ($) {
-
- // Function: Get URL parameter value by name. If the parameter exists, but
- // has no value, return true. Otherwise return false.
- var getUrlParameter = function getUrlParameter(parameter) {
- var pageUrl = decodeURIComponent(window.location.search.substring(1));
- var urlParameters = pageUrl.split('&');
- var parameterName;
- var i;
-
- for (i = 0; i < urlParameters.length; i++) {
- parameterName = urlParameters[i].split('=');
-
- if (parameterName[0] === parameter) {
- return parameterName[1] === undefined ? true : parameterName[1];
- }
- }
-
- return false;
- };
-
- // Saves the Moodle URL to the course implementation, if the URL is present
- // as a hidden form input (set by the Moodi integration) and if the URL
- // parameter indicates a successful completion of Moodi create request.
- Drupal.behaviors.uhc_moodi_save_moodle_url_on_moodi_create = {
- attach: function (context) {
- $(function() {
- var moodi_moodle_url = $('input[name=moodi_moodle_url]').val();
-
- if (getUrlParameter('moodi_creation_successful') && moodi_moodle_url) {
- $('#edit-field-moodle-url-und-0-url').val(moodi_moodle_url);
- $('#edit-submit2').click();
- }
- });
- }
- }
-})(jQuery);
diff --git a/modules/uhc_moodi/uhc_moodi.info b/modules/uhc_moodi/uhc_moodi.info
index 8d371e8d..682d5c25 100644
--- a/modules/uhc_moodi/uhc_moodi.info
+++ b/modules/uhc_moodi/uhc_moodi.info
@@ -2,7 +2,7 @@ name = UHC Moodi
description = Provides Moodi integration services
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_moodi
dependencies[] = uhc_course_collaboration
diff --git a/modules/uhc_moodi/uhc_moodi.module b/modules/uhc_moodi/uhc_moodi.module
index f8774a3b..9b2726e3 100644
--- a/modules/uhc_moodi/uhc_moodi.module
+++ b/modules/uhc_moodi/uhc_moodi.module
@@ -73,7 +73,7 @@ function uhc_moodi_add_moodi_widget(&$form, $course_implementation_id) {
// Moodi create button.
$form['uhc_moodi_fieldset']['uhc_moodi_create_button'] = array(
'#type' => 'submit',
- '#value' => t('Create Moodle course area'),
+ '#value' => t('Create a new Moodle course area'),
'#access' => uhc_moodi_create_button_access($moodi_response),
'#ajax' => array(
'callback' => 'uhc_moodi_create_button_ajax_callback',
@@ -99,9 +99,6 @@ function uhc_moodi_add_moodi_widget(&$form, $course_implementation_id) {
);
if ($show_status) {
$form['uhc_moodi_fieldset']['uhc_moodi_status_area']['#markup'] = '' . uhc_moodi_get_status_title($moodi_response) . '
' . uhc_moodi_get_status_markup($moodi_response);
- $form['uhc_moodi_fieldset']['uhc_moodi_status_area']['#attached'] = array('js' => array(
- drupal_get_path('module', 'uhc_moodi') . '/js/uhc_moodi_copy_moodle_url.js',
- ));
}
// Description of Moodle areas without participants.
@@ -364,52 +361,58 @@ function uhc_moodi_get_creation_result_title($moodi_response, $ok_status_codes =
}
/**
- * Handle Moodi create response. Redirects back to Moodle section on successful
- * Moodi create operation.
+ * Handle Moodi create response.
*
* @param $moodi_create_response object Moodi response.
* @param $form array Course implementation form.
*/
function uhc_moodi_handle_create_response($moodi_create_response, $form) {
if ($moodi_create_response->code == 200) {
+ watchdog('uhc_moodi', 'Moodle creation successful.');
uhc_moodi_create_moodle_created_activity_message();
-
- $current_path = !empty($form['uhc_moodi_fieldset']['current_path']['#value'])
- ? $form['uhc_moodi_fieldset']['current_path']['#value']
- : '';
-
- watchdog('uhc_moodi', 'Moodle creation successful. Refreshing page.');
- uhc_moodi_redirect($current_path);
+ uhc_moodi_save_moodle_url();
+ uhc_moodi_refresh_page($form);
}
}
-function uhc_moodi_create_moodle_created_activity_message() {
+function uhc_moodi_save_moodle_url() {
$nid = isset($_SESSION['og_context']['gid']) ? $_SESSION['og_context']['gid'] : NULL;
if ($nid) {
$node = node_load($nid);
- uhc_course_implementation_activity_create_message($node, 'course_implementation_moodle_course_area_create');
+ $course_implementation_id = $node->field_imp_id[LANGUAGE_NONE][0]['value'];
+ $moodi_response = uhc_moodi_get_controller()->get($course_implementation_id);
+ $node->field_moodle_url[LANGUAGE_NONE][0]['url'] = uhc_moodi_get_moodle_url($moodi_response);
+ node_save($node);
}
}
-/**
- * @param $path string Path.
- */
-function uhc_moodi_redirect($path) {
- if (!empty($path)) {
- ctools_include('ajax');
- ctools_add_js('ajax-responder');
-
- $options = array(
- 'query' => array(
- 'section' => 'edit-group_imp_moodle',
- 'moodi_creation_successful' => TRUE
- )
- );
+function uhc_moodi_refresh_page($form) {
+ ctools_include('ajax');
+ ctools_add_js('ajax-responder');
+
+ $options = array(
+ 'query' => array(
+ 'section' => 'edit-group_imp_moodle',
+ 'moodi_creation_successful' => TRUE
+ )
+ );
+
+ $current_path = !empty($form['uhc_moodi_fieldset']['current_path']['#value'])
+ ? $form['uhc_moodi_fieldset']['current_path']['#value']
+ : '';
+
+ $commands[] = ctools_ajax_command_redirect($current_path, 0, $options);
+ print ajax_render($commands);
+ exit;
+}
+
+function uhc_moodi_create_moodle_created_activity_message() {
+ $nid = isset($_SESSION['og_context']['gid']) ? $_SESSION['og_context']['gid'] : NULL;
- $commands[] = ctools_ajax_command_redirect($path, 0, $options);
- print ajax_render($commands);
- exit;
+ if ($nid) {
+ $node = node_load($nid);
+ uhc_course_implementation_activity_create_message($node, 'course_implementation_moodle_course_area_create');
}
}
diff --git a/modules/uhc_navigation/uhc_navigation.info b/modules/uhc_navigation/uhc_navigation.info
index 83a737ed..ab366fb5 100644
--- a/modules/uhc_navigation/uhc_navigation.info
+++ b/modules/uhc_navigation/uhc_navigation.info
@@ -2,7 +2,7 @@ name = UHC Navigation
description = Provides global settings for navigation, also main- and sidemenu.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_navigation
dependencies[] = context
dependencies[] = ctools
diff --git a/modules/uhc_online_services/uhc_online_services.info b/modules/uhc_online_services/uhc_online_services.info
index 194445a4..cb2d1728 100644
--- a/modules/uhc_online_services/uhc_online_services.info
+++ b/modules/uhc_online_services/uhc_online_services.info
@@ -2,7 +2,7 @@ name = UHC Online services
description = A listing of online services
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_online_services
dependencies[] = context
dependencies[] = ctools
diff --git a/modules/uhc_oodi/uhc_oodi.info b/modules/uhc_oodi/uhc_oodi.info
index 01cfbd79..dc9677d7 100644
--- a/modules/uhc_oodi/uhc_oodi.info
+++ b/modules/uhc_oodi/uhc_oodi.info
@@ -2,7 +2,7 @@ name = UHC Oodi
description = Provides API for other modules to interact with Oodi.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_oodi
files[] = includes/UHCOodiCache.php
files[] = includes/UHCOodiConnection.php
diff --git a/modules/uhc_open_university/uhc_open_university.info b/modules/uhc_open_university/uhc_open_university.info
index ea4c9e2e..5ff478e2 100644
--- a/modules/uhc_open_university/uhc_open_university.info
+++ b/modules/uhc_open_university/uhc_open_university.info
@@ -2,7 +2,7 @@ name = UHC Open University
description = Contains utility plugins and business logic for Open University.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_open_university
dependencies[] = context
dependencies[] = ctools
diff --git a/modules/uhc_page/uhc_page.info b/modules/uhc_page/uhc_page.info
index bfb79a0c..ca27728b 100644
--- a/modules/uhc_page/uhc_page.info
+++ b/modules/uhc_page/uhc_page.info
@@ -2,7 +2,7 @@ name = UHC Page
description = Portal page settings - Portal/landing page
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_page
dependencies[] = ctools
dependencies[] = entityreference
diff --git a/modules/uhc_rest_api/uhc_rest_api.info b/modules/uhc_rest_api/uhc_rest_api.info
index fc5c6535..d84da2bc 100644
--- a/modules/uhc_rest_api/uhc_rest_api.info
+++ b/modules/uhc_rest_api/uhc_rest_api.info
@@ -2,7 +2,7 @@ name = UHC REST API
description = Provides an API for services to consume this site's data.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_rest_api
dependencies[] = ctools
dependencies[] = image_url_formatter
diff --git a/modules/uhc_search_friendly_sorting/uhc_search_friendly_sorting.info b/modules/uhc_search_friendly_sorting/uhc_search_friendly_sorting.info
index a55684b6..c2d7ffdb 100644
--- a/modules/uhc_search_friendly_sorting/uhc_search_friendly_sorting.info
+++ b/modules/uhc_search_friendly_sorting/uhc_search_friendly_sorting.info
@@ -2,6 +2,6 @@ name = UHC Search Friendly Sorting
description = Alters search interface by adding friendly sorting options.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_search_friendly_sorting
dependencies[] = uhc_search_portal_feature
diff --git a/modules/uhc_search_front_page/uhc_search_front_page.info b/modules/uhc_search_front_page/uhc_search_front_page.info
index 698e2d36..3a0c8cdb 100644
--- a/modules/uhc_search_front_page/uhc_search_front_page.info
+++ b/modules/uhc_search_front_page/uhc_search_front_page.info
@@ -2,7 +2,7 @@ name = UHC front page search
description = Provides sitewide search as a block on the frontpage.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_search_front_page
dependencies[] = context
dependencies[] = search_api_views
diff --git a/modules/uhc_search_lite/uhc_search_lite.info b/modules/uhc_search_lite/uhc_search_lite.info
index 26a5d84b..f1d704de 100644
--- a/modules/uhc_search_lite/uhc_search_lite.info
+++ b/modules/uhc_search_lite/uhc_search_lite.info
@@ -2,5 +2,5 @@ name = UHC Search Lite
description = Minimalistic fast search for courses.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_search_lite
diff --git a/modules/uhc_search_portal_feature/uhc_search_portal_feature.info b/modules/uhc_search_portal_feature/uhc_search_portal_feature.info
index eecc31b7..39f6d8e5 100644
--- a/modules/uhc_search_portal_feature/uhc_search_portal_feature.info
+++ b/modules/uhc_search_portal_feature/uhc_search_portal_feature.info
@@ -2,7 +2,7 @@ name = UHC Search Portal
description = Portal course search, search indexes, views etc.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_search_portal_feature
dependencies[] = chosen
dependencies[] = ctools
diff --git a/modules/uhc_shib_conf/uhc_shib_conf.info b/modules/uhc_shib_conf/uhc_shib_conf.info
index 0dcb55d4..3933fcbb 100644
--- a/modules/uhc_shib_conf/uhc_shib_conf.info
+++ b/modules/uhc_shib_conf/uhc_shib_conf.info
@@ -2,7 +2,7 @@ name = UHC Shibboleth configuration
description = Specifies Shibboleth connection.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_shib_conf
dependencies[] = ctools
dependencies[] = sharedemail
diff --git a/modules/uhc_sources/uhc_sources.info b/modules/uhc_sources/uhc_sources.info
index 7a90516f..5f4a1a34 100644
--- a/modules/uhc_sources/uhc_sources.info
+++ b/modules/uhc_sources/uhc_sources.info
@@ -2,7 +2,7 @@ name = UHC Sources
description = Provides utility components and functionality for courses and course implementation sources.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_sources
dependencies[] = features
dependencies[] = field_group
diff --git a/modules/uhc_sources_filtering/uhc_sources_filtering.info b/modules/uhc_sources_filtering/uhc_sources_filtering.info
index 1dfbe38a..44091c5b 100644
--- a/modules/uhc_sources_filtering/uhc_sources_filtering.info
+++ b/modules/uhc_sources_filtering/uhc_sources_filtering.info
@@ -2,7 +2,7 @@ name = UHC Sources Filtering
description = Filters course implementations by certain logic and given configuration.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_sources_filtering
dependencies[] = features
dependencies[] = list
diff --git a/modules/uhc_statistics/uhc_statistics.info b/modules/uhc_statistics/uhc_statistics.info
index 444d7a04..1b627b6a 100644
--- a/modules/uhc_statistics/uhc_statistics.info
+++ b/modules/uhc_statistics/uhc_statistics.info
@@ -2,7 +2,7 @@ name = UHC Statistics
description = Provides statistics of course page usage. Works together with UHC Course Implementation Activity module.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_statistics
dependencies[] = entity
dependencies[] = entityreference
diff --git a/modules/uhc_studies/uhc_studies.info b/modules/uhc_studies/uhc_studies.info
index c3c5b97e..501a97e1 100644
--- a/modules/uhc_studies/uhc_studies.info
+++ b/modules/uhc_studies/uhc_studies.info
@@ -2,7 +2,7 @@ name = UHC Studies
description = Provides studies landing page and studies node types with related functionality.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
dependencies[] = ctools
dependencies[] = entityreference
dependencies[] = features
diff --git a/modules/uhc_subject/uhc_subject.info b/modules/uhc_subject/uhc_subject.info
index 94afaef7..66071753 100644
--- a/modules/uhc_subject/uhc_subject.info
+++ b/modules/uhc_subject/uhc_subject.info
@@ -2,7 +2,7 @@ name = UHC Subject
description = Provides subject content type
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_subject
dependencies[] = ctools
dependencies[] = entityreference
diff --git a/modules/uhc_taxonomy/uhc_taxonomy.info b/modules/uhc_taxonomy/uhc_taxonomy.info
index ba30af02..d627aa73 100644
--- a/modules/uhc_taxonomy/uhc_taxonomy.info
+++ b/modules/uhc_taxonomy/uhc_taxonomy.info
@@ -1,7 +1,7 @@
name = UHC Taxonomy
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_taxonomy
dependencies[] = ctools
dependencies[] = entity_translation
diff --git a/modules/uhc_taxonomy_source/uhc_taxonomy_source.info b/modules/uhc_taxonomy_source/uhc_taxonomy_source.info
index 6022979c..918b8e89 100644
--- a/modules/uhc_taxonomy_source/uhc_taxonomy_source.info
+++ b/modules/uhc_taxonomy_source/uhc_taxonomy_source.info
@@ -2,7 +2,7 @@ name = UHC Taxonomy Source
description = Provides the source data for taxonomy.
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_taxonomy_source
files[] = migrate/TaxonomyTermMigration.inc
files[] = migrate/TaxonomyMigrateDestinationTerm.inc
diff --git a/modules/uhc_teacher_tools/uhc_teacher_tools.info b/modules/uhc_teacher_tools/uhc_teacher_tools.info
index 42152a5b..e02323cc 100644
--- a/modules/uhc_teacher_tools/uhc_teacher_tools.info
+++ b/modules/uhc_teacher_tools/uhc_teacher_tools.info
@@ -1,7 +1,7 @@
name = UHC Teacher Tools
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_teacher_tools
dependencies[] = ctools
dependencies[] = features
diff --git a/modules/uhc_tour/uhc_tour.info b/modules/uhc_tour/uhc_tour.info
index 222aee88..9bbb2f75 100644
--- a/modules/uhc_tour/uhc_tour.info
+++ b/modules/uhc_tour/uhc_tour.info
@@ -2,7 +2,7 @@ name = UHC Tour
description = Joyride tour to showcase course implementation node & node form for teachers
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_tour
dependencies[] = context
dependencies[] = ctools
diff --git a/modules/uhc_wysiwyg/uhc_wysiwyg.info b/modules/uhc_wysiwyg/uhc_wysiwyg.info
index 889a70e6..d485bd37 100644
--- a/modules/uhc_wysiwyg/uhc_wysiwyg.info
+++ b/modules/uhc_wysiwyg/uhc_wysiwyg.info
@@ -2,7 +2,7 @@ name = UHC WYSIWYG
description = Adds wysiwyg-editor and related features and modules
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
project = uhc_wysiwyg
dependencies[] = ckeditor
dependencies[] = ctools
diff --git a/modules/uhc_xml_sitemap/uhc_xml_sitemap.info b/modules/uhc_xml_sitemap/uhc_xml_sitemap.info
index 853c86c6..09989462 100644
--- a/modules/uhc_xml_sitemap/uhc_xml_sitemap.info
+++ b/modules/uhc_xml_sitemap/uhc_xml_sitemap.info
@@ -2,7 +2,7 @@ name = UHC XML Sitemap
description = XML sitemap settings
core = 7.x
package = UHC
-version = 7.x-1.114
+version = 7.x-1.115
dependencies[] = ctools
dependencies[] = strongarm
dependencies[] = xmlsitemap
diff --git a/themes/hy_doo/bower.json b/themes/hy_doo/bower.json
index cc757641..3293e5d2 100644
--- a/themes/hy_doo/bower.json
+++ b/themes/hy_doo/bower.json
@@ -2,6 +2,6 @@
"name": "hy_doo",
"version": "1.0.0",
"dependencies": {
- "Styleguide": "https://github.com/UniversityofHelsinki/Styleguide.git#release-1.5.2"
+ "Styleguide": "https://github.com/UniversityofHelsinki/Styleguide.git#release-1.7.0"
}
}
diff --git a/themes/hy_doo/css/hy_doo.styles.css b/themes/hy_doo/css/hy_doo.styles.css
index df1bb9d5..ae57ef10 100644
--- a/themes/hy_doo/css/hy_doo.styles.css
+++ b/themes/hy_doo/css/hy_doo.styles.css
@@ -3461,7 +3461,7 @@ dl, ol, ul {
input[type="submit"], .button--small, .accordion-item, .accordion-item__light, .accordion-item__alternative,
.button--accordion,
.button--action-before, ul.pager .pager__previous a,
-.button--action, ul.pager .pager__next a, .button--anchor, .button--expand, .button--icon,
+.button--action, ul.pager .pager__next a, .button--anchor, .button--expand, .button--icon, .button--outline,
.button,
ul.pager .pager__page {
font-family: 'Open Sans', Helvetica, Arial, sans-serif;
@@ -3481,10 +3481,10 @@ ul.pager .pager__page {
input[type="submit"]:focus, .button--small:focus, .accordion-item:focus, .accordion-item__light:focus, .accordion-item__alternative:focus,
.button--accordion:focus,
.button--action-before:focus, ul.pager .pager__previous a:focus,
- .button--action:focus, ul.pager .pager__next a:focus, .button--anchor:focus, .button--expand:focus, .button--icon:focus, input[type="submit"]:hover, .button--small:hover, .accordion-item:hover, .accordion-item__light:hover, .accordion-item__alternative:hover,
+ .button--action:focus, ul.pager .pager__next a:focus, .button--anchor:focus, .button--expand:focus, .button--icon:focus, .button--outline:focus, input[type="submit"]:hover, .button--small:hover, .accordion-item:hover, .accordion-item__light:hover, .accordion-item__alternative:hover,
.button--accordion:hover,
.button--action-before:hover, ul.pager .pager__previous a:hover,
- .button--action:hover, ul.pager .pager__next a:hover, .button--anchor:hover, .button--expand:hover, .button--icon:hover,
+ .button--action:hover, ul.pager .pager__next a:hover, .button--anchor:hover, .button--expand:hover, .button--icon:hover, .button--outline:hover,
.button:focus,
ul.pager .pager__page:focus,
.button:hover,
@@ -3494,10 +3494,10 @@ ul.pager .pager__page {
input[type="submit"]:active, .button--small:active, .accordion-item:active, .accordion-item__light:active, .accordion-item__alternative:active,
.button--accordion:active,
.button--action-before:active, ul.pager .pager__previous a:active,
- .button--action:active, ul.pager .pager__next a:active, .button--anchor:active, .button--expand:active, .button--icon:active, input.is-active[type="submit"], .is-active.button--small, .is-active.accordion-item, .is-active.accordion-item__light, .is-active.accordion-item__alternative,
+ .button--action:active, ul.pager .pager__next a:active, .button--anchor:active, .button--expand:active, .button--icon:active, .button--outline:active, input.is-active[type="submit"], .is-active.button--small, .is-active.accordion-item, .is-active.accordion-item__light, .is-active.accordion-item__alternative,
.is-active.button--accordion,
.is-active.button--action-before, ul.pager .pager__previous a.is-active,
- .is-active.button--action, ul.pager .pager__next a.is-active, .is-active.button--anchor, .is-active.button--expand, .is-active.button--icon,
+ .is-active.button--action, ul.pager .pager__next a.is-active, .is-active.button--anchor, .is-active.button--expand, .is-active.button--icon, .is-active.button--outline,
.button:active,
ul.pager .pager__page:active,
.button.is-active,
@@ -3506,10 +3506,10 @@ ul.pager .pager__page {
input[type="submit"]:before, .button--small:before, .accordion-item:before, .accordion-item__light:before, .accordion-item__alternative:before,
.button--accordion:before,
.button--action-before:before, ul.pager .pager__previous a:before,
- .button--action:before, ul.pager .pager__next a:before, .button--anchor:before, .button--expand:before, .button--icon:before, input[type="submit"]:after, .button--small:after, .accordion-item:after, .accordion-item__light:after, .accordion-item__alternative:after,
+ .button--action:before, ul.pager .pager__next a:before, .button--anchor:before, .button--expand:before, .button--icon:before, .button--outline:before, input[type="submit"]:after, .button--small:after, .accordion-item:after, .accordion-item__light:after, .accordion-item__alternative:after,
.button--accordion:after,
.button--action-before:after, ul.pager .pager__previous a:after,
- .button--action:after, ul.pager .pager__next a:after, .button--anchor:after, .button--expand:after, .button--icon:after,
+ .button--action:after, ul.pager .pager__next a:after, .button--anchor:after, .button--expand:after, .button--icon:after, .button--outline:after,
.button:before,
ul.pager .pager__page:before,
.button:after,
@@ -3519,10 +3519,10 @@ ul.pager .pager__page {
input.theme-transparent[type="submit"], .theme-transparent.button--small, .theme-transparent.accordion-item, .theme-transparent.accordion-item__light, .theme-transparent.accordion-item__alternative,
.theme-transparent.button--accordion,
.theme-transparent.button--action-before, ul.pager .pager__previous a.theme-transparent,
- .theme-transparent.button--action, ul.pager .pager__next a.theme-transparent, .theme-transparent.button--anchor, .theme-transparent.button--expand, .theme-transparent.button--icon, input.theme-transparent-alt[type="submit"], .theme-transparent-alt.button--small, .theme-transparent-alt.accordion-item, .theme-transparent-alt.accordion-item__light, .theme-transparent-alt.accordion-item__alternative,
+ .theme-transparent.button--action, ul.pager .pager__next a.theme-transparent, .theme-transparent.button--anchor, .theme-transparent.button--expand, .theme-transparent.button--icon, .theme-transparent.button--outline, input.theme-transparent-alt[type="submit"], .theme-transparent-alt.button--small, .theme-transparent-alt.accordion-item, .theme-transparent-alt.accordion-item__light, .theme-transparent-alt.accordion-item__alternative,
.theme-transparent-alt.button--accordion,
.theme-transparent-alt.button--action-before, ul.pager .pager__previous a.theme-transparent-alt,
- .theme-transparent-alt.button--action, ul.pager .pager__next a.theme-transparent-alt, .theme-transparent-alt.button--anchor, .theme-transparent-alt.button--expand, .theme-transparent-alt.button--icon,
+ .theme-transparent-alt.button--action, ul.pager .pager__next a.theme-transparent-alt, .theme-transparent-alt.button--anchor, .theme-transparent-alt.button--expand, .theme-transparent-alt.button--icon, .theme-transparent-alt.button--outline,
.button.theme-transparent,
ul.pager .theme-transparent.pager__page,
.button.theme-transparent-alt,
@@ -3532,10 +3532,10 @@ ul.pager .pager__page {
input.theme-transparent[type="submit"]:hover, .theme-transparent.button--small:hover, .theme-transparent.accordion-item:hover, .theme-transparent.accordion-item__light:hover, .theme-transparent.accordion-item__alternative:hover,
.theme-transparent.button--accordion:hover,
.theme-transparent.button--action-before:hover, ul.pager .pager__previous a.theme-transparent:hover,
- .theme-transparent.button--action:hover, ul.pager .pager__next a.theme-transparent:hover, .theme-transparent.button--anchor:hover, .theme-transparent.button--expand:hover, .theme-transparent.button--icon:hover, input.theme-transparent-alt[type="submit"]:hover, .theme-transparent-alt.button--small:hover, .theme-transparent-alt.accordion-item:hover, .theme-transparent-alt.accordion-item__light:hover, .theme-transparent-alt.accordion-item__alternative:hover,
+ .theme-transparent.button--action:hover, ul.pager .pager__next a.theme-transparent:hover, .theme-transparent.button--anchor:hover, .theme-transparent.button--expand:hover, .theme-transparent.button--icon:hover, .theme-transparent.button--outline:hover, input.theme-transparent-alt[type="submit"]:hover, .theme-transparent-alt.button--small:hover, .theme-transparent-alt.accordion-item:hover, .theme-transparent-alt.accordion-item__light:hover, .theme-transparent-alt.accordion-item__alternative:hover,
.theme-transparent-alt.button--accordion:hover,
.theme-transparent-alt.button--action-before:hover, ul.pager .pager__previous a.theme-transparent-alt:hover,
- .theme-transparent-alt.button--action:hover, ul.pager .pager__next a.theme-transparent-alt:hover, .theme-transparent-alt.button--anchor:hover, .theme-transparent-alt.button--expand:hover, .theme-transparent-alt.button--icon:hover,
+ .theme-transparent-alt.button--action:hover, ul.pager .pager__next a.theme-transparent-alt:hover, .theme-transparent-alt.button--anchor:hover, .theme-transparent-alt.button--expand:hover, .theme-transparent-alt.button--icon:hover, .theme-transparent-alt.button--outline:hover,
.button.theme-transparent:hover,
ul.pager .theme-transparent.pager__page:hover,
.button.theme-transparent-alt:hover,
@@ -3544,16 +3544,16 @@ ul.pager .pager__page {
input.theme-transparent[type="submit"] a:hover, .theme-transparent.button--small a:hover, .theme-transparent.accordion-item a:hover, .theme-transparent.accordion-item__light a:hover, .theme-transparent.accordion-item__alternative a:hover,
.theme-transparent.button--accordion a:hover,
.theme-transparent.button--action-before a:hover, ul.pager .pager__previous a.theme-transparent a:hover,
- .theme-transparent.button--action a:hover, ul.pager .pager__next a.theme-transparent a:hover, .theme-transparent.button--anchor a:hover, .theme-transparent.button--expand a:hover, .theme-transparent.button--icon a:hover, input.theme-transparent[type="submit"]:hover, .theme-transparent.button--small:hover, .theme-transparent.accordion-item:hover, .theme-transparent.accordion-item__light:hover, .theme-transparent.accordion-item__alternative:hover,
+ .theme-transparent.button--action a:hover, ul.pager .pager__next a.theme-transparent a:hover, .theme-transparent.button--anchor a:hover, .theme-transparent.button--expand a:hover, .theme-transparent.button--icon a:hover, .theme-transparent.button--outline a:hover, input.theme-transparent[type="submit"]:hover, .theme-transparent.button--small:hover, .theme-transparent.accordion-item:hover, .theme-transparent.accordion-item__light:hover, .theme-transparent.accordion-item__alternative:hover,
.theme-transparent.button--accordion:hover,
.theme-transparent.button--action-before:hover, ul.pager .pager__previous a.theme-transparent:hover,
- .theme-transparent.button--action:hover, ul.pager .pager__next a.theme-transparent:hover, .theme-transparent.button--anchor:hover, .theme-transparent.button--expand:hover, .theme-transparent.button--icon:hover, input.theme-transparent-alt[type="submit"] a:hover, .theme-transparent-alt.button--small a:hover, .theme-transparent-alt.accordion-item a:hover, .theme-transparent-alt.accordion-item__light a:hover, .theme-transparent-alt.accordion-item__alternative a:hover,
+ .theme-transparent.button--action:hover, ul.pager .pager__next a.theme-transparent:hover, .theme-transparent.button--anchor:hover, .theme-transparent.button--expand:hover, .theme-transparent.button--icon:hover, .theme-transparent.button--outline:hover, input.theme-transparent-alt[type="submit"] a:hover, .theme-transparent-alt.button--small a:hover, .theme-transparent-alt.accordion-item a:hover, .theme-transparent-alt.accordion-item__light a:hover, .theme-transparent-alt.accordion-item__alternative a:hover,
.theme-transparent-alt.button--accordion a:hover,
.theme-transparent-alt.button--action-before a:hover, ul.pager .pager__previous a.theme-transparent-alt a:hover,
- .theme-transparent-alt.button--action a:hover, ul.pager .pager__next a.theme-transparent-alt a:hover, .theme-transparent-alt.button--anchor a:hover, .theme-transparent-alt.button--expand a:hover, .theme-transparent-alt.button--icon a:hover, input.theme-transparent-alt[type="submit"]:hover, .theme-transparent-alt.button--small:hover, .theme-transparent-alt.accordion-item:hover, .theme-transparent-alt.accordion-item__light:hover, .theme-transparent-alt.accordion-item__alternative:hover,
+ .theme-transparent-alt.button--action a:hover, ul.pager .pager__next a.theme-transparent-alt a:hover, .theme-transparent-alt.button--anchor a:hover, .theme-transparent-alt.button--expand a:hover, .theme-transparent-alt.button--icon a:hover, .theme-transparent-alt.button--outline a:hover, input.theme-transparent-alt[type="submit"]:hover, .theme-transparent-alt.button--small:hover, .theme-transparent-alt.accordion-item:hover, .theme-transparent-alt.accordion-item__light:hover, .theme-transparent-alt.accordion-item__alternative:hover,
.theme-transparent-alt.button--accordion:hover,
.theme-transparent-alt.button--action-before:hover, ul.pager .pager__previous a.theme-transparent-alt:hover,
- .theme-transparent-alt.button--action:hover, ul.pager .pager__next a.theme-transparent-alt:hover, .theme-transparent-alt.button--anchor:hover, .theme-transparent-alt.button--expand:hover, .theme-transparent-alt.button--icon:hover,
+ .theme-transparent-alt.button--action:hover, ul.pager .pager__next a.theme-transparent-alt:hover, .theme-transparent-alt.button--anchor:hover, .theme-transparent-alt.button--expand:hover, .theme-transparent-alt.button--icon:hover, .theme-transparent-alt.button--outline:hover,
.button.theme-transparent a:hover, ul.pager .theme-transparent.pager__page a:hover,
.button.theme-transparent:hover,
ul.pager .theme-transparent.pager__page:hover,
@@ -3880,6 +3880,24 @@ ul.pager .pager__previous a {
template: 3_7_8-button-group--small
description:
*/
+/*
+ section: 3.7.9
+ title: Button outline
+ template: 3_7_9-button-outline
+ description:
+*/
+.button--outline {
+ font-weight: 600;
+ font-style: normal;
+ background-color: transparent;
+ border: 2px solid #0098d0;
+ color: #0098d0; }
+ .button--outline:after {
+ margin-left: 1em;
+ transition-property: none; }
+ .button--outline:hover {
+ background-color: #0098d0; }
+
.island {
padding: 1em; }
@@ -4045,7 +4063,7 @@ ul.pager .pager__previous a {
description: The footer.
*/
.l-footer {
- background-color: #222;
+ background-color: #000;
overflow: hidden;
padding-bottom: 10px;
padding-top: 2em; }
@@ -4117,7 +4135,7 @@ ul.pager .pager__previous a {
description: The header bar with logo & navigation.
*/
.l-header-bar {
- background: #222;
+ background: #000;
display: -ms-flexbox;
display: flex;
-ms-flex-direction: column;
@@ -4190,7 +4208,7 @@ ul.pager .pager__previous a {
description: Full screen overlay for menu, etc.
*/
.l-overlay {
- background-color: #222;
+ background-color: #000;
display: none;
-ms-flex-direction: column;
flex-direction: column;
@@ -4357,12 +4375,12 @@ ul.pager .pager__previous a {
description: The top bar small variant
*/
.l-top-bar--small {
+ -ms-flex-align: center;
+ align-items: center;
+ background-color: #000;
display: none; }
@media (min-width: 62.5em) {
.l-top-bar--small {
- -ms-flex-align: center;
- align-items: center;
- background-color: #000;
display: -ms-flexbox;
display: flex; } }
.l-top-bar--small .l-top-bar__left {
@@ -5471,14 +5489,9 @@ ul.pager {
.main-menu-v2 a {
color: #FFF;
display: block;
- letter-spacing: 0.01em;
- transition: color 0.2s; }
- .main-menu-v2 a:hover {
- color: #d2d2d2; }
- .main-menu-v2 a.active {
- color: #0098d0; }
- .main-menu-v2 a.active:hover {
- color: #0882B3; }
+ letter-spacing: 0.01em; }
+ .main-menu-v2 a:hover, .main-menu-v2 a.active {
+ text-decoration: underline; }
.main-menu-v2 li.is-lvl1 {
margin-bottom: 48px;
@@ -5499,8 +5512,7 @@ ul.pager {
font-size: 1.125rem;
font-weight: 700;
font-style: normal;
- text-transform: uppercase;
- text-decoration: none; }
+ text-transform: uppercase; }
.main-menu-v2 li.is-lvl1.is-open {
opacity: 1; }
.main-menu-v2 li.is-lvl1.is-open > ul {
@@ -5532,9 +5544,7 @@ ul.pager {
font-size: 0.875rem;
font-weight: 600;
font-style: normal;
- color: #979797; }
- .main-menu-v2 li.is-lvl2.theme-minor > a:hover {
- color: #FFF; } }
+ color: #979797; } }
.main-menu-v2__expand {
bottom: 0;
@@ -5628,22 +5638,22 @@ ul.pager {
template: 6_1_2_table-simple
description:
*/
-
+.textarea table, .textarea-ingress table,
.table-simple {
font-size: 0.875rem; }
-
+ .textarea table tr, .textarea-ingress table tr,
.table-simple tr {
background-color: #F8F8F8; }
-
+ .textarea table tr th, .textarea-ingress table tr th,
.table-simple tr th {
background-color: #F8F8F8; }
-
+ .textarea table tr:nth-of-type(2n), .textarea-ingress table tr:nth-of-type(2n),
.table-simple tr:nth-of-type(2n) {
background-color: #FFF; }
-
+ .textarea table tr:nth-of-type(2n) th, .textarea-ingress table tr:nth-of-type(2n) th,
.table-simple tr:nth-of-type(2n) th {
background-color: #F8F8F8; }
-
+ .textarea table td, .textarea-ingress table td, .textarea table th, .textarea-ingress table th,
.table-simple td,
.table-simple th {
font-family: 'Open Sans', Helvetica, Arial, sans-serif;
@@ -5651,29 +5661,29 @@ ul.pager {
color: #555555;
padding: 0.7em 0.9em;
vertical-align: top; }
-
+ .textarea table td a, .textarea-ingress table td a, .textarea table td a.active, .textarea-ingress table td a.active, .textarea table th a, .textarea-ingress table th a, .textarea table th a.active, .textarea-ingress table th a.active,
.table-simple td a,
.table-simple td a.active,
.table-simple th a,
.table-simple th a.active {
color: #0098d0;
text-decoration: none; }
-
+ .textarea table td a:hover, .textarea-ingress table td a:hover, .textarea table td a.active:hover, .textarea-ingress table td a.active:hover, .textarea table th a:hover, .textarea-ingress table th a:hover, .textarea table th a.active:hover, .textarea-ingress table th a.active:hover,
.table-simple td a:hover,
.table-simple td a.active:hover,
.table-simple th a:hover,
.table-simple th a.active:hover {
color: #0882B3;
text-decoration: none; }
-
+ .textarea table td p, .textarea-ingress table td p, .textarea table th p, .textarea-ingress table th p,
.table-simple td p,
.table-simple th p {
font-size: inherit; }
-
+ .textarea table td.active, .textarea-ingress table td.active, .textarea table th.active, .textarea-ingress table th.active,
.table-simple td.active,
.table-simple th.active {
color: #555555; }
-
+ .textarea table td:first-child, .textarea-ingress table td:first-child, .textarea table th:first-child, .textarea-ingress table th:first-child,
.table-simple td:first-child,
.table-simple th:first-child {
font-weight: 700;
@@ -5860,6 +5870,155 @@ ul.pager {
vertical-align: bottom;
content: ""; }
+/*
+ section: 6.11.1
+ title: Textarea
+ template: 6_11_1_textarea
+ description: Basic component used in multiple row textareas with links, headings, lists and so on.
+*/
+.textarea,
+.textarea-ingress {
+ font-family: 'Open Sans', Helvetica, Arial, sans-serif;
+ line-height: 1.5em; }
+ .textarea ul, .textarea ol, .textarea-ingress ul, .textarea-ingress ol {
+ margin-bottom: 30px; }
+ .textarea li, .textarea-ingress li {
+ line-height: 1.5em;
+ margin-bottom: 0.5em; }
+ .textarea ul, .textarea-ingress ul {
+ padding-left: 2em;
+ position: relative; }
+ .textarea ul li, .textarea-ingress ul li {
+ list-style-type: none; }
+ .textarea ul li:before, .textarea-ingress ul li:before {
+ font-size: 0.5625rem;
+ display: inline-block;
+ font-family: "hy-icons";
+ font-style: normal;
+ font-weight: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ vertical-align: bottom;
+ content: "";
+ left: 0;
+ margin-top: 1px;
+ position: absolute; }
+ .textarea ol, .textarea-ingress ol {
+ counter-reset: item;
+ padding-left: 2em;
+ position: relative; }
+ .textarea ol li, .textarea-ingress ol li {
+ display: block; }
+ .textarea ol li:before, .textarea-ingress ol li:before {
+ font-family: 'Open Sans', Helvetica, Arial, sans-serif;
+ font-weight: 700;
+ font-style: normal;
+ content: counter(item) ". ";
+ counter-increment: item;
+ left: 1px;
+ position: absolute; }
+ .textarea h1, .textarea h2, .textarea h3, .textarea h4, .textarea legend, .textarea .logo-block__content .logo-block__sitename, .logo-block__content .textarea .logo-block__sitename, .textarea h5, .textarea h6, .textarea-ingress h1, .textarea-ingress h2, .textarea-ingress h3, .textarea-ingress h4, .textarea-ingress legend, .textarea-ingress .logo-block__content .logo-block__sitename, .logo-block__content .textarea-ingress .logo-block__sitename, .textarea-ingress h5, .textarea-ingress h6 {
+ margin-top: 32px; }
+ .textarea h1:first-child, .textarea h2:first-child, .textarea h3:first-child, .textarea h4:first-child, .textarea legend:first-child, .textarea .logo-block__content .logo-block__sitename:first-child, .logo-block__content .textarea .logo-block__sitename:first-child, .textarea h5:first-child, .textarea h6:first-child, .textarea-ingress h1:first-child, .textarea-ingress h2:first-child, .textarea-ingress h3:first-child, .textarea-ingress h4:first-child, .textarea-ingress legend:first-child, .textarea-ingress .logo-block__content .logo-block__sitename:first-child, .logo-block__content .textarea-ingress .logo-block__sitename:first-child, .textarea-ingress h5:first-child, .textarea-ingress h6:first-child {
+ margin-top: 0; }
+ .textarea a, .textarea-ingress a {
+ word-wrap: break-word; }
+ .textarea table, .textarea-ingress table {
+ line-height: normal;
+ margin-bottom: 2em; }
+ @media (min-width: 48em) {
+ .textarea .dropcap, .textarea-ingress .dropcap {
+ font-size: 4.6875rem;
+ font-weight: 700;
+ font-style: normal;
+ float: left;
+ line-height: 65px;
+ padding-right: 10px;
+ text-transform: uppercase; } }
+
+/**
+ * textarea-initial
+ * An element (usually an image) floated left before a textarea.
+ */
+
+.textarea-initial {
+ float: left;
+ margin-bottom: 2em;
+ margin-right: 2em; }
+
+/*
+ section: 6.11.2
+ title: Textarea infobox
+ template: 6_11_2_textarea-infobox
+ description: Infobox type textarea.
+*/
+
+.textarea-infobox {
+ font-family: 'Open Sans', Helvetica, Arial, sans-serif;
+ background-color: #F8F8F8;
+ margin-bottom: 2em;
+ padding: 1.5em; }
+
+ .textarea-infobox p {
+ line-height: normal; }
+
+ .textarea-infobox p:last-of-type {
+ margin-bottom: 0; }
+
+/*
+ section: 6.11.3
+ title: Textarea ingress
+ template: 6_11_3_textarea-ingress
+ description: Ingress textarea. Can be used with links, headings, lists or without. Class 'theme-bold' is available.
+*/
+.textarea-ingress {
+ font-size: 1.125rem;
+ font-weight: 400;
+ font-style: normal;
+ color: #555555;
+ line-height: 1.5em;
+ margin-bottom: 30px; }
+ .textarea-ingress ul, .textarea-ingress ol, .textarea-ingress li, .textarea-ingress p {
+ font-size: inherit; }
+ .textarea-ingress.theme-bold {
+ font-size: 1.2em;
+ font-weight: 600;
+ letter-spacing: 0.01em;
+ line-height: 1.5em;
+ margin-bottom: 30px; }
+ .textarea-ingress.theme-bold ul, .textarea-ingress.theme-bold ol, .textarea-ingress.theme-bold li, .textarea-ingress.theme-bold p {
+ font-size: inherit; }
+
+.textarea-readmore {
+ font-family: 'Open Sans', Helvetica, Arial, sans-serif;
+ background-color: #F8F8F8;
+ border-bottom: 1px solid #d2d2d2;
+ border-top: 1px solid #d2d2d2;
+ display: block;
+ font-weight: bold;
+ line-height: normal;
+ margin: 2em 0;
+ padding: 2.5rem 2rem;
+ transition: color 0.2s; }
+ @media (min-width: 48em) {
+ .textarea-readmore {
+ margin: 4em 0; } }
+
+.textarea-readmore__title {
+ font-size: 0.75rem;
+ display: block;
+ margin-bottom: 1rem;
+ text-transform: uppercase; }
+
+.textarea-readmore__text {
+ font-size: 1.875rem;
+ color: #222;
+ display: block;
+ max-width: 20em; }
+ @media (max-width: 48em) {
+ .textarea-readmore__text {
+ font-size: 1.42857rem; } }
+
/* HY DOO THEME */
@media (min-width: 48em) {
.ds-grid-1 {
@@ -6211,45 +6370,44 @@ ul.pager {
margin: 0;
padding-left: 1.5em; } }
-.l-action-footer-wrapper {
- border-top: 2px solid #d2d2d2; }
- .l-action-footer-wrapper .l-action-footer .block--uhc-doo-theme-features-last-updated {
- font-size: 0.875rem;
- float: left;
- line-height: 60px; }
- .l-action-footer-wrapper .l-action-footer .block--uhc-doo-theme-features-up-anchor {
- float: right; }
- .l-action-footer-wrapper .l-action-footer .block--uhc-doo-theme-features-up-anchor a#up-anchor {
- font-size: 0.8125rem;
- font-weight: 600;
+.l-action-footer-wrapper .l-action-footer .block--uhc-doo-theme-features-last-updated {
+ font-size: 0.875rem;
+ float: left;
+ line-height: 60px; }
+
+.l-action-footer-wrapper .l-action-footer .block--uhc-doo-theme-features-up-anchor {
+ float: right; }
+ .l-action-footer-wrapper .l-action-footer .block--uhc-doo-theme-features-up-anchor a#up-anchor {
+ font-size: 0.8125rem;
+ font-weight: 600;
+ font-style: normal;
+ background: #0098d0;
+ color: #FFF;
+ display: inline-block;
+ height: 60px;
+ line-height: 1.2em;
+ padding-top: 30px;
+ position: relative;
+ text-align: center;
+ text-decoration: none;
+ width: 60px; }
+ .l-action-footer-wrapper .l-action-footer .block--uhc-doo-theme-features-up-anchor a#up-anchor:hover {
+ background-color: #005479; }
+ .l-action-footer-wrapper .l-action-footer .block--uhc-doo-theme-features-up-anchor a#up-anchor:after {
+ display: inline-block;
+ font-family: "hy-icons";
font-style: normal;
- background: #0098d0;
+ font-weight: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ vertical-align: bottom;
+ content: "";
+ font-size: 0.9375rem;
color: #FFF;
- display: inline-block;
- height: 60px;
- line-height: 1.2em;
- padding-top: 30px;
- position: relative;
- text-align: center;
- text-decoration: none;
- width: 60px; }
- .l-action-footer-wrapper .l-action-footer .block--uhc-doo-theme-features-up-anchor a#up-anchor:hover {
- background-color: #005479; }
- .l-action-footer-wrapper .l-action-footer .block--uhc-doo-theme-features-up-anchor a#up-anchor:after {
- display: inline-block;
- font-family: "hy-icons";
- font-style: normal;
- font-weight: normal;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- vertical-align: bottom;
- content: "";
- font-size: 0.9375rem;
- color: #FFF;
- height: 100%;
- left: 23px;
- position: absolute;
- top: 10px; }
+ height: 100%;
+ left: 23px;
+ position: absolute;
+ top: 10px; }
.activity {
float: right;
@@ -6519,61 +6677,50 @@ ul.pager {
.course-hierarchy > li:after {
display: none; }
-.course-hierarchy li.root > .item-list ul.root {
- border-left: 1px solid #d2d2d2;
+.course-hierarchy li.root > .item-list ul.root li {
+ position: relative; }
+ .course-hierarchy li.root > .item-list ul.root li a {
+ font-size: 0.9375rem;
+ color: #979797; }
+ .course-hierarchy li.root > .item-list ul.root li a.active {
+ color: #424242; }
+ .course-hierarchy li.root > .item-list ul.root li.my-enrollment > a:after {
+ display: inline-block;
+ font-family: "hy-icons";
+ font-style: normal;
+ font-weight: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ vertical-align: bottom;
+ content: "";
+ color: #91C466;
+ position: absolute;
+ right: 0;
+ top: 6%; }
+ .course-hierarchy li.root > .item-list ul.root li:last-child {
+ padding-bottom: 0; }
+
+.course-hierarchy li.root > .item-list ul.root:first-child {
+ padding-top: 1em; }
+
+.course-hierarchy li.root > .item-list ul.root li.studygroupset {
+ border-top: 1px solid #d2d2d2;
+ border-left: 0;
+ border-right: 0;
border-bottom: 0;
+ padding: 0; }
+ .course-hierarchy li.root > .item-list ul.root li.studygroupset > a {
+ display: none; }
+
+.course-hierarchy li.root > .item-list ul.root > li:after {
+ content: '';
+ display: block; }
+
+.course-hierarchy li.root > .item-list ul.root > li:last-child:after {
+ border-bottom: 1px solid #d2d2d2;
+ border-left: 0;
border-right: 0;
- border-top: 0;
- margin: 1em 0; }
- .course-hierarchy li.root > .item-list ul.root li {
- padding: 0 1em 1.2em 2em;
- position: relative; }
- .course-hierarchy li.root > .item-list ul.root li a {
- font-size: 0.9375rem;
- color: #979797; }
- .course-hierarchy li.root > .item-list ul.root li a.active {
- color: #424242; }
- .course-hierarchy li.root > .item-list ul.root li a.active:before {
- width: 0;
- height: 0;
- content: '';
- border-top: 8px solid transparent;
- border-bottom: 8px solid transparent;
- border-left: 8px solid #005479;
- position: absolute;
- left: 0;
- top: 10%; }
- .course-hierarchy li.root > .item-list ul.root li.my-enrollment > a:after {
- display: inline-block;
- font-family: "hy-icons";
- font-style: normal;
- font-weight: normal;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- vertical-align: bottom;
- content: "";
- color: #91C466;
- position: absolute;
- right: 0;
- top: 6%; }
- .course-hierarchy li.root > .item-list ul.root li:last-child {
- padding-bottom: 0; }
- .course-hierarchy li.root > .item-list ul.root li.studygroupset {
- padding: 0; }
- .course-hierarchy li.root > .item-list ul.root li.studygroupset > a {
- display: none; }
- .course-hierarchy li.root > .item-list ul.root > li {
- margin-bottom: 1em; }
- .course-hierarchy li.root > .item-list ul.root > li:after {
- border-bottom: 1px solid #d2d2d2;
- border-left: 0;
- border-right: 0;
- border-top: 0;
- content: '';
- display: block;
- margin-top: 1em; }
- .course-hierarchy li.root > .item-list ul.root > li:last-child:after {
- border-bottom: none; }
+ border-top: 0; }
@media (min-width: 48em) {
.course-hierarchy {
@@ -6589,15 +6736,6 @@ ul.pager {
border-bottom: 1px solid #dfdfdf;
text-transform: uppercase;
padding: 20px 20px 20px 60px; }
- .course-hierarchy > li.root > a {
- /*
- @include menu-item-icon($icon-arrow);
- padding-left: 20px;
- &:before {
- @include transform(rotate(90deg));
- display: inline-block;
- }
- */ }
.course-hierarchy > li.root > .item-list {
margin-bottom: 0; }
.course-hierarchy > li.root > .item-list ul.root {
@@ -6605,11 +6743,8 @@ ul.pager {
border-left: 1px solid #dfdfdf; }
.course-hierarchy > li.root > .item-list ul.root li {
padding-left: 35px; }
- .course-hierarchy > li.root > .item-list ul.root > li:after {
- border-bottom: 1px solid #dfdfdf; }
.course-hierarchy > li.root > .item-list ul.root > li.last:after {
- margin-top: 0;
- border-bottom: none; } }
+ margin-top: 0; } }
.group-description-objectives .course-overview-source-legend {
text-align: center; }
@@ -6960,11 +7095,15 @@ body.open-university .view.course-list th.views-field-field-imp-giver-locality,
float: right; }
.ds-node-metadata label {
margin-right: 0.35em;
- font-size: unset; }
+ font-size: 0.875rem;
+ font-weight: 400;
+ line-height: 2em; }
.ds-node-metadata .teaching-languages {
display: block; }
.ds-node-metadata .teaching-languages span {
font-weight: 900; }
+ .ds-node-metadata .teaching-languages span:not(:last-of-type):after {
+ content: ", "; }
.ds-node-metadata .label-row.help {
display: inline-block; }
.ds-node-metadata .flexible-start {
@@ -7148,7 +7287,7 @@ body:not(.open-university) .view-id-course_node_references .field-imp-course-org
@media (min-width: 48em) {
#block-feedback-form .feedback-link,
#block-feedback-form #feedback-status-message {
- font-size: 0.875rem;
+ font-size: 0.8125rem;
width: 90px;
height: 90px; } }
#block-feedback-form #feedback-status-message {
@@ -7288,7 +7427,6 @@ body:not(.open-university) .view-id-course_node_references .field-imp-course-org
.l-info-footer-wrapper {
background-color: #f2f2f2; }
.l-info-footer-wrapper .l-info-footer {
- border-top: 2px solid #d2d2d2;
padding-top: 2em; }
.l-info-footer-wrapper .l-info-footer .block {
margin-bottom: 2.814em; }
diff --git a/themes/hy_doo/hy_doo.info b/themes/hy_doo/hy_doo.info
index e862271c..32d1988a 100644
--- a/themes/hy_doo/hy_doo.info
+++ b/themes/hy_doo/hy_doo.info
@@ -4,7 +4,7 @@ screenshot = screenshot.png
base theme = omega
engine = phptemplate
core = 7.x
-version = 7.x-1.114
+version = 7.x-1.115
; Scripts
scripts[] = js/mobile_detect.js
diff --git a/themes/hy_doo/sass/components/_action_footer.scss b/themes/hy_doo/sass/components/_action_footer.scss
index 73ef34ab..b98d7950 100644
--- a/themes/hy_doo/sass/components/_action_footer.scss
+++ b/themes/hy_doo/sass/components/_action_footer.scss
@@ -1,5 +1,4 @@
.l-action-footer-wrapper {
- @include line-break($mediumsilver);
.l-action-footer {
.block--uhc-doo-theme-features-last-updated {
@include font-size(14px);
diff --git a/themes/hy_doo/sass/components/_course_hierarchy.scss b/themes/hy_doo/sass/components/_course_hierarchy.scss
index 90dcc65d..08032746 100644
--- a/themes/hy_doo/sass/components/_course_hierarchy.scss
+++ b/themes/hy_doo/sass/components/_course_hierarchy.scss
@@ -16,22 +16,13 @@
li.root {
> .item-list {
ul.root {
- @include accessible-border-left;
- margin: 1em 0;
li {
- padding: 0 1em 1.2em 2em;
position: relative;
a {
@include font-size(15px);
color: $silver;
&.active {
color: $darkgray;
- &:before {
- @include alternative-arrow($darkblue, 8px, 'right');
- position: absolute;
- left: 0;
- top: 10%;
- }
}
}
&.my-enrollment > a:after {
@@ -45,29 +36,24 @@
padding-bottom: 0;
}
}
+ &:first-child {
+ padding-top: 1em;
+ }
li.studygroupset {
+ @include accessible-border-top;
padding: 0;
> a {
display: none;
}
}
> li {
- margin-bottom: 1em;
&:after {
- @include accessible-border-bottom;
content: '';
display: block;
- margin-top: 1em;
- }
- &.studygroup,
- &.studygroupset {
- &:after {
- //margin-left: 2em;
- }
}
&:last-child {
&:after {
- border-bottom: none;
+ @include accessible-border-bottom;
}
}
}
@@ -90,16 +76,6 @@
padding: 20px 20px 20px 60px;
}
&.root {
- > a {
- /*
- @include menu-item-icon($icon-arrow);
- padding-left: 20px;
- &:before {
- @include transform(rotate(90deg));
- display: inline-block;
- }
- */
- }
& > .item-list {
margin-bottom: 0;
ul.root {
@@ -109,12 +85,8 @@
padding-left: 35px;
}
> li {
- &:after {
- border-bottom: 1px solid darken($lightsilver, 10%);
- }
&.last:after {
margin-top: 0;
- border-bottom: none;
}
}
}
diff --git a/themes/hy_doo/sass/components/_ds.node.metadata.scss b/themes/hy_doo/sass/components/_ds.node.metadata.scss
index 13a81549..6d0827b0 100644
--- a/themes/hy_doo/sass/components/_ds.node.metadata.scss
+++ b/themes/hy_doo/sass/components/_ds.node.metadata.scss
@@ -35,12 +35,17 @@
}
label {
margin-right: 0.35em;
- font-size: unset;
+ @include font-size(14px);
+ font-weight: 400;
+ line-height: 2em;
}
.teaching-languages {
display: block;
span {
font-weight: 900;
+ &:not(:last-of-type):after {
+ content: ", ";
+ }
}
}
.label-row.help {
diff --git a/themes/hy_doo/sass/components/_feedback.scss b/themes/hy_doo/sass/components/_feedback.scss
index bc79a453..c937613a 100644
--- a/themes/hy_doo/sass/components/_feedback.scss
+++ b/themes/hy_doo/sass/components/_feedback.scss
@@ -87,7 +87,7 @@
line-height: 50px;
}
@include breakpoint($small) {
- @include font-size(14px);
+ @include font-size(13px);
width: 90px;
height: 90px;
&:before {
diff --git a/themes/hy_doo/sass/components/_info_footer.scss b/themes/hy_doo/sass/components/_info_footer.scss
index 75d9245b..6d0ed2de 100644
--- a/themes/hy_doo/sass/components/_info_footer.scss
+++ b/themes/hy_doo/sass/components/_info_footer.scss
@@ -1,7 +1,6 @@
.l-info-footer-wrapper {
background-color: $color-bg-prefooter;
.l-info-footer {
- @include line-break($mediumsilver);
padding-top: 2em;
.block {
margin-bottom: 2.814em;
diff --git a/themes/hy_doo/sass/hy_doo.styles.scss b/themes/hy_doo/sass/hy_doo.styles.scss
index 8bf7f06e..ed6a5add 100644
--- a/themes/hy_doo/sass/hy_doo.styles.scss
+++ b/themes/hy_doo/sass/hy_doo.styles.scss
@@ -42,6 +42,7 @@
@import "styleguide/components/_main-menu.scss";
@import "styleguide/components/_table.scss";
@import "styleguide/components/_fatmenu.scss";
+@import "styleguide/components/_textarea.scss";
/* HY DOO THEME */
@import "mixins/**/*";
diff --git a/uh_coursepages.info b/uh_coursepages.info
index 70dbfb03..4d68b6c9 100644
--- a/uh_coursepages.info
+++ b/uh_coursepages.info
@@ -1,7 +1,7 @@
name = Helsinki University Portal
description = Install with pre-configured features.
core = 7.x
-version = 7.x-1.114
+version = 7.x-1.115
dependencies[] = block
dependencies[] = file
dependencies[] = image