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

modal first Load
parent fae891f0
...@@ -1534,6 +1534,7 @@ var smallMenu = { ...@@ -1534,6 +1534,7 @@ var smallMenu = {
function showAjaxPanel (url,title,icon, mapEnd , urlObj) { function showAjaxPanel (url,title,icon, mapEnd , urlObj) {
//alert("showAjaxPanel"+url); //alert("showAjaxPanel"+url);
$(".progressTop").show().val(20); $(".progressTop").show().val(20);
//$("#loadingModal").css({"opacity": 0.7});
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,urlCtrl.afterLoad ); mylog.log("showAjaxPanel", url, urlObj,dest,urlCtrl.afterLoad );
//var dest = themeObj.mainContainer; //var dest = themeObj.mainContainer;
...@@ -1554,8 +1555,10 @@ function showAjaxPanel (url,title,icon, mapEnd , urlObj) { ...@@ -1554,8 +1555,10 @@ function showAjaxPanel (url,title,icon, mapEnd , urlObj) {
setTimeout(function(){ setTimeout(function(){
if( $(dest).length ) if( $(dest).length )
{ {
setTimeout(function(){ $('.progressTop').val(40)}, 1000); setTimeout(function(){ $('.progressTop').val(40)}, 500);
setTimeout(function(){ $('.progressTop').val(60)}, 3000); setTimeout(function(){ $('.progressTop').val(60)}, 1500);
setTimeout(function(){$("#loadingModal").css({"opacity": 0.6});}, 500);
setTimeout(function(){$("#loadingModal").css({"opacity": 0.5});}, 1500);
getAjax(dest, url, function(data){ getAjax(dest, url, function(data){
if( dest != themeObj.mainContainer ) if( dest != themeObj.mainContainer )
...@@ -1565,6 +1568,13 @@ function showAjaxPanel (url,title,icon, mapEnd , urlObj) { ...@@ -1565,6 +1568,13 @@ function showAjaxPanel (url,title,icon, mapEnd , urlObj) {
coInterface.bindTooltips(); coInterface.bindTooltips();
coInterface.bindLBHLinks(); coInterface.bindLBHLinks();
$(".progressTop").val(90); $(".progressTop").val(90);
if($("#loadingModal").is(":visible")){
setTimeout(function(){ $("#loadingModal").css({"opacity": 0.4});}, 10);
setTimeout(function(){ $("#loadingModal").css({"opacity": 0.3});}, 10);
setTimeout(function(){ $("#loadingModal").css({"opacity": 0.2});}, 10);
setTimeout(function(){ $("#loadingModal").css({"opacity": 0.1});}, 10);
setTimeout(function(){ $("#loadingModal").hide()}, 10);
}
setTimeout(function(){ $(".progressTop").val(100)}, 10); setTimeout(function(){ $(".progressTop").val(100)}, 10);
$(".progressTop").fadeOut(200); $(".progressTop").fadeOut(200);
$.unblockUI(); $.unblockUI();
......
<?php <?php
$layoutPath = 'webroot.themes.'.Yii::app()->theme->name.'.views.layouts.'; $layoutPath = 'webroot.themes.'.Yii::app()->theme->name.'.views.layouts.';
//header + menu
$this->renderPartial($layoutPath.'header',
array( "layoutPath"=>$layoutPath ,
"page" => "welcome",
"themeParams"=>@$params,
"useHeader"=>true
)
);
$cssAnsScriptFiles = array( $cssAnsScriptFiles = array(
//'/assets/css/profilSocial.css', '/assets/css/welcome.css'
'/assets/css/welcome.css',
// '/assets/css/referencement.css'
); );
HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFiles, Yii::app()->theme->baseUrl); HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFiles, Yii::app()->theme->baseUrl);
$cssAnsScriptFilesModule = array(
//'/js/default/directory.js',
);
HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFilesModule, $this->module->assetsUrl);
?> ?>
...@@ -39,18 +23,12 @@ ...@@ -39,18 +23,12 @@
?> ?>
</section> </section>
<?php $this->renderPartial($layoutPath.'footer',
array( "page" => "welcome")
);
?>
<script type="text/javascript" > <script type="text/javascript" >
var currentCategory = ""; var currentCategory = "";
jQuery(document).ready(function() { jQuery(document).ready(function() {
initWelcomeInterface(); initWelcomeInterface();
//location.hash = "";
}); });
......
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