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

Commit 98cd2c9

Browse files
cablemancableman
authored
Merge pull request #7 from zorp/development
Updated features
2 parents 33380c1 + 8523c11 commit 98cd2c9

10 files changed

+2465
-2233
lines changed

‎sites/all/modules/itk/osto_contact/osto_contact.pages_default.inc‎

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -57,56 +57,59 @@ function osto_contact_default_page_manager_pages() {
5757
$display->cache = array();
5858
$display->title = '';
5959
$display->uuid = 'ef424137-fabe-405f-a449-61b0fcdbe63a';
60+
$display->storage_type = 'page_manager';
61+
$display->storage_id = 'page_contact__panel';
6062
$display->content = array();
6163
$display->panels = array();
62-
$pane = new stdClass();
63-
$pane->pid = 'new-b349d080-2873-4ec3-85b4-4fe2becbe352';
64-
$pane->panel = 'left';
65-
$pane->type = 'contact';
66-
$pane->subtype = 'contact';
67-
$pane->shown = TRUE;
68-
$pane->access = array();
69-
$pane->configuration = array(
70-
'override_title' => 1,
71-
'override_title_text' => '',
72-
'override_title_heading' => 'h2',
73-
);
74-
$pane->cache = array();
75-
$pane->style = array(
76-
'settings' => NULL,
77-
);
78-
$pane->css = array();
79-
$pane->extras = array();
80-
$pane->position = 0;
81-
$pane->locks = array();
82-
$pane->uuid = 'b349d080-2873-4ec3-85b4-4fe2becbe352';
83-
$display->content['new-b349d080-2873-4ec3-85b4-4fe2becbe352'] = $pane;
84-
$display->panels['left'][0] = 'new-b349d080-2873-4ec3-85b4-4fe2becbe352';
85-
$pane = new stdClass();
86-
$pane->pid = 'new-229cf7f5-4516-4554-8042-146683c7a6b3';
87-
$pane->panel = 'right';
88-
$pane->type = 'custom';
89-
$pane->subtype = 'custom';
90-
$pane->shown = TRUE;
91-
$pane->access = array();
92-
$pane->configuration = array(
93-
'admin_title' => 'OS2 kontaktinformationer',
94-
'title' => 'Forretningsledelsen',
95-
'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>',
96-
'format' => 'full_html',
97-
'substitute' => TRUE,
98-
);
99-
$pane->cache = array();
100-
$pane->style = array(
101-
'settings' => NULL,
102-
);
103-
$pane->css = array();
104-
$pane->extras = array();
105-
$pane->position = 0;
106-
$pane->locks = array();
107-
$pane->uuid = '229cf7f5-4516-4554-8042-146683c7a6b3';
108-
$display->content['new-229cf7f5-4516-4554-8042-146683c7a6b3'] = $pane;
109-
$display->panels['right'][0] = 'new-229cf7f5-4516-4554-8042-146683c7a6b3';
64+
$pane = new stdClass();
65+
$pane->pid = 'new-b349d080-2873-4ec3-85b4-4fe2becbe352';
66+
$pane->panel = 'left';
67+
$pane->type = 'contact';
68+
$pane->subtype = 'contact';
69+
$pane->shown = TRUE;
70+
$pane->access = array();
71+
$pane->configuration = array(
72+
'override_title' => 1,
73+
'override_title_text' => '',
74+
'override_title_heading' => 'h2',
75+
);
76+
$pane->cache = array();
77+
$pane->style = array(
78+
'settings' => NULL,
79+
);
80+
$pane->css = array();
81+
$pane->extras = array();
82+
$pane->position = 0;
83+
$pane->locks = array();
84+
$pane->uuid = 'b349d080-2873-4ec3-85b4-4fe2becbe352';
85+
$display->content['new-b349d080-2873-4ec3-85b4-4fe2becbe352'] = $pane;
86+
$display->panels['left'][0] = 'new-b349d080-2873-4ec3-85b4-4fe2becbe352';
87+
$pane = new stdClass();
88+
$pane->pid = 'new-229cf7f5-4516-4554-8042-146683c7a6b3';
89+
$pane->panel = 'right';
90+
$pane->type = 'custom';
91+
$pane->subtype = 'custom';
92+
$pane->shown = TRUE;
93+
$pane->access = array();
94+
$pane->configuration = array(
95+
'admin_title' => 'OS2 kontaktinformationer',
96+
'title' => 'Forretningsledelsen',
97+
'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>',
98+
'format' => 'full_html',
99+
'substitute' => TRUE,
100+
'title_heading' => 'h2',
101+
);
102+
$pane->cache = array();
103+
$pane->style = array(
104+
'settings' => NULL,
105+
);
106+
$pane->css = array();
107+
$pane->extras = array();
108+
$pane->position = 0;
109+
$pane->locks = array();
110+
$pane->uuid = '229cf7f5-4516-4554-8042-146683c7a6b3';
111+
$display->content['new-229cf7f5-4516-4554-8042-146683c7a6b3'] = $pane;
112+
$display->panels['right'][0] = 'new-229cf7f5-4516-4554-8042-146683c7a6b3';
110113
$display->hide_title = PANELS_TITLE_FIXED;
111114
$display->title_pane = 'new-b349d080-2873-4ec3-85b4-4fe2becbe352';
112115
$handler->conf['display'] = $display;

‎sites/all/modules/itk/osto_newsletter/osto_newsletter.features.inc‎

Lines changed: 5 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -32,51 +32,13 @@ function osto_newsletter_default_mailchimp_signup() {
3232
"confirmation_message" : "Du er nu oprettet som abonnent.",
3333
"destination" : "node\\/247",
3434
"mergefields" : {
35-
"EMAIL" : {
36-
"name" : "Email",
37-
"req" : true,
38-
"field_type" : "email",
39-
"public" : true,
40-
"show" : true,
41-
"order" : "1",
42-
"default" : "",
43-
"helptext" : "",
44-
"size" : "25",
45-
"tag" : "EMAIL",
46-
"id" : 0
47-
},
48-
"NAME" : {
49-
"name" : "Navn",
50-
"req" : false,
51-
"field_type" : "text",
52-
"public" : true,
53-
"show" : true,
54-
"order" : "2",
55-
"default" : "",
56-
"helptext" : "",
57-
"size" : "25",
58-
"tag" : "NAME",
59-
"id" : 1
60-
},
61-
"TYPE" : {
62-
"name" : "Jeg repr\\u00e6senterer en:",
63-
"req" : false,
64-
"field_type" : "dropdown",
65-
"public" : true,
66-
"show" : true,
67-
"order" : "3",
68-
"default" : "",
69-
"helptext" : "",
70-
"size" : "25",
71-
"choices" : [ "", "Kommune", "Anden offentlig myndighed", "Leverand\\u00f8r", "Anden" ],
72-
"tag" : "TYPE",
73-
"id" : 2
74-
}
35+
"EMAIL" : {"tag":"EMAIL","name":"Email Address","type":"email","required":true,"default_value":"","public":true,"display_order":1,"options":{"size":25}},
36+
"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"}]},
37+
"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"}]}
7538
},
7639
"description" : "",
7740
"doublein" : 0,
78-
"send_welcome" : 0,
79-
"include_interest_groups" : 1
41+
"include_interest_groups" : 0
8042
},
8143
"rdf_mapping" : []
8244
}');
@@ -90,23 +52,7 @@ function osto_newsletter_default_mailchimp_signup() {
9052
"submit_button" : "Tilmeld",
9153
"confirmation_message" : "Du er nu oprettet som abonnent.",
9254
"destination" : "node\\/247",
93-
"mergefields" : {
94-
"EMAIL" : {
95-
"name" : "Email",
96-
"req" : true,
97-
"field_type" : "email",
98-
"public" : true,
99-
"show" : true,
100-
"order" : "1",
101-
"default" : "",
102-
"helptext" : "",
103-
"size" : "25",
104-
"tag" : "EMAIL",
105-
"id" : 0
106-
},
107-
"NAME" : 0,
108-
"TYPE" : 0
109-
},
55+
"mergefields" : { "EMAIL" : {"tag":"EMAIL","name":"Email","type":"email","required":true,"default_value":"","public":true,"display_order":"1","options":{"size":"25"}} },
11056
"description" : "",
11157
"doublein" : 0,
11258
"send_welcome" : 0,

‎sites/all/modules/itk/osto_newsletter/osto_newsletter.pages_default.inc‎

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -59,62 +59,64 @@ function osto_newsletter_default_page_manager_pages() {
5959
$display->cache = array();
6060
$display->title = 'OS2 Nyhedsbrev';
6161
$display->uuid = '314bb2c7-a62b-40ba-bc1d-8f0876536c62';
62+
$display->storage_type = 'page_manager';
63+
$display->storage_id = 'page_newsletter__panel';
6264
$display->content = array();
6365
$display->panels = array();
64-
$pane = new stdClass();
65-
$pane->pid = 'new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
66-
$pane->panel = 'left';
67-
$pane->type = 'custom';
68-
$pane->subtype = 'custom';
69-
$pane->shown = TRUE;
70-
$pane->access = array();
71-
$pane->configuration = array(
72-
'admin_title' => '',
73-
'title' => 'Arkiv',
74-
'body' => '<style type="text/css">
66+
$pane = new stdClass();
67+
$pane->pid = 'new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
68+
$pane->panel = 'left';
69+
$pane->type = 'custom';
70+
$pane->subtype = 'custom';
71+
$pane->shown = TRUE;
72+
$pane->access = array();
73+
$pane->configuration = array(
74+
'admin_title' => '',
75+
'title' => 'Arkiv',
76+
'body' => '<style type="text/css">
7577
<!--
7678
.display_archive {font-family: arial,verdana; font-size: 12px;}
7779
.campaign {line-height: 125%; margin: 5px;}
7880
//-->
7981
</style>
8082
<script language="javascript" src="//os2web.us13.list-manage.com/generate-js/?u=aec6a3efb03994692405857d0&fid=1625&show=10" type="text/javascript"></script>',
81-
'format' => 'custom_full_html',
82-
'substitute' => TRUE,
83-
);
84-
$pane->cache = array();
85-
$pane->style = array(
86-
'settings' => NULL,
87-
);
88-
$pane->css = array();
89-
$pane->extras = array();
90-
$pane->position = 0;
91-
$pane->locks = array();
92-
$pane->uuid = 'd362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
93-
$display->content['new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e'] = $pane;
94-
$display->panels['left'][0] = 'new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
95-
$pane = new stdClass();
96-
$pane->pid = 'new-31104c8d-40dc-483c-930e-7d3310074466';
97-
$pane->panel = 'right';
98-
$pane->type = 'block';
99-
$pane->subtype = 'mailchimp_signup-nyhedsbrev';
100-
$pane->shown = TRUE;
101-
$pane->access = array();
102-
$pane->configuration = array(
103-
'override_title' => 1,
104-
'override_title_text' => 'Tilmelding til nyhedsbrev',
105-
'override_title_heading' => 'h2',
106-
);
107-
$pane->cache = array();
108-
$pane->style = array(
109-
'settings' => NULL,
110-
);
111-
$pane->css = array();
112-
$pane->extras = array();
113-
$pane->position = 0;
114-
$pane->locks = array();
115-
$pane->uuid = '31104c8d-40dc-483c-930e-7d3310074466';
116-
$display->content['new-31104c8d-40dc-483c-930e-7d3310074466'] = $pane;
117-
$display->panels['right'][0] = 'new-31104c8d-40dc-483c-930e-7d3310074466';
83+
'format' => 'custom_full_html',
84+
'substitute' => TRUE,
85+
);
86+
$pane->cache = array();
87+
$pane->style = array(
88+
'settings' => NULL,
89+
);
90+
$pane->css = array();
91+
$pane->extras = array();
92+
$pane->position = 0;
93+
$pane->locks = array();
94+
$pane->uuid = 'd362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
95+
$display->content['new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e'] = $pane;
96+
$display->panels['left'][0] = 'new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
97+
$pane = new stdClass();
98+
$pane->pid = 'new-31104c8d-40dc-483c-930e-7d3310074466';
99+
$pane->panel = 'right';
100+
$pane->type = 'block';
101+
$pane->subtype = 'mailchimp_signup-nyhedsbrev';
102+
$pane->shown = TRUE;
103+
$pane->access = array();
104+
$pane->configuration = array(
105+
'override_title' => 1,
106+
'override_title_text' => 'Tilmelding til nyhedsbrev',
107+
'override_title_heading' => 'h2',
108+
);
109+
$pane->cache = array();
110+
$pane->style = array(
111+
'settings' => NULL,
112+
);
113+
$pane->css = array();
114+
$pane->extras = array();
115+
$pane->position = 0;
116+
$pane->locks = array();
117+
$pane->uuid = '31104c8d-40dc-483c-930e-7d3310074466';
118+
$display->content['new-31104c8d-40dc-483c-930e-7d3310074466'] = $pane;
119+
$display->panels['right'][0] = 'new-31104c8d-40dc-483c-930e-7d3310074466';
118120
$display->hide_title = PANELS_TITLE_FIXED;
119121
$display->title_pane = 'new-d362cf43-f4c8-4770-8ed0-3a2f1fc8562e';
120122
$handler->conf['display'] = $display;

‎sites/all/modules/itk/osto_views/osto_views.info‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package = ITK
55
version = 7.x-1.0
66
project = osto_views
77
dependencies[] = better_exposed_filters
8+
dependencies[] = ctools
89
dependencies[] = eva
910
dependencies[] = flexslider_views
1011
dependencies[] = strongarm
@@ -28,6 +29,7 @@ features[views_view][] = ting_events_popular
2829
features[views_view][] = ting_group_content
2930
features[views_view][] = ting_group_members
3031
features[views_view][] = ting_group_messages
32+
features[views_view][] = ting_group_relation
3133
features[views_view][] = ting_latest_group_content_all_groups
3234
features[views_view][] = ting_latest_products
3335
features[views_view][] = ting_members
@@ -51,4 +53,3 @@ features[views_view][] = ting_teams
5153
features[views_view][] = ting_user_followers
5254
features[views_view][] = ting_user_messages
5355
features[views_view][] = ting_user_projects
54-
features_exclude[dependencies][ctools] = ctools

0 commit comments

Comments
 (0)