Merge branch 'develop'

Author: andersbryrup

os2web_meetings.make

@@ -8,17 +8,12 @@ core = 7.x
 projects[os2web_qbrick][type] = "module"
 projects[os2web_qbrick][download][type] = "git"
 projects[os2web_qbrick][download][branch] = "develop"
-projects[os2web_qbrick][download][url] = "git@github.com:OS2web/os2web_qbrick.git"
+projects[os2web_qbrick][download][url] = "https://github.com/OS2web/os2web_qbrick.git"
 
 projects[os2web_print_send_to_friend][type] = "module"
 projects[os2web_print_send_to_friend][download][type] = "git"
 projects[os2web_print_send_to_friend][download][branch] = "develop"
-projects[os2web_print_send_to_friend][download][url] = "[email protected]:OS2web/os2web_print_send_to_friend.git"
-
-projects[os2web_print_send_to_friend][type] = "module"
-projects[os2web_print_send_to_friend][download][type] = "git"
-projects[os2web_print_send_to_friend][download][branch] = "develop"
-projects[os2web_print_send_to_friend][download][url] = "[email protected]:OS2web/os2web_print_send_to_friend.git"
+projects[os2web_print_send_to_friend][download][url] = "https://github.com/OS2web/os2web_print_send_to_friend.git"
 
 ;; Contrib modules below:
 

os2web_meetings.module

@@ -189,3 +189,13 @@ function _os2web_meetings_strip_words($text) {
     return FALSE;
   }
 }
+
+/**
+ * Implements hook_os2web_help().
+ */
+function os2web_meetings_os2web_help($sections) {
+
+  // Content types.
+  $sections['contenttype'] = t('<p><b>Meetings:</b> Dependent on the system, meetings are often imported by a metting importer, which can communicate with your ESDH.<br />A meeting contains bullets which can contain attachments. These are all imported, and should not be altered directly on site.<br />See the <a href="@url" target="_blank">overview</a> over meetings.</p>', array('@url' => url('dagsorden-og-referat')));
+  return $sections;
+}

os2web_meetings.strongarm.inc

@@ -361,7 +361,7 @@ function os2web_meetings_strongarm() {
   $strongarm->api_version = 1;
   $strongarm->name = 'menu_options_meeting';
   $strongarm->value = array(
-    0 => 'main-menu',
+    0 => 'os2web-main-menu',
   );
   $export['menu_options_meeting'] = $strongarm;
 
@@ -376,28 +376,28 @@ function os2web_meetings_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'menu_parent_os2web_meetings_bullet';
-  $strongarm->value = 'main-menu:0';
+  $strongarm->value = 'os2web-main-menu:0';
   $export['menu_parent_os2web_meetings_bullet'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'menu_parent_os2web_meetings_bullet_attach';
-  $strongarm->value = 'main-menu:0';
+  $strongarm->value = 'os2web-main-menu:0';
   $export['menu_parent_os2web_meetings_bullet_attach'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'menu_parent_meeting';
-  $strongarm->value = 'main-menu:0';
+  $strongarm->value = 'os2web-main-menu:0';
   $export['menu_parent_meeting'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'menu_parent_os2web_meeting_search_status';
-  $strongarm->value = 'main-menu:0';
+  $strongarm->value = 'os2web-main-menu:0';
   $export['menu_parent_os2web_meeting_search_status'] = $strongarm;
 
   $strongarm = new stdClass();