Skip to content
This repository was archived by the owner on Aug 14, 2023. It is now read-only.

Updated features #7

Merged
cableman merged 5 commits into from
Apr 6, 2017
Merged

Updated features #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8845505
Merge branch 'master' into development
zorp Aug 26, 2016
8a3e19d
Merge branch 'master' into development
zorp Feb 3, 2017
e89cd5a
Merge pull request #6 from os2git/development
os2git Mar 31, 2017
d384c57
Updated features with latets config changes
zorp Apr 4, 2017
8523c11
Merge branch 'master' into development
zorp Apr 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 51 additions & 48 deletions sites/all/modules/itk/osto_contact/osto_contact.pages_default.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,56 +57,59 @@ function osto_contact_default_page_manager_pages() {
$display->cache = array();
$display->title = '';
$display->uuid = 'ef424137-fabe-405f-a449-61b0fcdbe63a';
$display->storage_type = 'page_manager';
$display->storage_id = 'page_contact__panel';
$display->content = array();
$display->panels = array();
$pane = new stdClass();
$pane->pid = 'new-b349d080-2873-4ec3-85b4-4fe2becbe352';
$pane->panel = 'left';
$pane->type = 'contact';
$pane->subtype = 'contact';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'override_title' => 1,
'override_title_text' => '',
'override_title_heading' => 'h2',
);
$pane->cache = array();
$pane->style = array(
'settings' => NULL,
);
$pane->css = array();
$pane->extras = array();
$pane->position = 0;
$pane->locks = array();
$pane->uuid = 'b349d080-2873-4ec3-85b4-4fe2becbe352';
$display->content['new-b349d080-2873-4ec3-85b4-4fe2becbe352'] = $pane;
$display->panels['left'][0] = 'new-b349d080-2873-4ec3-85b4-4fe2becbe352';
$pane = new stdClass();
$pane->pid = 'new-229cf7f5-4516-4554-8042-146683c7a6b3';
$pane->panel = 'right';
$pane->type = 'custom';
$pane->subtype = 'custom';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'admin_title' => 'OS2 kontaktinformationer',
'title' => 'Forretningsledelsen',
'body' => '<div style="line-height:1.5em"><p>Du er også velkommen til at kontakte OS2s forretningsleder direkte. Eller sende os et brev, det er så hyggeligt.</p><p>&nbsp;</p><p>Rasmus Frey<br />Forretningsleder<br />Email: [email protected]<br />Telefon: +45 31154525</p><p>&nbsp;</p><p>OS2 - Offentligt digitaliseringsfællesskab<br />c/o Aarhus Kommune<br />Dokk1<br />Hack Kampmanns Plads 2<br />8000 Aarhus C<br />CVR: 55133018</p><p>&nbsp;</p><p>Email: [email protected]<br />Telefon: +45 29 20 84 27</p></div>',
'format' => 'full_html',
'substitute' => TRUE,
);
$pane->cache = array();
$pane->style = array(
'settings' => NULL,
);
$pane->css = array();
$pane->extras = array();
$pane->position = 0;
$pane->locks = array();
$pane->uuid = '229cf7f5-4516-4554-8042-146683c7a6b3';
$display->content['new-229cf7f5-4516-4554-8042-146683c7a6b3'] = $pane;
$display->panels['right'][0] = 'new-229cf7f5-4516-4554-8042-146683c7a6b3';
$pane = new stdClass();
$pane->pid = 'new-b349d080-2873-4ec3-85b4-4fe2becbe352';
$pane->panel = 'left';
$pane->type = 'contact';
$pane->subtype = 'contact';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'override_title' => 1,
'override_title_text' => '',
'override_title_heading' => 'h2',
);
$pane->cache = array();
$pane->style = array(
'settings' => NULL,
);
$pane->css = array();
$pane->extras = array();
$pane->position = 0;
$pane->locks = array();
$pane->uuid = 'b349d080-2873-4ec3-85b4-4fe2becbe352';
$display->content['new-b349d080-2873-4ec3-85b4-4fe2becbe352'] = $pane;
$display->panels['left'][0] = 'new-b349d080-2873-4ec3-85b4-4fe2becbe352';
$pane = new stdClass();
$pane->pid = 'new-229cf7f5-4516-4554-8042-146683c7a6b3';
$pane->panel = 'right';
$pane->type = 'custom';
$pane->subtype = 'custom';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'admin_title' => 'OS2 kontaktinformationer',
'title' => 'Forretningsledelsen',
'body' => '<div style="line-height:1.5em"><p>Du er også velkommen til at kontakte OS2s forretningsleder direkte. Eller sende os et brev, det er så hyggeligt.</p><p>&nbsp;</p><p>Rasmus Frey<br />Forretningsleder<br />Email: [email protected]<br />Telefon: +45 31154525</p><p>&nbsp;</p><p>OS2 - Offentligt digitaliseringsfællesskab<br />c/o Aarhus Kommune<br />Dokk1<br />Hack Kampmanns Plads 2<br />8000 Aarhus C<br />CVR: 55133018</p><p>&nbsp;</p><p>Email: [email protected]</p></div>',
'format' => 'full_html',
'substitute' => TRUE,
'title_heading' => 'h2',
);
$pane->cache = array();
$pane->style = array(
'settings' => NULL,
);
$pane->css = array();
$pane->extras = array();
$pane->position = 0;
$pane->locks = array();
$pane->uuid = '229cf7f5-4516-4554-8042-146683c7a6b3';
$display->content['new-229cf7f5-4516-4554-8042-146683c7a6b3'] = $pane;
$display->panels['right'][0] = 'new-229cf7f5-4516-4554-8042-146683c7a6b3';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = 'new-b349d080-2873-4ec3-85b4-4fe2becbe352';
$handler->conf['display'] = $display;
Expand Down
64 changes: 5 additions & 59 deletions sites/all/modules/itk/osto_newsletter/osto_newsletter.features.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,51 +32,13 @@ function osto_newsletter_default_mailchimp_signup() {
"confirmation_message" : "Du er nu oprettet som abonnent.",
"destination" : "node\\/247",
"mergefields" : {
"EMAIL" : {
"name" : "Email",
"req" : true,
"field_type" : "email",
"public" : true,
"show" : true,
"order" : "1",
"default" : "",
"helptext" : "",
"size" : "25",
"tag" : "EMAIL",
"id" : 0
},
"NAME" : {
"name" : "Navn",
"req" : false,
"field_type" : "text",
"public" : true,
"show" : true,
"order" : "2",
"default" : "",
"helptext" : "",
"size" : "25",
"tag" : "NAME",
"id" : 1
},
"TYPE" : {
"name" : "Jeg repr\\u00e6senterer en:",
"req" : false,
"field_type" : "dropdown",
"public" : true,
"show" : true,
"order" : "3",
"default" : "",
"helptext" : "",
"size" : "25",
"choices" : [ "", "Kommune", "Anden offentlig myndighed", "Leverand\\u00f8r", "Anden" ],
"tag" : "TYPE",
"id" : 2
}
"EMAIL" : {"tag":"EMAIL","name":"Email Address","type":"email","required":true,"default_value":"","public":true,"display_order":1,"options":{"size":25}},
"NAME" : {"merge_id":1,"tag":"NAME","name":"Navn","type":"text","required":false,"default_value":"","public":true,"display_order":2,"options":{"size":25},"help_text":"","list_id":"971cbdb77b","_links":[{"rel":"self","href":"https:\\/\\/us13.api.mailchimp.com\\/3.0\\/lists\\/971cbdb77b\\/merge-fields\\/1","method":"GET","targetSchema":"https:\\/\\/us13.api.mailchimp.com\\/schema\\/3.0\\/Definitions\\/Lists\\/Merge-Fields\\/Response.json"},{"rel":"parent","href":"https:\\/\\/us13.api.mailchimp.com\\/3.0\\/lists\\/971cbdb77b\\/merge-fields","method":"GET","targetSchema":"https:\\/\\/us13.api.mailchimp.com\\/schema\\/3.0\\/Definitions\\/Lists\\/Merge-Fields\\/CollectionResponse.json","schema":"https:\\/\\/us13.api.mailchimp.com\\/schema\\/3.0\\/CollectionLinks\\/Lists\\/MergeFields.json"},{"rel":"update","href":"https:\\/\\/us13.api.mailchimp.com\\/3.0\\/lists\\/971cbdb77b\\/merge-fields\\/1","method":"PATCH","targetSchema":"https:\\/\\/us13.api.mailchimp.com\\/schema\\/3.0\\/Definitions\\/Lists\\/Merge-Fields\\/Response.json","schema":"https:\\/\\/us13.api.mailchimp.com\\/schema\\/3.0\\/Definitions\\/Lists\\/Merge-Fields\\/PATCH.json"},{"rel":"delete","href":"https:\\/\\/us13.api.mailchimp.com\\/3.0\\/lists\\/971cbdb77b\\/merge-fields\\/1","method":"DELETE"}]},
"TYPE" : {"merge_id":2,"tag":"TYPE","name":"Jeg repr\\u00e6senterer en:","type":"dropdown","required":false,"default_value":"","public":true,"display_order":3,"options":{"choices":["","Kommune","Anden offentlig myndighed","Leverand\\u00f8r","Anden"]},"help_text":"","list_id":"971cbdb77b","_links":[{"rel":"self","href":"https:\\/\\/us13.api.mailchimp.com\\/3.0\\/lists\\/971cbdb77b\\/merge-fields\\/2","method":"GET","targetSchema":"https:\\/\\/us13.api.mailchimp.com\\/schema\\/3.0\\/Definitions\\/Lists\\/Merge-Fields\\/Response.json"},{"rel":"parent","href":"https:\\/\\/us13.api.mailchimp.com\\/3.0\\/lists\\/971cbdb77b\\/merge-fields","method":"GET","targetSchema":"https:\\/\\/us13.api.mailchimp.com\\/schema\\/3.0\\/Definitions\\/Lists\\/Merge-Fields\\/CollectionResponse.json","schema":"https:\\/\\/us13.api.mailchimp.com\\/schema\\/3.0\\/CollectionLinks\\/Lists\\/MergeFields.json"},{"rel":"update","href":"https:\\/\\/us13.api.mailchimp.com\\/3.0\\/lists\\/971cbdb77b\\/merge-fields\\/2","method":"PATCH","targetSchema":"https:\\/\\/us13.api.mailchimp.com\\/schema\\/3.0\\/Definitions\\/Lists\\/Merge-Fields\\/Response.json","schema":"https:\\/\\/us13.api.mailchimp.com\\/schema\\/3.0\\/Definitions\\/Lists\\/Merge-Fields\\/PATCH.json"},{"rel":"delete","href":"https:\\/\\/us13.api.mailchimp.com\\/3.0\\/lists\\/971cbdb77b\\/merge-fields\\/2","method":"DELETE"}]}
},
"description" : "",
"doublein" : 0,
"send_welcome" : 0,
"include_interest_groups" : 1
"include_interest_groups" : 0
},
"rdf_mapping" : []
}');
Expand All @@ -90,23 +52,7 @@ function osto_newsletter_default_mailchimp_signup() {
"submit_button" : "Tilmeld",
"confirmation_message" : "Du er nu oprettet som abonnent.",
"destination" : "node\\/247",
"mergefields" : {
"EMAIL" : {
"name" : "Email",
"req" : true,
"field_type" : "email",
"public" : true,
"show" : true,
"order" : "1",
"default" : "",
"helptext" : "",
"size" : "25",
"tag" : "EMAIL",
"id" : 0
},
"NAME" : 0,
"TYPE" : 0
},
"mergefields" : { "EMAIL" : {"tag":"EMAIL","name":"Email","type":"email","required":true,"default_value":"","public":true,"display_order":"1","options":{"size":"25"}} },
"description" : "",
"doublein" : 0,
"send_welcome" : 0,
Expand Down
98 changes: 50 additions & 48 deletions sites/all/modules/itk/osto_newsletter/osto_newsletter.pages_default.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,62 +59,64 @@ function osto_newsletter_default_page_manager_pages() {
$display->cache = array();
$display->title = 'OS2 Nyhedsbrev';
$display->uuid = '314bb2c7-a62b-40ba-bc1d-8f0876536c62';
$display->storage_type = 'page_manager';
$display->storage_id = 'page_newsletter__panel';
$display->content = array();
$display->panels = array();
$pane = new stdClass();
$pane->pid = 'new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
$pane->panel = 'left';
$pane->type = 'custom';
$pane->subtype = 'custom';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'admin_title' => '',
'title' => 'Arkiv',
'body' => '<style type="text/css">
$pane = new stdClass();
$pane->pid = 'new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
$pane->panel = 'left';
$pane->type = 'custom';
$pane->subtype = 'custom';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'admin_title' => '',
'title' => 'Arkiv',
'body' => '<style type="text/css">
<!--
.display_archive {font-family: arial,verdana; font-size: 12px;}
.campaign {line-height: 125%; margin: 5px;}
//-->
</style>
<script language="javascript" src="//os2web.us13.list-manage.com/generate-js/?u=aec6a3efb03994692405857d0&fid=1625&show=10" type="text/javascript"></script>',
'format' => 'custom_full_html',
'substitute' => TRUE,
);
$pane->cache = array();
$pane->style = array(
'settings' => NULL,
);
$pane->css = array();
$pane->extras = array();
$pane->position = 0;
$pane->locks = array();
$pane->uuid = 'd362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
$display->content['new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e'] = $pane;
$display->panels['left'][0] = 'new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
$pane = new stdClass();
$pane->pid = 'new-31104c8d-40dc-483c-930e-7d3310074466';
$pane->panel = 'right';
$pane->type = 'block';
$pane->subtype = 'mailchimp_signup-nyhedsbrev';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'override_title' => 1,
'override_title_text' => 'Tilmelding til nyhedsbrev',
'override_title_heading' => 'h2',
);
$pane->cache = array();
$pane->style = array(
'settings' => NULL,
);
$pane->css = array();
$pane->extras = array();
$pane->position = 0;
$pane->locks = array();
$pane->uuid = '31104c8d-40dc-483c-930e-7d3310074466';
$display->content['new-31104c8d-40dc-483c-930e-7d3310074466'] = $pane;
$display->panels['right'][0] = 'new-31104c8d-40dc-483c-930e-7d3310074466';
'format' => 'custom_full_html',
'substitute' => TRUE,
);
$pane->cache = array();
$pane->style = array(
'settings' => NULL,
);
$pane->css = array();
$pane->extras = array();
$pane->position = 0;
$pane->locks = array();
$pane->uuid = 'd362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
$display->content['new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e'] = $pane;
$display->panels['left'][0] = 'new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
$pane = new stdClass();
$pane->pid = 'new-31104c8d-40dc-483c-930e-7d3310074466';
$pane->panel = 'right';
$pane->type = 'block';
$pane->subtype = 'mailchimp_signup-nyhedsbrev';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'override_title' => 1,
'override_title_text' => 'Tilmelding til nyhedsbrev',
'override_title_heading' => 'h2',
);
$pane->cache = array();
$pane->style = array(
'settings' => NULL,
);
$pane->css = array();
$pane->extras = array();
$pane->position = 0;
$pane->locks = array();
$pane->uuid = '31104c8d-40dc-483c-930e-7d3310074466';
$display->content['new-31104c8d-40dc-483c-930e-7d3310074466'] = $pane;
$display->panels['right'][0] = 'new-31104c8d-40dc-483c-930e-7d3310074466';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = 'new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
$handler->conf['display'] = $display;
Expand Down
3 changes: 2 additions & 1 deletion sites/all/modules/itk/osto_views/osto_views.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package = ITK
version = 7.x-1.0
project = osto_views
dependencies[] = better_exposed_filters
dependencies[] = ctools
dependencies[] = eva
dependencies[] = flexslider_views
dependencies[] = strongarm
Expand All @@ -28,6 +29,7 @@ features[views_view][] = ting_events_popular
features[views_view][] = ting_group_content
features[views_view][] = ting_group_members
features[views_view][] = ting_group_messages
features[views_view][] = ting_group_relation
features[views_view][] = ting_latest_group_content_all_groups
features[views_view][] = ting_latest_products
features[views_view][] = ting_members
Expand All @@ -51,4 +53,3 @@ features[views_view][] = ting_teams
features[views_view][] = ting_user_followers
features[views_view][] = ting_user_messages
features[views_view][] = ting_user_projects
features_exclude[dependencies][ctools] = ctools
Loading