Commit a9076e38 authored by Raph El's avatar Raph El
Browse files

Merge branch 'master' into development

parents 7791588a 3edf01e2
......@@ -52,6 +52,8 @@ class NetworkModule extends CWebModule {
'chat.models.*',
'interop.models.*',
'survey.models.*',
'dda.models.*',
'news.models.*',
$this->id.'.models.*',
$this->id.'.components.*',
$this->id.'.messages.*',
......
......@@ -2699,19 +2699,31 @@ var directory = {
str += '<hr>';
str += '<span class="col-xs-12 no-padding text-dark descMD">'+params.shortDescription+'</span>';
}
voteCount = "";
if(params.votes){
var vc = 0;
if(params.votes.up)
vc += Object.keys(params.votes.up).length;
if(params.votes.down)
vc += Object.keys(params.votes.down).length;
if(params.votes.uncomplet)
vc += Object.keys(params.votes.uncomplet).length;
if(params.votes.white)
vc += Object.keys(params.votes.white).length;
voteCount = " ("+vc+")";
}
//SHOW HIDE VOTE BTNs
if(typeof userId != "undefined" && userId != null && userId != ""){
var btnSize = (params.status == "amendementAndVote") ? "6" : "12";
if( (params.status == "tovote" || params.status == "amendementAndVote") && params.hasVote ===false )
str += '<a href="javascript:;" '+ linkParams + ' data-coop-section="vote" class="bg-green openCoopPanelHtml btn col-sm-'+btnSize+' "><i class="fa fa-gavel"></i> '+trad.Vote+'</a>';
str += '<a href="javascript:;" '+ linkParams + ' data-coop-section="vote" class="bg-green openCoopPanelHtml btn col-sm-'+btnSize+' "><i class="fa fa-gavel"></i> '+trad.Vote+voteCount+'</a>';
//str += '<a href="javascript:" '+ linkParams + ' class="btn-openVoteDetail bg-green btn col-sm-'+btnSize+' "><i class="fa fa-gavel"></i> '+trad.Vote+'</a>';
else if( (params.status == "tovote" || params.status == "amendementAndVote") && params.hasVote !==false )
str += '<a href="javascript:;" '+ linkParams + ' data-coop-section="vote" class="openCoopPanelHtml btn btn-default col-sm-'+btnSize+' "><i class="fa fa-eye"></i> '+trad["See votes"]+'</a>';
str += '<a href="javascript:;" '+ linkParams + ' data-coop-section="vote" class="openCoopPanelHtml btn btn-default col-sm-'+btnSize+' "><i class="fa fa-eye"></i> '+trad["See votes"]+voteCount+'</a>';
} else {
var btnSize = (params.status == "amendementAndVote") ? "6" : "12";
if( (params.status == "tovote" || params.status == "amendementAndVote") && params.hasVote ===false )
str += '<a href="javascript:" data-toggle="modal" data-target="#modalLogin" class="btn-menu-connect bg-green btn col-sm-'+btnSize+' "><i class="fa fa-gavel"></i> '+trad.Vote+'</a>';
str += '<a href="javascript:" data-toggle="modal" data-target="#modalLogin" class="btn-menu-connect bg-green btn col-sm-'+btnSize+' "><i class="fa fa-gavel"></i> '+trad.Vote+voteCount+'</a>';
}
if( (params.status == "amendementAndVote" || params.status =="amendable") ){
......@@ -2719,6 +2731,19 @@ var directory = {
str += '<a href="javascript:;" '+ linkParams + ' data-coop-section="amendments" class="openCoopPanelHtml btn btn-default text-purple col-sm-6 "><i class="fa fa-list"></i> '+trad.Amendements+amendCount+'</a>';
}
if(params.votes ){
str += "<div class='col-sm-12 padding-10'>";
if(params.votes.up)
str += "<div class='col-sm-3 text-green tooltips text-center' data-toggle='tooltip' data-placement='bottom' data-original-title='"+trad.Agree+"'><i class='fa fa-thumbs-up'></i> "+Object.keys(params.votes.up).length+"</div>";
if(params.votes.down)
str += "<div class='col-sm-3 text-red tooltips text-center' data-toggle='tooltip' data-placement='bottom' data-original-title='"+trad.Disagree+"'><i class='fa fa-thumbs-down'></i> "+Object.keys(params.votes.down).length+"</div>";
if(params.votes.uncomplet)
str += "<div class='col-sm-3 text-orange tooltips text-center' data-toggle='tooltip' data-placement='bottom' data-original-title='"+trad.Uncomplet+"'><i class='fa fa-hand-grab-o'></i> "+Object.keys(params.votes.uncomplet).length+"</div>";
if(params.votes.white)
str += "<div class='col-sm-3 text-dark tooltips text-center' data-toggle='tooltip' data-placement='bottom' data-original-title='"+trad.Abstain+"'><i class='fa fa-circle-o'></i> "+Object.keys(params.votes.white).length+"</div>";
str += "</div>";
}
......
......@@ -412,7 +412,7 @@ function bindAboutPodElement() {
};
if(contextData.type == typeObj.person.col ){
form.dynForm.jsonSchema.properties.username = dyFInputs.inputText("Username", "Username", { required : true });
//form.dynForm.jsonSchema.properties.username = dyFInputs.inputText("Username", "Username", { required : true, validUserName : true,rangelength : [4, 32] }); //,uniqueUserName:true
form.dynForm.jsonSchema.properties.birthDate = dyFInputs.birthDate;
}
......
......@@ -1037,8 +1037,11 @@ function createStepTwo(data){
$("#divUpdate").hide();
}
var nameUpdate = '<input type="text" name="nameMappingUpdate" id="nameMappingUpdate" value='+data.mapping.name+'>';
$("#divSaisirNameUpdate").html(nameUpdate);
if(typeof data.mapping != "undefined" && typeof data.mapping.name != "undefined"){
var nameUpdate = '<input type="text" name="nameMappingUpdate" id="nameMappingUpdate" value='+data.mapping.name+'>';
$("#divSaisirNameUpdate").html(nameUpdate);
}
//mylog.log("listElt",listElt);
......
<div class="pageContent">
<style type="text/css">
#customHeader{
margin-top: 0px;
}
#costumBanner{
/* max-height: 375px; */
}
#costumBanner h1{
position: absolute;
color: white;
background-color: rgba(0,0,0,0.4);
font-size: 29px;
bottom: 0px;
padding: 20px;
}
#costumBanner h1 span{
color: #eeeeee;
font-style: italic;
}
#costumBanner img{
min-width: 100%;
}
.btn-main-menu{
background: #1b7baf;
border-radius: 20px;
padding: 20px !important;
color: white;
cursor: pointer;
border:3px solid transparent;
/*min-height:100px;*/
}
.btn-main-menu:hover{
border:2px solid #1b7baf;
background-color: white;
color: #1b7baf;
}
.ourvalues img{
height:70px;
}
.main-title{
color: #487614;
}
.ourvalues h3{
font-size: 36px;
}
.box-register label.letter-black{
margin-bottom:3px;
font-size: 13px;
}
.bullet-point{
width: 5px;
height: 5px;
display: -webkit-inline-box;
border-radius: 100%;
background-color: #fbae55;
}
.text-explain{
color: #555;
font-size: 18px;
}
.blue-bg {
background-color: white;
color: #5b2549;
height: 100%;
padding-bottom: 20px !important;
}
.circle {
font-weight: bold;
padding: 15px 20px;
border-radius: 50%;
background-color: #fea621;
color: white;
max-height: 50px;
z-index: 2;
}
.circle.active{
background: #ea4335;
border: inset 3px #ea4335;
max-height: 70px;
height: 70px;
font-size: 25px;
width: 70px;
}
.support-section{
background-color: white;
}
.support-section h2{
text-align: center;
padding: 60px 0px !important;
background: #450e33;
font-size: 40px;
color: white;
margin-bottom: 20px;
}
.timeline-ctc h2{
text-align: center;
padding: 105px 0px 60px 0px !important;
background: #450e33;
font-size: 40px;
color: white;
margin-bottom: 20px;
}
.how-it-works.row {
display: flex;
}
.row.timeline{
display: flex;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
margin-right: -15px;
margin-left: -15px;
}
.how-it-works.row .col-2 {
display: inline-flex;
align-self: stretch;
position: relative;
align-items: center;
justify-content: center;
}
.how-it-works.row .col-2::after {
content: "";
position: absolute;
border-left: 3px solid #0091c6;
z-index: 1;
}
.pb-3, .py-3 {
padding-bottom: 1rem !important;
}
.pt-2, .py-2 {
padding-top: 0.5rem !important;
}
.how-it-works.row .col-2.bottom::after {
height: 50%;
left: 50%;
top: 50%;
}
.how-it-works.row.justify-content-end .col-2.full::after {
height: 100%;
left: calc(50% - 3px);
}
.how-it-works.row .col-2.full::after {
height: 100%;
left: calc(50% - 0px);
}
.how-it-works.row .col-2.top::after {
height: 50%;
left: 50%;
top: 0;
}
.timeline div {
padding: 0;
height: 40px;
}
.timeline hr {
border-top: 3px solid #0091c6;
margin: 0;
top: 17px;
position: relative;
}
.timeline .col-2 {
display: flex;
overflow: hidden;
flex: 0 0 16.666667%;
max-width: 16.666667%;
}
.align-items-center {
-ms-flex-align: center !important;
align-items: center !important;
}
.justify-content-end {
-ms-flex-pack: end !important;
justify-content: flex-end !important;
}
.row {
display: -ms-flexbox;
display: flex;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
margin-right: -15px;
margin-left: -15px;
}
.how-it-works.row .col-6 p{
color: #444;
}
.how-it-works.row .col-6 h5{
font-size: 17px;
text-transform: inherit;
}
.col-2 {
-ms-flex: 0 0 16.666667%;
flex: 0 0 16.666667%;
max-width: 16.666667%;
}
.col-6 {
-ms-flex: 0 0 50%;
flex: 0 0 50%;
max-width: 50%;
}
.timeline .col-8 {
flex: 0 0 66.666667%;
max-width: 66.666667%;
}
.timeline .corner {
border: 3px solid #0091c6;
width: 100%;
position: relative;
border-radius: 15px;
}
.timeline .top-right {
left: 50%;
top: -50%;
}
.timeline .left-bottom {
left: -50%;
top: calc(50% - 3px);
}
.timeline .top-left {
left: -50%;
top: -50%;
}
.timeline .right-bottom {
left: 50%;
top: calc(50% - 3px);
}
@media screen and (min-width: 450px) and (max-width: 1024px) {
.logoDescription{
width: 60%;
margin:auto;
}
}
@media (max-width: 1024px){
#customHeader{
margin-top: -1px;
}
}
@media (max-width: 768px){
}
</style>
<div class="col-xs-12 no-padding" id="customHeader" style="background-color: white">
<div id="costumBanner" class="col-xs-12 col-sm-12 col-md-12 no-padding">
<!-- <h1>L'entraide<br/><span class="small">Une interface numérique pour échanger</span></h1>-->
<img class="img-responsive" src='<?php echo Yii::app()->getModule("co2")->assetsUrl ?>/images/custom/collectifEssArrageois/banner.png'>
</div>
<!--<div class="col-md-12 col-lg-12 col-sm-12 imageSection no-padding"
style=" position:relative;">-->
<div class="col-sm-12 col-md-12 col-xs-12 no-padding" style="max-width:100%; float:left;">
<div class="col-xs-12 no-padding" style="">
<div class="col-xs-12 no-padding">
<div class="col-md-12 col-sm-12 col-xs-12 padding-20" style="padding-left:100px;background-color: #f6f6f6; min-height:400px;">
<div class="col-xs-12 col-sm-10 col-sm-offset-1 pull-left padding-20 shadow2" style="margin-bottom:-80px;background-color: #fff;font-size: 14px;z-index: 5;">
<div class="col-xs-12 font-montserrat ourvalues" style="text-align:center;">
<h3 class="col-xs-12 text-center">
<span class="main-title">Un outil pour : </span><br>
<small>
<b>Nos valeurs sont solidaires, nos services sont diversifiés, non délocalisables et mettent l’humain au cœur des projets.<br>
</small>
<hr style="width:40%; margin:20px auto; border: 4px solid #fbae55;">
</h3>
<div class="col-xs-12">
<a href="javascript:;" data-hash="#search" class="btn-main-menu lbh-menu-app col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3" >
<div class="text-center">
<div class="col-md-12 no-padding text-center">
<h4 class="no-margin uppercase">
<i class="fa fa-hand-point-right faa-pulse"></i>
<?php echo Yii::t("home","Découvrir") ?>
</h4>
</div>
</div>
</a>
</div>
<h3 class="col-xs-12 text-center">
<hr style="width:40%; margin:20px auto; border: 4px solid #fbae55;">
</h3>
<!--<div class="col-md-10 col-md-offset-1 col-xs-12">
<span class="text-explain">Nous sommes de plus en plus nombreux à vouloir agir face au dérèglement climatique, à la croissance des inégalités, à la crise de la démocratie.<br/><span class="bullet-point"></span><br/>
Pour relever ces défis majeurs, changer nos pratiques quotidiennes de consommation ne suffit plus.
Il nous faut également œuvrer à la transformation de nos politiques publiques.<br/><span class="bullet-point"></span><br/>
Si la transition doit avoir lieu à toutes les échelles, les communes peuvent être le fer de lance de ce
mouvement.<br/>
En mars 2020, des candidat.e.s se présenteront aux élections municipales. Nous voulons les aider à
identifier et mettre en œuvre, une fois élu.e.s, des mesures concrètes pour encourager la transition
écologique, sociale et démocratique de leur commune.<br/><span class="bullet-point"></span><br/>
Nous, citoyennes et citoyens, sommes les mieux placés pour définir ces priorités et construire les
communes de demain. Ensemble, nous sommes la transition.
</span>
</div>-->
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script type="text/javascript">
jQuery(document).ready(function() {
setTitle("Les pépites de l'ESS");
});
</script>
......@@ -150,6 +150,8 @@ HtmlHelper::registerCssAndScriptsFiles($cssJs, Yii::app()->getRequest()->getBase
echo Yii::t("common","Invite people on") ;
else if ($parentType == Project::COLLECTION )
echo Yii::t("common",'Invite contributors on') ;
else if ($parentType == Action::COLLECTION )
echo Yii::t("common",'Assigner une personne') ;
else
echo Yii::t("common","Invite members on");
?>
......@@ -327,8 +329,10 @@ HtmlHelper::registerCssAndScriptsFiles($cssJs, Yii::app()->getRequest()->getBase
jQuery(document).ready(function() {
// mylog.log("members", members);
if(parentType != "citoyens" && typeof contextData != "undefined" && contextData != null)
if(parentType != "citoyens" && typeof contextData != "undefined" && contextData != null){
var name = (typeof contextData.name != "undefined" ? contextData.name : contextData.title);
$("#title-invite .name-parent").text(contextData.name);
}
initInvite();
bindInvite();
fadeInView("step1-search");
......@@ -571,8 +575,8 @@ HtmlHelper::registerCssAndScriptsFiles($cssJs, Yii::app()->getRequest()->getBase
success: function(data){
if(parentType == "actions"){
toastr.info(trad["processing"]);
//if(parentType == "actions"){
//toastr.info(trad["processing"]);
// var idProposal = $(this).data("id-action");
// uiCoop.getCoopData(parentType, parentId, "action", null, idProposal,
// function(){
......@@ -582,7 +586,7 @@ HtmlHelper::registerCssAndScriptsFiles($cssJs, Yii::app()->getRequest()->getBase
// }, false);
// $(".close-modal").trigger("click");
// $(".load-data-community").trigger("click");
} else {
//} else {
mylog.log("link/multiconnect success", data);
var nbInvites = data.length;
var str = "";
......@@ -664,7 +668,7 @@ HtmlHelper::registerCssAndScriptsFiles($cssJs, Yii::app()->getRequest()->getBase
initListInvite();
fadeInView("result");
$("#modal-invite #dropdown-result").html(str);
}
//}
}
......
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