Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Pixel Humain
co2
Commits
cc7d3c7e
Commit
cc7d3c7e
authored
May 17, 2019
by
Tibor Katelbach
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cms poi in costums
parent
d2589fe5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
5 deletions
+11
-5
assets/js/co.js
assets/js/co.js
+3
-1
assets/js/dynForm/poi.js
assets/js/dynForm/poi.js
+2
-1
controllers/AppController.php
controllers/AppController.php
+2
-2
views/docs/index.php
views/docs/index.php
+4
-1
No files found.
assets/js/co.js
View file @
cc7d3c7e
...
...
@@ -1140,7 +1140,9 @@ var urlCtrl = {
if
(
typeof
urlCtrl
.
loadableUrls
[
hash
]
==
"
undefined
"
||
typeof
urlCtrl
.
loadableUrls
[
hash
].
emptyContextData
==
"
undefined
"
||
urlCtrl
.
loadableUrls
[
hash
].
emptyContextData
==
true
){
contextData
=
null
;
//probably used for the add button, if Contextdata null then use userId
//mylog.log("emptyContextData",urlCtrl.loadableUrls[hash],urlCtrl.loadableUrls[hash].emptyContextData,)
//contextData = null;
}
$
(
"
.my-main-container
"
).
off
()
...
...
assets/js/dynForm/poi.js
View file @
cc7d3c7e
...
...
@@ -39,7 +39,8 @@ dynForm = {
afterSave
:
function
(
data
,
callB
){
mylog
.
log
(
"
afterSave poi
"
,
data
,
typeof
callB
);
dyFObj
.
commonAfterSave
(
data
,
callB
);
/*listObject=$(uploadObj.domTarget).fineUploader('getUploads');
/*
listObject=$(uploadObj.domTarget).fineUploader('getUploads');
goToUpload=false;
if(listObject.length > 0){
$.each(listObject, function(e,v){
...
...
controllers/AppController.php
View file @
cc7d3c7e
...
...
@@ -49,7 +49,7 @@ class AppController extends CommunecterController {
else
if
(
$hash
==
"agenda"
)
self
::
actionAgenda
();
else
echo
$this
->
renderPartial
(
$hash
,
$params
,
true
);
echo
$this
->
renderPartial
(
$hash
,
$params
);
}
...
...
@@ -57,7 +57,7 @@ class AppController extends CommunecterController {
CO2Stat
::
incNbLoad
(
"co2-welcome"
);
$params
=
array
();
echo
$this
->
renderPartial
(
"welcome"
,
$params
,
true
);
echo
$this
->
renderPartial
(
"welcome"
,
$params
);
}
public
function
actionView
(
$page
=
null
,
$url
=
null
){
CO2Stat
::
incNbLoad
(
"co2-info"
);
...
...
views/docs/index.php
View file @
cc7d3c7e
...
...
@@ -160,7 +160,7 @@
<?php
if
(
@
Yii
::
app
()
->
session
[
"costum"
]
&&
@
Yii
::
app
()
->
session
[
"costum"
][
"docTpl"
]){
$this
->
renderPartial
(
Yii
::
app
()
->
session
[
"costum"
][
"docTpl"
]);
$this
->
renderPartial
(
Yii
::
app
()
->
session
[
"costum"
][
"docTpl"
]
,
false
,
true
);
}
else
{
?>
<div
id=
"docs-main-container"
>
<div
id=
"header-doc"
class=
"shadow2"
>
...
...
@@ -331,8 +331,10 @@ if(@Yii::app()->session["costum"] && @Yii::app()->session["costum"]["docTpl"]){
</div>
</div>
<script
type=
"text/javascript"
>
var
page
=
"
<?php
echo
@
$page
?>
"
;
var
dir
=
"
<?php
echo
@
$dir
?>
"
;
jQuery
(
document
).
ready
(
function
()
{
dir
=
(
dir
==
""
)
?
mainLanguage
:
dir
;
if
(
page
!=
""
)
...
...
@@ -341,6 +343,7 @@ jQuery(document).ready(function() {
initDocs
(
"
welcome
"
,
mainLanguage
);
$
(
"
.link-docs-menu
"
).
off
().
on
(
"
click
"
,
function
(){
alert
(
"
.link-docs-menu
"
);
if
(
$
(
this
).
hasClass
(
"
down-menu
"
)){
$
(
"
#menu-left > ul > li > a
"
).
removeClass
(
"
active
"
).
find
(
"
i
"
).
removeClass
(
"
fa-angle-down
"
).
addClass
(
"
fa-angle-right
"
);
$
(
"
.subMenu .link-docs-menu
"
).
removeClass
(
"
active
"
);
...
...
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