diff --git a/autoload.inc.php b/autoload.inc.php index 37c1862..0db345c 100644 --- a/autoload.inc.php +++ b/autoload.inc.php @@ -3,13 +3,8 @@ require_once dirname(__FILE__).'/system/path.php'; require_once dirname(__FILE__).'/system/autoload.php'; -//autoload hook -> refers to autoload class singleton -function __autoload_system($class_name) { - return system\autoload::autoload($class_name); -} - //Register autoload -spl_autoload_register('__autoload_system'); +\SYSTEM\autoload::register_autoload(); //Register system classes \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/system','SYSTEM'); @@ -41,4 +36,5 @@ spl_autoload_register('__autoload_system'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/img','SYSTEM\IMG'); require_once dirname(__FILE__).'/lib/autoload.inc.php'; -require_once dirname(__FILE__).'/docu/register_sys_docu.php'; \ No newline at end of file +require_once dirname(__FILE__).'/docu/register_sys_docu.php'; +require_once dirname(__FILE__).'/sai/autoload.inc.php'; \ No newline at end of file diff --git a/sai/autoload.inc.php b/sai/autoload.inc.php index 4971b61..e82a68f 100644 --- a/sai/autoload.inc.php +++ b/sai/autoload.inc.php @@ -2,7 +2,6 @@ SYSTEM\autoload::registerFolder(dirname(__FILE__).'/sai','SYSTEM\SAI'); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/page','SYSTEM\SAI'); -SYSTEM\autoload::registerFolder(dirname(__FILE__).'/page/default_page','SYSTEM\SAI'); require_once dirname(__FILE__).'/modules/autoload_modules.php'; require_once dirname(__FILE__).'/modules/register_modules.php'; \ No newline at end of file diff --git a/sai/modules/autoload_modules.php b/sai/modules/autoload_modules.php index 63dcb2d..e82a55a 100644 --- a/sai/modules/autoload_modules.php +++ b/sai/modules/autoload_modules.php @@ -1,6 +1,6 @@ '.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE).'';} - public static function right_public(){return true;} - public static function right_right(){return true;} - - public static function sai_mod__SYSTEM_SAI_saimod_sys_sai_flag_css(){} - public static function sai_mod__SYSTEM_SAI_saimod_sys_sai_flag_js(){} -} \ No newline at end of file diff --git a/sai/modules/saimod_sys_sai/carousel.tpl b/sai/modules/saistart_sys_sai/carousel.tpl similarity index 100% rename from sai/modules/saimod_sys_sai/carousel.tpl rename to sai/modules/saistart_sys_sai/carousel.tpl diff --git a/sai/modules/saistart_sys_sai/saistart_sys_sai.php b/sai/modules/saistart_sys_sai/saistart_sys_sai.php new file mode 100644 index 0000000..a893cf6 --- /dev/null +++ b/sai/modules/saistart_sys_sai/saistart_sys_sai.php @@ -0,0 +1,12 @@ +'.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE).'';} + public static function right_public(){return true;} + public static function right_right(){return true;} + + public static function sai_mod__SYSTEM_SAI_saistart_sys_sai_flag_css(){} + public static function sai_mod__SYSTEM_SAI_saistart_sys_sai_flag_js(){} +} \ No newline at end of file diff --git a/sai/page/default_page/carousel.tpl b/sai/page/carousel.tpl similarity index 100% rename from sai/page/default_page/carousel.tpl rename to sai/page/carousel.tpl diff --git a/sai/page/default_page/css/apireference.css b/sai/page/css/apireference.css similarity index 100% rename from sai/page/default_page/css/apireference.css rename to sai/page/css/apireference.css diff --git a/sai/page/default_page/css/img/glyphicons-halflings-white.png b/sai/page/css/img/glyphicons-halflings-white.png similarity index 100% rename from sai/page/default_page/css/img/glyphicons-halflings-white.png rename to sai/page/css/img/glyphicons-halflings-white.png diff --git a/sai/page/default_page/css/img/glyphicons-halflings.png b/sai/page/css/img/glyphicons-halflings.png similarity index 100% rename from sai/page/default_page/css/img/glyphicons-halflings.png rename to sai/page/css/img/glyphicons-halflings.png diff --git a/sai/page/default_page/css/index.css b/sai/page/css/index.css similarity index 100% rename from sai/page/default_page/css/index.css rename to sai/page/css/index.css diff --git a/sai/page/default_page/css/libs/bootstrap-responsive.css b/sai/page/css/libs/bootstrap-responsive.css similarity index 100% rename from sai/page/default_page/css/libs/bootstrap-responsive.css rename to sai/page/css/libs/bootstrap-responsive.css diff --git a/sai/page/default_page/css/libs/bootstrap-responsive.min.css b/sai/page/css/libs/bootstrap-responsive.min.css similarity index 100% rename from sai/page/default_page/css/libs/bootstrap-responsive.min.css rename to sai/page/css/libs/bootstrap-responsive.min.css diff --git a/sai/page/default_page/css/libs/bootstrap-switch.css b/sai/page/css/libs/bootstrap-switch.css similarity index 100% rename from sai/page/default_page/css/libs/bootstrap-switch.css rename to sai/page/css/libs/bootstrap-switch.css diff --git a/sai/page/default_page/css/libs/bootstrap-timepicker.min.css b/sai/page/css/libs/bootstrap-timepicker.min.css similarity index 100% rename from sai/page/default_page/css/libs/bootstrap-timepicker.min.css rename to sai/page/css/libs/bootstrap-timepicker.min.css diff --git a/sai/page/default_page/css/libs/bootstrap.css b/sai/page/css/libs/bootstrap.css similarity index 100% rename from sai/page/default_page/css/libs/bootstrap.css rename to sai/page/css/libs/bootstrap.css diff --git a/sai/page/default_page/css/libs/bootstrap.min.css b/sai/page/css/libs/bootstrap.min.css similarity index 100% rename from sai/page/default_page/css/libs/bootstrap.min.css rename to sai/page/css/libs/bootstrap.min.css diff --git a/sai/page/default_page/css/libs/datepicker.css b/sai/page/css/libs/datepicker.css similarity index 100% rename from sai/page/default_page/css/libs/datepicker.css rename to sai/page/css/libs/datepicker.css diff --git a/sai/page/default_page/css/libs/jquery.miniColors.css b/sai/page/css/libs/jquery.miniColors.css similarity index 100% rename from sai/page/default_page/css/libs/jquery.miniColors.css rename to sai/page/css/libs/jquery.miniColors.css diff --git a/sai/page/default_page/css/libs/jquery.minicolors.png b/sai/page/css/libs/jquery.minicolors.png similarity index 100% rename from sai/page/default_page/css/libs/jquery.minicolors.png rename to sai/page/css/libs/jquery.minicolors.png diff --git a/sai/page/default_page/default_page.php b/sai/page/default_page.php similarity index 75% rename from sai/page/default_page/default_page.php rename to sai/page/default_page.php index e59d88e..5e24669 100644 --- a/sai/page/default_page/default_page.php +++ b/sai/page/default_page.php @@ -17,8 +17,7 @@ class default_page extends \SYSTEM\PAGE\Page { } private function menu_proj(){ - $result = ''; - + $result = ''; $mods = \SYSTEM\SAI\sai::getModules(); foreach($mods as $mod){ if(\call_user_func(array($mod, 'right_public')) || @@ -27,17 +26,24 @@ class default_page extends \SYSTEM\PAGE\Page { } return $result; } + + private function menu_start(){ + $mod = \SYSTEM\SAI\sai::getStartModule(); + if(\call_user_func(array($mod, 'right_public')) || + \call_user_func(array($mod, 'right_right'))){ + return \call_user_func(array($mod, 'html_li_menu'));} + throw new \SYSTEM\LOG\ERROR('Your SAI-Start-Module haz a Problem - either it does not exist or it is not public - which is required!');} private function css(){ - $result = ''. - ''; + $result = ''. + ''; return $result; } private function js(){ - $result = ''. - ''. - ''. + $result = ''. + ''. + ''. ''. ''. ''. @@ -52,6 +58,7 @@ class default_page extends \SYSTEM\PAGE\Page { $vars['css'] = $this->css(); $vars['js'] = $this->js(); + $vars['menu_start'] = $this->menu_start(); $vars['menu_sys'] = $this->menu_sys(); $vars['menu_proj'] = $this->menu_proj(); $vars['navimg'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG); @@ -59,6 +66,6 @@ class default_page extends \SYSTEM\PAGE\Page { $vars['copyright'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT); //© da_sense, TU Darmstadt 2013 $vars = array_merge($vars,\SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI)); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/default_page/sai.tpl'), $vars); + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/sai.tpl'), $vars); } } \ No newline at end of file diff --git a/sai/page/default_page/img/apns.png b/sai/page/img/apns.png similarity index 100% rename from sai/page/default_page/img/apns.png rename to sai/page/img/apns.png diff --git a/sai/page/default_page/img/badge.png b/sai/page/img/badge.png similarity index 100% rename from sai/page/default_page/img/badge.png rename to sai/page/img/badge.png diff --git a/sai/page/default_page/img/carousel/webseite.jpg b/sai/page/img/carousel/webseite.jpg similarity index 100% rename from sai/page/default_page/img/carousel/webseite.jpg rename to sai/page/img/carousel/webseite.jpg diff --git a/sai/page/default_page/img/cronjob-logo.png b/sai/page/img/cronjob-logo.png similarity index 100% rename from sai/page/default_page/img/cronjob-logo.png rename to sai/page/img/cronjob-logo.png diff --git a/sai/page/default_page/img/flag_de.png b/sai/page/img/flag_de.png similarity index 100% rename from sai/page/default_page/img/flag_de.png rename to sai/page/img/flag_de.png diff --git a/sai/page/default_page/img/flag_en.png b/sai/page/img/flag_en.png similarity index 100% rename from sai/page/default_page/img/flag_en.png rename to sai/page/img/flag_en.png diff --git a/sai/page/default_page/img/flow_upload.png b/sai/page/img/flow_upload.png similarity index 100% rename from sai/page/default_page/img/flow_upload.png rename to sai/page/img/flow_upload.png diff --git a/sai/page/default_page/img/gcm-logo.png b/sai/page/img/gcm-logo.png similarity index 100% rename from sai/page/default_page/img/gcm-logo.png rename to sai/page/img/gcm-logo.png diff --git a/sai/page/default_page/img/geo_point.png b/sai/page/img/geo_point.png similarity index 100% rename from sai/page/default_page/img/geo_point.png rename to sai/page/img/geo_point.png diff --git a/sai/page/default_page/img/geo_resize.png b/sai/page/img/geo_resize.png similarity index 100% rename from sai/page/default_page/img/geo_resize.png rename to sai/page/img/geo_resize.png diff --git a/sai/page/default_page/img/logo.png b/sai/page/img/logo.png similarity index 100% rename from sai/page/default_page/img/logo.png rename to sai/page/img/logo.png diff --git a/sai/page/default_page/img/nodejs-logo.png b/sai/page/img/nodejs-logo.png similarity index 100% rename from sai/page/default_page/img/nodejs-logo.png rename to sai/page/img/nodejs-logo.png diff --git a/sai/page/default_page/img/postgresql-logo.png b/sai/page/img/postgresql-logo.png similarity index 100% rename from sai/page/default_page/img/postgresql-logo.png rename to sai/page/img/postgresql-logo.png diff --git a/sai/page/default_page/img/rabbitmq-logo.jpg b/sai/page/img/rabbitmq-logo.jpg similarity index 100% rename from sai/page/default_page/img/rabbitmq-logo.jpg rename to sai/page/img/rabbitmq-logo.jpg diff --git a/sai/page/default_page/js/libs/bootstrap-datepicker.js b/sai/page/js/libs/bootstrap-datepicker.js similarity index 100% rename from sai/page/default_page/js/libs/bootstrap-datepicker.js rename to sai/page/js/libs/bootstrap-datepicker.js diff --git a/sai/page/default_page/js/libs/bootstrap-timepicker.min.js b/sai/page/js/libs/bootstrap-timepicker.min.js similarity index 100% rename from sai/page/default_page/js/libs/bootstrap-timepicker.min.js rename to sai/page/js/libs/bootstrap-timepicker.min.js diff --git a/sai/page/default_page/js/libs/bootstrap.js b/sai/page/js/libs/bootstrap.js similarity index 100% rename from sai/page/default_page/js/libs/bootstrap.js rename to sai/page/js/libs/bootstrap.js diff --git a/sai/page/default_page/js/libs/bootstrap.min.js b/sai/page/js/libs/bootstrap.min.js similarity index 100% rename from sai/page/default_page/js/libs/bootstrap.min.js rename to sai/page/js/libs/bootstrap.min.js diff --git a/sai/page/default_page/js/libs/geoFunctions.js b/sai/page/js/libs/geoFunctions.js similarity index 100% rename from sai/page/default_page/js/libs/geoFunctions.js rename to sai/page/js/libs/geoFunctions.js diff --git a/sai/page/default_page/js/libs/jquery.min.js b/sai/page/js/libs/jquery.min.js similarity index 100% rename from sai/page/default_page/js/libs/jquery.min.js rename to sai/page/js/libs/jquery.min.js diff --git a/sai/page/default_page/js/libs/jquery.miniColors.js b/sai/page/js/libs/jquery.miniColors.js similarity index 100% rename from sai/page/default_page/js/libs/jquery.miniColors.js rename to sai/page/js/libs/jquery.miniColors.js diff --git a/sai/page/default_page/js/libs/jquery.switch.js b/sai/page/js/libs/jquery.switch.js similarity index 100% rename from sai/page/default_page/js/libs/jquery.switch.js rename to sai/page/js/libs/jquery.switch.js diff --git a/sai/page/default_page/js/sai.js b/sai/page/js/sai.js similarity index 87% rename from sai/page/default_page/js/sai.js rename to sai/page/js/sai.js index cbb4585..36c29bd 100644 --- a/sai/page/default_page/js/sai.js +++ b/sai/page/js/sai.js @@ -3,9 +3,15 @@ var scripts_loaded = 0; var scripts_req = 0; /** jQuery on document ready */ $(document).ready(function() { - // initialize content - loadModuleContent('.SYSTEM.SAI.saimod_sys_sai'); + //loadModuleContent('.SYSTEM.SAI.saistart_sys_sai'); + $('#sai_navbar li a').each(function(){ + if($(this).parent().hasClass('active')){ + loadModuleContent($(this).attr("saimenu")); + } + }); + //alert($('#sai_navbar active').attr("saimenu")); + //loadModuleContent($('#sai_navbar li active a').attr("saimenu")); //load content -> menu $('#sai_navbar ul li a, #project_navbar ul li a').click(function () { diff --git a/sai/page/default_page/sai.tpl b/sai/page/sai.tpl similarity index 96% rename from sai/page/default_page/sai.tpl rename to sai/page/sai.tpl index 05c95d0..819a049 100644 --- a/sai/page/default_page/sai.tpl +++ b/sai/page/sai.tpl @@ -2,8 +2,7 @@ ${title} - - + ${css} ${js} @@ -17,6 +16,7 @@ SAI diff --git a/sai/sai/sai.php b/sai/sai/sai.php index 83ed4b8..9c4cad9 100644 --- a/sai/sai/sai.php +++ b/sai/sai/sai.php @@ -3,26 +3,36 @@ namespace SYSTEM\SAI; class sai { + private static $module_start = '\SYSTEM\SAI\saistart_sys_sai'; private static $modules = array(); //only strings! private static $modules_sys = array(); //only strings! - public static function register($module){ + private static function check_module($module){ if( !\class_exists($module) || !\is_array($parents = \class_parents($module)) || !\array_search('SYSTEM\SAI\SaiModule', $parents)){ - throw new \Exception('Problem with your Sysmodule class: '.$module);} + return false;} + return true;} + + public static function register_start($module){ + if(!self::check_module($module)){ + throw new \SYSTEM\LOG\ERROR('Problem with your Sysmodule class: '.$module);} + self::$module_start = $module;} + public static function register($module){ + if(!self::check_module($module)){ + throw new \SYSTEM\LOG\ERROR('Problem with your Sysmodule class: '.$module);} array_push(self::$modules,$module);} public static function register_sys($module){ - if( !\class_exists($module) || - !\is_array($parents = \class_parents($module)) || - !\array_search('SYSTEM\SAI\SaiModule', $parents)){ - throw new \Exception('Problem with your Sysmodule class: '.$module);} + if(!self::check_module($module)){ + throw new \SYSTEM\LOG\ERROR('Problem with your Sysmodule class: '.$module);} array_push(self::$modules_sys,$module);} + public static function getStartModule(){ + return self::$module_start;} public static function getModules(){ return self::$modules;} public static function getSysModules(){ return self::$modules_sys;} public static function getAllModules(){ - return array_merge(self::$modules_sys,self::$modules);} + return array_merge(self::$modules_sys,self::$modules,array(self::$module_start));} } \ No newline at end of file diff --git a/system/autoload.php b/system/autoload.php index 38a0c1b..15afe2e 100644 --- a/system/autoload.php +++ b/system/autoload.php @@ -1,5 +1,4 @@