F/clean up and gathering changes

README.md

@@ -1,3 +1,7 @@
 Import and handle Borger.dk articles. Including integration with the Borger.dk-webservice.
 
+Read guide under /doc:
+"Borger.dk menu import.pdf"
+"Guide til OS2web borger.dk - artikler.pdf"
+
 Borger.dk /Version 3

css/os2web_borger_dk.css

@@ -3,28 +3,11 @@
   margin-bottom: 2px;
   padding: 5px 0;
   display: inline-block;
-  width: 95%;
+  width: 90%;
   background: none;
   margin-top: 5px;
 }
 
-#borger_dk-body h5 {
-  padding: 15px 0;
-  font-size: 16px !important;
-}
-
-#borger_dk-body p {
-  color: #4A4A4A;
-  font-size: 13px;
-  line-height: 20px;
-}
-
-#borger_dk-body {
-  color: #4A4A4A;
-  font-size: 13px;
-  line-height: 19px;
-}
-
 div.microArticle a {
   color: #496E04;
 }
@@ -61,20 +44,6 @@ div.microArticle a {
   padding-bottom: 5px;
 }
 
-.os2web_borger_dk_selfservi ul li,
-.borger_dk-region-stack2 ul li {
-  line-height: 22px;
-  list-style-image: url("../images/arrowGreen.png");
-
-}
-
-.borger_dk-region-stack3 ul li,
-.borger_dk-region-stack4 ul li {
-  line-height: 20px;
-  list-style-image: url("../images/arrowGreen.png");
-}
-
-
 .os2web_borger_dk_selfservi ul li a, .os2web_borger_dk_selfservi a:link{
   color: #526A27;
   font-size: 13px;
@@ -99,10 +68,8 @@ div.microArticle a {
 }
 
 .borger_dk_body_intro_text {
-  font-size: 20px;
   font-weight: 300;
-  padding-bottom: 10px;
-  padding-top: 15px;
+  font-size: 16px;
   margin-bottom: 20px;
 }
 
@@ -168,6 +135,7 @@ div.microArticle a {
   float: right;
   padding-right: 10px;
 }
+
 a.gplus {
   display: inline-block;
   background-image: url(../images/foldOut.png);

js/os2web_borger_dk.js

@@ -1,3 +1,7 @@
+/**
+ * @file os2web_borger_dk.js
+ */
+
 (function($) {
   Drupal.behaviors.os2web_borger_dk = {
     attach: function(context) {
@@ -7,7 +11,6 @@
         var article = $(this).parent().find('h2');
         var myid = article.attr('id');
         var style = $('div.' + myid).css('display');
-        var path = $(this).css("background-image");
         if (style == 'none') {
           $("div." + myid).show("500");
           $(this).addClass('gminus');
@@ -20,23 +23,38 @@
         }
         return false;
       });
+
       $(".gplus_all").click(function() {
-        $("div.mArticle").show();
-        $(".microArticle a.gplus").addClass('gminus');
-        $(".microArticle a.gplus").removeClass('gplus');
+        if ($(".microArticle a").hasClass("gminus")) {
+          $("div.mArticle").hide();
+          $(".microArticle a.gminus").addClass('gplus');
+          $(".microArticle a.gminus").removeClass('gminus');
+        }
+        else {
+          $("div.mArticle").show();
+          $(".microArticle a.gplus").addClass('gminus');
+          $(".microArticle a.gplus").removeClass('gplus');
+        }
         return false;
       });
 
       $(".gminus_all").click(function() {
-        $(".microArticle a.gminus").addClass('gplus');
-        $(".microArticle a.gminus").removeClass('gminus');
-        $("div.mArticle").hide();
+        if ($(".microArticle a").hasClass("gminus")) {
+          $("div.mArticle").hide();
+          $(".microArticle a.gminus").addClass('gplus');
+          $(".microArticle a.gminus").removeClass('gminus');
+        }
+        else {
+          $("div.mArticle").show();
+          $(".microArticle a.gplus").addClass('gminus');
+          $(".microArticle a.gplus").removeClass('gplus');
+        }
         return false;
       });
+
       $(".microArticle h2.mArticle").click(function() {
         var myid = $(this).attr('id');
         var style = $('div.' + myid).css('display');
-        var path = $(this).css("background-image");
         if (style == 'none') {
           $("div." + myid).show("500");
           var alink = $(this).parent().find("a.gplus");

os2web_borger_dk.admin.inc

@@ -20,7 +20,11 @@ function os2web_borger_dk_settings_form($form, $form_state) {
     '#group' => 'vertical_settings_tab',
   );
   // Some of the fields are locked from from being changed.
-  $locked_os2web_types = array('field_os2web_borger_dk_borgerurl' => 1, 'field_termref_kle' => 2, 'field_os2web_borger_dk_formterm' => 2);
+  $locked_os2web_types = array(
+    'field_os2web_borger_dk_borgerurl' => 1,
+    'field_os2web_borger_dk_kle' => 2,
+    'field_os2web_borger_dk_formterm' => 2,
+  );
 
   $data = field_info_instances('node', 'os2web_borger_dk_article');
   $newdata = array();
@@ -35,7 +39,7 @@ function os2web_borger_dk_settings_form($form, $form_state) {
     }
     if (empty($locked_os2web_types[$type]) || (!empty($locked_os2web_types[$type]) && $locked_os2web_types[$type] == 1)) {
       // Only some of the locked types can be displayed.
-      $newdata[$type] = t($item['label']);
+      $newdata[$type] = $item['label'];
       $init[$type] = $type;
     }
   }
@@ -189,7 +193,7 @@ function os2web_borger_dk_settings_form($form, $form_state) {
     '#description' => t('Check to enable weekly menu-import from Borger.dk (otherwise menus are imported daily)'),
     '#default_value' => variable_get('os2web_borger_dk_weekly_borger_dk_menus_import', 0),
   );*/
-  $form['os2web_borger_dk_settings_6']['os2web_borger_dk_menu_import_description']= array(
+  $form['os2web_borger_dk_settings_6']['os2web_borger_dk_menu_import_description'] = array(
     '#type' => 'fieldset',
     '#title' => t('Description for importing Borger.dk menu structure'),
     '#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) {
                         Step2 : When Borger.dk menu items are imported, please import all Borger.dk articles.
                         Step 3 : Create Borger.dk menu structure now."),
   );
-  $menu_option = array();  
+  $menu_option = array();
   $existing_menu = db_query('SELECT * FROM {menu_custom}');
   $menu_option['borgerdkmenu2'] = variable_get('os2web_borger_dk_borger_dk_menu_name', 'Borger.dk menu');
   if ($existing_menu) {
@@ -213,10 +217,10 @@ function os2web_borger_dk_settings_form($form, $form_state) {
     '#title' => t('Select Borger.dk menu Parent Item'),
     '#options' => $menu_option,
     '#description' => t('Select Borger.dk menu Parent Item from the list. REMEMBER to save before you start Menu import.'),
-    '#default_value' => variable_get('build_borger_menu_under_menu','borgerdkmenu2'),
+    '#default_value' => variable_get('build_borger_menu_under_menu', 'borgerdkmenu2'),
     '#type' => 'select',
   );
-  //variable_set('build_borger_menu_under_menu');
+  // variable_set('build_borger_menu_under_menu');
 
   $disabled = FALSE;
   $description = '';
@@ -226,7 +230,7 @@ function os2web_borger_dk_settings_form($form, $form_state) {
     $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');
     drupal_set_message($description);
   }
-  $form['os2web_borger_dk_settings_6']['submit']= array(
+  $form['os2web_borger_dk_settings_6']['submit'] = array(
     '#type' => 'submit',
     '#value' => 'Import Borger.dk-menu now',
     '#submit' => array('os2web_borger_dk_import_menu_now_form_submit'),
@@ -239,9 +243,9 @@ function os2web_borger_dk_settings_form($form, $form_state) {
     '#value' => 'Import Borger.dk articles',
     '#submit' => array('os2web_borger_dk_import_articles_now_form_submit'),
     '#disabled' => $disabled,
-    '#description' => t(' Step2 : When Borger.dk menu items are imported, please import all Borger.dk articles.'),
+    '#description' => t('Step2 : When Borger.dk menu items are imported, please import all Borger.dk articles.'),
   );
-    $form['os2web_borger_dk_settings_6']['create_borger_dk_menu_links'] = array(
+  $form['os2web_borger_dk_settings_6']['create_borger_dk_menu_links'] = array(
     '#type' => 'submit',
     '#value' => t('Create Borger.dk menu structure now'),
     '#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) {
   $form['os2web_borger_dk_settings_7']['os2web_borger_dk_microarticle_active'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show and edit microarticles individually'),
-    '#description' => t('Check to enable visibility and editablity of microarticles from Borger.dk '),
+    '#description' => t('Check to enable visibility and editablity of microarticles from Borger.dk'),
     '#default_value' => variable_get('os2web_borger_dk_microarticle_active', 0),
   );
 
   $options = variable_get('os2web_borger_dk_municipality_list');
   if (isset($options)) {
-    $muni_items= $options; 
+    $muni_items = $options;
   }
-  else{
-    $muni_items= array();
+  else {
+    $muni_items = array();
     $municipalities = _os2web_borger_dk_GetMunicipalityList();
     $muni_items[0] = t('--Not selected--');
     foreach ($municipalities as $code => $item) {
@@ -290,23 +294,25 @@ function os2web_borger_dk_settings_form($form, $form_state) {
     '#options' => $muni_items,
     '#description' => t('Check to import articles from Borger.dk according to municipality.'),
     '#default_value' => $admin_municipality,
-    );
+  );
   return system_settings_form($form);
 }
 
 /**
- * Function _os2web_borger_dk_GetMunicipalityList()
+ * Function _os2web_borger_dk_GetMunicipalityList().
+ *
  * This function uses the Borger.dk Webservice GetMunicipalityList
  * in order to fetch a list of Municipality-codes from Borger.dk
  */
 function _os2web_borger_dk_GetMunicipalityList($wsdl = 'https://www.borger.dk/_vti_bin/borger/ArticleExport.svc?wsdl') {
   $errors = array();
   $municipality_item = array();
 
-  // Then we can start using a new soap-client to find the article-ID from the Borger.dk-URL
+  // Then we can start using a new soap-client to
+  // find the article-ID from the Borger.dk-URL.
   $client = new SoapClient($wsdl, array('exceptions' => 0));
   // First we make sure to keep requests/minute within given limits.
-  //_os2web_borger_dk_articles_check_webservice_constraints();
+  // _os2web_borger_dk_articles_check_webservice_constraints();
   // Then we execute our webservice-request.
   $result_list = $client->GetMunicipalityList();
   if (is_soap_fault($result_list)) {
@@ -315,15 +321,14 @@ function _os2web_borger_dk_GetMunicipalityList($wsdl = 'https://www.borger.dk/_v
   }
 
   $municipality_item = array();
-  // Then we get the result-list from the specified webservice
+  // Then we get the result-list from the specified webservice.
   $municipality_list = $result_list->GetMunicipalityListResult;
   if (is_soap_fault($municipality_list)) {
     $errors = _os2web_borger_dk_articles_translate_soap_fault('GetMunicipalityListResult', $municipality_list->faultcode, $municipality_list->faultstring);
 
     return $errors;
   }
   else {
-    //print 'GetAllSites found these availlable menu-items at Borger.dk: '. print_r($municipality_list, TRUE) ."\n\n";
     // Now we step through all the fetched menu-items and convert them to
     // arrays of wanted field-sets.
     if (is_array($municipality_list->Municipality)) {
@@ -342,6 +347,8 @@ function _os2web_borger_dk_GetMunicipalityList($wsdl = 'https://www.borger.dk/_v
 }
 
 /**
+ * Function _os2web_borger_dk_articles_parse_borgerdk_municipality_item().
+ *
  * This function parses a Borger.dk-ArticleDescription and extracts all
  * the field values we want for our list of titles (for autocompletion etc)
  */

os2web_borger_dk.features.field.inc

@@ -130,14 +130,14 @@ function os2web_borger_dk_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-os2web_borger_dk_article-field_billede'.
-  $fields['node-os2web_borger_dk_article-field_billede'] = array(
+  // Exported field: 'node-os2web_borger_dk_article-field_os2web_borger_dk_image'.
+  $fields['node-os2web_borger_dk_article-field_os2web_borger_dk_image'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_billede',
+      'field_name' => 'field_os2web_borger_dk_image',
       'foreign keys' => array(
         'fid' => array(
           'columns' => array(
@@ -189,7 +189,7 @@ function os2web_borger_dk_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_billede',
+      'field_name' => 'field_os2web_borger_dk_image',
       'label' => 'Billede',
       'required' => 0,
       'settings' => array(
@@ -1461,14 +1461,14 @@ function os2web_borger_dk_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-os2web_borger_dk_article-field_termref_kle'.
-  $fields['node-os2web_borger_dk_article-field_termref_kle'] = array(
+  // Exported field: 'node-os2web_borger_dk_article-field_os2web_borger_dk_kle'.
+  $fields['node-os2web_borger_dk_article-field_os2web_borger_dk_kle'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_termref_kle',
+      'field_name' => 'field_os2web_borger_dk_kle',
       'foreign keys' => array(
         'tid' => array(
           'columns' => array(
@@ -1522,7 +1522,7 @@ function os2web_borger_dk_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_termref_kle',
+      'field_name' => 'field_os2web_borger_dk_kle',
       'label' => 'KL Emneord',
       'required' => 0,
       'settings' => array(