Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Daniel CAZAL
co2
Commits
759dbf00
Commit
759dbf00
authored
Feb 04, 2019
by
alex
Browse files
Merge branch 'development' into custom-alex
parents
489b8620
ef34dab0
Changes
4
Hide whitespace changes
Inline
Side-by-side
assets/images/custom/ctc/partenaires_pacte.png
View replaced file @
489b8620
View file @
759dbf00
619 KB
|
W:
|
H:
627 KB
|
W:
|
H:
2-up
Swipe
Onion skin
assets/js/default/profilSocial.js
View file @
759dbf00
...
...
@@ -60,6 +60,15 @@ function responsiveMenuLeft(menuTop){
}
}
function
bindButtonMenu
(){
$
(
"
#paramsMenu
"
).
click
(
function
(){
$
(
"
.dropdown-profil-menu-params
"
).
addClass
(
"
open
"
);
});
$
(
"
.dropdown-profil-menu-params .dropdown-menu
"
).
mouseleave
(
function
(){
//alert("dropdown-user mouseleave");
setTimeout
(
function
(){
//if(!$(".dropdown-profil-menu-params").is(":hover"))
$
(
"
.dropdown-profil-menu-params
"
).
removeClass
(
"
open
"
);
},
200
);
});
$
(
"
#btn-superadmin
"
).
click
(
function
(){
loadAdminDashboard
();
});
...
...
views/custom/laRaffinerie.php
View file @
759dbf00
...
...
@@ -469,7 +469,7 @@ $projectList = [];
<li>
<a href='javascript:;' class='linkMenu linkOrganization'
data-key='"
.
$idElt
.
"'
data-col='"
.
Organization
::
CONTROLLER
.
"'
data-col='"
.
$type
.
"'
data-countmembers='"
.
getCountMembers
(
$elt
)
.
"'
data-countevents='"
.
getCountEvents
(
$elt
)
.
"'
data-countprojects='"
.
getCountProjects
(
$elt
)
.
"'
...
...
@@ -603,7 +603,8 @@ $projectList = [];
$thumbImgUrl
=
getProfileThumbUrl
(
$elt
);
$shortDescription
=
getShortDescription
(
$elt
);
$nbInscrits
=
count
(
$elt
[
'links'
][
'members'
]);
$nbInscrits
=
(
!
empty
(
$elt
[
'links'
][
'members'
])
?
count
(
@
$elt
[
'links'
][
'members'
])
:
0
);
?>
...
...
@@ -658,7 +659,7 @@ $projectList = [];
?>
</button>
</div> -->
<div
class=
"col-sm-4"
><a
class=
"customBtn"
href=
"https://chat.communecter.org/channel/laRaffinerie"
>
<?php
echo
Yii
::
t
(
"cooperation"
,
"Chat"
);
<div
class=
"col-sm-4"
><a
class=
"customBtn"
href=
"https://chat.communecter.org/channel/laRaffinerie"
target=
"_blank"
>
<?php
echo
Yii
::
t
(
"cooperation"
,
"Chat"
);
?>
</a></div>
<div
class=
"col-sm-4"
><a
class=
"customBtn"
href=
"#"
>
Contact
</a></div>
<div
class=
"col-sm-4"
><a
class=
"customBtn"
href=
"#"
>
S'inscrire au projet
</a></div>
...
...
views/element/profilSocial.php
View file @
759dbf00
...
...
@@ -299,9 +299,9 @@ $this->renderPartial( $layoutPath.'modals.'.Yii::app()->params["CO2DomainName"].
if
(
Yii
::
app
()
->
params
[
'rocketchatMultiEnabled'
]
&&
$type
!=
Person
::
COLLECTION
)
{
?>
<div
class=
"btn-group "
id=
"
paramsMenu
"
>
<div
class=
"btn-group "
id=
""
>
<ul
class=
"nav navbar-nav"
>
<li
class=
"dropdown"
>
<li
class=
"dropdown
dropdown-profil-menu-params
"
>
<button
type=
"button"
class=
"btn btn-default bold"
>
<?php
if
(
@
Yii
::
app
()
->
session
[
"userId"
]
&&
$edit
==
true
){
?>
<i
class=
"fa fa-comments"
></i>
<span
class=
"hidden-xs hidden-sm"
>
<?php
echo
Yii
::
t
(
"cooperation"
,
"Chat"
);
?>
...
...
@@ -310,7 +310,7 @@ $this->renderPartial( $layoutPath.'modals.'.Yii::app()->params["CO2DomainName"].
<?php
}
?>
</span>
</button>
<ul
class=
"dropdown-menu arrow_box menu-params"
>
<ul
class=
"dropdown-menu arrow_box menu-params
dropdown-profil-menu-params
"
>
<?php
if
(
$hasRC
&&
@
$element
[
"tools"
][
"chat"
]
)
...
...
@@ -455,8 +455,8 @@ $this->renderPartial( $layoutPath.'modals.'.Yii::app()->params["CO2DomainName"].
<i
class=
"fa fa-grav letter-red"
></i>
<span
class=
"hidden-xs hidden-sm hidden-md"
></span>
</button>
<?php
}
?>
<ul
class=
"nav navbar-nav"
id=
"paramsMenu"
>
<li
class=
"dropdown"
>
<ul
class=
"nav navbar-nav"
id=
"paramsMenu"
>
<li
class=
"dropdown
dropdown-profil-menu-params
"
>
<button
type=
"button"
class=
"btn btn-default bold"
>
<?php
if
(
@
Yii
::
app
()
->
session
[
"userId"
]
&&
$edit
==
true
){
?>
<i
class=
"fa fa-cogs"
></i>
<span
class=
"hidden-xs hidden-sm"
>
<?php
echo
Yii
::
t
(
"common"
,
"Settings"
);
?>
...
...
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