Commit eaa622f4 authored by Clément Damiens's avatar Clément Damiens
Browse files

Merged branch master into master

parents d1f1cc2d de136158
......@@ -1157,13 +1157,16 @@ var urlCtrl = {
if($.inArray(key, CO2params["costum"])==-1)
showAjaxPanel(baseUrl+'/'+ moduleId + '/app/page/type/'+data.contextType+'/id/'+data.contextId+viewPage+get);
}else
}else{
//alert( baseUrl+'/'+ moduleId + '/app/index 1' );
showAjaxPanel( baseUrl+'/'+ moduleId + '/app/index', 'Home','home' );
}
}
} );
}else{
//if(typeof custom == "undefined" || typeof custom.url=="undefined")
showAjaxPanel( baseUrl+'/'+ moduleId + '/app/index', 'Home','home' );
//alert( baseUrl+'/'+ moduleId + '/app/index 2' );
showAjaxPanel( baseUrl+'/'+ moduleId + '/app/index', 'Home','home' );
//else
}
}
......@@ -1171,8 +1174,10 @@ var urlCtrl = {
//alert( ctrlId +"/"+ actionId );
showAjaxPanel( baseUrl+'/'+ activeModuleId + '/'+ctrlId +"/"+ actionId, 'Home','home' );
}
else
else {
//alert( baseUrl+'/'+ moduleId + '/app/index 3' );
showAjaxPanel( baseUrl+'/'+ moduleId + '/app/index', 'Home','home' );
}
mylog.log("END loadByHash hash:", hash);
location.hash = hash;
......@@ -1194,6 +1199,7 @@ var urlCtrl = {
hashT=location.hash.split("?");
setUrl=hashT[0].substring(0);
extraParamsArray=["preview"];
extraUrl="";
if(setExtraP && notEmpty(hashT[1])){
checkTableGet=hashT[1].split("&");
......
......@@ -6,6 +6,7 @@
"tool" : { "label": "Tool","key":"tool","icon":"wrench"},
"machine" : { "label": "Machine","key":"machine","icon":"cogs"},
"article" : { "label": "Article","key":"article","icon":"newspaper-o"},
"cms" : { "label": "CMS","key":"cms","icon":"edit"},
"software" : { "label": "Software","key":"software","icon":"code"},
"rh" : { "label": "Human ressource","key":"rh","icon":"users"},
"financialRessource" : { "label": "Financial ressource","key":"RessourceFinanciere","icon":"money"},
......
......@@ -39,7 +39,8 @@ class DocsController extends CommunecterController {
$url= $page;
if(!empty($dir))
$url = $dir."/".$page;
echo $this->renderPartial($url, null,true);
echo $this->renderPartial($url, null,true);
}
}
?>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment