From 7976273b3e08708a359a880133c8c11454373508 Mon Sep 17 00:00:00 2001 From: DOO Project team Date: Mon, 11 Dec 2017 12:51:16 +0200 Subject: [PATCH] Released v1.105 --- CHANGELOG.md | 23 ++ .../examples/jakso.json | 49 --- .../examples/toteutus.json | 68 ---- .../includes/UHCESB.inc | 162 -------- .../includes/UHCMessageQueueProcessorBase.inc | 74 ---- .../UHCMessageQueueProcessorInterface.inc | 56 --- .../includes/UHCOodi.inc | 34 -- .../uhc_activemq_connector.api.php | 30 -- .../uhc_activemq_connector.drush.inc | 123 ------- .../uhc_activemq_connector.info | 8 +- .../uhc_activemq_connector.install | 19 - .../uhc_activemq_connector.module | 174 +-------- .../uhc_analytics_and_tracking.info | 3 +- .../uhc_analytics_and_tracking.module | 2 +- .../uhc_autofill_metadata.info | 2 +- modules/uhc_autologin/uhc_autologin.info | 2 +- modules/uhc_avatar/uhc_avatar.info | 2 +- .../uhc_cache_warmer/uhc_cache_warmer.info | 2 +- modules/uhc_comment/uhc_comment.info | 2 +- modules/uhc_comment/uhc_comment.module | 19 + .../uhc_contact_card/uhc_contact_card.info | 2 +- .../uhc_content_administration_feature.info | 2 +- modules/uhc_course/uhc_course.info | 2 +- .../uhc_course_collaboration.info | 2 +- ...on_private.features.conditional_fields.inc | 262 +++++++++++++ ...laboration_private.features.field_base.inc | 54 +++ ...ration_private.features.field_instance.inc | 139 +++++++ .../uhc_course_collaboration_private.info | 9 +- .../uhc_course_hierarchy.info | 2 +- .../uhc_course_implementation.info | 2 +- .../uhc_course_implementation_activity.info | 2 +- .../uhc_course_implementation_activity.module | 10 + ...c_course_implementation_activity_mece.info | 2 +- ...ourse_implementation_inherited_fields.info | 2 +- ...HCCourseImplementationMessageProcessor.inc | 33 -- .../uhc_course_implementation_source.info | 2 +- .../uhc_course_implementation_source.module | 12 - .../uhc_course_material.info | 2 +- .../uhc_course_material.module | 24 +- .../uhc_course_material_dnd.info | 2 +- .../uhc_course_material_sort.info | 2 +- .../includes/UHCCourseMessageProcessor.inc | 33 -- .../uhc_course_source/uhc_course_source.info | 2 +- .../uhc_course_source.module | 12 - .../uhc_course_tasks_and_material.info | 2 +- .../uhc_css_js_aggregation.info | 2 +- modules/uhc_date_format/uhc_date_format.info | 2 +- modules/uhc_dev_feature/uhc_dev_feature.info | 2 +- .../uhc_dev_feature.views_default.inc | 10 - .../uhc_doo_theme_features.info | 2 +- modules/uhc_ds/uhc_ds.info | 3 +- modules/uhc_ds/uhc_ds.module | 24 +- modules/uhc_elisa_chat/uhc_elisa_chat.info | 2 +- modules/uhc_environment/uhc_environment.info | 2 +- modules/uhc_event/uhc_event.info | 2 +- .../uhc_exam_results/uhc_exam_results.info | 2 +- modules/uhc_favorites/uhc_favorites.info | 4 +- modules/uhc_feedback/uhc_feedback.info | 2 +- modules/uhc_field_base/uhc_field_base.info | 2 +- modules/uhc_genetics/uhc_genetics.context.inc | 96 ----- .../uhc_genetics/uhc_genetics.features.inc | 21 -- modules/uhc_genetics/uhc_genetics.info | 16 +- modules/uhc_genetics/uhc_genetics.module | 28 +- .../uhc_genetics.views_default.inc | 346 ----------------- modules/uhc_leiki/uhc_leiki.info | 2 +- .../uhc_liftups.features.field_base.inc | 2 - .../uhc_liftups.features.field_instance.inc | 1 + modules/uhc_liftups/uhc_liftups.info | 2 +- modules/uhc_liftups/uhc_liftups.strongarm.inc | 3 + .../uhc_liftups/uhc_liftups.views_default.inc | 290 +-------------- modules/uhc_locale/uhc_locale.info | 2 +- .../uhc_migrate_message_report.info | 2 +- .../uhc_molecular_biosciences.context.inc | 96 ----- .../uhc_molecular_biosciences.features.inc | 21 -- .../uhc_molecular_biosciences.info | 15 +- .../uhc_molecular_biosciences.module | 28 +- ...hc_molecular_biosciences.views_default.inc | 347 ------------------ modules/uhc_moodi/uhc_moodi.info | 2 +- modules/uhc_navigation/uhc_navigation.info | 2 +- .../uhc_online_services.info | 2 +- modules/uhc_oodi/uhc_oodi.info | 2 +- .../uhc_open_university.info | 2 +- .../uhc_open_university.module | 109 ------ modules/uhc_page/uhc_page.info | 2 +- modules/uhc_rest_api/uhc_rest_api.info | 2 +- .../uhc_search_friendly_sorting.info | 7 + .../uhc_search_friendly_sorting.module | 161 ++++++++ .../uhc_search_front_page.info | 2 +- .../uhc_search_front_page.views_default.inc | 5 - modules/uhc_search_lite/uhc_search_lite.info | 2 +- .../uhc_search_portal_feature.info | 2 +- .../uhc_search_portal_feature.module | 10 - modules/uhc_shib_conf/uhc_shib_conf.info | 2 +- modules/uhc_sources/uhc_sources.info | 2 +- .../uhc_sources_filtering.info | 2 +- .../uhc_sources_filtering.module | 46 +-- modules/uhc_statistics/uhc_statistics.info | 2 +- .../uhc_statistics.views_default.inc | 129 +------ .../uhc_studies.features.field_instance.inc | 1 + modules/uhc_studies/uhc_studies.info | 2 +- .../uhc_studies/uhc_studies.views_default.inc | 4 +- modules/uhc_subject/uhc_subject.info | 2 +- modules/uhc_taxonomy/uhc_taxonomy.info | 2 +- .../uhc_taxonomy_source.info | 2 +- .../uhc_teacher_tools/uhc_teacher_tools.info | 2 +- modules/uhc_tour/uhc_tour.info | 2 +- modules/uhc_wysiwyg/uhc_wysiwyg.info | 2 +- modules/uhc_xml_sitemap/uhc_xml_sitemap.info | 2 +- themes/hy_doo/css/hy_doo.styles.css | 83 ++++- themes/hy_doo/hy_doo.info | 2 +- themes/hy_doo/preprocess/html.preprocess.inc | 2 - themes/hy_doo/sass/components/_teaser.scss | 14 +- .../_horizontal-tabs.scss | 77 ++++ uh_coursepages.info | 8 +- uh_coursepages.install | 25 ++ 115 files changed, 995 insertions(+), 2583 deletions(-) delete mode 100644 modules/uhc_activemq_connector/examples/jakso.json delete mode 100644 modules/uhc_activemq_connector/examples/toteutus.json delete mode 100644 modules/uhc_activemq_connector/includes/UHCESB.inc delete mode 100644 modules/uhc_activemq_connector/includes/UHCMessageQueueProcessorBase.inc delete mode 100644 modules/uhc_activemq_connector/includes/UHCMessageQueueProcessorInterface.inc delete mode 100644 modules/uhc_activemq_connector/includes/UHCOodi.inc delete mode 100644 modules/uhc_activemq_connector/uhc_activemq_connector.api.php delete mode 100644 modules/uhc_activemq_connector/uhc_activemq_connector.drush.inc delete mode 100644 modules/uhc_activemq_connector/uhc_activemq_connector.install create mode 100644 modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.conditional_fields.inc delete mode 100644 modules/uhc_course_implementation_source/includes/UHCCourseImplementationMessageProcessor.inc delete mode 100644 modules/uhc_course_source/includes/UHCCourseMessageProcessor.inc delete mode 100644 modules/uhc_genetics/uhc_genetics.context.inc delete mode 100644 modules/uhc_genetics/uhc_genetics.features.inc delete mode 100644 modules/uhc_genetics/uhc_genetics.views_default.inc delete mode 100644 modules/uhc_molecular_biosciences/uhc_molecular_biosciences.context.inc delete mode 100644 modules/uhc_molecular_biosciences/uhc_molecular_biosciences.features.inc delete mode 100644 modules/uhc_molecular_biosciences/uhc_molecular_biosciences.views_default.inc create mode 100644 modules/uhc_search_friendly_sorting/uhc_search_friendly_sorting.info create mode 100644 modules/uhc_search_friendly_sorting/uhc_search_friendly_sorting.module create mode 100644 themes/hy_doo/sass/styleguide_additions/_horizontal-tabs.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index bb804dbf..d8cacd7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +# University of Helsinki Courses v1.105 +Päiväys: 11.12.2017 + +## Lisäykset + - DOO-3169: Näytetään opiskelumuoto käyttäjälle studies-sivulla. + - DOO-3225: Lisättiin kurssisivujen viestinlähetykseen mahdollisuus määrittää vastaussähköpostiosoite. + +## Muutokset + - DOO-3060: Parannettiin horisontaalisten välilehtien käyttökokemusta. + - DOO-3233: Palautettiin metatietokentät kurssimateriaalin lisäykseen. + - DOO-3062: Parannettiin toteutuksen linkin erottuvuutta studies-sivulla. + +## Korjaukset + - DOO-3231: Studies-ländärin koulutusohjelmittain -välilehden nuolet eivät ole linkkejä. + - DOO-3175: Hakutulossyötteen järjestäminen ei toiminut. + +## Poistot + - DOO-3251: Poistettiin roolisuodatin tilastonäkymästä. + - DOO-3168: Poistettiin tenttien korostusväripalkki studies-sivun toteutuslistauksista. + - DOO-3147: Poistettiin genetiikkaan ja molekyylibiologiaan liittyvää toiminnallisuutta. + - DOO-2554: Poistettiin vanha ESB PoC toteutus (ActiveMQ). + + # University of Helsinki Courses v1.104 Päiväys: 13.11.2017 diff --git a/modules/uhc_activemq_connector/examples/jakso.json b/modules/uhc_activemq_connector/examples/jakso.json deleted file mode 100644 index b9b4d86b..00000000 --- a/modules/uhc_activemq_connector/examples/jakso.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "type": "base", - "data": [ - { - "TUNNISTE": "590155", - "NIMI_FI": "Formulointi III", - "NIMI_SV": "Formulering III", - "NIMI_EN": "Formulation III", - "OPPIAINE": "Teollisuusfarmasia", - "OPETUSTYYPPI_ID": 3, - "URL_FI": "https://weboodi.helsinki.fi/hy/alkusivu.jsp?Kieli=1\u0026avattavaSivu=opintjakstied\u0026OpinKohd=46010555", - "URL_SV": "https://weboodi.helsinki.fi/hy/alkusivu.jsp?Kieli=2\u0026avattavaSivu=opintjakstied\u0026OpinKohd=46010555", - "URL_EN": "https://weboodi.helsinki.fi/hy/alkusivu.jsp?Kieli=6\u0026avattavaSivu=opintjakstied\u0026OpinKohd=46010555", - "LAAJUUS": "6", - "KURSSIKUVAUS": { - "AJOITUS_FI": "\u003cp\u003eOpintojakso luennoidaan kolmen vuoden v\u0026#228;lein. Seuraavan\nkerran opintojakso luennoidaan syksylll\u0026#228; 2016.\u003c/p\u003e", - "ARVIOINTI_FI": "\u003cp\u003eArviointi asteikolla 0-5\u003c/p\u003e", - "ED_OPINNOT_FI": "\u003cp\u003eL\u0026#228;\u0026#228;kevalmiste I (590335). Formulointi I, II ja III\novat erillisi\u0026#228; kokonaisuuksia, joita ei tarvitse suorittaa\nj\u0026#228;rjestyksess\u0026#228;.\u003c/p\u003e", - "KOHDERYHMA_FI": "\u003cp\u003ePakollinen opintojakso teollisuusfarmasian jatko-opiskelijoille\nsek\u0026#228; erikoistumiskoulutusta suorittaville proviisoreille.\nOpintojakso soveltuu valinnaisena farmasian opiskelijoille,\nteollisuusfarmasiaan ja farmasian teknologiaan syventyville\nproviisoriopiskelijoille ja muille tiedekunnan\njatko-opiskelijoille.\u003c/p\u003e", - "LISATIEDOT_FI": "\u003cp\u003eOsallistujista riippuen opetuskielen\u0026#228; voi olla\nenglanti.\u003c/p\u003e", - "OPPIMATERIAALI_FI": "\u003cp\u003eLuentomateriaali\u003c/p\u003e\n\u003cp\u003eGibson, M.: Pharmaceutical Preformulation and formulation (1.\npainos): sivut: 201-223 (preformulointi), 331-352 (parenteraaliset\nvalmisteet), 355-376 (inhalaatiovalmisteet), 459-488\n(silm\u0026#228;l\u0026#228;\u0026#228;kkeet), 491-511 (nen\u0026#228;\u0026#228;n\nannosteltavat), 515-567 (paikallisesti k\u0026#228;ytett\u0026#228;v\u0026#228;t\nja transdermaaliset valmisteet)\u003c/p\u003e\n\u003cp\u003etai\u003c/p\u003e\n\u003cp\u003e\n\u003c!--[if gte mso 9]\u003e\u003cxml\u003e Normal 0 21 false false false FI X-NONE X-NONE MicrosoftInternetExplorer4 \u003c/xml\u003e\u003c![endif]--\u003e\n \n\u003c!--[if gte mso 9]\u003e\u003cxml\u003e \u003c/xml\u003e\u003c![endif]--\u003e\n \n\u003c!--[if gte mso 10]\u003e \u003cmce:style\u003e\u003c! /* Style Definitions */ table.MsoNormalTable {mso-style-name:\"Normaali taulukko\"; mso-tstyle-rowband-size:0; mso-tstyle-colband-size:0; mso-style-noshow:yes; mso-style-priority:99; mso-style-qformat:yes; mso-style-parent:\"\"; mso-padding-alt:0cm 5.4pt 0cm 5.4pt; mso-para-margin:0cm; mso-para-margin-bottom:.0001pt; mso-pagination:widow-orphan; font-size:11.0pt; font-family:\"Calibri\",\"sans-serif\"; mso-ascii-font-family:Calibri; mso-ascii-theme-font:minor-latin; mso-fareast-font-family:Calibri; mso-fareast-theme-font:minor-latin; mso-hansi-font-family:Calibri; mso-hansi-theme-font:minor-latin; mso-bidi-font-family:\"Times New Roman\"; mso-bidi-theme-font:minor-bidi; mso-ansi-language:EN-US; mso-fareast-language:EN-US;} --\u003e\n \n\u003c!--[endif]--\u003e\n\u003c/p\u003e\n\u003cp\u003eGibson, M.: Pharmaceutical Preformulation and formulation\n(2.painos): kappaleet 6 (s. 214-231), 9-10, 12-14.\u003c/p\u003e", - "SISALTO_FI": "\u003cp\u003eOpintojaksossa perehdyt\u0026#228;\u0026#228;n esimerkiksi\nparenteraalisten, puolikiinteiden ja\ninhalaatio-l\u0026#228;\u0026#228;kevalmisteiden formulointiin.\u003c/p\u003e", - "SUORITUSTAVAT_FI": "\u003cp\u003eOpintojakso koostuu asiantuntijaluennoista. Opintojaksosta on\nloppukuulustelu. Opintojakson materiaali ja linkki kurssikirjaan\n(e-kirja) ovat saatavilla Moodlessa. Moodle-alueen avaimen saa\nottamalla yhteytt\u0026#228; teollisuusfarmasian\nhenkil\u0026#246;kuntaan.\u003c/p\u003e\n\u003cp\u003eLukukausina, joina kurssia ei luennoida, opintojakson\ntenttiminen on mahdollista kaikkina teollisuusfarmasian\ntenttip\u0026#228;ivin\u0026#228; ilmoittautumalla Teollisuusfarmasian\nkirjatenttiin (590188). Tentitt\u0026#228;v\u0026#228;n opintojakson nimi\ntulee kirjoittaa ilmoittautuessa lomakkeen\nlis\u0026#228;tietoja-kohtaan.\u003c/p\u003e", - "TAVOITE_FI": "\u003cp\u003eOpiskelija ymm\u0026#228;rt\u0026#228;\u0026#228; muiden kuin suun kautta\nannettavien l\u0026#228;\u0026#228;kemuotojen kuten parenteraalisten,\npuolikiinteiden ja inhalaatiol\u0026#228;\u0026#228;kevalmisteiden\nformulointia.\u003c/p\u003e", - "AJOITUS_SV": "Ajoitus ruotsiksi", - "ARVIOINTI_SV": "Arviointi ruotsiksi", - "ED_OPINNOT_SV": "Edelliset opinnot ruotsiksi", - "KOHDERYHMA_SV": "Kohderyhmä ruotsiksi", - "LISATIEDOT_SV": "Lisätiedot ruotsiksi", - "OPPIMATERIAALI_SV": "Oppimateriaali ruotsiksi", - "SISALTO_SV": "Sisältö ruotsiksi", - "SUORITUSTAVAT_SV": "Suoritustavat ruotsiksi", - "TAVOITE_SV": "Tavoite ruotsiksi", - "AJOITUS_EN": "Ajoitus englanniksi", - "ARVIOINTI_EN": "Arviointi englanniksi", - "ED_OPINNOT_EN": "Edelliet opinnot englanniksi", - "KOHDERYHMA_EN": "Kohderyhmä englanniksi", - "LISATIEDOT_EN": "Lisätiedot englanniksi", - "OPPIMATERIAALI_EN": "Oppimateriaali englanniksi", - "SISALTO_EN": "Sisältö engalnniksi", - "SUORITUSTAVAT_EN": "Suoritustvat englanniksi", - "TAVOITE_EN": "Tavoite englanniksi" - }, - "KIELI": ["FI"], - "KIRJALLISUUS": [] - } - ], - "md5": "785afadb81d58936d15f60746d539581" -} \ No newline at end of file diff --git a/modules/uhc_activemq_connector/examples/toteutus.json b/modules/uhc_activemq_connector/examples/toteutus.json deleted file mode 100644 index ba8caa4d..00000000 --- a/modules/uhc_activemq_connector/examples/toteutus.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "realisation", - "data": { - "info": [ - { - "JAKSO_ID": "590155", - "NIMI_FI": "Formulointi III - Pauliinan opetus", - "NIMI_SV": "Formulering III - Pauliinas undervisning", - "NIMI_EN": "Formulation III - Pauliina's teaching", - "ALKAMISPVM": "2015-05-11T00:00:00.000+03:00", - "PAATTYMISPVM": "2015-06-30T00:00:00.000+03:00", - "OPETUSMUOTO_ID": 5, - "URL_FI": "https://weboodi.helsinki.fi/hy/alkusivu.jsp?Kieli=1\u0026avattavaSivu=opettaptied\u0026OpetTap=107694052", - "URL_SV": "https://weboodi.helsinki.fi/hy/alkusivu.jsp?Kieli=2\u0026avattavaSivu=opettaptied\u0026OpetTap=107694052", - "URL_EN": "https://weboodi.helsinki.fi/hy/alkusivu.jsp?Kieli=6\u0026avattavaSivu=opettaptied\u0026OpetTap=107694052", - "TOTEUTUS_ID": 107694052, - "ARVIOINTI_FI": "Arviointi suomeksi", - "ARVIOINTI_SV": "Arviointi ruotsiksi", - "ARVIOINTI_EN": "Arviointi englanniksi", - "AJOITUS_FI": "Ajoitus suomeksi", - "AJOITUS_SV": "Ajoitus ruotsiksi", - "AJOITUS_EN": "Ajoitus englanniksi", - "ED_OPINNOT_FI": "Edelliset opinnot suomeksi", - "ED_OPINNOT_SV": "Edelliset opinnot ruotsiksi", - "ED_OPINNOT_EN": "Edelliset opinnot engalnniksi", - "KOHDERYHMA_FI": "Kohderyhmä suomeksi", - "KOHDERYHMA_SV": "Kohderyhmä ruotsiksi", - "KOHDERYHMA_EN": "Kohderyhmä englanniksi", - "LISATIEDOT_FI": "Lisätiedot suomeksi", - "LISATIEDOT_SV": "Lisätiedot ruotsiksi", - "LISATIEDOT_EN": "Lisätiedot englanniksi", - "OPPIMATERIAALI_FI": "Oppimateriaali suomeksi", - "OPPIMATERIAALI_SV": "Oppimateriaali ruotsiksi", - "OPPIMATERIAALI_EN": "Oppimateriaali englanniksi", - "OPINTOMAKSU_FI": "50 €", - "OPINTOMAKSU_SV": "50 €", - "OPINTOMAKSU_EN": "50 €", - "SISALTO_FI": "Sisältö suomeksi", - "SISALTO_SV": "Sisältö ruotsiksi", - "SISALTO_EN": "Sisältö englanniksi", - "SUORITUSTAVAT_FI": "Suoritustavat suomeksi", - "SUORITUSTAVAT_SV": "Suoritustavat ruotsiksi", - "SUORITUSTAVAT_EN": "Suoritustavat englanniksi", - "TAVOITE_FI": "Tavoite suomeksi", - "TAVOITE_SV": "Tavoite ruotsiksi", - "TAVOITE_EN": "Tavoite englanniksi", - "TOTEUTUS_FI": "Toteutus suomeksi", - "TOTEUTUS_SV": "Toteutus ruotsiksi", - "TOTEUTUS_EN": "Toteutus englanniksi", - "LAAJUUS": "4", - "KIELI": ["FI"], - "PAIKKAKUNNAT": {}, - "TOTEUTTAJA": {} - } - ], - "opettajat": [], - "alitoteutukset": [], - "organisaatiot": [ - { - "VASTUUORGANISAATIO_ID": "H5530", - "VASTUUPROSENTTI": 100, - "TIEDEKUNTA_ID": "H55" - } - ], - "periodit": [{"PERIODI_ID": 68257725}] - }, - "md5": "6778cf05a9c26c2c565bbb2b33fc2625" -} \ No newline at end of file diff --git a/modules/uhc_activemq_connector/includes/UHCESB.inc b/modules/uhc_activemq_connector/includes/UHCESB.inc deleted file mode 100644 index 54da0db2..00000000 --- a/modules/uhc_activemq_connector/includes/UHCESB.inc +++ /dev/null @@ -1,162 +0,0 @@ -clearDebug(); - - // Set in/out queues - $this->setQueueIn($queueBase); - $this->setQueueOut($queueBase); - - // Username and passwords for connecting - $options = $connectionSettings; - $user = $options['credentials']['user']; - $pass = $options['credentials']['pass']; - $connection = $options['brokers'][0]; - - // Create queue consumer where responses are read from. - $this->in = new \FuseSource\Stomp\Stomp($connection); - $this->in->connect($user, $pass); - - // Create queue producer where requests are sent to. - $this->out = new \FuseSource\Stomp\Stomp($connection); - $this->out->connect($user, $pass); - - } - else { - throw new \Exception('Could not load the library.'); - } - } - - /** - * Queue in information is the queue name we'll be reading incoming messages. - */ - protected $queueIn; - protected function setQueueIn($queue_base) { - $this->queueIn = $queue_base . '.in'; - } - - /** - * Queue out information is the queue name we'll be pushing messages out. - */ - protected $queueOut; - protected function setQueueOut($queue_base) { - $this->queueOut = $queue_base . '.out'; - } - - /** - * Perform and request to ActiveMQ populating the message with proper routing - * information. This will send out an message using an "out" queue and then - * reads the response from "in" queue. - * - * @param array $properties - * @param null $body - * @return \FuseSource\Stomp\Frame - */ - public function request(array $properties, $body = NULL) { - - // Always ensure we have this header to let ESB route the response correctly - $properties['esb_reply_to'] = $this->queueIn; - - // Set destination names - $inQueue = '/queue/' . $this->queueIn; - $outQueue = '/queue/' . $this->queueOut; - - // Generate random correlation id, and append it to outgoing message - $generated_correlation_id = md5(uniqid(rand(), true)); - $properties['correlation-id'] = $generated_correlation_id; - - // Keep track of assembled request - $this->clearDebug(); - $this->debugInfo['request']['properties'] = $properties; - $this->debugInfo['request']['body'] = $body; - - // Subscribe to incoming messages and send out the request and then read in - // the response. - $this->in->subscribe($inQueue); - $response = NULL; - if ($this->out->send($outQueue, $body, $properties)) { - while ($message = $this->in->readFrame()) { - $this->debugInfo['responses']['all'][] = $message; - if ($message->headers['correlation-id'] == $generated_correlation_id) { - $this->in->ack($message); - $response = $message; - break; - } - } - } - $this->in->unsubscribe($inQueue); - - // Keep track of response - $this->debugInfo['responses']['match'] = $response; - - return $response; - } - - /** - * Clears and constructs debugging information. - */ - public function clearDebug() { - $this->debugInfo = array( - 'request' => array('properties' => array(), 'body' => NULL), - 'responses' => array('all' => NULL, 'match' => NULL), - ); - } - - /** - * Returns debugging information. - * @return array - */ - public function getDebugInfo() { - return $this->debugInfo; - } - - /** - * On destruct, disconnect in/out queues. - */ - public function __destruct() { - $this->in->disconnect(); - $this->out->disconnect(); - } - -} diff --git a/modules/uhc_activemq_connector/includes/UHCMessageQueueProcessorBase.inc b/modules/uhc_activemq_connector/includes/UHCMessageQueueProcessorBase.inc deleted file mode 100644 index 63d96809..00000000 --- a/modules/uhc_activemq_connector/includes/UHCMessageQueueProcessorBase.inc +++ /dev/null @@ -1,74 +0,0 @@ -queueName = $queueName; - $this->stompFrame = $stompFrame; - $this->extractBody(); - } - - public function validate() { - watchdog(__CLASS__, '@queue: Validation item 
@item
', array('@queue' => $this->queueName, '@item' => print_r($this->stompFrame,1)), WATCHDOG_DEBUG); - } - - public function process() { - watchdog(__CLASS__, '@queue: Processing item 
@item
', array('@queue' => $this->queueName, '@item' => print_r($this->stompFrame,1)), WATCHDOG_DEBUG); - } - - /** - * This will extract the body by reading message's body and decoding from JSON - * format. - */ - protected function extractBody() { - if (isset($this->stompFrame->body) && !empty($this->stompFrame->body)) { - if ($jsonBody = json_decode($this->stompFrame->body)) { - $this->jsonBody = $jsonBody; - } - } - } - - /** - * This gets you JSON decoded object. - * - * @return mixed - * JSON decoded object or NULL. - */ - public function getJSONBody() { - return $this->jsonBody; - } - - /** - * Gets the type of the message, so called may conclude how to process the - * body. - * - * @return mixed - * Expected string or NULL. - */ - public function getType() { - return $this->getJSONBody()->type; - } - - /** - * Static method for logging messages in name of this module. - * - * @param $message - * @param array $variables - * @param int $severity - * @param null $link - */ - static public function log($message, $variables = array(), $severity = WATCHDOG_NOTICE, $link = NULL) { - watchdog('uhc_activemq_connector', $message, $variables, $severity, $link); - } - -} diff --git a/modules/uhc_activemq_connector/includes/UHCMessageQueueProcessorInterface.inc b/modules/uhc_activemq_connector/includes/UHCMessageQueueProcessorInterface.inc deleted file mode 100644 index 6c28e4b5..00000000 --- a/modules/uhc_activemq_connector/includes/UHCMessageQueueProcessorInterface.inc +++ /dev/null @@ -1,56 +0,0 @@ -request($properties); - } - -} diff --git a/modules/uhc_activemq_connector/uhc_activemq_connector.api.php b/modules/uhc_activemq_connector/uhc_activemq_connector.api.php deleted file mode 100644 index 886a06d6..00000000 --- a/modules/uhc_activemq_connector/uhc_activemq_connector.api.php +++ /dev/null @@ -1,30 +0,0 @@ - array( - array( - 'class_name' => 'MyMessageQueueProcessor', - 'implements' => 'UHCMessageQueueProcessorInterface', - ), - ), - ); -} diff --git a/modules/uhc_activemq_connector/uhc_activemq_connector.drush.inc b/modules/uhc_activemq_connector/uhc_activemq_connector.drush.inc deleted file mode 100644 index 17fcf88b..00000000 --- a/modules/uhc_activemq_connector/uhc_activemq_connector.drush.inc +++ /dev/null @@ -1,123 +0,0 @@ - 'Processes ActiveMQ messages.', - 'aliases' => array('uhc-pq'), - 'arguments' => array( - 'queue-name' => dt('Optional queue name. If omitted, then default queue name will be used.'), - ), - ); - - $items['uhc-activemq-connector-add-to-queue'] = array( - 'description' => 'Drops into the queue an item using given filepath contents as message body.', - 'aliases' => array('uhc-atq'), - 'arguments' => array( - 'filepath' => dt('The filepath of the message body file.'), - 'queue-name' => dt('Optional queue name. If omitted, then default queue name will be used.'), - ), - 'examples' => array( - 'drush uhc-atq ./examples/toteutus.json' => dt('Creates an message having toteutus.json file contents as message body.'), - ), - ); - - $items['uhc-activemq-connector-request-esb'] = array( - 'description' => 'Requests doo.oodi service through ESB with given values.', - 'aliases' => array('uhc-request-esb'), - 'arguments' => array( - 'method' => dt('Method to be called. Example: "doo.oodi.codes.semesters"'), - 'parameters' => dt('Optional parameters for method as an query string. Example: "course_id=12345&organisation=H930"'), - 'body' => dt('Optional body for the request.'), - ), - 'examples' => array( - 'drush uhc-request-esb doo.oodi.kurssisivu.courseunitrealisations.data jakso_code=590155' => dt('Requests 590155 course data.'), - 'drush uhc-request-esb doo.oodi.kurssisivu.courseunitrealisations.events course_id=103132867&langcode=fi' => dt('Requests events of course realistation 103132867 data in finnish.'), - ), - ); - - return $items; -} - -/** - * Callback for request through ESB. - */ -function drush_uhc_activemq_connector_request_esb($method, $parameters_str = '', $body = NULL) { - - // Parameters are passed as query string (through commandline), so lets - // extract them. - $parameters = array(); - parse_str($parameters_str, $parameters); - - // Request ESB through UHCESB class - $options = variable_get('uhc_activemq_connector_settings'); - $default_queue_base = variable_get('uhc_activemq_connector_default_queue_base', 'doo.dev.kurssisivu'); - $esb = new UHCESB($options, $default_queue_base); - $properties = $parameters + array( - 'method' => $method, - ); - $esb->request($properties, $body); - - drush_print_r($esb->getDebugInfo()); -} - -/** - * Callback for processing UHC's queued messages. - * - * @param string $queue_name Queue name. - */ -function drush_uhc_activemq_connector_process_queue($queue_name = NULL) { - // If queue name is not given, lets use default queue name. - $queue_name = is_null($queue_name) ? variable_get('uhc_activemq_connector_default_queue', 'doo.local1.kurssisivu.in') : $queue_name; - uhc_activemq_connector_process_queue($queue_name); -} - -/** - * Callback for dropping an message to the queue. - * @param $filepath - * File path containing the message body contents. - * @param $queue_name - * Optional queue name. If omitted, then default queue name will be used. - */ -function drush_uhc_activemq_connector_add_to_queue($filepath, $queue_name = NULL) { - - // If queue name is not given, lets use default queue name. - $queue_name = is_null($queue_name) ? variable_get('uhc_activemq_connector_default_queue', 'doo.local1.kurssisivu.in') : $queue_name; - - // Prepend print working directory - if ($_SERVER['PWD']) { - $filepath = $_SERVER['PWD'] . '/' . $filepath; - } - - // Ensure that file exist and is readable - if (!file_exists($filepath) || !is_readable($filepath)) { - drush_set_error('File ' . $filepath . ' does not exist or is not readable.'); - exit(1); - } - - // Connect to STOMP - $stomp = uhc_activemq_connector_get_stomp_instance(); - - // Queue an message - try { - $stomp->send("/queue/" . $queue_name, file_get_contents($filepath)); - } - catch (\FuseSource\Stomp\Exception\StompException $e) { - UHCMessageQueueProcessorBase::log('Error creating queue item: @exception', array('@exception' => $e->getMessage()), WATCHDOG_ERROR); - } - - // Disconnect from STOMP - $stomp->disconnect(); -} diff --git a/modules/uhc_activemq_connector/uhc_activemq_connector.info b/modules/uhc_activemq_connector/uhc_activemq_connector.info index 93be1513..fc66a7e3 100644 --- a/modules/uhc_activemq_connector/uhc_activemq_connector.info +++ b/modules/uhc_activemq_connector/uhc_activemq_connector.info @@ -1,10 +1,6 @@ name = UHC ActiveMQ Connector -description = Connects to HY's Apache ActiveMQ and deals with queued messages. +description = This module is deprecated. core = 7.x package = UHC -version = 7.x-1.104 +version = 7.x-1.105 project = uhc_activemq_connector -files[] = includes/UHCESB.inc -files[] = includes/UHCMessageQueueProcessorInterface.inc -files[] = includes/UHCMessageQueueProcessorBase.inc -files[] = includes/UHCOodi.inc diff --git a/modules/uhc_activemq_connector/uhc_activemq_connector.install b/modules/uhc_activemq_connector/uhc_activemq_connector.install deleted file mode 100644 index cb376db7..00000000 --- a/modules/uhc_activemq_connector/uhc_activemq_connector.install +++ /dev/null @@ -1,19 +0,0 @@ - 'STOMP PHP Client', - 'vendor url' => 'https://github.com/dejanb/stomp-php', - 'download url' => 'https://github.com/dejanb/stomp-php', - 'path' => 'src/FuseSource/Stomp', - 'version callback' => 'uhc_activemq_connector_stomp_version_callback', - 'files' => array( - 'php' => array( - 'ExceptionInterface.php', - 'Exception/StompException.php', - 'Frame.php', - 'Message.php', - 'Message/Bytes.php', - 'Message/Map.php', - 'Stomp.php', - ), - ), - ); - - return $libraries; -} - -/** - * Callback for bypassing version of Stomp client as it does not provide any - * information or technique to detect it. - */ -function uhc_activemq_connector_stomp_version_callback() { - return TRUE; -} - -/** - * Helper function for getting stomp instance, - * @return \FuseSource\Stomp\Stomp - * @throws \FuseSource\Stomp\Exception\StompException If Stomp connection creation fails. - * @throws Exception If the Stomp instance can not get Stomp instance. - */ -function uhc_activemq_connector_get_stomp_instance() { - - // Stomp library is stored in this directory. TODO: Use library! - if (($library = libraries_load('stomp_php')) && !empty($library['loaded'])) { - - // Specify connection settings - $options = variable_get('uhc_activemq_connector_settings'); - $user = $options['credentials']['user']; - $pass = $options['credentials']['pass']; - $connection = $options['brokers'][0]; - - // Connect and return the instance - $stomp = new \FuseSource\Stomp\Stomp($connection); - $stomp->connect($user, $pass); - return $stomp; - } - - throw new Exception('Could not get Stomp instance. Library missing?'); -} - -/** - * Processes the queue by claiming each item and then calling for subscribers. - * - * @param string $queue_name Queue name. - * @return null|void - */ -function uhc_activemq_connector_process_queue($queue_name) { - $implementations = uhc_activemq_connector_get_queue_worker_implementations($queue_name); - - // Skip processing if there are no queue worker implementations. - if (empty($implementations)) { - return NULL; - } - - // Ensure that each class implements UHCMessageQueueProcessorInterface. - $classes = array(); - foreach ($implementations as $implementation) { - if ($implementation['implements'] != 'UHCMessageQueueProcessorInterface') { - UHCMessageQueueProcessorBase::log('Class @class was not implementing UHCMessageQueueProcessorInterface interface', array('@class' => $implementation['class_name']), WATCHDOG_ERROR); - return NULL; - } - if (!in_array($implementation['implements'], class_implements($implementation['class_name']))) { - UHCMessageQueueProcessorBase::log('Class @class was not implementing @interface', array('@class' => $implementation['class_name'], '@interface' => $implementation['implements']), WATCHDOG_ERROR); - return NULL; - } - $classes[] = $implementation['class_name']; - } - - // Now, as we know that there are listeners to this queue and they're - // validated now lets start the hazzle. - /** @var $stomp \FuseSource\Stomp\Stomp */ - $stomp = uhc_activemq_connector_get_stomp_instance(); - $stomp->subscribe('/queue/' . $queue_name); - while ($item = $stomp->readFrame()) { - - // Log all incoming messages if settings has been set to do so. - if (variable_get('uhc_activemq_connector_log_incoming_messages', FALSE)) { - watchdog('uhc_activemq_connector', 'Incoming message: 
!message
', array('!message' => print_r($item, 1)), WATCHDOG_DEBUG); - } - - // Construct each listener class. - $listeners = array(); - foreach ($classes as $class) { - $listeners[] = new $class($queue_name, $item); - } - - // Ensure that there are no more than one listener passing validation. - $validated = NULL; - foreach ($listeners as $key => $listener) { /** @var $listener UHCMessageQueueProcessorInterface */ - if ($listener->validate() === UHCMessageQueueProcessorInterface::VALIDATE_PASS) { - // When listener passes validation while already validated by some other - // listener... - if ($validated !== NULL) { - // Log out error and continue to next item (not next listener) - UHCMessageQueueProcessorBase::log('There were more than one listener passing the validation. First passed validation was by @key', array('@key' => $validated), WATCHDOG_ERROR); - continue 2; - } - else { - // Or else, just this item to be the validated one - $validated = $key; - } - } - } - - // Skip processing if no validations passed. - if ($validated === NULL) { - continue; - } - - // Process. If successful, delete item / acknowledge it. - - /** @var $processor UHCMessageQueueProcessorInterface */ - $processor = $listeners[$validated]; - if ($processor->process() === UHCMessageQueueProcessorInterface::PROCESS_PROCESSED) { - // This will send signal to ActiveMQ that this item has been processed. - $stomp->ack($item->headers['message-id']); - } - - } - $stomp->disconnect(); -} - -/** - * Return queue worker implementations for the given queue. - * - * @param string $queue_name Queue name. - * @return array Queue worker implementations. - */ -function uhc_activemq_connector_get_queue_worker_implementations($queue_name) { - $hook = 'uhc_activemq_connector_message_processor_info'; - $modules = module_implements($hook); - $implementations = array(); - foreach ($modules as $module) { - $function = $module . '_' . $hook; - if (function_exists($function)) { - $items = $function(); - foreach ($items as $key => $value) { - if ($key == $queue_name) { - $implementations = array_merge($value, $implementations); - } - } - } - } - - return $implementations; -} 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 50724c62..463c8fd8 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.104 +version = 7.x-1.105 project = uhc_analytics_and_tracking dependencies[] = ctools dependencies[] = facetapi @@ -11,6 +11,7 @@ dependencies[] = google_analytics_et dependencies[] = googleanalytics dependencies[] = strongarm dependencies[] = uhc_open_university +dependencies[] = uhc_search_friendly_sorting dependencies[] = uhc_search_portal_feature dependencies[] = views features[ctools][] = strongarm:strongarm:1 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 b6113d4c..2646672a 100644 --- a/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.module +++ b/modules/uhc_analytics_and_tracking/uhc_analytics_and_tracking.module @@ -280,7 +280,7 @@ function uhc_analytics_and_tracking_track_search_type($keyword, $filters) { * @return string */ function uhc_analytics_and_tracking_get_sort_by(&$view) { - return !empty($view->exposed_input['sorting']) ? uhc_open_university_sorting_label($view->exposed_input['sorting']) : ''; + return !empty($view->exposed_input['sorting']) ? uhc_search_friendly_sorting_label($view->exposed_input['sorting']) : ''; } /** diff --git a/modules/uhc_autofill_metadata/uhc_autofill_metadata.info b/modules/uhc_autofill_metadata/uhc_autofill_metadata.info index 8f6f0bcd..edec9250 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.104 +version = 7.x-1.105 project = uhc_autofill_metadata dependencies[] = ctools dependencies[] = features diff --git a/modules/uhc_autologin/uhc_autologin.info b/modules/uhc_autologin/uhc_autologin.info index 89476bb9..83f46910 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.104 +version = 7.x-1.105 project = uhc_autologin dependencies[] = shib_auth diff --git a/modules/uhc_avatar/uhc_avatar.info b/modules/uhc_avatar/uhc_avatar.info index 5628a0a4..5a45e5ac 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.104 +version = 7.x-1.105 project = uhc_avatar diff --git a/modules/uhc_cache_warmer/uhc_cache_warmer.info b/modules/uhc_cache_warmer/uhc_cache_warmer.info index 1af5e234..d0e431b9 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.104 +version = 7.x-1.105 project = uhc_cache_warmer diff --git a/modules/uhc_comment/uhc_comment.info b/modules/uhc_comment/uhc_comment.info index 88ae58a9..2813a1b9 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.104 +version = 7.x-1.105 project = uhc_comment dependencies[] = comment dependencies[] = ctools diff --git a/modules/uhc_comment/uhc_comment.module b/modules/uhc_comment/uhc_comment.module index 6e6c879b..bd8037ba 100644 --- a/modules/uhc_comment/uhc_comment.module +++ b/modules/uhc_comment/uhc_comment.module @@ -86,9 +86,28 @@ function uhc_comment_form_comment_node_course_implementation_form_alter(&$form, drupal_add_css('div#comments h2.title {display: none;}', 'inline'); } + _uhc_comment_set_default_reply_to_address($form); + + $form['#validate'][] = 'uhc_comment_comment_form_validate'; $form['#submit'][] = 'uhc_comment_handle_comment_form_submit'; } +function _uhc_comment_set_default_reply_to_address(&$form) { + global $user; + $form['field_reply_to_email'][LANGUAGE_NONE][0]['value']['#default_value'] = $user->mail; +} + +function uhc_comment_comment_form_validate($form, &$form_state) { + $reply_to_email = isset($form_state['values']['field_reply_to_email'][LANGUAGE_NONE][0]['value']) + ? $form_state['values']['field_reply_to_email'][LANGUAGE_NONE][0]['value'] + : NULL; + + if ($reply_to_email && filter_var($reply_to_email, FILTER_VALIDATE_EMAIL) === FALSE) { + $error = t('%email is not a valid e-mail address.', array('%email' => $reply_to_email)); + form_set_error('field_reply_to_email', $error); + } +} + /** * @param $node object Node. * @return bool TRUE if the current user is course teacher or course diff --git a/modules/uhc_contact_card/uhc_contact_card.info b/modules/uhc_contact_card/uhc_contact_card.info index b592abee..7da8711b 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.104 +version = 7.x-1.105 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 71ed434f..90248c2f 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.104 +version = 7.x-1.105 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 9284ab95..433aff77 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.104 +version = 7.x-1.105 project = uhc_course dependencies[] = ctools dependencies[] = entity_token diff --git a/modules/uhc_course_collaboration/uhc_course_collaboration.info b/modules/uhc_course_collaboration/uhc_course_collaboration.info index 678ee3d1..354c1636 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.104 +version = 7.x-1.105 project = uhc_course_collaboration dependencies[] = ctools dependencies[] = features diff --git a/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.conditional_fields.inc b/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.conditional_fields.inc new file mode 100644 index 00000000..1b38d5b4 --- /dev/null +++ b/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.conditional_fields.inc @@ -0,0 +1,262 @@ + 'comment', + 'bundle' => 'comment_node_course_implementation', + 'dependent' => 'field_reply_to_email', + 'dependee' => 'field_specify_reply_to_email_add', + 'options' => array( + 'state' => 'visible', + 'condition' => 'checked', + 'grouping' => 'AND', + 'effect' => 'show', + 'effect_options' => array(), + 'element_view' => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 'element_view_per_role' => 0, + 'element_view_roles' => array( + 1 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 2 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 3 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 4 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 5 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 6 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 7 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 8 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + ), + 'element_edit' => array( + 1 => 1, + 3 => 0, + ), + 'element_edit_per_role' => 0, + 'element_edit_roles' => array( + 1 => array( + 1 => 1, + 3 => 0, + ), + 2 => array( + 1 => 1, + 3 => 0, + ), + 3 => array( + 1 => 1, + 3 => 0, + ), + 4 => array( + 1 => 1, + 3 => 0, + ), + 5 => array( + 1 => 1, + 3 => 0, + ), + 6 => array( + 1 => 1, + 3 => 0, + ), + 7 => array( + 1 => 1, + 3 => 0, + ), + 8 => array( + 1 => 1, + 3 => 0, + ), + ), + 'selector' => '', + 'values_set' => 1, + 'value' => array(), + 'values' => array(), + 'value_form' => array(), + ), + ); + + $items["comment:comment_node_course_implementation:1"] = array( + 'entity' => 'comment', + 'bundle' => 'comment_node_course_implementation', + 'dependent' => 'field_specify_reply_to_email_add', + 'dependee' => 'field_send_email', + 'options' => array( + 'state' => 'visible', + 'condition' => 'checked', + 'grouping' => 'AND', + 'effect' => 'show', + 'effect_options' => array(), + 'element_view' => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 'element_view_per_role' => 0, + 'element_view_roles' => array( + 1 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 2 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 3 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 4 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 5 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 6 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 7 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + 8 => array( + 1 => 1, + 2 => 2, + 5 => 0, + 3 => 0, + 4 => 0, + ), + ), + 'element_edit' => array( + 1 => 1, + 3 => 0, + ), + 'element_edit_per_role' => 0, + 'element_edit_roles' => array( + 1 => array( + 1 => 1, + 3 => 0, + ), + 2 => array( + 1 => 1, + 3 => 0, + ), + 3 => array( + 1 => 1, + 3 => 0, + ), + 4 => array( + 1 => 1, + 3 => 0, + ), + 5 => array( + 1 => 1, + 3 => 0, + ), + 6 => array( + 1 => 1, + 3 => 0, + ), + 7 => array( + 1 => 1, + 3 => 0, + ), + 8 => array( + 1 => 1, + 3 => 0, + ), + ), + 'selector' => '', + 'values_set' => 1, + 'value' => array(), + 'values' => array(), + 'value_form' => array(), + ), + ); + + return $items; +} diff --git a/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.field_base.inc b/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.field_base.inc index dedd772d..ba25cf00 100644 --- a/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.field_base.inc +++ b/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.field_base.inc @@ -39,6 +39,31 @@ function uhc_course_collaboration_private_field_default_field_bases() { 'type' => 'list_boolean', ); + // Exported field_base: 'field_reply_to_email'. + $field_bases['field_reply_to_email'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_reply_to_email', + 'field_permissions' => array( + 'type' => 0, + ), + 'indexes' => array( + 'format' => array( + 0 => 'format', + ), + ), + 'locked' => 0, + 'module' => 'text', + 'settings' => array( + 'entity_translation_sync' => FALSE, + 'max_length' => 255, + ), + 'translatable' => 0, + 'type' => 'text', + ); + // Exported field_base: 'field_send_email'. $field_bases['field_send_email'] = array( 'active' => 1, @@ -68,5 +93,34 @@ function uhc_course_collaboration_private_field_default_field_bases() { 'type' => 'list_boolean', ); + // Exported field_base: 'field_specify_reply_to_email_add'. + $field_bases['field_specify_reply_to_email_add'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_specify_reply_to_email_add', + 'field_permissions' => array( + 'type' => 0, + ), + 'indexes' => array( + 'value' => array( + 0 => 'value', + ), + ), + 'locked' => 0, + 'module' => 'list', + 'settings' => array( + 'allowed_values' => array( + 0 => '', + 1 => '', + ), + 'allowed_values_function' => '', + 'entity_translation_sync' => FALSE, + ), + 'translatable' => 0, + 'type' => 'list_boolean', + ); + return $field_bases; } diff --git a/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.field_instance.inc b/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.field_instance.inc index 30cacffd..03b0f873 100644 --- a/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.field_instance.inc +++ b/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.features.field_instance.inc @@ -28,6 +28,7 @@ function uhc_course_collaboration_private_field_default_field_instances() { 'settings' => array( 'field_multiple_limit' => -1, 'field_multiple_limit_offset' => 0, + 'field_multiple_limit_order' => 0, ), 'type' => 'list_default', 'weight' => 3, @@ -59,6 +60,90 @@ function uhc_course_collaboration_private_field_default_field_instances() { ), ); + // Exported field_instance: + // 'comment-comment_node_course_implementation-field_reply_to_email'. + $field_instances['comment-comment_node_course_implementation-field_reply_to_email'] = array( + 'bundle' => 'comment_node_course_implementation', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'text', + 'settings' => array( + 'field_multiple_limit' => -1, + 'field_multiple_limit_offset' => 0, + 'field_multiple_limit_order' => 0, + ), + 'type' => 'text_default', + 'weight' => 5, + ), + 'full' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'ds_extras_field_template' => '', + 'entity_type' => 'comment', + 'field_name' => 'field_reply_to_email', + 'label' => 'Reply to', + 'required' => 0, + 'settings' => array( + 'better_formats' => array( + 'allowed_formats' => array( + 'ds_code' => 'ds_code', + 'embed_code' => 'embed_code', + 'filtered_html' => 'filtered_html', + 'full_html' => 'full_html', + 'plain_text' => 'plain_text', + ), + 'allowed_formats_toggle' => 0, + 'default_order_toggle' => 0, + 'default_order_wrapper' => array( + 'formats' => array( + 'ds_code' => array( + 'weight' => 12, + ), + 'embed_code' => array( + 'weight' => 1, + ), + 'filtered_html' => array( + 'weight' => 0, + ), + 'full_html' => array( + 'weight' => 1, + ), + 'plain_text' => array( + 'weight' => 10, + ), + ), + ), + ), + 'entity_translation_sync' => FALSE, + 'linkit' => array( + 'button_text' => 'Search', + 'enable' => 0, + 'profile' => '', + ), + 'text_processing' => 0, + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'text', + 'settings' => array( + 'maxlength_js' => 0, + 'maxlength_js_label' => 'Content limited to @limit characters, remaining: @remaining', + 'size' => 60, + ), + 'type' => 'text_textfield', + 'weight' => 4, + ), + ); + // Exported field_instance: // 'comment-comment_node_course_implementation-field_send_email'. $field_instances['comment-comment_node_course_implementation-field_send_email'] = array( @@ -77,6 +162,7 @@ function uhc_course_collaboration_private_field_default_field_instances() { 'settings' => array( 'field_multiple_limit' => -1, 'field_multiple_limit_offset' => 0, + 'field_multiple_limit_order' => 0, ), 'type' => 'list_default', 'weight' => 3, @@ -108,9 +194,62 @@ function uhc_course_collaboration_private_field_default_field_instances() { ), ); + // Exported field_instance: + // 'comment-comment_node_course_implementation-field_specify_reply_to_email_add'. + $field_instances['comment-comment_node_course_implementation-field_specify_reply_to_email_add'] = array( + 'bundle' => 'comment_node_course_implementation', + 'default_value' => array( + 0 => array( + 'value' => 0, + ), + ), + 'deleted' => 0, + 'description' => 'Add reply-to address, if you wish the students to answer to your message by e-mail.', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'list', + 'settings' => array( + 'field_multiple_limit' => -1, + 'field_multiple_limit_offset' => 0, + 'field_multiple_limit_order' => 0, + ), + 'type' => 'list_default', + 'weight' => 4, + ), + 'full' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'ds_extras_field_template' => '', + 'entity_type' => 'comment', + 'field_name' => 'field_specify_reply_to_email_add', + 'label' => 'Add reply-to address', + 'required' => 0, + 'settings' => array( + 'entity_translation_sync' => FALSE, + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'options', + 'settings' => array( + 'display_label' => 1, + ), + 'type' => 'options_onoff', + 'weight' => 3, + ), + ); + // Translatables // Included for use with string extractors like potx. + t('Add reply-to address'); + t('Add reply-to address, if you wish the students to answer to your message by e-mail.'); t('Also send as an email to the students'); + t('Reply to'); t('Restricted to course’s participants only'); return $field_instances; 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 5a23df54..aca09875 100644 --- a/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.info +++ b/modules/uhc_course_collaboration_private/uhc_course_collaboration_private.info @@ -2,20 +2,27 @@ name = UHC Course Collaboration Private description = Extends collaboration by providing option to share content privately. core = 7.x package = UHC -version = 7.x-1.104 +version = 7.x-1.105 project = uhc_course_collaboration_private dependencies[] = comment_og +dependencies[] = conditional_fields dependencies[] = features dependencies[] = list dependencies[] = og dependencies[] = options +dependencies[] = text dependencies[] = uhc_course_collaboration dependencies[] = uhc_course_implementation +features[conditional_fields][] = comment:comment_node_course_implementation features[features_api][] = api:2 features[field_base][] = field_private +features[field_base][] = field_reply_to_email features[field_base][] = field_send_email +features[field_base][] = field_specify_reply_to_email_add features[field_instance][] = comment-comment_node_course_implementation-field_private +features[field_instance][] = comment-comment_node_course_implementation-field_reply_to_email features[field_instance][] = comment-comment_node_course_implementation-field_send_email +features[field_instance][] = comment-comment_node_course_implementation-field_specify_reply_to_email_add features[og_features_permission][] = node:course_implementation:approve comment_node_course_implementation features[og_features_permission][] = node:course_implementation:delete comment_node_course_implementation features[og_features_permission][] = node:course_implementation:edit comment_node_course_implementation diff --git a/modules/uhc_course_hierarchy/uhc_course_hierarchy.info b/modules/uhc_course_hierarchy/uhc_course_hierarchy.info index 165f3e01..90de0092 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.104 +version = 7.x-1.105 project = uhc_course_hierarchy php = 5.4 dependencies[] = uhc_autofill_metadata diff --git a/modules/uhc_course_implementation/uhc_course_implementation.info b/modules/uhc_course_implementation/uhc_course_implementation.info index 3c7db4ac..b6f0fd9a 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.104 +version = 7.x-1.105 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 a4b9de20..3afd74ed 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.104 +version = 7.x-1.105 project = uhc_course_implementation_activity dependencies[] = comment dependencies[] = ctools diff --git a/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.module b/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.module index 2f8e0c87..3e6f49a6 100644 --- a/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.module +++ b/modules/uhc_course_implementation_activity/uhc_course_implementation_activity.module @@ -215,6 +215,13 @@ function uhc_course_implementation_activity_send_notify_mail($comment) { 'from' => $from, ); + // "Reply-To" header + $reply_to_checked = field_get_items('comment', $comment, 'field_specify_reply_to_email_add'); + $reply_to_email = field_get_items('comment', $comment, 'field_reply_to_email'); + if (!empty($reply_to_checked[0]['value']) && !empty($reply_to_email[0]['value'])) { + $params['Reply-To'] = $reply_to_email[0]['value']; + } + drupal_mail('uhc_course_implementation_activity', 'notification', $to, $selected_lang, $params, $from, TRUE); } @@ -228,6 +235,9 @@ function uhc_course_implementation_activity_mail($key, &$message, $params) { $message['body'][] = $params['message']; $message['headers']['Return-Path'] = variable_get('site_mail', ''); $message['headers']['Sender'] = $params['from']; + if (!empty($params['Reply-To'])) { + $message['headers']['Reply-To'] = $params['Reply-To']; + } } } 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 4a47231d..445be60f 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.104 +version = 7.x-1.105 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 8c6a1945..573b8971 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.104 +version = 7.x-1.105 project = uhc_course_implementation_inherited_fields dependencies[] = ctools dependencies[] = ds diff --git a/modules/uhc_course_implementation_source/includes/UHCCourseImplementationMessageProcessor.inc b/modules/uhc_course_implementation_source/includes/UHCCourseImplementationMessageProcessor.inc deleted file mode 100644 index 8d577a0c..00000000 --- a/modules/uhc_course_implementation_source/includes/UHCCourseImplementationMessageProcessor.inc +++ /dev/null @@ -1,33 +0,0 @@ -getType() == 'realisation' ? self::VALIDATE_PASS : self::VALIDATE_FAIL; - } - - public function process() { - $id = $this->getId(); - $item = $this->getJSONBody(); - /** @var $migration CourseImplementationNodeMigration */ - $migration = Migration::getInstance('CourseImplementationNode', 'CourseImplementationNodeMigration', array('predefined_ids' => array($id), 'predefined_item' => $item)); - $migration->prepareUpdate(); - $result = $migration->processImport(); - return $result == Migration::RESULT_COMPLETED ? UHCMessageQueueProcessorInterface::PROCESS_PROCESSED : NULL; - } - - protected function getId() { - $item = $this->getJSONBody(); - return $item->data->info[0]->TOTEUTUS_ID; - } - -} 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 ee3cf30c..6ceab977 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.104 +version = 7.x-1.105 project = uhc_course_implementation_source files[] = includes/UHCCourseImplementationMessageProcessor.inc files[] = migrate/CourseImplementationDestinationNode.inc diff --git a/modules/uhc_course_implementation_source/uhc_course_implementation_source.module b/modules/uhc_course_implementation_source/uhc_course_implementation_source.module index d73ab369..e69c8afa 100644 --- a/modules/uhc_course_implementation_source/uhc_course_implementation_source.module +++ b/modules/uhc_course_implementation_source/uhc_course_implementation_source.module @@ -72,18 +72,6 @@ function uhc_course_implementation_source_add_course_implementation_submit(&$for drupal_set_message(t('The page will be created/updated soon (within @expected_duration)', array('@expected_duration' => variable_get('uhc_sources_expected_duration', '10 min')))); } -/** - * Implements hook_uhc_activemq_connector_message_processor_info(). - */ -function uhc_course_implementation_source_uhc_activemq_connector_message_processor_info() { - $default_queue_name = variable_get('uhc_activemq_connector_default_queue', 'doo.local1.kurssisivu.in'); - return array( - $default_queue_name => array( - array('class_name' => 'UHCCourseImplementationMessageProcessor', 'implements' => 'UHCMessageQueueProcessorInterface') - ), - ); -} - /** * Queues a course implementation by the given ID. * diff --git a/modules/uhc_course_material/uhc_course_material.info b/modules/uhc_course_material/uhc_course_material.info index bab06b12..09368ae4 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.104 +version = 7.x-1.105 project = uhc_course_material dependencies[] = ctools dependencies[] = entityreference diff --git a/modules/uhc_course_material/uhc_course_material.module b/modules/uhc_course_material/uhc_course_material.module index fc611811..3507c319 100644 --- a/modules/uhc_course_material/uhc_course_material.module +++ b/modules/uhc_course_material/uhc_course_material.module @@ -219,24 +219,15 @@ function uhc_course_material_inline_entity_form_entity_form_alter(&$entity_form, $entity_form['field_material_link']['#access'] = $has_file ? FALSE : TRUE; $entity_form['field_material_file']['#access'] = $has_link ? FALSE : TRUE; - $hidden_fields = array( - 'field_material_author', - 'field_private', - 'field_material_section', - 'field_material_pub_info' - ); - // if node formed accessed with add file, clean up form accordingly if (strpos($form_state['clicked_button']['#id'], 'add-material-file') !== false) { $relevant_field = 'field_material_file'; - $hidden_fields[] = 'field_material_link'; - uhc_course_material_clean_form($entity_form, $form_state, $relevant_field, $hidden_fields); + uhc_course_material_clean_form($entity_form, $form_state, $relevant_field, 'field_material_link'); } // if node formed accessed with add link, clean up form accordingly if (strpos($form_state['clicked_button']['#id'], 'add-material-link') !== false) { $relevant_field = 'field_material_link'; - $hidden_fields[] = 'field_material_file'; - uhc_course_material_clean_form($entity_form, $form_state, $relevant_field, $hidden_fields); + uhc_course_material_clean_form($entity_form, $form_state, $relevant_field, 'field_material_file'); } } @@ -252,17 +243,16 @@ function uhc_course_material_inline_entity_form_entity_form_alter(&$entity_form, } /** - * Clean up material node form. We want it as simple as possible when initially adding a file/link. - * Hide label. Change form title to same as clicked button. Hide non-relevant fields, Make relevant field required. + * Clean up material node form. We want it as simple as possible when initially + * adding a file/link. Hide label. Change form title to same as clicked button. + * Hide non-relevant field, Make relevant field required. */ -function uhc_course_material_clean_form(&$entity_form, $form_state, $relevant_field, $hidden_fields) { +function uhc_course_material_clean_form(&$entity_form, $form_state, $relevant_field, $hidden_field) { $entity_form[$relevant_field][LANGUAGE_NONE][0]['#title_display'] = 'invisible'; $entity_form['#title'] = $form_state['clicked_button']['#value']; //$entity_form['actions']['ief_add_save']['#value'] = $form_state['clicked_button']['#value']; $entity_form[$relevant_field][LANGUAGE_NONE][0]['#required'] = TRUE; - foreach ($hidden_fields as $hidden_field) { - $entity_form[$hidden_field]['#access'] = FALSE; - } + $entity_form[$hidden_field]['#access'] = FALSE; } /** 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 75894344..19011ab2 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.104 +version = 7.x-1.105 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 3c6fdddf..0f20ffc4 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.104 +version = 7.x-1.105 project = uhc_course_material_sort dependencies[] = behavior_weights dependencies[] = uhc_course_material diff --git a/modules/uhc_course_source/includes/UHCCourseMessageProcessor.inc b/modules/uhc_course_source/includes/UHCCourseMessageProcessor.inc deleted file mode 100644 index 5d09210c..00000000 --- a/modules/uhc_course_source/includes/UHCCourseMessageProcessor.inc +++ /dev/null @@ -1,33 +0,0 @@ -getType() == 'base' ? self::VALIDATE_PASS : self::VALIDATE_FAIL; - } - - public function process() { - $id = $this->getId(); - $item = $this->getJSONBody(); - /** @var $migration CourseNodeMigration */ - $migration = Migration::getInstance('CourseNode', 'CourseNodeMigration', array('predefined_ids' => array($id), 'predefined_item' => $item)); - $migration->prepareUpdate(); - $result = $migration->processImport(); - return $result == Migration::RESULT_COMPLETED ? UHCMessageQueueProcessorInterface::PROCESS_PROCESSED : NULL; - } - - protected function getId() { - $item = $this->getJSONBody(); - return $item->data[0]->TUNNISTE; - } - -} diff --git a/modules/uhc_course_source/uhc_course_source.info b/modules/uhc_course_source/uhc_course_source.info index 1addc067..604cdef1 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.104 +version = 7.x-1.105 project = uhc_course_source files[] = includes/UHCCourseMessageProcessor.inc files[] = migrate/CourseNodeMigration.inc diff --git a/modules/uhc_course_source/uhc_course_source.module b/modules/uhc_course_source/uhc_course_source.module index cf361dca..595b4999 100644 --- a/modules/uhc_course_source/uhc_course_source.module +++ b/modules/uhc_course_source/uhc_course_source.module @@ -8,18 +8,6 @@ * @see README.md how to contribute to this project */ -/** - * Implements hook_uhc_activemq_connector_message_processor_info(). - */ -function uhc_course_source_uhc_activemq_connector_message_processor_info() { - $default_queue_name = variable_get('uhc_activemq_connector_default_queue', 'doo.local1.kurssisivu.in'); - return array( - $default_queue_name => array( - array('class_name' => 'UHCCourseMessageProcessor', 'implements' => 'UHCMessageQueueProcessorInterface') - ), - ); -} - /** * Imports given course number no matter whether it exist in system already or * not. 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 b798ce0e..d2642f00 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.104 +version = 7.x-1.105 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 74c8047d..ed097ebe 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.104 +version = 7.x-1.105 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 caceef43..c819a486 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.104 +version = 7.x-1.105 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 b2b84d94..deda3963 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.104 +version = 7.x-1.105 project = uhc_dev_feature dependencies[] = views features[ctools][] = views:views_default:3.0 diff --git a/modules/uhc_dev_feature/uhc_dev_feature.views_default.inc b/modules/uhc_dev_feature/uhc_dev_feature.views_default.inc index bb04e597..c030fca1 100644 --- a/modules/uhc_dev_feature/uhc_dev_feature.views_default.inc +++ b/modules/uhc_dev_feature/uhc_dev_feature.views_default.inc @@ -304,16 +304,6 @@ function uhc_dev_feature_views_default_views() { $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['label'] = 'Keyword'; $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['identifier'] = 'field_imp_keywords_value'; $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['group_items'] = array( - 1 => array( - 'title' => 'Genetics', - 'operator' => '=', - 'value' => 'genetiikka', - ), - 2 => array( - 'title' => 'Molecular bioscience', - 'operator' => '=', - 'value' => 'molekyylibiotieteet', - ), 3 => array( 'title' => '', 'operator' => '=', 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 d285712e..651ddd73 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.104 +version = 7.x-1.105 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 0dd2dbd9..21787008 100644 --- a/modules/uhc_ds/uhc_ds.info +++ b/modules/uhc_ds/uhc_ds.info @@ -1,8 +1,9 @@ name = UHC Display Suite description = Display settings for UHC subsite. core = 7.x +php = 5.5 package = UHC -version = 7.x-1.104 +version = 7.x-1.105 project = uhc_ds dependencies[] = ctools dependencies[] = date_views diff --git a/modules/uhc_ds/uhc_ds.module b/modules/uhc_ds/uhc_ds.module index cb6d1d05..4a62b6c2 100644 --- a/modules/uhc_ds/uhc_ds.module +++ b/modules/uhc_ds/uhc_ds.module @@ -357,6 +357,8 @@ function uhc_ds_status_org_location_date($field) { $locality = $open_university && isset($values['field_imp_locality']) ? render($values['field_imp_locality']) : ''; $course = node_load(field_get_items('node', $node, 'field_imp_reference_to_courses')[0]['target_id']); $flexible_start = isset($values['field_imp_flexible_start']) ? render($values['field_imp_flexible_start']) : ''; + $method_of_study = uhc_ds_get_rendered_method_of_study($node); + $method_of_study = $method_of_study ? "$method_of_study, " : ''; // when not viewing a course node, display title and credits only if they differ from the ones in the course. $title_and_credits = ''; @@ -370,10 +372,13 @@ function uhc_ds_status_org_location_date($field) { } } - $rendered_title_and_credits = '
' . $title_and_credits . '
'; + $rendered_title_and_credits = '
' + . $title_and_credits + . '
'; return render($status) . $rendered_title_and_credits + . $method_of_study . $organisation_names . $rendered_organiser . $locality @@ -399,6 +404,23 @@ function uhc_ds_get_rendered_organisation_names($node) { return implode(', ', $rendered_organisation_names); } +/** + * @param $node + * @return string + */ +function uhc_ds_get_rendered_method_of_study($node) { + $method_of_study_field_items = field_get_items('node', $node, 'field_imp_method_of_study'); + $rendered_method_of_study = array(); + + if (!empty($method_of_study_field_items)) { + $rendered_method_of_study = array_map(function ($term) { + return '' . check_plain($term->name) . ''; + }, taxonomy_term_load_multiple(array_column($method_of_study_field_items, 'tid'))); + } + + return implode(', ', $rendered_method_of_study); +} + function uhc_ds_get_imp_course_organiser_fallback($node) { $organiser_fi = field_view_field('node', $node, 'field_imp_course_organiser', array('label' => 'hidden'), 'fi'); diff --git a/modules/uhc_elisa_chat/uhc_elisa_chat.info b/modules/uhc_elisa_chat/uhc_elisa_chat.info index bc820612..fdeb7527 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.104 +version = 7.x-1.105 project = uhc_elisa_chat diff --git a/modules/uhc_environment/uhc_environment.info b/modules/uhc_environment/uhc_environment.info index 62d840f8..fc186017 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.104 +version = 7.x-1.105 dependencies[] = site_status_message diff --git a/modules/uhc_event/uhc_event.info b/modules/uhc_event/uhc_event.info index 8e9378d1..7cb805d7 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.104 +version = 7.x-1.105 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 fbff9b8b..6a630c5d 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.104 +version = 7.x-1.105 dependencies[] = ctools dependencies[] = features dependencies[] = file diff --git a/modules/uhc_favorites/uhc_favorites.info b/modules/uhc_favorites/uhc_favorites.info index 15b37e7e..97bd8bde 100644 --- a/modules/uhc_favorites/uhc_favorites.info +++ b/modules/uhc_favorites/uhc_favorites.info @@ -2,11 +2,9 @@ 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.104 +version = 7.x-1.105 project = uhc_favorites dependencies[] = favoritewidget dependencies[] = uhc_course_implementation -dependencies[] = uhc_genetics -dependencies[] = uhc_molecular_biosciences dependencies[] = uhc_open_university dependencies[] = uhc_search_front_page diff --git a/modules/uhc_feedback/uhc_feedback.info b/modules/uhc_feedback/uhc_feedback.info index 4e29fc78..ca54b639 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.104 +version = 7.x-1.105 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 95bc0694..d86edc29 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.104 +version = 7.x-1.105 project = uhc_field_base dependencies[] = ctools dependencies[] = date diff --git a/modules/uhc_genetics/uhc_genetics.context.inc b/modules/uhc_genetics/uhc_genetics.context.inc deleted file mode 100644 index 95cf5cd1..00000000 --- a/modules/uhc_genetics/uhc_genetics.context.inc +++ /dev/null @@ -1,96 +0,0 @@ -disabled = FALSE; /* Edit this to true to make a default context disabled initially */ - $context->api_version = 3; - $context->name = 'portal_main'; - $context->description = 'Portal main page'; - $context->tag = 'section'; - $context->conditions = array( - 'path' => array( - 'values' => array( - 'genetics' => 'genetics', - ), - ), - ); - $context->reactions = array( - 'block' => array( - 'blocks' => array( - 'views-uhc_liftups-main' => array( - 'module' => 'views', - 'delta' => 'uhc_liftups-main', - 'region' => 'content', - 'weight' => '-10', - ), - 'views--exp-uhc_search-desktop' => array( - 'module' => 'views', - 'delta' => '-exp-uhc_search-desktop', - 'region' => 'content', - 'weight' => '-9', - ), - 'views-uhc_course_liftups-latest' => array( - 'module' => 'views', - 'delta' => 'uhc_course_liftups-latest', - 'region' => 'content_suffix', - 'weight' => '-19', - ), - ), - ), - 'theme_html' => array( - 'class' => 'search-main-page', - ), - ); - $context->condition_mode = 0; - - // Translatables - // Included for use with string extractors like potx. - t('Portal main page'); - t('section'); - $export['portal_main'] = $context; - - $context = new stdClass(); - $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */ - $context->api_version = 3; - $context->name = 'portal_search_results'; - $context->description = 'Portal search results page'; - $context->tag = 'section'; - $context->conditions = array( - 'path' => array( - 'values' => array( - 'genetics/search' => 'genetics/search', - 'genetics/search/*' => 'genetics/search/*', - ), - ), - ); - $context->reactions = array( - 'block' => array( - 'blocks' => array( - 'views--exp-uhc_search-desktop' => array( - 'module' => 'views', - 'delta' => '-exp-uhc_search-desktop', - 'region' => 'content', - 'weight' => '-24', - ), - ), - ), - ); - $context->condition_mode = 0; - - // Translatables - // Included for use with string extractors like potx. - t('Portal search results page'); - t('section'); - $export['portal_search_results'] = $context; - - return $export; -} diff --git a/modules/uhc_genetics/uhc_genetics.features.inc b/modules/uhc_genetics/uhc_genetics.features.inc deleted file mode 100644 index 196572d1..00000000 --- a/modules/uhc_genetics/uhc_genetics.features.inc +++ /dev/null @@ -1,21 +0,0 @@ - "3"); - } -} - -/** - * Implements hook_views_api(). - */ -function uhc_genetics_views_api($module = NULL, $api = NULL) { - return array("api" => "3.0"); -} diff --git a/modules/uhc_genetics/uhc_genetics.info b/modules/uhc_genetics/uhc_genetics.info index f2780177..1d74f6bf 100644 --- a/modules/uhc_genetics/uhc_genetics.info +++ b/modules/uhc_genetics/uhc_genetics.info @@ -1,18 +1,6 @@ name = UHC Genetics -description = Provides ability to have genetics section in the site. +description = This module is deprecated. core = 7.x package = UHC -version = 7.x-1.104 +version = 7.x-1.105 project = uhc_genetics -dependencies[] = context -dependencies[] = ctools -dependencies[] = search_api_views -dependencies[] = views -dependencies[] = views_block_area -features[context][] = portal_main -features[context][] = portal_search_results -features[ctools][] = context:context:3 -features[ctools][] = views:views_default:3.0 -features[features_api][] = api:2 -features[views_view][] = uhc_search -project path = profiles/uh_coursepages/modules diff --git a/modules/uhc_genetics/uhc_genetics.module b/modules/uhc_genetics/uhc_genetics.module index 605e350a..0be23a6b 100644 --- a/modules/uhc_genetics/uhc_genetics.module +++ b/modules/uhc_genetics/uhc_genetics.module @@ -1,31 +1,5 @@ 'uhc_genetics_page', - 'access callback' => TRUE, - ); - return $items; -} - -/** - * Implementation of hook_page(). - */ -function uhc_genetics_page() { - return ' '; -} diff --git a/modules/uhc_genetics/uhc_genetics.views_default.inc b/modules/uhc_genetics/uhc_genetics.views_default.inc deleted file mode 100644 index 65586395..00000000 --- a/modules/uhc_genetics/uhc_genetics.views_default.inc +++ /dev/null @@ -1,346 +0,0 @@ -name = 'uhc_search'; - $view->description = ''; - $view->tag = 'default'; - $view->base_table = 'search_api_index_uhc_portal'; - $view->human_name = 'UHC search'; - $view->core = 7; - $view->api_version = '3.0'; - $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */ - - /* Display: Master */ - $handler = $view->new_display('default', 'Master', 'default'); - $handler->display->display_options['css_class'] = 'course-search'; - $handler->display->display_options['use_more_always'] = FALSE; - $handler->display->display_options['link_display'] = 'desktop'; - $handler->display->display_options['access']['type'] = 'none'; - $handler->display->display_options['cache']['type'] = 'none'; - $handler->display->display_options['query']['type'] = 'views_query'; - $handler->display->display_options['exposed_form']['type'] = 'input_required'; - $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Show results'; - $handler->display->display_options['exposed_form']['options']['reset_button'] = TRUE; - $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Clear selections x'; - $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Sorting:'; - $handler->display->display_options['exposed_form']['options']['expose_sort_order'] = FALSE; - $handler->display->display_options['exposed_form']['options']['text_input_required'] = ''; - $handler->display->display_options['exposed_form']['options']['text_input_required_format'] = 'filtered_html'; - $handler->display->display_options['pager']['type'] = 'full'; - $handler->display->display_options['pager']['options']['items_per_page'] = '10'; - $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['pager']['options']['id'] = '0'; - $handler->display->display_options['pager']['options']['quantity'] = '9'; - $handler->display->display_options['pager']['options']['expose']['items_per_page'] = TRUE; - $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = 'Show:'; - $handler->display->display_options['pager']['options']['expose']['items_per_page_options'] = '10, 20, 50, 100'; - $handler->display->display_options['style_plugin'] = 'table'; - $handler->display->display_options['style_options']['columns'] = array( - 'field_imp_reference_to_courses_url' => 'field_imp_reference_to_courses_url', - 'field_imp_reference_to_courses_field_course_course_number' => 'field_imp_reference_to_courses_field_course_course_number', - 'url' => 'url', - 'title_field' => 'title_field', - 'field_imp_reference_to_courses_field_course_type_of_teaching' => 'field_imp_reference_to_courses_field_course_type_of_teaching', - 'field_imp_method_of_study' => 'field_imp_method_of_study', - 'field_imp_teacher' => 'field_imp_teacher', - ); - $handler->display->display_options['style_options']['default'] = '-1'; - $handler->display->display_options['style_options']['info'] = array( - 'field_imp_reference_to_courses_url' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'field_imp_reference_to_courses_field_course_course_number' => array( - 'sortable' => 1, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'url' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'title_field' => array( - 'sortable' => 1, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'field_imp_reference_to_courses_field_course_type_of_teaching' => array( - 'sortable' => 1, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'field_imp_method_of_study' => array( - 'sortable' => 1, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'field_imp_teacher' => array( - 'sortable' => 1, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - ); - /* Header: Global: Block area */ - $handler->display->display_options['header']['block']['id'] = 'block'; - $handler->display->display_options['header']['block']['table'] = 'views'; - $handler->display->display_options['header']['block']['field'] = 'block'; - $handler->display->display_options['header']['block']['label'] = 'Theme'; - $handler->display->display_options['header']['block']['block_to_insert'] = 'facetapi:eahZtWygrbd0mW39GxTTrKpmT6NtmJd3'; - $handler->display->display_options['header']['block']['title'] = 'Theme'; - /* Header: Global: Block area */ - $handler->display->display_options['header']['block_1']['id'] = 'block_1'; - $handler->display->display_options['header']['block_1']['table'] = 'views'; - $handler->display->display_options['header']['block_1']['field'] = 'block'; - $handler->display->display_options['header']['block_1']['label'] = 'Type of teaching'; - $handler->display->display_options['header']['block_1']['block_to_insert'] = 'facetapi:ebLMT1Egl05afck7AKCq6EMM2B4VuGer'; - $handler->display->display_options['header']['block_1']['title'] = 'Type of teaching'; - /* Header: Global: Block area */ - $handler->display->display_options['header']['block_2']['id'] = 'block_2'; - $handler->display->display_options['header']['block_2']['table'] = 'views'; - $handler->display->display_options['header']['block_2']['field'] = 'block'; - $handler->display->display_options['header']['block_2']['label'] = 'Method of study'; - $handler->display->display_options['header']['block_2']['block_to_insert'] = 'facetapi:do4BdKvyCgpZP4td6B6GmQ8iCUJ40HBx'; - $handler->display->display_options['header']['block_2']['title'] = 'Method of study'; - /* Header: Global: Block area */ - $handler->display->display_options['header']['block_3']['id'] = 'block_3'; - $handler->display->display_options['header']['block_3']['table'] = 'views'; - $handler->display->display_options['header']['block_3']['field'] = 'block'; - $handler->display->display_options['header']['block_3']['label'] = 'Start month'; - $handler->display->display_options['header']['block_3']['block_to_insert'] = 'facetapi:cEQesYoZJTu7ITT2OD5RXHP0T0bqniOh'; - $handler->display->display_options['header']['block_3']['title'] = 'Start month'; - /* Header: Global: Block area */ - $handler->display->display_options['header']['block_5']['id'] = 'block_5'; - $handler->display->display_options['header']['block_5']['table'] = 'views'; - $handler->display->display_options['header']['block_5']['field'] = 'block'; - $handler->display->display_options['header']['block_5']['label'] = 'Teaching language'; - $handler->display->display_options['header']['block_5']['block_to_insert'] = 'facetapi:as918Au1kK03VaWu2iPYsRfNZ1iJWE7X'; - $handler->display->display_options['header']['block_5']['title'] = 'Teaching language'; - /* Header: Global: Result summary */ - $handler->display->display_options['header']['result']['id'] = 'result'; - $handler->display->display_options['header']['result']['table'] = 'views'; - $handler->display->display_options['header']['result']['field'] = 'result'; - $handler->display->display_options['header']['result']['content'] = '

Results (@total)

'; - /* No results behavior: Global: Text area */ - $handler->display->display_options['empty']['area']['id'] = 'area'; - $handler->display->display_options['empty']['area']['table'] = 'views'; - $handler->display->display_options['empty']['area']['field'] = 'area'; - $handler->display->display_options['empty']['area']['empty'] = TRUE; - $handler->display->display_options['empty']['area']['content'] = 'No results'; - $handler->display->display_options['empty']['area']['format'] = 'plain_text'; - /* Field: Reference to course(s): URL (indexed) */ - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['id'] = 'field_imp_reference_to_courses_url'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['field'] = 'field_imp_reference_to_courses_url'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['label'] = ''; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['exclude'] = TRUE; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['display_as_link'] = FALSE; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['link_to_entity'] = 0; - /* Field: Reference to course(s): Course number (indexed) */ - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_course_number']['id'] = 'field_imp_reference_to_courses_field_course_course_number'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_course_number']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_course_number']['field'] = 'field_imp_reference_to_courses_field_course_course_number'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_course_number']['label'] = 'ID'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_course_number']['alter']['text'] = '[field_imp_reference_to_courses_field_course_course_number]'; - /* Field: Indexed Multilingual Content: URL */ - $handler->display->display_options['fields']['url']['id'] = 'url'; - $handler->display->display_options['fields']['url']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['url']['field'] = 'url'; - $handler->display->display_options['fields']['url']['label'] = ''; - $handler->display->display_options['fields']['url']['exclude'] = TRUE; - $handler->display->display_options['fields']['url']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['url']['display_as_link'] = FALSE; - $handler->display->display_options['fields']['url']['link_to_entity'] = 0; - /* Field: Indexed Multilingual Content: Title */ - $handler->display->display_options['fields']['title_field']['id'] = 'title_field'; - $handler->display->display_options['fields']['title_field']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['title_field']['field'] = 'title_field'; - $handler->display->display_options['fields']['title_field']['label'] = 'Name'; - $handler->display->display_options['fields']['title_field']['alter']['alter_text'] = TRUE; - $handler->display->display_options['fields']['title_field']['alter']['text'] = '[title_field]'; - /* Field: Reference to course(s): Type of teaching (indexed) */ - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['id'] = 'field_imp_reference_to_courses_field_course_type_of_teaching'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['field'] = 'field_imp_reference_to_courses_field_course_type_of_teaching'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['label'] = 'Type of teaching'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['link_to_entity'] = 0; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['view_mode'] = 'full'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['bypass_access'] = 0; - /* Field: Indexed Multilingual Content: Method of study */ - $handler->display->display_options['fields']['field_imp_method_of_study']['id'] = 'field_imp_method_of_study'; - $handler->display->display_options['fields']['field_imp_method_of_study']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_method_of_study']['field'] = 'field_imp_method_of_study'; - $handler->display->display_options['fields']['field_imp_method_of_study']['link_to_entity'] = 0; - $handler->display->display_options['fields']['field_imp_method_of_study']['view_mode'] = 'full'; - $handler->display->display_options['fields']['field_imp_method_of_study']['bypass_access'] = 0; - /* Field: Indexed Multilingual Content: Begin date */ - $handler->display->display_options['fields']['field_imp_begin_date']['id'] = 'field_imp_begin_date'; - $handler->display->display_options['fields']['field_imp_begin_date']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_begin_date']['field'] = 'field_imp_begin_date'; - $handler->display->display_options['fields']['field_imp_begin_date']['settings'] = array( - 'format_type' => 'short_date_only', - 'fromto' => 'both', - 'multiple_number' => '', - 'multiple_from' => '', - 'multiple_to' => '', - ); - /* Field: Indexed Multilingual Content: Teacher */ - $handler->display->display_options['fields']['field_imp_teacher']['id'] = 'field_imp_teacher'; - $handler->display->display_options['fields']['field_imp_teacher']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_teacher']['field'] = 'field_imp_teacher'; - $handler->display->display_options['fields']['field_imp_teacher']['label'] = 'Teacher(s)'; - /* Field: Content: Favorite widget */ - $handler->display->display_options['fields']['favorite_widget']['id'] = 'favorite_widget'; - $handler->display->display_options['fields']['favorite_widget']['table'] = 'views_entity_node'; - $handler->display->display_options['fields']['favorite_widget']['field'] = 'favorite_widget'; - $handler->display->display_options['fields']['favorite_widget']['label'] = 'Favorites'; - $handler->display->display_options['fields']['favorite_widget']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['favorite_widget']['link_to_entity'] = 0; - /* Sort criterion: Search: Relevance */ - $handler->display->display_options['sorts']['search_api_relevance']['id'] = 'search_api_relevance'; - $handler->display->display_options['sorts']['search_api_relevance']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['sorts']['search_api_relevance']['field'] = 'search_api_relevance'; - $handler->display->display_options['sorts']['search_api_relevance']['order'] = 'DESC'; - /* Filter criterion: Indexed Multilingual Content: Academic year */ - $handler->display->display_options['filters']['academic_year']['id'] = 'academic_year'; - $handler->display->display_options['filters']['academic_year']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['filters']['academic_year']['field'] = 'academic_year'; - $handler->display->display_options['filters']['academic_year']['group'] = 1; - $handler->display->display_options['filters']['academic_year']['exposed'] = TRUE; - $handler->display->display_options['filters']['academic_year']['expose']['operator_id'] = 'academic_year_op'; - $handler->display->display_options['filters']['academic_year']['expose']['label'] = 'Academic year'; - $handler->display->display_options['filters']['academic_year']['expose']['operator'] = 'academic_year_op'; - $handler->display->display_options['filters']['academic_year']['expose']['identifier'] = 'academic_year'; - $handler->display->display_options['filters']['academic_year']['expose']['required'] = TRUE; - $handler->display->display_options['filters']['academic_year']['expose']['remember_roles'] = array( - 2 => '2', - 1 => 0, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - ); - /* Filter criterion: Indexed Multilingual Content: Combined fulltext */ - $handler->display->display_options['filters']['search_api_aggregation_1']['id'] = 'search_api_aggregation_1'; - $handler->display->display_options['filters']['search_api_aggregation_1']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['filters']['search_api_aggregation_1']['field'] = 'search_api_aggregation_1'; - $handler->display->display_options['filters']['search_api_aggregation_1']['group'] = 1; - $handler->display->display_options['filters']['search_api_aggregation_1']['exposed'] = TRUE; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['operator_id'] = 'search_api_aggregation_1_op'; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['label'] = 'Search by keyword'; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['description'] = 'If you want to see all the courses, leave the search field empty.'; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['operator'] = 'search_api_aggregation_1_op'; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['identifier'] = 'search'; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['remember_roles'] = array( - 2 => '2', - 1 => 0, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - ); - /* Filter criterion: Indexed Multilingual Content: Item language */ - $handler->display->display_options['filters']['search_api_language']['id'] = 'search_api_language'; - $handler->display->display_options['filters']['search_api_language']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['filters']['search_api_language']['field'] = 'search_api_language'; - $handler->display->display_options['filters']['search_api_language']['value'] = array( - 'current' => 'current', - ); - $handler->display->display_options['filters']['search_api_language']['group'] = 1; - /* Filter criterion: Indexed Multilingual Content: Keywords */ - $handler->display->display_options['filters']['field_imp_keywords']['id'] = 'field_imp_keywords'; - $handler->display->display_options['filters']['field_imp_keywords']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['filters']['field_imp_keywords']['field'] = 'field_imp_keywords'; - $handler->display->display_options['filters']['field_imp_keywords']['value'] = 'genetiikka'; - $handler->display->display_options['filters']['field_imp_keywords']['group'] = 1; - /* Filter criterion: Indexed Multilingual Content: Hierarchy position */ - $handler->display->display_options['filters']['field_hierarchy_position']['id'] = 'field_hierarchy_position'; - $handler->display->display_options['filters']['field_hierarchy_position']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['filters']['field_hierarchy_position']['field'] = 'field_hierarchy_position'; - $handler->display->display_options['filters']['field_hierarchy_position']['value'] = 'root'; - $handler->display->display_options['filters']['field_hierarchy_position']['group'] = 1; - - /* Display: Desktop */ - $handler = $view->new_display('page', 'Desktop', 'desktop'); - $handler->display->display_options['display_description'] = 'Table'; - $handler->display->display_options['exposed_block'] = TRUE; - $handler->display->display_options['path'] = 'genetics/search'; - - /* Display: Facets block */ - $handler = $view->new_display('search_api_views_facets_block', 'Facets block', 'search_api_views_facets_block_1'); - $handler->display->display_options['pager']['type'] = 'some'; - $handler->display->display_options['block_description'] = 'Genetics search facets'; - $handler->display->display_options['linked_path'] = 'genetics/search'; - $handler->display->display_options['facet_field'] = 'nid'; - $handler->display->display_options['hide_block'] = 1; - $translatables['uhc_search'] = array( - t('Master'), - t('more'), - t('Show results'), - t('Clear selections x'), - t('Sorting:'), - t('Asc'), - t('Desc'), - t('Show:'), - t('- All -'), - t('Offset'), - t('« first'), - t('‹ previous'), - t('next ›'), - t('last »'), - t('Theme'), - t('Type of teaching'), - t('Method of study'), - t('Start month'), - t('Teaching language'), - t('

Results (@total)

'), - t('No results'), - t('ID'), - t('[field_imp_reference_to_courses_field_course_course_number]'), - t('Name'), - t('[title_field]'), - t('Begin date'), - t('Teacher(s)'), - t('Favorites'), - t('Academic year'), - t('Search by keyword'), - t('If you want to see all the courses, leave the search field empty.'), - t('Desktop'), - t('Table'), - t('Facets block'), - t('Genetics search facets'), - ); - $export['uhc_search'] = $view; - - return $export; -} diff --git a/modules/uhc_leiki/uhc_leiki.info b/modules/uhc_leiki/uhc_leiki.info index d337e7cd..566b8208 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.104 +version = 7.x-1.105 project = uhc_leiki diff --git a/modules/uhc_liftups/uhc_liftups.features.field_base.inc b/modules/uhc_liftups/uhc_liftups.features.field_base.inc index 6242b6e1..5b1c2de8 100644 --- a/modules/uhc_liftups/uhc_liftups.features.field_base.inc +++ b/modules/uhc_liftups/uhc_liftups.features.field_base.inc @@ -192,9 +192,7 @@ function uhc_liftups_field_default_field_bases() { 'module' => 'list', 'settings' => array( 'allowed_values' => array( - 'genetics' => 'Genetics', 'openuniversity' => 'Open University', - 'biosciences' => 'Molecular biosciences', ), 'allowed_values_function' => '', 'entity_translation_sync' => FALSE, diff --git a/modules/uhc_liftups/uhc_liftups.features.field_instance.inc b/modules/uhc_liftups/uhc_liftups.features.field_instance.inc index eeec0734..a49ca5b9 100644 --- a/modules/uhc_liftups/uhc_liftups.features.field_instance.inc +++ b/modules/uhc_liftups/uhc_liftups.features.field_instance.inc @@ -27,6 +27,7 @@ function uhc_liftups_field_default_field_instances() { 'label' => 'above', 'module' => 'entityreference', 'settings' => array( + 'bypass_access' => FALSE, 'field_multiple_limit' => -1, 'field_multiple_limit_offset' => 0, 'field_multiple_limit_order' => 0, diff --git a/modules/uhc_liftups/uhc_liftups.info b/modules/uhc_liftups/uhc_liftups.info index 188d3214..84dfa84f 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.104 +version = 7.x-1.105 project = uhc_liftups dependencies[] = ctools dependencies[] = date diff --git a/modules/uhc_liftups/uhc_liftups.strongarm.inc b/modules/uhc_liftups/uhc_liftups.strongarm.inc index 05ecf2e2..c5cc2982 100644 --- a/modules/uhc_liftups/uhc_liftups.strongarm.inc +++ b/modules/uhc_liftups/uhc_liftups.strongarm.inc @@ -142,6 +142,9 @@ function uhc_liftups_strongarm() { 'meta_information' => array( 'custom_settings' => FALSE, ), + 'teaser_accordion' => array( + 'custom_settings' => FALSE, + ), 'revision' => array( 'custom_settings' => FALSE, ), diff --git a/modules/uhc_liftups/uhc_liftups.views_default.inc b/modules/uhc_liftups/uhc_liftups.views_default.inc index af853893..9ab29b49 100644 --- a/modules/uhc_liftups/uhc_liftups.views_default.inc +++ b/modules/uhc_liftups/uhc_liftups.views_default.inc @@ -307,41 +307,6 @@ function uhc_liftups_views_default_views() { 'und' => 'und', ); - /* Display: Latest genetics */ - $handler = $view->new_display('block', 'Latest genetics', 'latest'); - $handler->display->display_options['display_description'] = 'Three lifted courses'; - $handler->display->display_options['defaults']['filter_groups'] = FALSE; - $handler->display->display_options['defaults']['filters'] = FALSE; - /* Filter criterion: Content: Published */ - $handler->display->display_options['filters']['status']['id'] = 'status'; - $handler->display->display_options['filters']['status']['table'] = 'node'; - $handler->display->display_options['filters']['status']['field'] = 'status'; - $handler->display->display_options['filters']['status']['value'] = 1; - $handler->display->display_options['filters']['status']['group'] = 1; - $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE; - /* Filter criterion: Content: Type */ - $handler->display->display_options['filters']['type']['id'] = 'type'; - $handler->display->display_options['filters']['type']['table'] = 'node'; - $handler->display->display_options['filters']['type']['field'] = 'type'; - $handler->display->display_options['filters']['type']['value'] = array( - 'course_liftup' => 'course_liftup', - ); - /* Filter criterion: Content: Language */ - $handler->display->display_options['filters']['language']['id'] = 'language'; - $handler->display->display_options['filters']['language']['table'] = 'node'; - $handler->display->display_options['filters']['language']['field'] = 'language'; - $handler->display->display_options['filters']['language']['value'] = array( - '***CURRENT_LANGUAGE***' => '***CURRENT_LANGUAGE***', - 'und' => 'und', - ); - /* Filter criterion: Content: Liftup section (field_liftup_section) */ - $handler->display->display_options['filters']['field_liftup_section_value']['id'] = 'field_liftup_section_value'; - $handler->display->display_options['filters']['field_liftup_section_value']['table'] = 'field_data_field_liftup_section'; - $handler->display->display_options['filters']['field_liftup_section_value']['field'] = 'field_liftup_section_value'; - $handler->display->display_options['filters']['field_liftup_section_value']['value'] = array( - 'genetics' => 'genetics', - ); - /* Display: Latest open university */ $handler = $view->new_display('block', 'Latest open university', 'block_1'); $handler->display->display_options['display_description'] = 'Three lifted courses'; @@ -488,154 +453,6 @@ function uhc_liftups_views_default_views() { $handler->display->display_options['filters']['field_liftup_section_value']['value'] = array( 'openuniversity' => 'openuniversity', ); - - /* Display: Latest biosciences */ - $handler = $view->new_display('block', 'Latest biosciences', 'block_2'); - $handler->display->display_options['display_description'] = 'Three lifted courses'; - $handler->display->display_options['defaults']['fields'] = FALSE; - /* Field: Content: Path */ - $handler->display->display_options['fields']['path']['id'] = 'path'; - $handler->display->display_options['fields']['path']['table'] = 'node'; - $handler->display->display_options['fields']['path']['field'] = 'path'; - $handler->display->display_options['fields']['path']['relationship'] = 'field_courseliftup_courseimp_target_id'; - $handler->display->display_options['fields']['path']['label'] = ''; - $handler->display->display_options['fields']['path']['exclude'] = TRUE; - $handler->display->display_options['fields']['path']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['path']['absolute'] = TRUE; - /* Field: Content: Image */ - $handler->display->display_options['fields']['field_courseliftup_image']['id'] = 'field_courseliftup_image'; - $handler->display->display_options['fields']['field_courseliftup_image']['table'] = 'field_data_field_courseliftup_image'; - $handler->display->display_options['fields']['field_courseliftup_image']['field'] = 'field_courseliftup_image'; - $handler->display->display_options['fields']['field_courseliftup_image']['label'] = ''; - $handler->display->display_options['fields']['field_courseliftup_image']['alter']['make_link'] = TRUE; - $handler->display->display_options['fields']['field_courseliftup_image']['alter']['path'] = '[path]'; - $handler->display->display_options['fields']['field_courseliftup_image']['element_type'] = '0'; - $handler->display->display_options['fields']['field_courseliftup_image']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_courseliftup_image']['element_wrapper_class'] = 'box-story__image'; - $handler->display->display_options['fields']['field_courseliftup_image']['element_default_classes'] = FALSE; - $handler->display->display_options['fields']['field_courseliftup_image']['click_sort_column'] = 'fid'; - $handler->display->display_options['fields']['field_courseliftup_image']['settings'] = array( - 'image_style' => 'liftup_322_x_190', - 'image_link' => '', - ); - /* Field: Content: Theme */ - $handler->display->display_options['fields']['field_course_theme']['id'] = 'field_course_theme'; - $handler->display->display_options['fields']['field_course_theme']['table'] = 'field_data_field_course_theme'; - $handler->display->display_options['fields']['field_course_theme']['field'] = 'field_course_theme'; - $handler->display->display_options['fields']['field_course_theme']['relationship'] = 'field_imp_reference_to_courses_target_id'; - $handler->display->display_options['fields']['field_course_theme']['label'] = ''; - $handler->display->display_options['fields']['field_course_theme']['exclude'] = TRUE; - $handler->display->display_options['fields']['field_course_theme']['element_type'] = '0'; - $handler->display->display_options['fields']['field_course_theme']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_course_theme']['element_wrapper_type'] = '0'; - $handler->display->display_options['fields']['field_course_theme']['element_default_classes'] = FALSE; - $handler->display->display_options['fields']['field_course_theme']['empty'] = 'Molecular Biosciences'; - $handler->display->display_options['fields']['field_course_theme']['type'] = 'taxonomy_term_reference_plain'; - $handler->display->display_options['fields']['field_course_theme']['settings'] = array( - 'field_multiple_limit' => '-1', - 'field_multiple_limit_offset' => '0', - ); - $handler->display->display_options['fields']['field_course_theme']['delta_offset'] = '0'; - /* Field: Content: Begin date */ - $handler->display->display_options['fields']['field_imp_begin_date']['id'] = 'field_imp_begin_date'; - $handler->display->display_options['fields']['field_imp_begin_date']['table'] = 'field_data_field_imp_begin_date'; - $handler->display->display_options['fields']['field_imp_begin_date']['field'] = 'field_imp_begin_date'; - $handler->display->display_options['fields']['field_imp_begin_date']['relationship'] = 'field_courseliftup_courseimp_target_id'; - $handler->display->display_options['fields']['field_imp_begin_date']['label'] = ''; - $handler->display->display_options['fields']['field_imp_begin_date']['exclude'] = TRUE; - $handler->display->display_options['fields']['field_imp_begin_date']['element_type'] = '0'; - $handler->display->display_options['fields']['field_imp_begin_date']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_imp_begin_date']['element_wrapper_type'] = '0'; - $handler->display->display_options['fields']['field_imp_begin_date']['element_default_classes'] = FALSE; - $handler->display->display_options['fields']['field_imp_begin_date']['settings'] = array( - 'format_type' => 'short_date_only', - 'fromto' => 'both', - 'multiple_number' => '', - 'multiple_from' => '', - 'multiple_to' => '', - ); - /* Field: Global: Custom text */ - $handler->display->display_options['fields']['nothing']['id'] = 'nothing'; - $handler->display->display_options['fields']['nothing']['table'] = 'views'; - $handler->display->display_options['fields']['nothing']['field'] = 'nothing'; - $handler->display->display_options['fields']['nothing']['label'] = ''; - $handler->display->display_options['fields']['nothing']['alter']['text'] = '[field_imp_begin_date][field_course_theme]'; - $handler->display->display_options['fields']['nothing']['element_type'] = '0'; - $handler->display->display_options['fields']['nothing']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['nothing']['element_wrapper_type'] = 'div'; - $handler->display->display_options['fields']['nothing']['element_wrapper_class'] = 'box-story__topical'; - $handler->display->display_options['fields']['nothing']['element_default_classes'] = FALSE; - /* Field: Content: Title */ - $handler->display->display_options['fields']['title']['id'] = 'title'; - $handler->display->display_options['fields']['title']['table'] = 'node'; - $handler->display->display_options['fields']['title']['field'] = 'title'; - $handler->display->display_options['fields']['title']['label'] = ''; - $handler->display->display_options['fields']['title']['alter']['path'] = '[field_imp_canonical_url]'; - $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE; - $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE; - $handler->display->display_options['fields']['title']['element_type'] = 'h4'; - $handler->display->display_options['fields']['title']['element_class'] = 'box-story__title'; - $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['title']['element_wrapper_type'] = '0'; - $handler->display->display_options['fields']['title']['element_default_classes'] = FALSE; - $handler->display->display_options['fields']['title']['link_to_node'] = FALSE; - /* Field: Content: Description */ - $handler->display->display_options['fields']['field_courseliftup_descripion']['id'] = 'field_courseliftup_descripion'; - $handler->display->display_options['fields']['field_courseliftup_descripion']['table'] = 'field_data_field_courseliftup_descripion'; - $handler->display->display_options['fields']['field_courseliftup_descripion']['field'] = 'field_courseliftup_descripion'; - $handler->display->display_options['fields']['field_courseliftup_descripion']['label'] = ''; - $handler->display->display_options['fields']['field_courseliftup_descripion']['alter']['strip_tags'] = TRUE; - $handler->display->display_options['fields']['field_courseliftup_descripion']['element_type'] = 'div'; - $handler->display->display_options['fields']['field_courseliftup_descripion']['element_class'] = 'box-story__content'; - $handler->display->display_options['fields']['field_courseliftup_descripion']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_courseliftup_descripion']['element_wrapper_type'] = '0'; - $handler->display->display_options['fields']['field_courseliftup_descripion']['element_default_classes'] = FALSE; - $handler->display->display_options['fields']['field_courseliftup_descripion']['settings'] = array( - 'trim_length' => '120', - ); - /* Field: Content: Link */ - $handler->display->display_options['fields']['view_node']['id'] = 'view_node'; - $handler->display->display_options['fields']['view_node']['table'] = 'views_entity_node'; - $handler->display->display_options['fields']['view_node']['field'] = 'view_node'; - $handler->display->display_options['fields']['view_node']['relationship'] = 'field_courseliftup_courseimp_target_id'; - $handler->display->display_options['fields']['view_node']['label'] = ''; - $handler->display->display_options['fields']['view_node']['element_type'] = '0'; - $handler->display->display_options['fields']['view_node']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['view_node']['element_wrapper_type'] = 'div'; - $handler->display->display_options['fields']['view_node']['element_wrapper_class'] = 'box-story__link button--action icon--arrow-right theme-transparent'; - $handler->display->display_options['fields']['view_node']['element_default_classes'] = FALSE; - $handler->display->display_options['fields']['view_node']['text'] = 'Read more'; - $handler->display->display_options['defaults']['filter_groups'] = FALSE; - $handler->display->display_options['defaults']['filters'] = FALSE; - /* Filter criterion: Content: Published */ - $handler->display->display_options['filters']['status']['id'] = 'status'; - $handler->display->display_options['filters']['status']['table'] = 'node'; - $handler->display->display_options['filters']['status']['field'] = 'status'; - $handler->display->display_options['filters']['status']['value'] = 1; - $handler->display->display_options['filters']['status']['group'] = 1; - $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE; - /* Filter criterion: Content: Type */ - $handler->display->display_options['filters']['type']['id'] = 'type'; - $handler->display->display_options['filters']['type']['table'] = 'node'; - $handler->display->display_options['filters']['type']['field'] = 'type'; - $handler->display->display_options['filters']['type']['value'] = array( - 'course_liftup' => 'course_liftup', - ); - /* Filter criterion: Content: Language */ - $handler->display->display_options['filters']['language']['id'] = 'language'; - $handler->display->display_options['filters']['language']['table'] = 'node'; - $handler->display->display_options['filters']['language']['field'] = 'language'; - $handler->display->display_options['filters']['language']['value'] = array( - '***CURRENT_LANGUAGE***' => '***CURRENT_LANGUAGE***', - 'und' => 'und', - ); - /* Filter criterion: Content: Liftup section (field_liftup_section) */ - $handler->display->display_options['filters']['field_liftup_section_value']['id'] = 'field_liftup_section_value'; - $handler->display->display_options['filters']['field_liftup_section_value']['table'] = 'field_data_field_liftup_section'; - $handler->display->display_options['filters']['field_liftup_section_value']['field'] = 'field_liftup_section_value'; - $handler->display->display_options['filters']['field_liftup_section_value']['value'] = array( - 'biosciences' => 'biosciences', - ); $translatables['uhc_course_liftups'] = array( t('Master'), t('Highlights of upcoming courses'), @@ -650,12 +467,9 @@ function uhc_liftups_views_default_views() { t('Genetics'), t('[field_imp_begin_date][field_course_theme]'), t('Read more'), - t('Latest genetics'), - t('Three lifted courses'), t('Latest open university'), + t('Three lifted courses'), t('Open University'), - t('Latest biosciences'), - t('Molecular Biosciences'), ); $export['uhc_course_liftups'] = $view; @@ -689,7 +503,7 @@ function uhc_liftups_views_default_views() { $handler->display->display_options['header']['area_text_custom']['table'] = 'views'; $handler->display->display_options['header']['area_text_custom']['field'] = 'area_text_custom'; $handler->display->display_options['header']['area_text_custom']['label'] = 'h1 title'; - $handler->display->display_options['header']['area_text_custom']['content'] = '

Courses in genetics

'; + $handler->display->display_options['header']['area_text_custom']['content'] = '

Open University course search

'; /* Field: Content: Link to */ $handler->display->display_options['fields']['field_liftup_link_to']['id'] = 'field_liftup_link_to'; $handler->display->display_options['fields']['field_liftup_link_to']['table'] = 'field_data_field_liftup_link_to'; @@ -774,45 +588,6 @@ function uhc_liftups_views_default_views() { 'und' => 'und', ); - /* Display: Genetics parade liftup */ - $handler = $view->new_display('block', 'Genetics parade liftup', 'main'); - $handler->display->display_options['display_description'] = 'Used in landingpage\'s primary liftup (only one).'; - $handler->display->display_options['defaults']['pager'] = FALSE; - $handler->display->display_options['pager']['type'] = 'some'; - $handler->display->display_options['pager']['options']['items_per_page'] = '1'; - $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['defaults']['filter_groups'] = FALSE; - $handler->display->display_options['defaults']['filters'] = FALSE; - /* Filter criterion: Content: Published */ - $handler->display->display_options['filters']['status']['id'] = 'status'; - $handler->display->display_options['filters']['status']['table'] = 'node'; - $handler->display->display_options['filters']['status']['field'] = 'status'; - $handler->display->display_options['filters']['status']['value'] = 1; - $handler->display->display_options['filters']['status']['group'] = 1; - $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE; - /* Filter criterion: Content: Type */ - $handler->display->display_options['filters']['type']['id'] = 'type'; - $handler->display->display_options['filters']['type']['table'] = 'node'; - $handler->display->display_options['filters']['type']['field'] = 'type'; - $handler->display->display_options['filters']['type']['value'] = array( - 'liftup' => 'liftup', - ); - /* Filter criterion: Content: Language */ - $handler->display->display_options['filters']['language']['id'] = 'language'; - $handler->display->display_options['filters']['language']['table'] = 'node'; - $handler->display->display_options['filters']['language']['field'] = 'language'; - $handler->display->display_options['filters']['language']['value'] = array( - '***CURRENT_LANGUAGE***' => '***CURRENT_LANGUAGE***', - 'und' => 'und', - ); - /* Filter criterion: Content: Liftup section (field_liftup_section) */ - $handler->display->display_options['filters']['field_liftup_section_value']['id'] = 'field_liftup_section_value'; - $handler->display->display_options['filters']['field_liftup_section_value']['table'] = 'field_data_field_liftup_section'; - $handler->display->display_options['filters']['field_liftup_section_value']['field'] = 'field_liftup_section_value'; - $handler->display->display_options['filters']['field_liftup_section_value']['value'] = array( - 'genetics' => 'genetics', - ); - /* Display: Open university parade liftup */ $handler = $view->new_display('block', 'Open university parade liftup', 'block_1'); $handler->display->display_options['display_description'] = 'Used in landingpage\'s primary liftup (only one).'; @@ -820,13 +595,6 @@ function uhc_liftups_views_default_views() { $handler->display->display_options['pager']['type'] = 'some'; $handler->display->display_options['pager']['options']['items_per_page'] = '1'; $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['defaults']['header'] = FALSE; - /* Header: Global: Unfiltered text */ - $handler->display->display_options['header']['area_text_custom']['id'] = 'area_text_custom'; - $handler->display->display_options['header']['area_text_custom']['table'] = 'views'; - $handler->display->display_options['header']['area_text_custom']['field'] = 'area_text_custom'; - $handler->display->display_options['header']['area_text_custom']['label'] = 'h1 title'; - $handler->display->display_options['header']['area_text_custom']['content'] = '

Open University course search

'; $handler->display->display_options['defaults']['filter_groups'] = FALSE; $handler->display->display_options['defaults']['filters'] = FALSE; /* Filter criterion: Content: Published */ @@ -858,52 +626,6 @@ function uhc_liftups_views_default_views() { $handler->display->display_options['filters']['field_liftup_section_value']['value'] = array( 'openuniversity' => 'openuniversity', ); - - /* Display: Biosciences parade liftup */ - $handler = $view->new_display('block', 'Biosciences parade liftup', 'block_2'); - $handler->display->display_options['display_description'] = 'Used in landingpage\'s primary liftup (only one).'; - $handler->display->display_options['defaults']['pager'] = FALSE; - $handler->display->display_options['pager']['type'] = 'some'; - $handler->display->display_options['pager']['options']['items_per_page'] = '1'; - $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['defaults']['header'] = FALSE; - /* Header: Global: Unfiltered text */ - $handler->display->display_options['header']['area_text_custom']['id'] = 'area_text_custom'; - $handler->display->display_options['header']['area_text_custom']['table'] = 'views'; - $handler->display->display_options['header']['area_text_custom']['field'] = 'area_text_custom'; - $handler->display->display_options['header']['area_text_custom']['label'] = 'h1 title'; - $handler->display->display_options['header']['area_text_custom']['content'] = '

Courses in Molecular Biosciences

'; - $handler->display->display_options['defaults']['filter_groups'] = FALSE; - $handler->display->display_options['defaults']['filters'] = FALSE; - /* Filter criterion: Content: Published */ - $handler->display->display_options['filters']['status']['id'] = 'status'; - $handler->display->display_options['filters']['status']['table'] = 'node'; - $handler->display->display_options['filters']['status']['field'] = 'status'; - $handler->display->display_options['filters']['status']['value'] = 1; - $handler->display->display_options['filters']['status']['group'] = 1; - $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE; - /* Filter criterion: Content: Type */ - $handler->display->display_options['filters']['type']['id'] = 'type'; - $handler->display->display_options['filters']['type']['table'] = 'node'; - $handler->display->display_options['filters']['type']['field'] = 'type'; - $handler->display->display_options['filters']['type']['value'] = array( - 'liftup' => 'liftup', - ); - /* Filter criterion: Content: Language */ - $handler->display->display_options['filters']['language']['id'] = 'language'; - $handler->display->display_options['filters']['language']['table'] = 'node'; - $handler->display->display_options['filters']['language']['field'] = 'language'; - $handler->display->display_options['filters']['language']['value'] = array( - '***CURRENT_LANGUAGE***' => '***CURRENT_LANGUAGE***', - 'und' => 'und', - ); - /* Filter criterion: Content: Liftup section (field_liftup_section) */ - $handler->display->display_options['filters']['field_liftup_section_value']['id'] = 'field_liftup_section_value'; - $handler->display->display_options['filters']['field_liftup_section_value']['table'] = 'field_data_field_liftup_section'; - $handler->display->display_options['filters']['field_liftup_section_value']['field'] = 'field_liftup_section_value'; - $handler->display->display_options['filters']['field_liftup_section_value']['value'] = array( - 'biosciences' => 'biosciences', - ); $translatables['uhc_liftups'] = array( t('Master'), t('more'), @@ -913,13 +635,9 @@ function uhc_liftups_views_default_views() { t('Asc'), t('Desc'), t('h1 title'), - t('

Courses in genetics

'), - t('Genetics parade liftup'), - t('Used in landingpage\'s primary liftup (only one).'), - t('Open university parade liftup'), t('

Open University course search

'), - t('Biosciences parade liftup'), - t('

Courses in Molecular Biosciences

'), + t('Open university parade liftup'), + t('Used in landingpage\'s primary liftup (only one).'), ); $export['uhc_liftups'] = $view; diff --git a/modules/uhc_locale/uhc_locale.info b/modules/uhc_locale/uhc_locale.info index 5d6eb242..17e6c125 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.104 +version = 7.x-1.105 project = uhc_locale dependencies[] = ctools dependencies[] = features 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 14f79e22..06fdb993 100644 --- a/modules/uhc_migrate_message_report/uhc_migrate_message_report.info +++ b/modules/uhc_migrate_message_report/uhc_migrate_message_report.info @@ -2,6 +2,6 @@ name = UHC Migrate Message Report description = Reports of migrate messages. core = 7.x package = UHC -version = 7.x-1.104 +version = 7.x-1.105 project = uhc_migrate_message_report dependencies[] = uhc_course_implementation_source diff --git a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.context.inc b/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.context.inc deleted file mode 100644 index c97875a4..00000000 --- a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.context.inc +++ /dev/null @@ -1,96 +0,0 @@ -disabled = FALSE; /* Edit this to true to make a default context disabled initially */ - $context->api_version = 3; - $context->name = 'portal_main_biosciences'; - $context->description = 'Portal main page (Biosciences)'; - $context->tag = 'section'; - $context->conditions = array( - 'path' => array( - 'values' => array( - 'molecular-biosciences' => 'molecular-biosciences', - ), - ), - ); - $context->reactions = array( - 'block' => array( - 'blocks' => array( - 'views-uhc_liftups-block_2' => array( - 'module' => 'views', - 'delta' => 'uhc_liftups-block_2', - 'region' => 'content', - 'weight' => '-9', - ), - 'views-ddc12e0f6574edc3850aacc947821543' => array( - 'module' => 'views', - 'delta' => 'ddc12e0f6574edc3850aacc947821543', - 'region' => 'content', - 'weight' => '-8', - ), - 'views-uhc_course_liftups-block_2' => array( - 'module' => 'views', - 'delta' => 'uhc_course_liftups-block_2', - 'region' => 'content_suffix', - 'weight' => '-10', - ), - ), - ), - 'theme_html' => array( - 'class' => 'search-main-page', - ), - ); - $context->condition_mode = 0; - - // Translatables - // Included for use with string extractors like potx. - t('Portal main page (Biosciences)'); - t('section'); - $export['portal_main_biosciences'] = $context; - - $context = new stdClass(); - $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */ - $context->api_version = 3; - $context->name = 'portal_search_results_biosciences'; - $context->description = 'Portal search results page (biosciences)'; - $context->tag = 'section'; - $context->conditions = array( - 'path' => array( - 'values' => array( - 'molecular-biosciences/search' => 'molecular-biosciences/search', - 'molecular-biosciences/search/*' => 'molecular-biosciences/search/*', - ), - ), - ); - $context->reactions = array( - 'block' => array( - 'blocks' => array( - 'views-ddc12e0f6574edc3850aacc947821543' => array( - 'module' => 'views', - 'delta' => 'ddc12e0f6574edc3850aacc947821543', - 'region' => 'content', - 'weight' => '-10', - ), - ), - ), - ); - $context->condition_mode = 0; - - // Translatables - // Included for use with string extractors like potx. - t('Portal search results page (biosciences)'); - t('section'); - $export['portal_search_results_biosciences'] = $context; - - return $export; -} diff --git a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.features.inc b/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.features.inc deleted file mode 100644 index 447cc0d1..00000000 --- a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.features.inc +++ /dev/null @@ -1,21 +0,0 @@ - "3"); - } -} - -/** - * Implements hook_views_api(). - */ -function uhc_molecular_biosciences_views_api($module = NULL, $api = NULL) { - return array("api" => "3.0"); -} diff --git a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.info b/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.info index 7d0e1ab8..deae1541 100644 --- a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.info +++ b/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.info @@ -1,17 +1,6 @@ name = UHC Molecular Biosciences -description = Provides ability to have molecular biosciences section in the site. +description = This module is deprecated. core = 7.x package = UHC -version = 7.x-1.104 +version = 7.x-1.105 project = uhc_molecular_biosciences -dependencies[] = context -dependencies[] = ctools -dependencies[] = search_api_views -dependencies[] = views -dependencies[] = views_block_area -features[context][] = portal_main_biosciences -features[context][] = portal_search_results_biosciences -features[ctools][] = context:context:3 -features[ctools][] = views:views_default:3.0 -features[features_api][] = api:2 -features[views_view][] = uhc_search_biosciences diff --git a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.module b/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.module index ce76720e..0be23a6b 100644 --- a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.module +++ b/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.module @@ -1,31 +1,5 @@ 'uhc_molecular_biosciences_page', - 'access callback' => TRUE, - ); - return $items; -} - -/** - * Implementation of hook_page(). - */ -function uhc_molecular_biosciences_page() { - return ' '; -} diff --git a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.views_default.inc b/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.views_default.inc deleted file mode 100644 index c8daa4c1..00000000 --- a/modules/uhc_molecular_biosciences/uhc_molecular_biosciences.views_default.inc +++ /dev/null @@ -1,347 +0,0 @@ -name = 'uhc_search_biosciences'; - $view->description = ''; - $view->tag = 'default'; - $view->base_table = 'search_api_index_uhc_portal'; - $view->human_name = 'UHC search (Biosciences)'; - $view->core = 7; - $view->api_version = '3.0'; - $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */ - - /* Display: Master */ - $handler = $view->new_display('default', 'Master', 'default'); - $handler->display->display_options['css_class'] = 'course-search'; - $handler->display->display_options['use_more_always'] = FALSE; - $handler->display->display_options['link_display'] = 'desktop'; - $handler->display->display_options['access']['type'] = 'none'; - $handler->display->display_options['cache']['type'] = 'none'; - $handler->display->display_options['query']['type'] = 'views_query'; - $handler->display->display_options['exposed_form']['type'] = 'input_required'; - $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Show results'; - $handler->display->display_options['exposed_form']['options']['reset_button'] = TRUE; - $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Clear selections x'; - $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Sorting:'; - $handler->display->display_options['exposed_form']['options']['expose_sort_order'] = FALSE; - $handler->display->display_options['exposed_form']['options']['text_input_required'] = ''; - $handler->display->display_options['exposed_form']['options']['text_input_required_format'] = 'filtered_html'; - $handler->display->display_options['pager']['type'] = 'full'; - $handler->display->display_options['pager']['options']['items_per_page'] = '16'; - $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['pager']['options']['id'] = '0'; - $handler->display->display_options['pager']['options']['quantity'] = '9'; - $handler->display->display_options['style_plugin'] = 'table'; - $handler->display->display_options['style_options']['columns'] = array( - 'field_imp_reference_to_courses_url' => 'field_imp_reference_to_courses_url', - 'field_imp_reference_to_courses_field_course_course_number' => 'field_imp_reference_to_courses_field_course_course_number', - 'url' => 'url', - 'title_field' => 'title_field', - 'field_imp_reference_to_courses_field_course_type_of_teaching' => 'field_imp_reference_to_courses_field_course_type_of_teaching', - 'field_imp_method_of_study' => 'field_imp_method_of_study', - 'field_imp_teacher' => 'field_imp_teacher', - ); - $handler->display->display_options['style_options']['default'] = '-1'; - $handler->display->display_options['style_options']['info'] = array( - 'field_imp_reference_to_courses_url' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'field_imp_reference_to_courses_field_course_course_number' => array( - 'sortable' => 1, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'url' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'title_field' => array( - 'sortable' => 1, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'field_imp_reference_to_courses_field_course_type_of_teaching' => array( - 'sortable' => 1, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'field_imp_method_of_study' => array( - 'sortable' => 1, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'field_imp_teacher' => array( - 'sortable' => 1, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - ); - /* Header: Global: Block area */ - $handler->display->display_options['header']['block']['id'] = 'block'; - $handler->display->display_options['header']['block']['table'] = 'views'; - $handler->display->display_options['header']['block']['field'] = 'block'; - $handler->display->display_options['header']['block']['label'] = 'Theme'; - $handler->display->display_options['header']['block']['block_to_insert'] = 'facetapi:eahZtWygrbd0mW39GxTTrKpmT6NtmJd3'; - $handler->display->display_options['header']['block']['title'] = 'Theme'; - /* Header: Global: Block area */ - $handler->display->display_options['header']['block_1']['id'] = 'block_1'; - $handler->display->display_options['header']['block_1']['table'] = 'views'; - $handler->display->display_options['header']['block_1']['field'] = 'block'; - $handler->display->display_options['header']['block_1']['label'] = 'Type of teaching'; - $handler->display->display_options['header']['block_1']['block_to_insert'] = 'facetapi:ebLMT1Egl05afck7AKCq6EMM2B4VuGer'; - $handler->display->display_options['header']['block_1']['title'] = 'Type of teaching'; - /* Header: Global: Block area */ - $handler->display->display_options['header']['block_2']['id'] = 'block_2'; - $handler->display->display_options['header']['block_2']['table'] = 'views'; - $handler->display->display_options['header']['block_2']['field'] = 'block'; - $handler->display->display_options['header']['block_2']['label'] = 'Method of study'; - $handler->display->display_options['header']['block_2']['block_to_insert'] = 'facetapi:do4BdKvyCgpZP4td6B6GmQ8iCUJ40HBx'; - $handler->display->display_options['header']['block_2']['title'] = 'Method of study'; - /* Header: Global: Block area */ - $handler->display->display_options['header']['block_3']['id'] = 'block_3'; - $handler->display->display_options['header']['block_3']['table'] = 'views'; - $handler->display->display_options['header']['block_3']['field'] = 'block'; - $handler->display->display_options['header']['block_3']['label'] = 'Start month'; - $handler->display->display_options['header']['block_3']['block_to_insert'] = 'facetapi:cEQesYoZJTu7ITT2OD5RXHP0T0bqniOh'; - $handler->display->display_options['header']['block_3']['title'] = 'Start month'; - /* Header: Global: Block area */ - $handler->display->display_options['header']['block_5']['id'] = 'block_5'; - $handler->display->display_options['header']['block_5']['table'] = 'views'; - $handler->display->display_options['header']['block_5']['field'] = 'block'; - $handler->display->display_options['header']['block_5']['label'] = 'Teaching language'; - $handler->display->display_options['header']['block_5']['block_to_insert'] = 'facetapi:as918Au1kK03VaWu2iPYsRfNZ1iJWE7X'; - $handler->display->display_options['header']['block_5']['title'] = 'Teaching language'; - /* Header: Global: Result summary */ - $handler->display->display_options['header']['result']['id'] = 'result'; - $handler->display->display_options['header']['result']['table'] = 'views'; - $handler->display->display_options['header']['result']['field'] = 'result'; - $handler->display->display_options['header']['result']['content'] = '

Results (@total)

'; - /* No results behavior: Global: Text area */ - $handler->display->display_options['empty']['area']['id'] = 'area'; - $handler->display->display_options['empty']['area']['table'] = 'views'; - $handler->display->display_options['empty']['area']['field'] = 'area'; - $handler->display->display_options['empty']['area']['empty'] = TRUE; - $handler->display->display_options['empty']['area']['content'] = 'No results'; - $handler->display->display_options['empty']['area']['format'] = 'plain_text'; - /* Field: Reference to course(s): URL (indexed) */ - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['id'] = 'field_imp_reference_to_courses_url'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['field'] = 'field_imp_reference_to_courses_url'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['label'] = ''; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['exclude'] = TRUE; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['display_as_link'] = FALSE; - $handler->display->display_options['fields']['field_imp_reference_to_courses_url']['link_to_entity'] = 0; - /* Field: Reference to course(s): Course number (indexed) */ - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_course_number']['id'] = 'field_imp_reference_to_courses_field_course_course_number'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_course_number']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_course_number']['field'] = 'field_imp_reference_to_courses_field_course_course_number'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_course_number']['label'] = 'ID'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_course_number']['alter']['text'] = '[field_imp_reference_to_courses_field_course_course_number]'; - /* Field: Indexed Multilingual Content: URL */ - $handler->display->display_options['fields']['url']['id'] = 'url'; - $handler->display->display_options['fields']['url']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['url']['field'] = 'url'; - $handler->display->display_options['fields']['url']['label'] = ''; - $handler->display->display_options['fields']['url']['exclude'] = TRUE; - $handler->display->display_options['fields']['url']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['url']['display_as_link'] = FALSE; - $handler->display->display_options['fields']['url']['link_to_entity'] = 0; - /* Field: Indexed Multilingual Content: Title */ - $handler->display->display_options['fields']['title_field']['id'] = 'title_field'; - $handler->display->display_options['fields']['title_field']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['title_field']['field'] = 'title_field'; - $handler->display->display_options['fields']['title_field']['label'] = 'Name'; - $handler->display->display_options['fields']['title_field']['alter']['alter_text'] = TRUE; - $handler->display->display_options['fields']['title_field']['alter']['text'] = '[title_field]'; - /* Field: Reference to course(s): Type of teaching (indexed) */ - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['id'] = 'field_imp_reference_to_courses_field_course_type_of_teaching'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['field'] = 'field_imp_reference_to_courses_field_course_type_of_teaching'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['label'] = 'Type of teaching'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['link_to_entity'] = 0; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['view_mode'] = 'full'; - $handler->display->display_options['fields']['field_imp_reference_to_courses_field_course_type_of_teaching']['bypass_access'] = 0; - /* Field: Indexed Multilingual Content: Method of study */ - $handler->display->display_options['fields']['field_imp_method_of_study']['id'] = 'field_imp_method_of_study'; - $handler->display->display_options['fields']['field_imp_method_of_study']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_method_of_study']['field'] = 'field_imp_method_of_study'; - $handler->display->display_options['fields']['field_imp_method_of_study']['link_to_entity'] = 0; - $handler->display->display_options['fields']['field_imp_method_of_study']['view_mode'] = 'full'; - $handler->display->display_options['fields']['field_imp_method_of_study']['bypass_access'] = 0; - /* Field: Indexed Multilingual Content: Begin date */ - $handler->display->display_options['fields']['field_imp_begin_date']['id'] = 'field_imp_begin_date'; - $handler->display->display_options['fields']['field_imp_begin_date']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_begin_date']['field'] = 'field_imp_begin_date'; - $handler->display->display_options['fields']['field_imp_begin_date']['settings'] = array( - 'format_type' => 'short_date_only', - 'fromto' => 'both', - 'multiple_number' => '', - 'multiple_from' => '', - 'multiple_to' => '', - ); - /* Field: Indexed Multilingual Content: Teacher */ - $handler->display->display_options['fields']['field_imp_teacher']['id'] = 'field_imp_teacher'; - $handler->display->display_options['fields']['field_imp_teacher']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['fields']['field_imp_teacher']['field'] = 'field_imp_teacher'; - $handler->display->display_options['fields']['field_imp_teacher']['label'] = 'Teacher(s)'; - /* Field: Content: Favorite widget */ - $handler->display->display_options['fields']['favorite_widget']['id'] = 'favorite_widget'; - $handler->display->display_options['fields']['favorite_widget']['table'] = 'views_entity_node'; - $handler->display->display_options['fields']['favorite_widget']['field'] = 'favorite_widget'; - $handler->display->display_options['fields']['favorite_widget']['label'] = 'Favorites'; - $handler->display->display_options['fields']['favorite_widget']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['favorite_widget']['link_to_entity'] = 0; - /* Sort criterion: Search: Relevance */ - $handler->display->display_options['sorts']['search_api_relevance']['id'] = 'search_api_relevance'; - $handler->display->display_options['sorts']['search_api_relevance']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['sorts']['search_api_relevance']['field'] = 'search_api_relevance'; - $handler->display->display_options['sorts']['search_api_relevance']['order'] = 'DESC'; - /* Filter criterion: Indexed Multilingual Content: Academic year */ - $handler->display->display_options['filters']['academic_year']['id'] = 'academic_year'; - $handler->display->display_options['filters']['academic_year']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['filters']['academic_year']['field'] = 'academic_year'; - $handler->display->display_options['filters']['academic_year']['group'] = 1; - $handler->display->display_options['filters']['academic_year']['exposed'] = TRUE; - $handler->display->display_options['filters']['academic_year']['expose']['operator_id'] = 'academic_year_op'; - $handler->display->display_options['filters']['academic_year']['expose']['label'] = 'Academic year'; - $handler->display->display_options['filters']['academic_year']['expose']['operator'] = 'academic_year_op'; - $handler->display->display_options['filters']['academic_year']['expose']['identifier'] = 'academic_year'; - $handler->display->display_options['filters']['academic_year']['expose']['required'] = TRUE; - $handler->display->display_options['filters']['academic_year']['expose']['remember_roles'] = array( - 2 => '2', - 1 => 0, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - ); - /* Filter criterion: Indexed Multilingual Content: Combined fulltext */ - $handler->display->display_options['filters']['search_api_aggregation_1']['id'] = 'search_api_aggregation_1'; - $handler->display->display_options['filters']['search_api_aggregation_1']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['filters']['search_api_aggregation_1']['field'] = 'search_api_aggregation_1'; - $handler->display->display_options['filters']['search_api_aggregation_1']['group'] = 1; - $handler->display->display_options['filters']['search_api_aggregation_1']['exposed'] = TRUE; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['operator_id'] = 'search_api_aggregation_1_op'; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['label'] = 'Search by keyword'; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['description'] = 'If you want to see all the courses, leave the search field empty.'; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['operator'] = 'search_api_aggregation_1_op'; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['identifier'] = 'search'; - $handler->display->display_options['filters']['search_api_aggregation_1']['expose']['remember_roles'] = array( - 2 => '2', - 1 => 0, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - ); - /* Filter criterion: Indexed Multilingual Content: Item language */ - $handler->display->display_options['filters']['search_api_language']['id'] = 'search_api_language'; - $handler->display->display_options['filters']['search_api_language']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['filters']['search_api_language']['field'] = 'search_api_language'; - $handler->display->display_options['filters']['search_api_language']['value'] = array( - 'current' => 'current', - ); - $handler->display->display_options['filters']['search_api_language']['group'] = 1; - /* Filter criterion: Indexed Multilingual Content: Keywords */ - $handler->display->display_options['filters']['field_imp_keywords']['id'] = 'field_imp_keywords'; - $handler->display->display_options['filters']['field_imp_keywords']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['filters']['field_imp_keywords']['field'] = 'field_imp_keywords'; - $handler->display->display_options['filters']['field_imp_keywords']['value'] = 'molekyylibiotieteet'; - $handler->display->display_options['filters']['field_imp_keywords']['group'] = 1; - - /* Display: Desktop */ - $handler = $view->new_display('page', 'Desktop', 'desktop'); - $handler->display->display_options['display_description'] = 'Table'; - $handler->display->display_options['defaults']['pager'] = FALSE; - $handler->display->display_options['pager']['type'] = 'full'; - $handler->display->display_options['pager']['options']['items_per_page'] = '10'; - $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['pager']['options']['id'] = '0'; - $handler->display->display_options['pager']['options']['quantity'] = '9'; - $handler->display->display_options['pager']['options']['expose']['items_per_page'] = TRUE; - $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = 'Show:'; - $handler->display->display_options['pager']['options']['expose']['items_per_page_options'] = '10, 20, 50, 100'; - $handler->display->display_options['exposed_block'] = TRUE; - $handler->display->display_options['path'] = 'molecular-biosciences/search'; - - /* Display: Facets block */ - $handler = $view->new_display('search_api_views_facets_block', 'Facets block', 'search_api_views_facets_block_1'); - $handler->display->display_options['pager']['type'] = 'some'; - $handler->display->display_options['block_description'] = 'Biosciences search facets'; - $handler->display->display_options['linked_path'] = 'molecular-biosciences/search'; - $handler->display->display_options['facet_field'] = 'nid'; - $handler->display->display_options['hide_block'] = 1; - $translatables['uhc_search_biosciences'] = array( - t('Master'), - t('more'), - t('Show results'), - t('Clear selections x'), - t('Sorting:'), - t('Asc'), - t('Desc'), - t('Items per page'), - t('- All -'), - t('Offset'), - t('« first'), - t('‹ previous'), - t('next ›'), - t('last »'), - t('Theme'), - t('Type of teaching'), - t('Method of study'), - t('Start month'), - t('Teaching language'), - t('

Results (@total)

'), - t('No results'), - t('ID'), - t('[field_imp_reference_to_courses_field_course_course_number]'), - t('Name'), - t('[title_field]'), - t('Begin date'), - t('Teacher(s)'), - t('Favorites'), - t('Academic year'), - t('Search by keyword'), - t('If you want to see all the courses, leave the search field empty.'), - t('Desktop'), - t('Table'), - t('Show:'), - t('Facets block'), - t('Biosciences search facets'), - ); - $export['uhc_search_biosciences'] = $view; - - return $export; -} diff --git a/modules/uhc_moodi/uhc_moodi.info b/modules/uhc_moodi/uhc_moodi.info index 754de108..6019fe39 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.104 +version = 7.x-1.105 project = uhc_moodi files[] = classes/UHCMoodiService.php diff --git a/modules/uhc_navigation/uhc_navigation.info b/modules/uhc_navigation/uhc_navigation.info index 7af265af..a475d57f 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.104 +version = 7.x-1.105 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 980a2e3d..7f352357 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.104 +version = 7.x-1.105 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 42b2c2ee..b5c7d869 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.104 +version = 7.x-1.105 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 407ee6aa..8b74b354 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.104 +version = 7.x-1.105 project = uhc_open_university dependencies[] = context dependencies[] = ctools diff --git a/modules/uhc_open_university/uhc_open_university.module b/modules/uhc_open_university/uhc_open_university.module index 64c661bc..0ee33adb 100644 --- a/modules/uhc_open_university/uhc_open_university.module +++ b/modules/uhc_open_university/uhc_open_university.module @@ -185,115 +185,6 @@ function uhc_open_university_is_open_university_context($node = NULL) { || uhc_open_university_is_open_university_course_or_implementation($node); } -/** - * Implements hook_form_alter(). - * - * Modifies open university view for two things: - * 1) Creates an custom sorting form element for picking sortable field and - * sorting type - * 2) Moves items per page element into shared container with above - * - * Note: This technical approach is initial version of this type of sorting. We - * probably consider something better in following tickets. - * - * @see uhc_open_university_form_apply_sort() - * @todo Move this elsewhere and update dependency in uhc_analytics_and_tracking - */ -function uhc_open_university_form_alter(&$form, &$form_state, $form_id) { - if (!in_array($form['#id'], uhc_search_portal_feature_search_view_exposed_form_ids())) { - return; - } - - // Default sorting: - // No search term: by title (ascending). - // With search term: by relevance (descending). - $sorting_default_value = empty($_GET['search']) ? 'title_field:asc' : 'search_api_relevance:desc'; - - $submit_on_change_script = 'this.form.submit();'; - $form['items_per_page']['#attributes']['onchange'][] = $submit_on_change_script; - $sort_options = array( - 'title_field:asc' => uhc_open_university_sorting_label('title_field:asc'), - 'title_field:desc' => uhc_open_university_sorting_label('title_field:desc'), - ); - // Only show relavance option in other than Open University search. - if ($form['#id'] != 'views-exposed-form-uhc-search-open-university-desktop') { - $sort_options['search_api_relevance:desc'] = uhc_open_university_sorting_label('search_api_relevance:desc'); - } - // Only show location options in Open University search. - if ($form['#id'] == 'views-exposed-form-uhc-search-open-university-desktop') { - $sort_options['field_imp_locality:asc'] = uhc_open_university_sorting_label('field_imp_locality:asc'); - $sort_options['field_imp_locality:desc'] = uhc_open_university_sorting_label('field_imp_locality:desc'); - - // Default sorting by title (ascending). - $sorting_default_value = 'title_field:asc'; - } - $sort_options['field_imp_begin_date:asc'] = uhc_open_university_sorting_label('field_imp_begin_date:asc'); - $sort_options['field_imp_begin_date:desc'] = uhc_open_university_sorting_label('field_imp_begin_date:desc'); - - $form['#info']['pager-and-sorting-controls'] = array( - 'value' => 'pager-and-sorting-controls', - ); - - $form['pager-and-sorting-controls'] = array( - '#type' => 'container', - '#weight' => 5, - '#attributes' => array( - 'class' => array( - 'pager-and-sorting-controls', - ), - ), - 'sorting' => array( - '#type' => 'select', - '#options' => $sort_options, - '#default_value' => $sorting_default_value, - '#title' => t('Sort:'), - '#attributes' => array('onchange' => $submit_on_change_script), - ), - 'items_per_page' => $form['items_per_page'], - ); - - unset($form['items_per_page']); - $form['#submit'][] = 'uhc_open_university_form_apply_sort'; -} - -/** - * Helper function for resolving sorting machine definitions to human readable - * labels. - * @param $key - * @return mixed - * @todo Move this elsewhere and update dependency in uhc_analytics_and_tracking - */ -function uhc_open_university_sorting_label($key) { - $labels = array( - 'title_field:asc' => t('By name A-Ö'), - 'title_field:desc' => t('By name Ö-A'), - 'field_imp_locality:asc' => t('By location A-Ö'), - 'field_imp_locality:desc' => t('By location Ö-A'), - 'field_imp_begin_date:asc' => t('Ascending by begin date'), - 'field_imp_begin_date:desc' => t('Descending by begin date'), - 'search_api_relevance:desc' => t('Relevance'), - ); - return !empty($labels[$key]) ? $labels[$key] : $key; -} - -/** - * This form submission callback applies sorting preferences as defined in - * custom sorting form element. - * - * Note: This technical approach is initial version of this type of sorting. We - * probably consider something better in following tickets. - * - * @see uhc_open_university_form_alter() - * @todo Move this elsewhere and update dependency in uhc_analytics_and_tracking - */ -function uhc_open_university_form_apply_sort(&$form, &$form_state) { - if (isset($_GET['search']) && isset($form_state['values']['sorting'])) { - $sort = explode(':', $form_state['values']['sorting']); - $_GET['order'] = $sort[0]; - $_GET['sort'] = $sort[1]; - } -} - /** * Implements hook_translated_menu_link_alter(). * diff --git a/modules/uhc_page/uhc_page.info b/modules/uhc_page/uhc_page.info index dbdc34a6..d1b6d394 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.104 +version = 7.x-1.105 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 6c07bc86..b35a0c3e 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.104 +version = 7.x-1.105 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 new file mode 100644 index 00000000..cbaf0117 --- /dev/null +++ b/modules/uhc_search_friendly_sorting/uhc_search_friendly_sorting.info @@ -0,0 +1,7 @@ +name = UHC Search Friendly Sorting +description = Alters search interface by adding friendly sorting options. +core = 7.x +package = UHC +version = 7.x-1.105 +project = uhc_search_friendly_sorting +dependencies[] = uhc_search_portal_feature diff --git a/modules/uhc_search_friendly_sorting/uhc_search_friendly_sorting.module b/modules/uhc_search_friendly_sorting/uhc_search_friendly_sorting.module new file mode 100644 index 00000000..500d4436 --- /dev/null +++ b/modules/uhc_search_friendly_sorting/uhc_search_friendly_sorting.module @@ -0,0 +1,161 @@ + uhc_search_friendly_sorting_label('title_field:asc'), + 'title_field:desc' => uhc_search_friendly_sorting_label('title_field:desc'), + ); + // Only show relavance option in other than Open University search. + if ($form['#id'] != 'views-exposed-form-uhc-search-open-university-desktop') { + $sort_options['search_api_relevance:desc'] = uhc_search_friendly_sorting_label('search_api_relevance:desc'); + } + // Only show location options in Open University search. + if ($form['#id'] == 'views-exposed-form-uhc-search-open-university-desktop') { + $sort_options['field_imp_locality:asc'] = uhc_search_friendly_sorting_label('field_imp_locality:asc'); + $sort_options['field_imp_locality:desc'] = uhc_search_friendly_sorting_label('field_imp_locality:desc'); + + // Default sorting by title (ascending). + $sorting_default_value = 'title_field:asc'; + } + $sort_options['field_imp_begin_date:asc'] = uhc_search_friendly_sorting_label('field_imp_begin_date:asc'); + $sort_options['field_imp_begin_date:desc'] = uhc_search_friendly_sorting_label('field_imp_begin_date:desc'); + + $form['#info']['pager-and-sorting-controls'] = array( + 'value' => 'pager-and-sorting-controls', + ); + + $form['pager-and-sorting-controls'] = array( + '#type' => 'container', + '#weight' => 5, + '#attributes' => array( + 'class' => array( + 'pager-and-sorting-controls', + ), + ), + 'sorting' => array( + '#type' => 'select', + '#options' => $sort_options, + '#default_value' => $sorting_default_value, + '#title' => t('Sort:'), + '#attributes' => array('onchange' => $submit_on_change_script), + ), + 'items_per_page' => $form['items_per_page'], + ); + + unset($form['items_per_page']); + $form['#submit'][] = 'uhc_search_friendly_sorting_form_apply_sort'; +} + +/** + * Gets default sorting option. When no search term is given, return title + * ascending, and when search term has been given, return relevance descending. + * @return string + */ +function _uhc_search_friendly_sorting_get_default() { + return empty($_GET['search']) ? 'title_field:asc' : 'search_api_relevance:desc'; +} + +/** + * Helper function for resolving sorting machine definitions to human readable + * labels. + * @param $key + * @return mixed + * @todo Move this elsewhere and update dependency in uhc_analytics_and_tracking + */ +function uhc_search_friendly_sorting_label($key) { + $labels = _uhc_search_friendly_sorting_get_options(); + return !empty($labels[$key]) ? $labels[$key] : $key; +} + +/** + * @return array + * Returns set of sorting options. + */ +function _uhc_search_friendly_sorting_get_options() { + return array( + 'title_field:asc' => t('By name A-Ö'), + 'title_field:desc' => t('By name Ö-A'), + 'field_imp_locality:asc' => t('By location A-Ö'), + 'field_imp_locality:desc' => t('By location Ö-A'), + 'field_imp_begin_date:asc' => t('Ascending by begin date'), + 'field_imp_begin_date:desc' => t('Descending by begin date'), + 'search_api_relevance:desc' => t('Relevance'), + ); +} + +/** + * @param string $key + * Sorting option key. For example: "title_field:desc" + * + * @return bool + * Returns TRUE if given sorting option exists. FALSE otherwise. + */ +function _uhc_search_friendly_sorting_option_exists($key) { + $labels = _uhc_search_friendly_sorting_get_options(); + return isset($labels[$key]); +} + +/** + * This form submission callback applies sorting preferences as defined in + * custom sorting form element. + * + * Note: This technical approach is initial version of this type of sorting. We + * probably consider something better in following tickets. + * + * @see uhc_open_university_form_alter() + * @todo Move this elsewhere and update dependency in uhc_analytics_and_tracking + */ +function uhc_search_friendly_sorting_form_apply_sort(&$form, &$form_state) { + if (isset($_GET['search']) && isset($form_state['values']['sorting']) && _uhc_search_friendly_sorting_option_exists($form_state['values']['sorting'])) { + $sort = explode(':', $form_state['values']['sorting']); + $_GET['order'] = $sort[0]; + $_GET['sort'] = $sort[1]; + } +} + +/** + * Implements hook_search_api_views_query_alter(). + */ +function uhc_search_friendly_sorting_search_api_views_query_alter(view &$view, SearchApiViewsQuery &$query) { + if ($view->name == 'uhc_portal_search_front_page_') { + if ($view->plugin_name == 'rss') { + if (isset($_GET['sorting']) && _uhc_search_friendly_sorting_option_exists($_GET['sorting'])) { + $sorting = $_GET['sorting']; + } + else { + $sorting = _uhc_search_friendly_sorting_get_default(); + } + $sort = explode(':', $sorting); + $query->sort($sort[0], strtoupper($sort[1])); + } + } +} 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 1f45d35b..26a9e529 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.104 +version = 7.x-1.105 project = uhc_search_front_page dependencies[] = context dependencies[] = search_api_views diff --git a/modules/uhc_search_front_page/uhc_search_front_page.views_default.inc b/modules/uhc_search_front_page/uhc_search_front_page.views_default.inc index 82c06977..5cdc3a79 100644 --- a/modules/uhc_search_front_page/uhc_search_front_page.views_default.inc +++ b/modules/uhc_search_front_page/uhc_search_front_page.views_default.inc @@ -187,11 +187,6 @@ function uhc_search_front_page_views_default_views() { 'multiple_from' => '', 'multiple_to' => '', ); - /* Sort criterion: Search: Relevance */ - $handler->display->display_options['sorts']['search_api_relevance']['id'] = 'search_api_relevance'; - $handler->display->display_options['sorts']['search_api_relevance']['table'] = 'search_api_index_uhc_portal'; - $handler->display->display_options['sorts']['search_api_relevance']['field'] = 'search_api_relevance'; - $handler->display->display_options['sorts']['search_api_relevance']['order'] = 'DESC'; /* Filter criterion: Indexed Multilingual Content: Academic year */ $handler->display->display_options['filters']['academic_year']['id'] = 'academic_year'; $handler->display->display_options['filters']['academic_year']['table'] = 'search_api_index_uhc_portal'; diff --git a/modules/uhc_search_lite/uhc_search_lite.info b/modules/uhc_search_lite/uhc_search_lite.info index 322d9ecc..e0a1e56a 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.104 +version = 7.x-1.105 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 53e20ba0..4766b4e1 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.104 +version = 7.x-1.105 project = uhc_search_portal_feature dependencies[] = chosen dependencies[] = ctools diff --git a/modules/uhc_search_portal_feature/uhc_search_portal_feature.module b/modules/uhc_search_portal_feature/uhc_search_portal_feature.module index e9dcf099..64d9f622 100644 --- a/modules/uhc_search_portal_feature/uhc_search_portal_feature.module +++ b/modules/uhc_search_portal_feature/uhc_search_portal_feature.module @@ -63,9 +63,7 @@ function uhc_search_portal_feature_form_alter(&$form, &$form_state, $form_id) { // Supply the correct base path to the search usability tweak JS $lang_prefix = ($lang == 'fi' || $lang == 'sv') ? $lang . '/' : ''; $base_path = array( - 'views-exposed-form-uhc-search-desktop' => $lang_prefix . 'genetics/search', 'views-exposed-form-uhc-search-open-university-desktop' => $lang_prefix . 'open-university/search', - 'views-exposed-form-uhc-search-biosciences-desktop' => $lang_prefix . 'molecular-biosciences/search', 'views-exposed-form-uhc-portal-search-front-page--desktop' => $lang_prefix . 'search/results', ); @@ -517,18 +515,10 @@ function uhc_search_portal_feature_section_search_form($field) { if (!empty($node->field_liftup_section)) { $section = $node->field_liftup_section[LANGUAGE_NONE][0]['value']; - if ($section == 'genetics') { - $exposed_form = block_load('views', '-exp-uhc_search-desktop'); - $facet_block = $show_filters ? block_load('views', '5dfb76ba1ce9809077d9d525bbf50f2c') : NULL; - } if ($section == 'openuniversity') { $exposed_form = block_load('views', '6e81312883288ad7f0d23af96a88ead6'); $facet_block = $show_filters ? block_load('views', 'c2214b19d79a77c1c1558fab6eb67c87') : NULL; } - if ($section == 'biosciences') { - $exposed_form = block_load('views', 'ddc12e0f6574edc3850aacc947821543'); - $facet_block = $show_filters ? block_load('views', '1f9eeaa6dc7b5053fb2ed2e1936d239c') : NULL; - } } else { // If no section is set, show front page search. diff --git a/modules/uhc_shib_conf/uhc_shib_conf.info b/modules/uhc_shib_conf/uhc_shib_conf.info index 44ea0f5d..e68e4f31 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.104 +version = 7.x-1.105 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 7a2c3835..56f876e7 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.104 +version = 7.x-1.105 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 3256c9da..25a53f85 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.104 +version = 7.x-1.105 project = uhc_sources_filtering dependencies[] = features dependencies[] = list diff --git a/modules/uhc_sources_filtering/uhc_sources_filtering.module b/modules/uhc_sources_filtering/uhc_sources_filtering.module index 11bd9932..a095a0c0 100644 --- a/modules/uhc_sources_filtering/uhc_sources_filtering.module +++ b/modules/uhc_sources_filtering/uhc_sources_filtering.module @@ -45,13 +45,10 @@ function uhc_sources_filtering_uhc_course_implementation_source_deny_source_row( return new SkippableItem('Too old course implementation.'); } - // $row must be either allowed by organisation OR by allowed - // keyword&realisation type combination. + // $row must be allowed by organisation $allow_by_organisation = uhc_sources_filter_allow_by_organisation($row); - $allow_by_keyword_and_realisation_type = uhc_sources_filter_allow_by_keyword_and_realisation_type($row); - if (!$allow_by_organisation['result'] && !$allow_by_keyword_and_realisation_type['result']) { - $params = array('@reason1' => $allow_by_organisation['reason'], '@reason2' => $allow_by_keyword_and_realisation_type['reason']); - return new SkippableItem('Failed because @reason1 OR @reason2', $params); + if (!$allow_by_organisation['result']) { + return new SkippableItem('Failed because @reason', array('@reason' => $allow_by_organisation['reason'])); } return FALSE; @@ -102,43 +99,6 @@ function uhc_sources_filter_allow_by_organisation($row) { return array('result' => $allow_by_organisation, 'reason' => $reason); } -/** - * Specify if given $row should be allowed for importing in regards of - * keyword and realisation type. - * @param $row - * @return array - * Result array having two values keyed by: - * - result: boolean value indicating whether to allow or not - * - reason: string reason why it was allowed/denied - */ -function uhc_sources_filter_allow_by_keyword_and_realisation_type($row) { - // Allow by keyword and realisation types (only check if - // $allow_by_organisation is not TRUE) - // @todo Perhaps do this in uhc_genetics and uhc_molecular_biosciences modules? - $allowed_keywords = array('genetiikka', 'molekyylibiotieteet'); - $denied_realisations = uhc_sources_filtering_denied_realisation_type_codes(); - if (isset($row->descriptions) && isset($row->realisation_type_code)) { - // Important: Clone the row object to avoid modifying the original object - // when parsing the keywords. - $row_clone = clone $row; - $description_elements = variable_get('uhc_course_implementation_source_predefined_description_names', array()); - CourseImplementationNodeMigration::prepareDescriptions($row_clone, $description_elements); - $keywords = CourseImplementationNodeMigration::parseKeywords($row_clone->keywords); - foreach ($keywords as $keyword) { - if (in_array($keyword, $allowed_keywords) && !in_array($row->realisation_type_code, $denied_realisations)) { - // When source row has allowed keyword and allowed realistion type, then - // allow migrating this item. - return array('result' => TRUE, 'reason' => 'Keyword was found from allowed keywords but is not blocked by allowed realisations type codes.'); - break; - } - } - return array('result' => FALSE, 'reason' => 'Did not found any keywords (' . implode(', ', $keywords) . ') that are realisation type -whitelisted.'); - } - else { - return array('result' => FALSE, 'reason' => 'Was not able to determine descriptions or realisation type code.'); - } -} - /** * Specify if given $row should be allowed for importing in regards of begin * date. diff --git a/modules/uhc_statistics/uhc_statistics.info b/modules/uhc_statistics/uhc_statistics.info index 3d6392fa..af3069d5 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.104 +version = 7.x-1.105 project = uhc_statistics dependencies[] = entity dependencies[] = entityreference diff --git a/modules/uhc_statistics/uhc_statistics.views_default.inc b/modules/uhc_statistics/uhc_statistics.views_default.inc index e2b64355..4438b4c6 100644 --- a/modules/uhc_statistics/uhc_statistics.views_default.inc +++ b/modules/uhc_statistics/uhc_statistics.views_default.inc @@ -140,36 +140,6 @@ function uhc_statistics_views_default_views() { 'course_implementation' => 'course_implementation', ); $handler->display->display_options['filters']['type']['group'] = 1; - /* Filter criterion: Content: Keywords (field_imp_keywords) */ - $handler->display->display_options['filters']['field_imp_keywords_value']['id'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['table'] = 'field_data_field_imp_keywords'; - $handler->display->display_options['filters']['field_imp_keywords_value']['field'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['group'] = 1; - $handler->display->display_options['filters']['field_imp_keywords_value']['exposed'] = TRUE; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['operator_id'] = 'field_imp_keywords_value_op'; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['label'] = 'Keywords (field_imp_keywords)'; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['operator'] = 'field_imp_keywords_value_op'; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['identifier'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['is_grouped'] = TRUE; - $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['label'] = 'Keyword'; - $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['identifier'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['group_items'] = array( - 1 => array( - 'title' => 'Genetics', - 'operator' => '=', - 'value' => 'genetiikka', - ), - 2 => array( - 'title' => 'Molecular bioscience', - 'operator' => '=', - 'value' => 'molekyylibiotieteet', - ), - 3 => array( - 'title' => '', - 'operator' => '=', - 'value' => '', - ), - ); /* Filter criterion: Content: Has taxonomy terms (with depth; Simple hierarchical select) */ $handler->display->display_options['filters']['shs_term_node_tid_depth']['id'] = 'shs_term_node_tid_depth'; $handler->display->display_options['filters']['shs_term_node_tid_depth']['table'] = 'node'; @@ -258,34 +228,6 @@ function uhc_statistics_views_default_views() { 8 => 0, ); $handler->display->display_options['filters']['field_imp_begin_date_value']['form_type'] = 'date_popup'; - /* Filter criterion: User: Roles */ - $handler->display->display_options['filters']['rid']['id'] = 'rid'; - $handler->display->display_options['filters']['rid']['table'] = 'users_roles'; - $handler->display->display_options['filters']['rid']['field'] = 'rid'; - $handler->display->display_options['filters']['rid']['relationship'] = 'user'; - $handler->display->display_options['filters']['rid']['value'] = array( - 3 => '3', - 4 => '4', - 5 => '5', - 6 => '6', - ); - $handler->display->display_options['filters']['rid']['group'] = 1; - $handler->display->display_options['filters']['rid']['exposed'] = TRUE; - $handler->display->display_options['filters']['rid']['expose']['operator_id'] = 'rid_op'; - $handler->display->display_options['filters']['rid']['expose']['label'] = 'Edited by user role'; - $handler->display->display_options['filters']['rid']['expose']['operator'] = 'rid_op'; - $handler->display->display_options['filters']['rid']['expose']['identifier'] = 'rid'; - $handler->display->display_options['filters']['rid']['expose']['remember_roles'] = array( - 2 => '2', - 1 => 0, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - ); - $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE; /* Filter criterion: Message: Type */ $handler->display->display_options['filters']['type_1']['id'] = 'type_1'; $handler->display->display_options['filters']['type_1']['table'] = 'message'; @@ -609,12 +551,9 @@ function uhc_statistics_views_default_views() { t('Organisation'), t('Number of activities'), t('Last activity'), - t('Keywords (field_imp_keywords)'), - t('Keyword'), t('Method of study'), t('Last updated (between)'), t('Begin date (between)'), - t('Edited by user role'), t('Type of activity'), t('Data export'), ); @@ -733,36 +672,6 @@ function uhc_statistics_views_default_views() { 'course_implementation' => 'course_implementation', ); $handler->display->display_options['filters']['type']['group'] = 1; - /* Filter criterion: Content: Keywords (field_imp_keywords) */ - $handler->display->display_options['filters']['field_imp_keywords_value']['id'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['table'] = 'field_data_field_imp_keywords'; - $handler->display->display_options['filters']['field_imp_keywords_value']['field'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['group'] = 1; - $handler->display->display_options['filters']['field_imp_keywords_value']['exposed'] = TRUE; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['operator_id'] = 'field_imp_keywords_value_op'; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['label'] = 'Keywords (field_imp_keywords)'; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['operator'] = 'field_imp_keywords_value_op'; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['identifier'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['is_grouped'] = TRUE; - $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['label'] = 'Keyword'; - $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['identifier'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['group_items'] = array( - 1 => array( - 'title' => 'Genetics', - 'operator' => '=', - 'value' => 'genetiikka', - ), - 2 => array( - 'title' => 'Molecular bioscience', - 'operator' => '=', - 'value' => 'molekyylibiotieteet', - ), - 3 => array( - 'title' => '', - 'operator' => '=', - 'value' => '', - ), - ); /* Filter criterion: Content: Has taxonomy terms (with depth; Simple hierarchical select) */ $handler->display->display_options['filters']['shs_term_node_tid_depth']['id'] = 'shs_term_node_tid_depth'; $handler->display->display_options['filters']['shs_term_node_tid_depth']['table'] = 'node'; @@ -1382,15 +1291,13 @@ function uhc_statistics_views_default_views() { t('last »'), t('This statistics view displays the amount of course implementations where the selected field has content. It is best to select a single field only as a filter and have the rest set as "-any-".'), t('

@total results

'), - t('Comments'), + t('Messages'), t('Course material'), t('Title'), t('Organisation'), t('Number of custom sections'), t('.'), t(','), - t('Keywords (field_imp_keywords)'), - t('Keyword'), t('Method of study'), t('Begin date (between)'), t('Moodle URL'), @@ -1412,7 +1319,6 @@ function uhc_statistics_views_default_views() { t('Course conduct'), t('Material description'), t('Materials'), - t('Messages'), t('Restricted messages'), t('Restricted material'), t('Results'), @@ -1511,36 +1417,6 @@ function uhc_statistics_views_default_views() { 'course_implementation' => 'course_implementation', ); $handler->display->display_options['filters']['type']['group'] = 1; - /* Filter criterion: Content: Keywords (field_imp_keywords) */ - $handler->display->display_options['filters']['field_imp_keywords_value']['id'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['table'] = 'field_data_field_imp_keywords'; - $handler->display->display_options['filters']['field_imp_keywords_value']['field'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['group'] = 1; - $handler->display->display_options['filters']['field_imp_keywords_value']['exposed'] = TRUE; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['operator_id'] = 'field_imp_keywords_value_op'; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['label'] = 'Keywords (field_imp_keywords)'; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['operator'] = 'field_imp_keywords_value_op'; - $handler->display->display_options['filters']['field_imp_keywords_value']['expose']['identifier'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['is_grouped'] = TRUE; - $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['label'] = 'Keyword'; - $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['identifier'] = 'field_imp_keywords_value'; - $handler->display->display_options['filters']['field_imp_keywords_value']['group_info']['group_items'] = array( - 1 => array( - 'title' => 'Genetics', - 'operator' => '=', - 'value' => 'genetiikka', - ), - 2 => array( - 'title' => 'Molecular bioscience', - 'operator' => '=', - 'value' => 'molekyylibiotieteet', - ), - 3 => array( - 'title' => '', - 'operator' => '=', - 'value' => '', - ), - ); /* Filter criterion: Content: Has taxonomy terms (with depth; Simple hierarchical select) */ $handler->display->display_options['filters']['shs_term_node_tid_depth']['id'] = 'shs_term_node_tid_depth'; $handler->display->display_options['filters']['shs_term_node_tid_depth']['table'] = 'node'; @@ -1568,6 +1444,7 @@ function uhc_statistics_views_default_views() { $handler->display->display_options['filters']['field_imp_begin_date_value']['table'] = 'field_data_field_imp_begin_date'; $handler->display->display_options['filters']['field_imp_begin_date_value']['field'] = 'field_imp_begin_date_value'; $handler->display->display_options['filters']['field_imp_begin_date_value']['operator'] = 'between'; + $handler->display->display_options['filters']['field_imp_begin_date_value']['group'] = 1; $handler->display->display_options['filters']['field_imp_begin_date_value']['exposed'] = TRUE; $handler->display->display_options['filters']['field_imp_begin_date_value']['expose']['operator_id'] = 'field_imp_begin_date_value_op'; $handler->display->display_options['filters']['field_imp_begin_date_value']['expose']['label'] = 'Begin date (between)'; @@ -1629,8 +1506,6 @@ function uhc_statistics_views_default_views() { t('last »'), t('Content entity referenced from field_imp_reference_to_courses'), t('Month Created'), - t('Keywords (field_imp_keywords)'), - t('Keyword'), t('Organisation'), t('Begin date (between)'), t('Created'), diff --git a/modules/uhc_studies/uhc_studies.features.field_instance.inc b/modules/uhc_studies/uhc_studies.features.field_instance.inc index 23303e16..5b14113e 100644 --- a/modules/uhc_studies/uhc_studies.features.field_instance.inc +++ b/modules/uhc_studies/uhc_studies.features.field_instance.inc @@ -644,6 +644,7 @@ function uhc_studies_field_default_field_instances() { 'label' => 'above', 'module' => 'entityreference', 'settings' => array( + 'bypass_access' => FALSE, 'field_multiple_limit' => -1, 'field_multiple_limit_offset' => 0, 'field_multiple_limit_order' => 0, diff --git a/modules/uhc_studies/uhc_studies.info b/modules/uhc_studies/uhc_studies.info index 443173b1..b273363a 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.104 +version = 7.x-1.105 dependencies[] = ctools dependencies[] = entityreference dependencies[] = features diff --git a/modules/uhc_studies/uhc_studies.views_default.inc b/modules/uhc_studies/uhc_studies.views_default.inc index f8e76292..a9ea1317 100644 --- a/modules/uhc_studies/uhc_studies.views_default.inc +++ b/modules/uhc_studies/uhc_studies.views_default.inc @@ -158,7 +158,6 @@ function uhc_studies_views_default_views() { $handler->display->display_options['exposed_form']['type'] = 'basic'; $handler->display->display_options['pager']['type'] = 'none'; $handler->display->display_options['style_plugin'] = 'list'; - $handler->display->display_options['style_options']['row_class'] = 'list-of-links__link button--action icon--arrow-right theme-transparent'; $handler->display->display_options['style_options']['class'] = 'list-of-links'; $handler->display->display_options['style_options']['wrapper_class'] = ''; $handler->display->display_options['row_plugin'] = 'fields'; @@ -167,6 +166,9 @@ function uhc_studies_views_default_views() { $handler->display->display_options['fields']['title_field']['table'] = 'field_data_title_field'; $handler->display->display_options['fields']['title_field']['field'] = 'title_field'; $handler->display->display_options['fields']['title_field']['label'] = ''; + $handler->display->display_options['fields']['title_field']['alter']['make_link'] = TRUE; + $handler->display->display_options['fields']['title_field']['alter']['path'] = '[path]'; + $handler->display->display_options['fields']['title_field']['alter']['link_class'] = 'list-of-links__link button--action icon--arrow-right theme-transparent'; $handler->display->display_options['fields']['title_field']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['title_field']['link_to_entity'] = 1; /* Sort criterion: Field: Title (title_field) */ diff --git a/modules/uhc_subject/uhc_subject.info b/modules/uhc_subject/uhc_subject.info index 1bedbca9..fa2754f3 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.104 +version = 7.x-1.105 project = uhc_subject dependencies[] = ctools dependencies[] = entityreference diff --git a/modules/uhc_taxonomy/uhc_taxonomy.info b/modules/uhc_taxonomy/uhc_taxonomy.info index dfca19c9..b84f8c17 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.104 +version = 7.x-1.105 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 83a0b729..a8f9a40a 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.104 +version = 7.x-1.105 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 e55a0d12..430582f2 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.104 +version = 7.x-1.105 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 bd7a66ec..ddd31a55 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.104 +version = 7.x-1.105 project = uhc_tour dependencies[] = context dependencies[] = ctools diff --git a/modules/uhc_wysiwyg/uhc_wysiwyg.info b/modules/uhc_wysiwyg/uhc_wysiwyg.info index e0444a9c..d80c69b2 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.104 +version = 7.x-1.105 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 de7acece..98c6c937 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.104 +version = 7.x-1.105 dependencies[] = ctools dependencies[] = strongarm dependencies[] = xmlsitemap diff --git a/themes/hy_doo/css/hy_doo.styles.css b/themes/hy_doo/css/hy_doo.styles.css index a59701d6..932779af 100644 --- a/themes/hy_doo/css/hy_doo.styles.css +++ b/themes/hy_doo/css/hy_doo.styles.css @@ -7528,10 +7528,14 @@ h2.study-module-select-title { .node--teaser.node--course-implementation .org-location-date { color: #0098d0; letter-spacing: -0.05em; - padding: 0.8em 0; } - .node--teaser.node--course-implementation.exam { - border-left: 3px solid #fa9500; - padding-left: 0.8em; } + padding: 0.8em 1em 0.8em 0; + display: block; + width: 100%; + border-bottom: 0; } + .node--teaser.node--course-implementation .org-location-date div:nth-child(2) { + font-weight: 300; + font-style: normal; + color: #666; } .node--teaser.node--course-implementation:hover .org-location-date { color: #0882B3; } .node--teaser.node--course-implementation .label-row.help { @@ -8802,6 +8806,77 @@ form label, img.file-icon { display: none; } +/* + section: 6.7 + title: Horizontal tabs + template: 6_7_horizontal-tabs + description: +*/ +.horizontal-tabs .horizontal-tabs-list { + -ms-flex-align: center; + align-items: center; + display: -ms-flexbox; + display: flex; + -ms-flex-direction: row; + flex-direction: row; + margin-bottom: 30px; + overflow: hidden; + position: relative; } + @media (min-width: 48em) { + .horizontal-tabs .horizontal-tabs-list { + margin-bottom: 60px; } } + +.horizontal-tabs .horizontal-tabs-pane { + min-width: 0; } + .horizontal-tabs .horizontal-tabs-pane legend { + display: none; } + +.horizontal-tabs .horizontal-tab-button { + border: 1px solid #eaeaea; + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; + -ms-flex-positive: 1; + flex-grow: 1; + margin: 0; + text-align: center; } + .horizontal-tabs .horizontal-tab-button:not(:last-child) { + border-right: none; } + .horizontal-tabs .horizontal-tab-button > a { + font-size: 12.25px; + font-size: 0.875rem; + -ms-flex-align: center; + align-items: center; + background: #f8f8f8; + color: #979797; + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; + font-weight: 600; + height: 5rem; + -ms-flex-pack: center; + justify-content: center; + padding: 0; + transition-duration: 0.2s; + transition-property: color, background-color; } + @media (min-width: 48em) { + .horizontal-tabs .horizontal-tab-button > a { + font-size: 14px; } } + .horizontal-tabs .horizontal-tab-button > a > strong { + font-weight: 400; } + .horizontal-tabs .horizontal-tab-button.ui-tabs-selected { + border-top-color: #0098d0; + border-bottom-color: transparent; + z-index: 2; } + .horizontal-tabs .horizontal-tab-button.ui-tabs-selected a { + background-color: #FFF; + box-shadow: inset 0 3px 0 #0098d0; + color: #0098d0; } + .horizontal-tabs .horizontal-tab-button:hover > a { + color: #0098d0; } + span.links__link.theme-language { color: #d2d2d2; } @media (min-width: 48em) { diff --git a/themes/hy_doo/hy_doo.info b/themes/hy_doo/hy_doo.info index 33930c78..e69017e8 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.104 +version = 7.x-1.105 ; Scripts scripts[] = js/mobile_detect.js diff --git a/themes/hy_doo/preprocess/html.preprocess.inc b/themes/hy_doo/preprocess/html.preprocess.inc index bba5bc1f..3e0362bf 100644 --- a/themes/hy_doo/preprocess/html.preprocess.inc +++ b/themes/hy_doo/preprocess/html.preprocess.inc @@ -201,8 +201,6 @@ function _hy_doo_preprocess_is_search_page(&$variables) { 'search-main-page', 'page-search', 'page-open-university-search', - 'page-genetics-search', - 'page-molecular-biosciences-search' ); return !empty($variables['classes_array']) diff --git a/themes/hy_doo/sass/components/_teaser.scss b/themes/hy_doo/sass/components/_teaser.scss index f60ae66c..a668f7e4 100644 --- a/themes/hy_doo/sass/components/_teaser.scss +++ b/themes/hy_doo/sass/components/_teaser.scss @@ -15,11 +15,15 @@ .org-location-date { color: $blue; letter-spacing: -0.05em; - padding: 0.8em 0; - } - &.exam { - border-left: 3px solid $orange; - padding-left: 0.8em; + padding: 0.8em 1em 0.8em 0; + display: block; + width: 100%; + border-bottom: 0; + + div:nth-child(2) { + @include font-weight-light; + color: $gray; + } } &:hover { .org-location-date { diff --git a/themes/hy_doo/sass/styleguide_additions/_horizontal-tabs.scss b/themes/hy_doo/sass/styleguide_additions/_horizontal-tabs.scss new file mode 100644 index 00000000..9a38f11f --- /dev/null +++ b/themes/hy_doo/sass/styleguide_additions/_horizontal-tabs.scss @@ -0,0 +1,77 @@ +/* + section: 6.7 + title: Horizontal tabs + template: 6_7_horizontal-tabs + description: +*/ +// NOTE: this is not smacss because the field group horizontal-tabs.js produces shitty markup +.horizontal-tabs { + .horizontal-tabs-list { + align-items: center; + display: flex; + flex-direction: row; + margin-bottom: $vert-spacing-unit; + overflow: hidden; + position: relative; + + @include breakpoint($small) { + margin-bottom: $vert-spacing-unit * 2; + } + } + + .horizontal-tabs-pane { + min-width: 0; + + legend { + display: none; + } + } + + .horizontal-tab-button { + border: 1px solid #eaeaea; + display: flex; + flex-direction: column; + flex-grow: 1; + margin: 0; + text-align: center; + + &:not(:last-child) { + border-right: none; + } + + > a { + @include font-size(14px); + align-items: center; + background: #f8f8f8; + color: $silver; + display: flex; + flex-direction: column; + font-weight: 600; + height: 5rem; + justify-content: center; + padding: 0; + transition-duration: 0.2s; + transition-property: color, background-color; + + > strong { + font-weight: 400; + } + } + + &.ui-tabs-selected { + border-top-color: $blue; + border-bottom-color: transparent; + z-index: 2; + + a { + background-color: $white; + box-shadow: inset 0 3px 0 $blue; + color: $blue; + } + } + + &:hover > a { + color: $blue; + } + } +} \ No newline at end of file diff --git a/uh_coursepages.info b/uh_coursepages.info index 27d0f126..34051d59 100644 --- a/uh_coursepages.info +++ b/uh_coursepages.info @@ -1,7 +1,7 @@ name = Helsinki University Portal -description = Install with pre-configured features for courses in genetics. +description = Install with pre-configured features. core = 7.x -version = 7.x-1.104 +version = 7.x-1.105 dependencies[] = block dependencies[] = file dependencies[] = image @@ -61,8 +61,7 @@ dependencies[] = variable_realm dependencies[] = uhc_autofill_metadata dependencies[] = uhc_doo_theme_features dependencies[] = uhc_content_administration_feature -dependencies[] = uhc_genetics -dependencies[] = uhc_molecular_biosciences +dependencies[] = uhc_search_friendly_sorting dependencies[] = uhc_search_portal_feature dependencies[] = uhc_contact_card dependencies[] = uhc_course @@ -100,7 +99,6 @@ dependencies[] = uhc_tour dependencies[] = uhc_subject dependencies[] = uhc_online_services dependencies[] = uhc_rest_api -dependencies[] = uhc_activemq_connector dependencies[] = uhc_migrate_message_report ; Project contrib diff --git a/uh_coursepages.install b/uh_coursepages.install index 051d972c..556c9e7b 100644 --- a/uh_coursepages.install +++ b/uh_coursepages.install @@ -1338,3 +1338,28 @@ function uh_coursepages_update_7048(&$sandbox) { function uh_coursepages_update_7049(&$sandbox) { module_enable(array('uhc_migrate_message_report')); } + +/** + * Enable Search Friendly Sorting module. + */ +function uh_coursepages_update_7050(&$sandbox) { + module_enable(array('uhc_search_friendly_sorting')); +} + +/** + * Disable uhc_genetics and uhc_molecular_biosciences modules. + */ +function uh_coursepages_update_7051(&$sandbox) { + module_disable(array('uhc_genetics', 'uhc_molecular_biosciences')); +} + +/** + * Disable uhc_activemq_connector module. + */ +function uh_coursepages_update_7052(&$sandbox) { + variable_del('uhc_activemq_connector_settings'); + variable_del('uhc_activemq_connector_log_incoming_messages'); + variable_del('uhc_activemq_connector_default_queue'); + variable_del('uhc_activemq_connector_default_queue_base'); + module_disable(array('uhc_activemq_connector')); +}