Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Pixel Humain
co2
Commits
b2f91802
Commit
b2f91802
authored
May 08, 2019
by
Clément Damiens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modal first Load
parent
fae891f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
25 deletions
+13
-25
assets/js/co.js
assets/js/co.js
+12
-2
views/app/welcome.php
views/app/welcome.php
+1
-23
No files found.
assets/js/co.js
View file @
b2f91802
...
...
@@ -1534,6 +1534,7 @@ var smallMenu = {
function
showAjaxPanel
(
url
,
title
,
icon
,
mapEnd
,
urlObj
)
{
//alert("showAjaxPanel"+url);
$
(
"
.progressTop
"
).
show
().
val
(
20
);
//$("#loadingModal").css({"opacity": 0.7});
var
dest
=
(
typeof
urlObj
==
"
undefined
"
||
typeof
urlObj
.
useHeader
!=
"
undefined
"
)
?
themeObj
.
mainContainer
:
"
.pageContent
"
;
mylog
.
log
(
"
showAjaxPanel
"
,
url
,
urlObj
,
dest
,
urlCtrl
.
afterLoad
);
//var dest = themeObj.mainContainer;
...
...
@@ -1554,8 +1555,10 @@ function showAjaxPanel (url,title,icon, mapEnd , urlObj) {
setTimeout
(
function
(){
if
(
$
(
dest
).
length
)
{
setTimeout
(
function
(){
$
(
'
.progressTop
'
).
val
(
40
)},
1000
);
setTimeout
(
function
(){
$
(
'
.progressTop
'
).
val
(
60
)},
3000
);
setTimeout
(
function
(){
$
(
'
.progressTop
'
).
val
(
40
)},
500
);
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
){
if
(
dest
!=
themeObj
.
mainContainer
)
...
...
@@ -1565,6 +1568,13 @@ function showAjaxPanel (url,title,icon, mapEnd , urlObj) {
coInterface
.
bindTooltips
();
coInterface
.
bindLBHLinks
();
$
(
"
.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
);
$
(
"
.progressTop
"
).
fadeOut
(
200
);
$
.
unblockUI
();
...
...
views/app/welcome.php
View file @
b2f91802
<?php
$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
(
//'/assets/css/profilSocial.css',
'/assets/css/welcome.css'
,
// '/assets/css/referencement.css'
'/assets/css/welcome.css'
);
HtmlHelper
::
registerCssAndScriptsFiles
(
$cssAnsScriptFiles
,
Yii
::
app
()
->
theme
->
baseUrl
);
$cssAnsScriptFilesModule
=
array
(
//'/js/default/directory.js',
);
HtmlHelper
::
registerCssAndScriptsFiles
(
$cssAnsScriptFilesModule
,
$this
->
module
->
assetsUrl
);
?>
...
...
@@ -39,18 +23,12 @@
?>
</section>
<?php
$this
->
renderPartial
(
$layoutPath
.
'footer'
,
array
(
"page"
=>
"welcome"
)
);
?>
<script
type=
"text/javascript"
>
var
currentCategory
=
""
;
jQuery
(
document
).
ready
(
function
()
{
initWelcomeInterface
();
//location.hash = "";
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment