Commit 65a5ad4d authored by Tibor Katelbach's avatar Tibor Katelbach
Browse files

sub hash urls

parent cab2564f
......@@ -693,13 +693,10 @@ var url = {
if(pathT[0] == "modal"){
path = path.substring(5);
alert(baseUrl+'/'+moduleId+path);
url.loadByHash("#search",function () {
smallMenu.openAjaxHTML(baseUrl+'/'+moduleId+path);
})
smallMenu.openAjaxHTML(baseUrl+'/'+moduleId+path);
} else
showAjaxPanel( '/'+path+urlExtra+extraParams, endPoint.title,endPoint.icon, res,endPoint );
if(endPoint.menu)
$("."+endPoint.menu).removeClass("hide");
}
......@@ -967,11 +964,12 @@ function processingBlockUi() {
}
function showAjaxPanel (url,title,icon, mapEnd , urlObj) {
//alert("showAjaxPanel"+url);
mylog.log("showAjaxPanel",url,urlObj);
var dest = ( typeof urlObj == "undefined" || ( typeof urlObj.useHeader != "undefined" ) ) ? themeObj.mainContainer : ".pageContent" ;
var dest = ( typeof urlObj == "undefined" || typeof urlObj.useHeader != "undefined" ) ? themeObj.mainContainer : ".pageContent" ;
mylog.log("showAjaxPanel",url,urlObj,dest);
//var dest = themeObj.mainContainer;
hideScrollTop = false;
//alert("showAjaxPanel"+dest);
//alert("showAjaxPanel"+dest);
showNotif(false);
setTimeout(function(){
......@@ -995,7 +993,7 @@ function showAjaxPanel (url,title,icon, mapEnd , urlObj) {
getAjax(dest, baseUrl+'/'+moduleId+url, function(data){
if( dest != themeObj.mainContainer )
$("#subModuleTitle").html("");
$(".subModuleTitle").html("");
//initNotifications();
......@@ -1030,7 +1028,7 @@ function showAjaxPanel (url,title,icon, mapEnd , urlObj) {
}*/
},"html");
} else
console.error( 'showAjaxPanel', themeObj.mainContainer, "doesn't exist" );
console.error( 'showAjaxPanel', dest, "doesn't exist" );
}, 400);
}
/*prevDbAccessCount = 0;
......
......@@ -32,8 +32,6 @@
<h2><a href="default/view/page/roadmap/dir/docs|panels" class="lbhp">ROADMAP</a></h2>
<h2><a href="default/view/page/smarterre/dir/docs|comprendre" class="lbhp ">Smarterre</a></h2>
<h2><a href="#default.view.page.index.dir.docs" data-dismiss="modal" class="lbh">D<span class="text-red">OC</span>S</a></h2>
<h2><a href="#modal.default.view.page.index.dir.docs" data-dismiss="modal" class="lbh">MODOCS</a></h2>
<h2><a href="default/view/page/contact/dir/docs|panels" class="lbhp "><span class="text-red">CO</span>NTACT</a></h2>
</div>
<div class="col-xs-4">
......
<?php $this->renderPartial('../docs/panels/menuLink',array("url"=>"default/view/page/links")); ?>
<div class="panel-heading border-light center text-dark partition-white radius-10">
<span class=" text-red homestead tpl_title"> SmarTerre</span>
<br/>
......
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