Commit 576775f9 authored by Raph El's avatar Raph El

Merge branch 'cressRE' into qa

parents f25a246e e6e95dd1
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
inputType : "text", inputType : "text",
label : "Sujet", label : "Sujet",
values : sectionDyf.<?php echo $kunik ?>ParamsData.mail_type values : sectionDyf.<?php echo $kunik ?>ParamsData.mail_type
} },
mail_type : { mail_type : {
inputType : "textarea", inputType : "textarea",
label : "Mail type", label : "Mail type",
......
...@@ -44,20 +44,20 @@ if( isset($this->costum["tpls"][$keyTpl]) ) { ...@@ -44,20 +44,20 @@ if( isset($this->costum["tpls"][$keyTpl]) ) {
foreach ($formList as $k => $v) { foreach ($formList as $k => $v) {
?> ?>
<div id='<?php echo $v ?>' class='col-sm-offset-1 col-sm-10 sectionStep ' style="padding-bottom:40px"> <div id='<?php echo $v ?>xx' class='col-sm-offset-1 col-sm-10 sectionStep ' style="padding-bottom:40px">
<?php <?php
$form = PHDB::findOne( Form::COLLECTION,[ "id"=>$v ] ); $form = PHDB::findOne( Form::COLLECTION,[ "id"=>$v ] );
?> ?>
<script type="text/javascript"> <script type="text/javascript">
formInputs["<?php echo $v ?>"] = <?php echo json_encode( $form['inputs'] ); ?>; formInputs["<?php echo $v ?>"] = <?php echo json_encode( $form['inputs'] ); ?>;
var formInputsHere = formInputs; var formInputsHere = formInputs;
</script> </script>
<?php <?php
if( !empty($form) ) if( !empty($form) )
{ {
echo '<h1 class="text-center" style="color:'.$color1.'" >'.@$form["name"].'</h1>'; echo '<h1 class="text-center" style="color:'.$color1.'" >'.@$form["name"].'</h1>';
echo "<div class='text-center'>"; echo "<div class='text-center'>";
if(isset($this->costum["cms"][$form["id"]."desc"])) if(isset($this->costum["cms"][$form["id"]."desc"]))
echo htmlentities($this->costum["cms"][$form["id"]."desc"]); echo htmlentities($this->costum["cms"][$form["id"]."desc"]);
...@@ -67,24 +67,24 @@ var formInputsHere = formInputs; ...@@ -67,24 +67,24 @@ var formInputsHere = formInputs;
echo "<a class='btn btn-xs btn-danger editBtn' href='javascript:;' data-key='".@$form["id"]."desc' data-type='textarea' data-markdown='1' data-path='costum.cms.".@$form["id"]."desc' data-label='Expliquez les objectifs de cette étape ? '> <i class='fa fa-pencil'></i></a>"; echo "<a class='btn btn-xs btn-danger editBtn' href='javascript:;' data-key='".@$form["id"]."desc' data-type='textarea' data-markdown='1' data-path='costum.cms.".@$form["id"]."desc' data-label='Expliquez les objectifs de cette étape ? '> <i class='fa fa-pencil'></i></a>";
echo "</div>"; echo "</div>";
//echo "<div class='markdown'>"; //echo "<div class='markdown'>";
echo "<div class=''>"; echo "<div class=''>";
echo $this->renderPartial("survey.views.tpls.forms.formSection", echo $this->renderPartial("survey.views.tpls.forms.formSection",
[ "formId" => $v, [ "formId" => $v,
"form" => $form, "form" => $form,
"wizard" => false, "wizard" => false,
"answer"=>$answer, "answer"=>$answer,
"mode" => "w", "mode" => "w",
"showForm" => $showForm, "showForm" => $showForm,
"canEdit" => $canEdit, "canEdit" => $canEdit,
"el" => $el ] ,true ); "el" => $el ] ,true );
echo "</div>"; echo "</div>";
} }
else else
{ {
echo ""; echo "";
} }
?> ?>
</div> </div>
<?php <?php
} }
...@@ -99,23 +99,13 @@ jQuery(document).ready(function() { ...@@ -99,23 +99,13 @@ jQuery(document).ready(function() {
descHtml = dataHelper.markdownToHtml($(v).html()); descHtml = dataHelper.markdownToHtml($(v).html());
$(v).html(descHtml); $(v).html(descHtml);
}); });
// Todo BUG en nav private
if( localStorage !== null && localStorage.wizardStep !== null)
showStepForm(localStorage.wizardStep);
}); });
function showStepForm(id){
mylog.log("showStepForm", id);
$(".sectionStep").addClass("hide");
$(id).removeClass("hide");
localStorage.setItem("wizardStep",id);
}
</script> </script>
</div> </div>
</div> </div>
\ No newline at end of file
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