Group wiki link

diff --git a/languages/ca.php b/languages/ca.php
index effccb3bf84728ea76a64b27d534ae22f258109a..8e96ce3e398fde24dd1f4ff20b00c6c5cdaba970 100644 (file)
--- a/languages/ca.php
+++ b/languages/ca.php
@@ -4,7 +4,7 @@
 
 $catalan = array( 
         'dokuwiki:wiki'  =>  "Wiki" , 
-        'dokuwiki:groupwiki'  =>  "Wiki" , 
+        'dokuwiki:group'  =>  "Wiki del group" , 
         'dokuwiki:userwiki'  =>  "La meva Wiki" , 
         'dokuwiki'  =>  "Wikis" , 
         'item:object:dokuwiki'  =>  "Wikis" , 

diff --git a/languages/en.php b/languages/en.php
index f2748f25b2e3489b711bc4f2605c8b32b06e1f68..a24819ddc70987218348f0b028fe9ac7841b8cbd 100755 (executable)
--- a/languages/en.php
+++ b/languages/en.php
@@ -16,7 +16,7 @@
                "dokuwiki:wikifrom"=>'%s wiki',\r
                "dokuwiki:pages"=>'%s pages',\r
                "dokuwiki:dokuwiki"=>'Wiki',\r
-               "dokuwiki:groupwiki"=>'Wiki',\r
+               "dokuwiki:group"=>'Group wiki',\r
                "dokuwiki:userwiki"=>'My Wiki',\r
                "groups:enabledokuwiki"=>'Enable group wiki',\r
                "groups:enabledokuwiki_frontpage"=>'Show main wiki page in the group front page (only if wiki is enabled)',\r

diff --git a/languages/es.php b/languages/es.php
index 46e665c53c7349cfbe1c9cb1099fbd9f89ea0918..fc9240a6eeb54912aea2b7ab8d1f20e1ec0a82ff 100755 (executable)
--- a/languages/es.php
+++ b/languages/es.php
@@ -11,7 +11,7 @@
 \r
        $spanish = array(\r
                 "dokuwiki:wiki"=>'Wiki',\r
-                "dokuwiki:groupwiki"=>'Wiki',\r
+                "dokuwiki:group"=>'Wiki del grupo',\r
                 "dokuwiki:userwiki"=>'Mi Wiki',\r
                 "dokuwiki"=>'Wikis',\r
                 "item:object:dokuwiki"=>'Wikis',\r

diff --git a/start.php b/start.php
index 2fc13011bed524c58320e405cbc6b3f47099d234..4cb80b4b908696cbe5a63968297d1a9a0efccb3c 100644 (file)
--- a/start.php
+++ b/start.php
@@ -152,17 +152,16 @@
                return;
        }
 
-       function elggdokuwiki_pagesetup() {
-               global $CONFIG;
-               if (page_owner()) {
-                       $page_owner = page_owner_entity();
-                       if ($page_owner instanceof ElggGroup && $page_owner->dokuwiki_enable == 'yes')
-                               $title = elgg_echo("dokuwiki:groupwiki");
-                       if ($title && get_context() == "groups") {
-                               add_submenu_item($title, $CONFIG->wwwroot . "pg/dokuwiki/" . page_owner());
-                       }
-               }
-
+       /**
+        * Add a menu item to an ownerblock
+        */
+       function dokuwiki_owner_block_menu($hook, $type, $return, $params) {
+               if (elgg_instanceof($params['entity'], 'group') /*&& $params['entity']->dokuwiki_enable != "no"*/) {
+                       $url = "dokuwiki/group/{$params['entity']->guid}/all";
+                       $item = new ElggMenuItem('dokuwiki', elgg_echo('dokuwiki:group'), $url);
+                       $return[] = $item;
+               }
+               return $return;
        }
 
        function elggdokuwiki_icon_hook($hook, $entity_type, $returnvalue, $params) {
@@ -185,7 +184,9 @@
                        register_entity_type('object','dokuwiki');
                        register_plugin_hook('entity:icon:url', 'object', 'elggdokuwiki_icon_hook');
                        register_entity_url_handler('elggdokuwiki_url','object', 'dokuwiki');
-                       register_elgg_event_handler('pagesetup','system','elggdokuwiki_pagesetup');
+
+               // add blog link to
+               elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'dokuwiki_owner_block_menu');
 
                        register_page_handler('dokuwiki','elggdokuwiki_page_handler');
                        add_group_tool_option('dokuwiki',elgg_echo('groups:enabledokuwiki'),false);