Skip to content

Commit 9bc2c80

Browse files
author
Yani0029
committed
Merge feature/os2web-1.0-migration into master, and added newest changes in module
1 parent 951099b commit 9bc2c80

18 files changed

+2100
-467
lines changed

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
Import and handle Borger.dk articles. Including integration with the Borger.dk-webservice.
22

3+
Read guide under /doc:
4+
"Borger.dk menu import.pdf"
5+
"Guide til OS2web borger.dk - artikler.pdf"
6+
37
Borger.dk /Version 3

‎css/os2web_borger_dk.css

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,11 @@
33
margin-bottom: 2px;
44
padding: 5px 0;
55
display: inline-block;
6-
width: 95%;
6+
width: 90%;
77
background: none;
88
margin-top: 5px;
99
}
1010

11-
#borger_dk-body h5 {
12-
padding: 15px 0;
13-
font-size: 16px !important;
14-
}
15-
16-
#borger_dk-body p {
17-
color: #4A4A4A;
18-
font-size: 13px;
19-
line-height: 20px;
20-
}
21-
22-
#borger_dk-body {
23-
color: #4A4A4A;
24-
font-size: 13px;
25-
line-height: 19px;
26-
}
27-
2811
div.microArticle a {
2912
color: #496E04;
3013
}
@@ -61,20 +44,6 @@ div.microArticle a {
6144
padding-bottom: 5px;
6245
}
6346

64-
.os2web_borger_dk_selfservi ul li,
65-
.borger_dk-region-stack2 ul li {
66-
line-height: 22px;
67-
list-style-image: url("../images/arrowGreen.png");
68-
69-
}
70-
71-
.borger_dk-region-stack3 ul li,
72-
.borger_dk-region-stack4 ul li {
73-
line-height: 20px;
74-
list-style-image: url("../images/arrowGreen.png");
75-
}
76-
77-
7847
.os2web_borger_dk_selfservi ul li a, .os2web_borger_dk_selfservi a:link{
7948
color: #526A27;
8049
font-size: 13px;
@@ -99,10 +68,8 @@ div.microArticle a {
9968
}
10069

10170
.borger_dk_body_intro_text {
102-
font-size: 20px;
10371
font-weight: 300;
104-
padding-bottom: 10px;
105-
padding-top: 15px;
72+
font-size: 16px;
10673
margin-bottom: 20px;
10774
}
10875

@@ -168,6 +135,7 @@ div.microArticle a {
168135
float: right;
169136
padding-right: 10px;
170137
}
138+
171139
a.gplus {
172140
display: inline-block;
173141
background-image: url(../images/foldOut.png);

‎doc/Borger.dk menu import.pdf

641 KB
Binary file not shown.

‎doc/Guide til OS2web borger.dk - artikler.pdf

2.11 MB
Binary file not shown.

‎images/arrowGreen.png

-987 Bytes
Binary file not shown.

‎js/os2web_borger_dk.js

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* @file os2web_borger_dk.js
3+
*/
4+
15
(function($) {
26
Drupal.behaviors.os2web_borger_dk = {
37
attach: function(context) {
@@ -7,7 +11,6 @@
711
var article = $(this).parent().find('h2');
812
var myid = article.attr('id');
913
var style = $('div.' + myid).css('display');
10-
var path = $(this).css("background-image");
1114
if (style == 'none') {
1215
$("div." + myid).show("500");
1316
$(this).addClass('gminus');
@@ -20,23 +23,38 @@
2023
}
2124
return false;
2225
});
26+
2327
$(".gplus_all").click(function() {
24-
$("div.mArticle").show();
25-
$(".microArticle a.gplus").addClass('gminus');
26-
$(".microArticle a.gplus").removeClass('gplus');
28+
if ($(".microArticle a").hasClass("gminus")) {
29+
$("div.mArticle").hide();
30+
$(".microArticle a.gminus").addClass('gplus');
31+
$(".microArticle a.gminus").removeClass('gminus');
32+
}
33+
else {
34+
$("div.mArticle").show();
35+
$(".microArticle a.gplus").addClass('gminus');
36+
$(".microArticle a.gplus").removeClass('gplus');
37+
}
2738
return false;
2839
});
2940

3041
$(".gminus_all").click(function() {
31-
$(".microArticle a.gminus").addClass('gplus');
32-
$(".microArticle a.gminus").removeClass('gminus');
33-
$("div.mArticle").hide();
42+
if ($(".microArticle a").hasClass("gminus")) {
43+
$("div.mArticle").hide();
44+
$(".microArticle a.gminus").addClass('gplus');
45+
$(".microArticle a.gminus").removeClass('gminus');
46+
}
47+
else {
48+
$("div.mArticle").show();
49+
$(".microArticle a.gplus").addClass('gminus');
50+
$(".microArticle a.gplus").removeClass('gplus');
51+
}
3452
return false;
3553
});
54+
3655
$(".microArticle h2.mArticle").click(function() {
3756
var myid = $(this).attr('id');
3857
var style = $('div.' + myid).css('display');
39-
var path = $(this).css("background-image");
4058
if (style == 'none') {
4159
$("div." + myid).show("500");
4260
var alink = $(this).parent().find("a.gplus");

‎os2web_borger_dk.admin.inc

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ function os2web_borger_dk_settings_form($form, $form_state) {
2020
'#group' => 'vertical_settings_tab',
2121
);
2222
// Some of the fields are locked from from being changed.
23-
$locked_os2web_types = array('field_os2web_borger_dk_borgerurl' => 1, 'field_termref_kle' => 2, 'field_os2web_borger_dk_formterm' => 2);
23+
$locked_os2web_types = array(
24+
'field_os2web_borger_dk_borgerurl' => 1,
25+
'field_os2web_borger_dk_kle' => 2,
26+
'field_os2web_borger_dk_formterm' => 2,
27+
);
2428

2529
$data = field_info_instances('node', 'os2web_borger_dk_article');
2630
$newdata = array();
@@ -35,7 +39,7 @@ function os2web_borger_dk_settings_form($form, $form_state) {
3539
}
3640
if (empty($locked_os2web_types[$type]) || (!empty($locked_os2web_types[$type]) && $locked_os2web_types[$type] == 1)) {
3741
// Only some of the locked types can be displayed.
38-
$newdata[$type] = t($item['label']);
42+
$newdata[$type] = $item['label'];
3943
$init[$type] = $type;
4044
}
4145
}
@@ -189,7 +193,7 @@ function os2web_borger_dk_settings_form($form, $form_state) {
189193
'#description' => t('Check to enable weekly menu-import from Borger.dk (otherwise menus are imported daily)'),
190194
'#default_value' => variable_get('os2web_borger_dk_weekly_borger_dk_menus_import', 0),
191195
);*/
192-
$form['os2web_borger_dk_settings_6']['os2web_borger_dk_menu_import_description']= array(
196+
$form['os2web_borger_dk_settings_6']['os2web_borger_dk_menu_import_description'] = array(
193197
'#type' => 'fieldset',
194198
'#title' => t('Description for importing Borger.dk menu structure'),
195199
'#description' => t("Before you import Borger.dk menu structure, please create a content type
@@ -198,7 +202,7 @@ function os2web_borger_dk_settings_form($form, $form_state) {
198202
Step2 : When Borger.dk menu items are imported, please import all Borger.dk articles.
199203
Step 3 : Create Borger.dk menu structure now."),
200204
);
201-
$menu_option = array();
205+
$menu_option = array();
202206
$existing_menu = db_query('SELECT * FROM {menu_custom}');
203207
$menu_option['borgerdkmenu2'] = variable_get('os2web_borger_dk_borger_dk_menu_name', 'Borger.dk menu');
204208
if ($existing_menu) {
@@ -213,10 +217,10 @@ function os2web_borger_dk_settings_form($form, $form_state) {
213217
'#title' => t('Select Borger.dk menu Parent Item'),
214218
'#options' => $menu_option,
215219
'#description' => t('Select Borger.dk menu Parent Item from the list. REMEMBER to save before you start Menu import.'),
216-
'#default_value' => variable_get('build_borger_menu_under_menu','borgerdkmenu2'),
220+
'#default_value' => variable_get('build_borger_menu_under_menu', 'borgerdkmenu2'),
217221
'#type' => 'select',
218222
);
219-
//variable_set('build_borger_menu_under_menu');
223+
// variable_set('build_borger_menu_under_menu');
220224

221225
$disabled = FALSE;
222226
$description = '';
@@ -226,7 +230,7 @@ function os2web_borger_dk_settings_form($form, $form_state) {
226230
$description = t('If you want to import the Borger.dk menu you must first activate "Import and utilize Borger.dk-menus" and save the settings');
227231
drupal_set_message($description);
228232
}
229-
$form['os2web_borger_dk_settings_6']['submit']= array(
233+
$form['os2web_borger_dk_settings_6']['submit'] = array(
230234
'#type' => 'submit',
231235
'#value' => 'Import Borger.dk-menu now',
232236
'#submit' => array('os2web_borger_dk_import_menu_now_form_submit'),
@@ -239,9 +243,9 @@ function os2web_borger_dk_settings_form($form, $form_state) {
239243
'#value' => 'Import Borger.dk articles',
240244
'#submit' => array('os2web_borger_dk_import_articles_now_form_submit'),
241245
'#disabled' => $disabled,
242-
'#description' => t(' Step2 : When Borger.dk menu items are imported, please import all Borger.dk articles.'),
246+
'#description' => t('Step2 : When Borger.dk menu items are imported, please import all Borger.dk articles.'),
243247
);
244-
$form['os2web_borger_dk_settings_6']['create_borger_dk_menu_links'] = array(
248+
$form['os2web_borger_dk_settings_6']['create_borger_dk_menu_links'] = array(
245249
'#type' => 'submit',
246250
'#value' => t('Create Borger.dk menu structure now'),
247251
'#submit' => array('os2web_borger_dk_create_borger_dk_menu_now_form_submit'),
@@ -258,16 +262,16 @@ function os2web_borger_dk_settings_form($form, $form_state) {
258262
$form['os2web_borger_dk_settings_7']['os2web_borger_dk_microarticle_active'] = array(
259263
'#type' => 'checkbox',
260264
'#title' => t('Show and edit microarticles individually'),
261-
'#description' => t('Check to enable visibility and editablity of microarticles from Borger.dk '),
265+
'#description' => t('Check to enable visibility and editablity of microarticles from Borger.dk'),
262266
'#default_value' => variable_get('os2web_borger_dk_microarticle_active', 0),
263267
);
264268

265269
$options = variable_get('os2web_borger_dk_municipality_list');
266270
if (isset($options)) {
267-
$muni_items= $options;
271+
$muni_items = $options;
268272
}
269-
else{
270-
$muni_items= array();
273+
else {
274+
$muni_items = array();
271275
$municipalities = _os2web_borger_dk_GetMunicipalityList();
272276
$muni_items[0] = t('--Not selected--');
273277
foreach ($municipalities as $code => $item) {
@@ -290,23 +294,25 @@ function os2web_borger_dk_settings_form($form, $form_state) {
290294
'#options' => $muni_items,
291295
'#description' => t('Check to import articles from Borger.dk according to municipality.'),
292296
'#default_value' => $admin_municipality,
293-
);
297+
);
294298
return system_settings_form($form);
295299
}
296300

297301
/**
298-
* Function _os2web_borger_dk_GetMunicipalityList()
302+
* Function _os2web_borger_dk_GetMunicipalityList().
303+
*
299304
* This function uses the Borger.dk Webservice GetMunicipalityList
300305
* in order to fetch a list of Municipality-codes from Borger.dk
301306
*/
302307
function _os2web_borger_dk_GetMunicipalityList($wsdl = 'https://www.borger.dk/_vti_bin/borger/ArticleExport.svc?wsdl') {
303308
$errors = array();
304309
$municipality_item = array();
305310

306-
// Then we can start using a new soap-client to find the article-ID from the Borger.dk-URL
311+
// Then we can start using a new soap-client to
312+
// find the article-ID from the Borger.dk-URL.
307313
$client = new SoapClient($wsdl, array('exceptions' => 0));
308314
// First we make sure to keep requests/minute within given limits.
309-
//_os2web_borger_dk_articles_check_webservice_constraints();
315+
// _os2web_borger_dk_articles_check_webservice_constraints();
310316
// Then we execute our webservice-request.
311317
$result_list = $client->GetMunicipalityList();
312318
if (is_soap_fault($result_list)) {
@@ -315,15 +321,14 @@ function _os2web_borger_dk_GetMunicipalityList($wsdl = 'https://www.borger.dk/_v
315321
}
316322

317323
$municipality_item = array();
318-
// Then we get the result-list from the specified webservice
324+
// Then we get the result-list from the specified webservice.
319325
$municipality_list = $result_list->GetMunicipalityListResult;
320326
if (is_soap_fault($municipality_list)) {
321327
$errors = _os2web_borger_dk_articles_translate_soap_fault('GetMunicipalityListResult', $municipality_list->faultcode, $municipality_list->faultstring);
322328

323329
return $errors;
324330
}
325331
else {
326-
//print 'GetAllSites found these availlable menu-items at Borger.dk: '. print_r($municipality_list, TRUE) ."\n\n";
327332
// Now we step through all the fetched menu-items and convert them to
328333
// arrays of wanted field-sets.
329334
if (is_array($municipality_list->Municipality)) {
@@ -342,6 +347,8 @@ function _os2web_borger_dk_GetMunicipalityList($wsdl = 'https://www.borger.dk/_v
342347
}
343348

344349
/**
350+
* Function _os2web_borger_dk_articles_parse_borgerdk_municipality_item().
351+
*
345352
* This function parses a Borger.dk-ArticleDescription and extracts all
346353
* the field values we want for our list of titles (for autocompletion etc)
347354
*/

‎os2web_borger_dk.features.field.inc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@ function os2web_borger_dk_field_default_fields() {
130130
),
131131
);
132132

133-
// Exported field: 'node-os2web_borger_dk_article-field_billede'.
134-
$fields['node-os2web_borger_dk_article-field_billede'] = array(
133+
// Exported field: 'node-os2web_borger_dk_article-field_os2web_borger_dk_image'.
134+
$fields['node-os2web_borger_dk_article-field_os2web_borger_dk_image'] = array(
135135
'field_config' => array(
136136
'active' => '1',
137137
'cardinality' => '-1',
138138
'deleted' => '0',
139139
'entity_types' => array(),
140-
'field_name' => 'field_billede',
140+
'field_name' => 'field_os2web_borger_dk_image',
141141
'foreign keys' => array(
142142
'fid' => array(
143143
'columns' => array(
@@ -189,7 +189,7 @@ function os2web_borger_dk_field_default_fields() {
189189
),
190190
),
191191
'entity_type' => 'node',
192-
'field_name' => 'field_billede',
192+
'field_name' => 'field_os2web_borger_dk_image',
193193
'label' => 'Billede',
194194
'required' => 0,
195195
'settings' => array(
@@ -1461,14 +1461,14 @@ function os2web_borger_dk_field_default_fields() {
14611461
),
14621462
);
14631463

1464-
// Exported field: 'node-os2web_borger_dk_article-field_termref_kle'.
1465-
$fields['node-os2web_borger_dk_article-field_termref_kle'] = array(
1464+
// Exported field: 'node-os2web_borger_dk_article-field_os2web_borger_dk_kle'.
1465+
$fields['node-os2web_borger_dk_article-field_os2web_borger_dk_kle'] = array(
14661466
'field_config' => array(
14671467
'active' => '1',
14681468
'cardinality' => '-1',
14691469
'deleted' => '0',
14701470
'entity_types' => array(),
1471-
'field_name' => 'field_termref_kle',
1471+
'field_name' => 'field_os2web_borger_dk_kle',
14721472
'foreign keys' => array(
14731473
'tid' => array(
14741474
'columns' => array(
@@ -1522,7 +1522,7 @@ function os2web_borger_dk_field_default_fields() {
15221522
),
15231523
),
15241524
'entity_type' => 'node',
1525-
'field_name' => 'field_termref_kle',
1525+
'field_name' => 'field_os2web_borger_dk_kle',
15261526
'label' => 'KL Emneord',
15271527
'required' => 0,
15281528
'settings' => array(

0 commit comments

Comments
 (0)