Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit decc831

Browse files
RaphaelRIVIERERaphaelRIVIERE
committedJun 15, 2017
Merge branch 'master' of https://github.com/pixelhumain/co2 
1 parent a206039 commit decc831

File tree

4 files changed

+48
-83
lines changed

4 files changed

+48
-83
lines changed
 

‎assets/js/co.js

+22-58
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,8 @@ var urlCtrl = {
599599
"#admin.createfile" : {title:'IMPORT DATA', icon : 'download'},
600600
"#log.monitoring" : {title:'LOG MONITORING ', icon : 'plus'},
601601
"#adminpublic.index" : {title:'SOURCE ADMIN', icon : 'download'},
602-
"#adminpublic.createfile" : {title:'IMPORT DATA', icon : 'download', useHeader : true},
603-
"#adminpublic.adddata" : {title:'ADDDATA ', icon : 'download', useHeader : true},
602+
"#adminpublic.createfile" : {title:'IMPORT DATA', icon : 'download', useHeader : false},
603+
"#adminpublic.adddata" : {title:'ADDDATA ', icon : 'download'},
604604
"#admin.cleantags" : {title : 'CLEAN TAGS', icon : 'download'},
605605
"#default.directory" : {title:'COMMUNECTED DIRECTORY', icon : 'connectdevelop', menuId:"menu-btn-directory"},
606606
"#default.news" : {title:'COMMUNECTED NEWS ', icon : 'rss', menuId:"menu-btn-news" },
@@ -2174,25 +2174,17 @@ var collection = {
21742174
if(data.result){
21752175
if(data.list == '$unset'){
21762176
if(location.hash.indexOf("#page") >=0){
2177-
if(location.hash.indexOf("view.directory.dir.collections") >=0 && contextData.id==userId){
2178-
loadDataDirectory("collections", "star");
2179-
}else{
2180-
$(".favorisMenu").removeClass("text-yellow");
2181-
$(".favorisMenu").children("i").removeClass("fa-star").addClass('fa-star-o');
2182-
}
2177+
$(".favorisMenu").removeClass("text-yellow");
2178+
$(".favorisMenu").children("i").removeClass("fa-star").addClass('fa-star-o');
21832179
}else{
21842180
$(el).children("i").removeClass("fa-star text-red").addClass('fa-star-o');
21852181
delete userConnected.collections[collection][what][id];
21862182
}
21872183
}
21882184
else{
21892185
if(location.hash.indexOf("#page") >=0){
2190-
if(location.hash.indexOf("view.directory.dir.collections") >=0 && contextData.id==userId){
2191-
loadDataDirectory("collections", "star");
2192-
}else{
2193-
$(".favorisMenu").addClass("text-yellow");
2194-
$(".favorisMenu").children("i").removeClass("fa-star-o").addClass('fa-star');
2195-
}
2186+
$(".favorisMenu").addClass("text-yellow");
2187+
$(".favorisMenu").children("i").removeClass("fa-star-o").addClass('fa-star');
21962188
}
21972189
else
21982190
$(el).children("i").removeClass("fa-star-o").addClass('fa-star text-red');
@@ -2241,8 +2233,7 @@ var uploadObj = {
22412233
gotoUrl : null,
22422234
isSub : false,
22432235
update : false,
2244-
contentKey:"profil",
2245-
folder : "communecter", //on force pour pas casser toutes les vielles images
2236+
folder : moduleId, //on force pour pas casser toutes les vielles images
22462237
set : function(type,id){
22472238
uploadObj.type = type;
22482239
mylog.log("set uploadObj.id", id);
@@ -2273,7 +2264,7 @@ var dyFObj = {
22732264
formData.key = ctrl;
22742265
mylog.warn("here--- -------- elementLocations",dyFInputs.locationObj);
22752266
mylog.warn("here--- -------- elementLocations",dyFInputs.locationObj.elementLocations);
2276-
if(dyFInputs.locationObj.centerLocation){
2267+
if(dyFInputs.locationObj.elementLocations){
22772268
//formData.multiscopes = elementLocation;
22782269
mylog.warn("here--- -------- centerLocation",dyFInputs.locationObj.centerLocation);
22792270
formData.address = dyFInputs.locationObj.centerLocation.address;
@@ -2488,10 +2479,6 @@ var dyFObj = {
24882479
$.unblockUI();
24892480
$("#openModal").modal("hide");
24902481
mylog.warn("--------------- Open Form ",type, afterLoad,data);
2491-
uploadObj.contentKey="profil";
2492-
if(type=="addPhoto")
2493-
uploadObj.contentKey="slider";
2494-
24952482
mylog.dir(data);
24962483
//global variables clean up
24972484
dyFInputs.locationObj.elementLocation = null;
@@ -2764,12 +2751,6 @@ var dyFInputs = {
27642751
urlCtrl.loadByHash(location.hash);
27652752
$('#ajax-modal').modal("hide");
27662753
});
2767-
2768-
$("#ajax-modal .modal-header").removeClass("bg-dark bg-purple bg-red bg-azure bg-green bg-green-poi bg-orange bg-yellow bg-blue bg-turq bg-url")
2769-
.addClass("bg-dark");
2770-
2771-
$("#ajax-modal-modal-title").html("<i class='fa fa-camera'></i> Publier une photo");
2772-
27732754
},500);
27742755
}
27752756
},
@@ -2885,37 +2866,22 @@ var dyFInputs = {
28852866
if( locObj.address.addressCountry)
28862867
strHTML += locObj.address.addressCountry;
28872868
if( locObj.address.postalCode)
2888-
strHTML += ", "+locObj.address.postalCode;
2869+
strHTML += " ,"+locObj.address.postalCode;
28892870
if( locObj.address.addressLocality)
2890-
strHTML += ", "+locObj.address.addressLocality;
2871+
strHTML += " ,"+locObj.address.addressLocality;
28912872
if( locObj.address.streetAddress)
2892-
strHTML += ", "+locObj.address.streetAddress;
2873+
strHTML += " ,"+locObj.address.streetAddress;
28932874
var btnSuccess = "";
28942875
var locCenter = "";
28952876
if( dyFInputs.locationObj.countLocation == 0){
28962877
btnSuccess = "btn-success";
2897-
locCenter = "<span class='lblcentre'> addresse principale</span>";
2878+
locCenter = "<span class='lblcentre'>(localité centrale)</span>";
28982879
}
28992880

2900-
strHTML =
2901-
"<div class='col-md-12 col-sm-12 col-xs-12 text-left shadow2 padding-15 margin-top-15 margin-bottom-15'>" +
2902-
"<span class='pull-left locationEl"+dyFInputs.locationObj.countLocation+" locel text-red bold'>"+
2903-
"<i class='fa fa-home fa-2x'></i> "+
2904-
strHTML+
2905-
"</span> "+
2906-
2907-
"<a href='javascript:dyFInputs.locationObj.removeLocation("+dyFInputs.locationObj.countLocation+")' "+
2908-
"class=' locationEl"+dyFInputs.locationObj.countLocation+" btn btn-sm btn-danger pull-right'> "+
2909-
"<i class='fa fa-times'></i> Effacer"+
2910-
"</a>"+
2911-
2912-
"<a href='javascript:dyFInputs.locationObj.setAsCenter("+dyFInputs.locationObj.countLocation+")' "+
2913-
"class='margin-right-5 centers pull-right center"+dyFInputs.locationObj.countLocation+" locationEl"+dyFInputs.locationObj.countLocation+" btn btn-sm "+btnSuccess+"'> "+
2914-
"<i class='fa fa-map-marker'></i> "+locCenter+
2915-
"</a>" +
2916-
2917-
"</div>";
2918-
$(".locationlocation").append(strHTML);
2881+
strHTML = "<a href='javascript:dyFInputs.locationObj.removeLocation("+dyFInputs.locationObj.countLocation+")' class=' locationEl"+dyFInputs.locationObj.countLocation+" btn'> <i class='text-red fa fa-times'></i></a>"+
2882+
"<span class='locationEl"+dyFInputs.locationObj.countLocation+" locel text-azure'>"+strHTML+"</span> "+
2883+
"<a href='javascript:dyFInputs.locationObj.setAsCenter("+dyFInputs.locationObj.countLocation+")' class='centers center"+dyFInputs.locationObj.countLocation+" locationEl"+dyFInputs.locationObj.countLocation+" btn btn-xs "+btnSuccess+"'> <i class='fa fa-map-marker'></i>"+locCenter+"</a> <br/>";
2884+
$(".locationlocation").prepend(strHTML);
29192885
dyFInputs.locationObj.countLocation++;
29202886
},
29212887
copyPCForm2Dynform : function (postalCodeObj) {
@@ -2963,7 +2929,7 @@ var dyFInputs = {
29632929
delete v.center;
29642930
})
29652931
$(".centers").removeClass('btn-success');
2966-
$(".center"+ix).addClass('btn-success').append(" <span class='lblcentre'> addresse principale</span>");
2932+
$(".center"+ix).addClass('btn-success').append(" <span class='lblcentre'>(localité centrale)</span>");
29672933
dyFInputs.locationObj.centerLocation = dyFInputs.locationObj.elementLocations[ix];
29682934
dyFInputs.locationObj.elementLocations[ix].center = true;
29692935
}
@@ -3021,6 +2987,7 @@ var dyFInputs = {
30212987
var startDate = "";
30222988
var endDate = "";
30232989
$("#ajaxFormModal #allDay").val($("#ajaxFormModal #allDay").is(':checked'));
2990+
30242991
if (allDay) {
30252992
$(".dateTimeInput").addClass("dateInput");
30262993
$(".dateTimeInput").removeClass("dateTimeInput");
@@ -3255,15 +3222,13 @@ var typeObj = {
32553222
}
32563223
} },
32573224
"addPhoto":{
3258-
icon:"upload",
3259-
color:"dark",
32603225
dynForm : {
32613226
jsonSchema : {
3262-
title : "Ajouter des images à l'album ?",
3263-
icon : "upload",
3227+
title : "Uploader une image ?",
3228+
icon : "question-cirecle-o",
32643229
noSubmitBtns : true,
32653230
properties : {
3266-
image : dyFInputs.imageAddPhoto,
3231+
image : dyFInputs.imageAddPhoto
32673232
}
32683233
}
32693234
}},
@@ -3921,6 +3886,5 @@ function test(params, itemType){
39213886
$(document).ready(function() {
39223887
setTimeout( function () { checkPoll() }, 10000);
39233888
document.onkeyup = keyboardNav.checkKeycode;
3924-
if(notNull(userId) && userId!="")
3925-
bindRightClicks();
3889+
bindRightClicks();
39263890
});

‎assets/js/default/editInPlace.js

+23-21
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,15 @@ function bindAboutPodElement() {
221221
}
222222
}
223223
};
224+
224225
var typeDate = "date";
225226
if(contextData.type == typeObj.event.col){
226227
var checked = (notNull(contextData.allDay) && contextData.allDay == true) ? true : false ;
227228
form.dynForm.jsonSchema.properties.allDay = dyFInputs.allDay(checked);
228229
form.dynForm.jsonSchema.properties.allDayHidden = dyFInputs.inputHidden(checked);
229-
if(checked == true )
230-
type = "datetime";
230+
mylog.log("allDay", checked)
231+
if(checked == false )
232+
typeDate = "datetime";
231233

232234
}
233235

@@ -553,33 +555,33 @@ function bindAboutPodElement() {
553555
if(data.result && data.resultGoods.result){
554556

555557
if(typeof data.resultGoods.values.telegram != "undefined"){
556-
contextData.telegram = data.resultGoods.values.telegram.trim();
557-
changeNetwork('#telegramAbout', contextData.telegram, 'https://web.telegram.org/#/im?p=@'+contextData.telegram);
558+
contextData.socialNetwork.telegram = data.resultGoods.values.telegram.trim();
559+
changeNetwork('#telegramAbout', contextData.socialNetwork.telegram, 'https://web.telegram.org/#/im?p=@'+contextData.socialNetwork.telegram);
558560
}
559561

560562
if(typeof data.resultGoods.values.facebook != "undefined"){
561-
contextData.facebook = data.resultGoods.values.facebook.trim();
562-
changeNetwork('#facebookAbout', contextData.facebook, contextData.facebook);
563+
contextData.socialNetwork.facebook = data.resultGoods.values.facebook.trim();
564+
changeNetwork('#facebookAbout', contextData.socialNetwork.facebook, contextData.socialNetwork.facebook);
563565
}
564566

565567
if(typeof data.resultGoods.values.twitter != "undefined"){
566-
contextData.twitter = data.resultGoods.values.twitter.trim();
567-
changeNetwork('#twitterAbout', contextData.twitter, contextData.twitter);
568+
contextData.socialNetwork.twitter = data.resultGoods.values.twitter.trim();
569+
changeNetwork('#twitterAbout', contextData.socialNetwork.twitter, contextData.socialNetwork.twitter);
568570
}
569571

570572
if(typeof data.resultGoods.values.gitHub != "undefined"){
571-
contextData.gitHub = data.resultGoods.values.gitHub.trim();
572-
changeNetwork('#gitHubAbout', contextData.gitHub, contextData.gitHub);
573+
contextData.socialNetwork.gitHub = data.resultGoods.values.gitHub.trim();
574+
changeNetwork('#gitHubAbout', contextData.socialNetwork.gitHub, contextData.socialNetwork.gitHub);
573575
}
574576

575577
if(typeof data.resultGoods.values.skype != "undefined"){
576-
contextData.skype = data.resultGoods.values.skype.trim();
577-
changeNetwork('#skypeAbout', contextData.skype, contextData.skype);
578+
contextData.socialNetwork.skype = data.resultGoods.values.skype.trim();
579+
changeNetwork('#skypeAbout', contextData.socialNetwork.skype, contextData.socialNetwork.skype);
578580
}
579581

580582
if(typeof data.resultGoods.values.gpplus != "undefined"){
581-
contextData.gpplus = data.resultGoods.values.gpplus.trim();
582-
changeNetwork('#gpplusAbout', contextData.gpplus, contextData.gpplus);
583+
contextData.socialNetwork.gpplus = data.resultGoods.values.gpplus.trim();
584+
changeNetwork('#gpplusAbout', contextData.socialNetwork.gpplus, contextData.socialNetwork.gpplus);
583585
}
584586
}
585587
dyFObj.closeForm();
@@ -591,7 +593,7 @@ function bindAboutPodElement() {
591593
typeElement : dyFInputs.inputHidden(),
592594
isUpdate : dyFInputs.inputHidden(true),
593595
skype : dyFInputs.inputUrl("Lien vers Skype"),
594-
github : dyFInputs.inputUrl("Lien vers Git Hub"),
596+
gitHub : dyFInputs.inputUrl("Lien vers Git Hub"),
595597
gpplus : dyFInputs.inputUrl("Lien vers Google Plus"),
596598
twitter : dyFInputs.inputUrl("Lien vers Twitter"),
597599
facebook : dyFInputs.inputUrl("Lien vers Facebook"),
@@ -610,17 +612,17 @@ function bindAboutPodElement() {
610612
typeElement : contextData.type,
611613
};
612614

613-
if(notEmpty(contextData.socialNetwork.twitter))
615+
if(notEmpty(contextData.socialNetwork) && notEmpty(contextData.socialNetwork.twitter))
614616
dataUpdate.twitter = contextData.socialNetwork.twitter;
615-
if(notEmpty(contextData.socialNetwork.gpplus))
617+
if(notEmpty(contextData.socialNetwork) && notEmpty(contextData.socialNetwork.gpplus))
616618
dataUpdate.gpplus = contextData.socialNetwork.gpplus;
617-
if(notEmpty(contextData.socialNetwork.gitHub))
619+
if(notEmpty(contextData.socialNetwork) && notEmpty(contextData.socialNetwork.gitHub))
618620
dataUpdate.gitHub = contextData.socialNetwork.gitHub;
619-
if(notEmpty(contextData.socialNetwork.skype))
621+
if(notEmpty(contextData.socialNetwork) && notEmpty(contextData.socialNetwork.skype))
620622
dataUpdate.skype = contextData.socialNetwork.skype;
621-
if(notEmpty(contextData.socialNetwork.telegram))
623+
if(notEmpty(contextData.socialNetwork) && notEmpty(contextData.socialNetwork.telegram))
622624
dataUpdate.telegram = contextData.socialNetwork.telegram;
623-
if(notEmpty(contextData.socialNetwork.facebook))
625+
if(notEmpty(contextData.socialNetwork) && notEmpty(contextData.socialNetwork.facebook))
624626
dataUpdate.facebook = contextData.socialNetwork.facebook;
625627

626628
dyFObj.openForm(form, null, dataUpdate);

‎views/adminpublic/adddata.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ function bindAddData(){
321321
$.ajax({
322322
type: 'POST',
323323
data: params,
324-
url: baseUrl+'/communecter/adminpublic/adddataindb/',
324+
url: baseUrl+'/'+moduleId+'/adminpublic/adddataindb/',
325325
dataType : 'json',
326326
success: function(data){
327327
console.log("data",data);

‎views/element/about.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@
7777
<span><i class="fa fa-quote-left"></i></span> <?php echo Yii::t("common", "Short description") ?>
7878
</div>
7979
<div id="shortDescriptionAbout" class="col-md-8 col-sm-8 col-xs-12 valueAbout padding-10">
80-
<span class="visible-xs col-xs-12 no-padding"><i class="fa fa-quote-left"></i> <?php echo Yii::t("common", "Short description") ?>:
81-
</span><?php echo (@$element["shortDescription"]) ? $element["shortDescription"] : '<i>'.Yii::t("common","Not specified").'</i>'; ?>
80+
<span class="visible-xs col-xs-12 no-padding"><i class="fa fa-quote-left"></i> <?php echo Yii::t("common", "Short description") ?>: </span><?php echo (@$element["shortDescription"]) ? $element["shortDescription"] : '<i>'.Yii::t("common","Not specified").'</i>'; ?>
8281
</div>
8382
<span id="shortDescriptionAboutEdit" name="shortDescriptionAboutEdit" class="col-xs-12 hidden" ><?php echo (!empty($element["shortDescription"])) ? $element["shortDescription"] : ""; ?></span>
8483
</div>
@@ -274,7 +273,7 @@
274273
</a>
275274
<?php if($edit==true || $openEdition==true ){?>
276275
<button class="btn-update-when btn btn-default letter-blue pull-right tooltips"
277-
data-toggle="tooltip" data-placement="top" title="" alt="" data-original-title="<?php echo Yii::t("common","Update network") ?>">
276+
data-toggle="tooltip" data-placement="top" title="" alt="" data-original-title="<?php echo Yii::t("common","Update date") ?>">
278277
<b><i class="fa fa-pencil"></i></b>
279278
</button>
280279
<?php } ?>

0 commit comments

Comments
 (0)
Please sign in to comment.