From 97f3777a11c68bb9bdc4e8ca4f513768d8425430 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 10 Mar 2016 20:42:30 +0100 Subject: [PATCH] updated phpdoc_md reference, updated system_wiki docu reference, fixed docu include, docu saimod --- docu/system_wiki | 2 +- lib/phpdoc_md | 2 +- sai/modules/saimod_sys_docu/saimod_sys_docu.php | 5 ++++- sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl | 2 +- sai/sai/saigui.php | 2 ++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docu/system_wiki b/docu/system_wiki index e15bada..dcf45d4 160000 --- a/docu/system_wiki +++ b/docu/system_wiki @@ -1 +1 @@ -Subproject commit e15bada4ee925c7ef5cffe8ae37cc615f8f28d7e +Subproject commit dcf45d45fe02cd1c9865556286d6545a545d994b diff --git a/lib/phpdoc_md b/lib/phpdoc_md index 6a52c6e..e092eca 160000 --- a/lib/phpdoc_md +++ b/lib/phpdoc_md @@ -1 +1 @@ -Subproject commit 6a52c6e0529d005d07c9f58af2934b5752d13907 +Subproject commit e092eca1a6f13b696fc4b7c9ca1df558bf3a4022 diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php index 6a84ad5..a62ffbd 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php +++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php @@ -25,7 +25,10 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_action_generate_md(){ \LIB\lib_phpdoc_md::php(); - + $configs = \SYSTEM\DOCU\docu::getAll(); + foreach($configs as $config){ + \phpdoc_md::run( $config['inpath_md'], + $config['outpath_md']);} } public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_action_cat($cat = 'system'){ diff --git a/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl b/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl index 0b37cf2..bad3060 100644 --- a/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl +++ b/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl @@ -3,7 +3,7 @@
diff --git a/sai/sai/saigui.php b/sai/sai/saigui.php index 61b4d44..fc9fa51 100644 --- a/sai/sai/saigui.php +++ b/sai/sai/saigui.php @@ -8,6 +8,8 @@ class saigui extends \SYSTEM\PAGE\Page { \SYSTEM\DOCU\docu::register(array( 'id' => 'system', 'inpath' => new \SYSTEM\PSYSTEM(), 'outpath' => new \SYSTEM\PSYSTEM('docu/system/'), + 'inpath_md' => new \SYSTEM\PSYSTEM('docu/system/structure.xml'), + 'outpath_md' => new \SYSTEM\PSYSTEM('docu/system_wiki/'), 'cachepath' => new \SYSTEM\PSYSTEM('docu/system/cache/'), 'ignore' => array( 'lib/animate/*', 'lib/bootstrap/*',