From c43245ecdc113b55434f262a8a60ea14caafdd21 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Sun, 14 Jun 2015 17:16:01 +0200 Subject: [PATCH] Fixes --- src/View.php | 60 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 53 insertions(+), 7 deletions(-) diff --git a/src/View.php b/src/View.php index 9069cb3..06ef729 100644 --- a/src/View.php +++ b/src/View.php @@ -110,6 +110,8 @@ class View { $yes_cache=0; + $all_path=array(); + if(!isset(View::$cache_template[$template])) { @@ -118,6 +120,8 @@ class View { $view_path=View::$root_path.'/'.$base_path.'/'.$template.'.php'; + $all_path[]=$view_path; + if(is_file($view_path)) { @@ -142,7 +146,7 @@ class View { else { - throw new \Exception('Error: view not found: '.$view_path); + throw new \Exception('Error: view not found: '.implode(' and ', $all_path)); die; } @@ -167,6 +171,17 @@ class View { } + /** + * Simple alias of load_view + */ + + static public function load_view($arr_template_values, $template) + { + + return View::loadView($arr_template_values, $template); + + } + /** * Method for create a url for access files via .php script * @@ -382,13 +397,34 @@ class View { $arr_final_css=array(); - View::$css=array_unique(View::$css); + //View::$css=array_unique(View::$css); foreach(View::$css as $css) { - $url=View::getMediaUrl('css/'.$css); + + if(gettype($css)=='array') + { + + $css=array_unique($css); + + foreach($css as $module => $css_item) + { + + $url=View::getMediaUrl('css/'.$css); + + $arr_final_css[]=''."\n"; + + } + + } + else + { - $arr_final_css[]=''."\n"; + $url=View::getMediaUrl('css/'.$css); + + $arr_final_css[]=''."\n"; + + } } @@ -407,13 +443,23 @@ class View { $arr_final_js=array(); - View::$js=array_unique(View::$js); + //View::$js=array_unique(View::$js); foreach(View::$js as $js) { - $url=View::getMediaUrl('js/'.$js); - $arr_final_js[]=$arr_final_jscript[]=''."\n";; + if(gettype($js)=='array') + { + + } + else + { + + $url=View::getMediaUrl('js/'.$js); + + $arr_final_js[]=$arr_final_jscript[]=''."\n";; + + } }