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

Merge branch 'development' of https://gitlab.adullact.net/pixelhumain/co2 into development

parents 243591a4 0c798ca6
......@@ -1516,10 +1516,19 @@ var urlCtrl = {
urlCtrl.bindModalPreview();
coInterface.bindLBHLinks();
coInterface.bindTooltips();
urlCtrl.resizePreview();
}
);
});
},
resizePreview : function(){
heightModal=$("#modal-preview-coop").outerHeight();
heightToolsMenu=$("#modal-preview-coop .toolsMenu").outerHeight();
if(heightModal != 0)
$("#modal-preview-coop .container-preview").css({"height": (heightModal-heightToolsMenu)+"px"});
else
setTimeout(function(){ urlCtrl.resizePreview(); }, 200);
},
bindModalPreview : function(){
urlCtrl.previewCurrentlyLoading=false;
$("#modal-preview-coop .btn-close-preview, .deleteThisBtn").click(function(){
......
......@@ -127,13 +127,16 @@
);
$this->renderPartial('co2.views.poi.standalone', $params );
}else if($type == Form::ANSWER_COLLECTION){
$params = array("element"=>$element ,
}else if($type == Answer::COLLECTION){
$params = array("answer"=>$element ,
"page" => "page",
"type" => $type,
"form"=>$answer["form"],
"canEdit"=>$canEdit,
"controller" => $controller);
$params = Form::getDataForm($params);
$params["canEdit"]=false;
$params["mode"]="r";
$this->renderPartial('survey.views.tpls.forms.formWizard', $params );
}
?>
......
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