Gitlab CSE Unil

Commit e000eadd authored by M. Chardon's avatar M. Chardon
Browse files

correction github, place dans feedback configuration

parent 1f059165
This diff is collapsed.
...@@ -426,6 +426,7 @@ define(['jquery', 'jqueryui', 'core/notification', 'core/templates', 'core/fragm ...@@ -426,6 +426,7 @@ define(['jquery', 'jqueryui', 'core/notification', 'core/templates', 'core/fragm
$("#assignfeedback_editpdfplus_widget_admin_workspace").show(); $("#assignfeedback_editpdfplus_widget_admin_workspace").show();
$("#editpdlplus_axes_worspace").hide(); $("#editpdlplus_axes_worspace").hide();
} }
$('#assignfeedback_editpdfplus_widget_admin_div_axis').show();
$('#assignfeedback_editpdfplus_widget_admin_div_addaxis').show(); $('#assignfeedback_editpdfplus_widget_admin_div_addaxis').show();
$('#assignfeedback_editpdfplus_widget_admin_div_addaxis').html(""); $('#assignfeedback_editpdfplus_widget_admin_div_addaxis').html("");
$('#assignfeedback_editpdfplus_widget_admin_toolheader').hide(); $('#assignfeedback_editpdfplus_widget_admin_toolheader').hide();
...@@ -445,6 +446,7 @@ define(['jquery', 'jqueryui', 'core/notification', 'core/templates', 'core/fragm ...@@ -445,6 +446,7 @@ define(['jquery', 'jqueryui', 'core/notification', 'core/templates', 'core/fragm
AdminPanel.prototype.openDivEditAxis = function () { AdminPanel.prototype.openDivEditAxis = function () {
$("#message_edit_tool").hide(); $("#message_edit_tool").hide();
$("#axistool").hide(); $("#axistool").hide();
$('#assignfeedback_editpdfplus_widget_admin_div_axis').show();
$('#assignfeedback_editpdfplus_widget_admin_div_editaxis').show(); $('#assignfeedback_editpdfplus_widget_admin_div_editaxis').show();
$('#assignfeedback_editpdfplus_widget_admin_div_editaxis').html(""); $('#assignfeedback_editpdfplus_widget_admin_div_editaxis').html("");
$('#assignfeedback_editpdfplus_widget_admin_toolheader').hide(); $('#assignfeedback_editpdfplus_widget_admin_toolheader').hide();
...@@ -465,6 +467,7 @@ define(['jquery', 'jqueryui', 'core/notification', 'core/templates', 'core/fragm ...@@ -465,6 +467,7 @@ define(['jquery', 'jqueryui', 'core/notification', 'core/templates', 'core/fragm
AdminPanel.prototype.openDivExportAxis = function () { AdminPanel.prototype.openDivExportAxis = function () {
$("#message_edit_tool").hide(); $("#message_edit_tool").hide();
$("#axistool").hide(); $("#axistool").hide();
$('#assignfeedback_editpdfplus_widget_admin_div_axis').show();
$('#assignfeedback_editpdfplus_widget_admin_div_exportaxis').show(); $('#assignfeedback_editpdfplus_widget_admin_div_exportaxis').show();
$('#assignfeedback_editpdfplus_widget_admin_div_exportaxis').html(""); $('#assignfeedback_editpdfplus_widget_admin_div_exportaxis').html("");
$('#assignfeedback_editpdfplus_widget_admin_toolheader').hide(); $('#assignfeedback_editpdfplus_widget_admin_toolheader').hide();
......
...@@ -129,36 +129,40 @@ ...@@ -129,36 +129,40 @@
</div> </div>
</div> </div>
</td> </td>
<td id='assignfeedback_editpdfplus_widget_admin_toolworkspace' class='assignfeedback_editpdfplus_widget_admin_col2'> <td>
<div id='editpdlplus_toolbars'> <div class="d-flex">
{{# toolbars }} <div id='assignfeedback_editpdfplus_widget_admin_toolworkspace' class='assignfeedback_editpdfplus_widget_admin_col2 w-100'>
<div id="editpdlplus_toolbar_{{axis.id}}" class="btn-group toolbar sortable" style="display: none;width: 100%;"> <div id='editpdlplus_toolbars'>
<ul class="sortable" style="list-style-type: none;margin: 0;padding: 0;width: 100%;"> {{# toolbars }}
{{# tools }} <div id="editpdlplus_toolbar_{{axis.id}}" class="btn-group toolbar sortable" style="display: none;width: 100%;">
<li style="float: left;display: block;"> <ul class="sortable" style="list-style-type: none;margin: 0;padding: 0;width: 100%;">
<button class="btn {{button}} editpdlplus_tool" id="editpdlplus_tool_{{id}}" value="{{id}}" style="{{style}}" data-enable="{{enabled}}"> {{# tools }}
{{label}} <li style="float: left;display: block;">
</button> <button class="btn {{button}} editpdlplus_tool" id="editpdlplus_tool_{{id}}" value="{{id}}" style="{{style}}" data-enable="{{enabled}}">
</li> {{label}}
{{/ tools }} </button>
</ul> </li>
</div> {{/ tools }}
{{/ toolbars }} </ul>
</div> </div>
{{{ toolorderform.render }}} {{/ toolbars }}
</div>
{{{ toolorderform.render }}}
<div class="alert" id="message_edit_tool"></div> <div class="alert" id="message_edit_tool"></div>
<div id="editpdlplus_tool_item"></div> <div id="editpdlplus_tool_item"></div>
</td> </div>
<td> <div id="assignfeedback_editpdfplus_widget_admin_div_axis" style="display:none;" class="w-100">
<div id="assignfeedback_editpdfplus_widget_admin_div_addaxis" style="display:none;" class="card w-50 ml-2 border-primary"> <div id="assignfeedback_editpdfplus_widget_admin_div_addaxis" style="display:none;" class="card w-50 ml-2 border-primary">
</div> </div>
<div id="assignfeedback_editpdfplus_widget_admin_div_editaxis" style="display:none;" class="card w-50 ml-2 border-primary"> <div id="assignfeedback_editpdfplus_widget_admin_div_editaxis" style="display:none;" class="card w-50 ml-2 border-primary">
</div> </div>
<div id="assignfeedback_editpdfplus_widget_admin_div_delaxis" style="display:none;" class="card w-50 ml-2 border-primary"> <div id="assignfeedback_editpdfplus_widget_admin_div_delaxis" style="display:none;" class="card w-50 ml-2 border-primary">
</div> </div>
<div id="assignfeedback_editpdfplus_widget_admin_div_exportaxis" style="display:none;" class="card w-50 ml-2 border-primary"> <div id="assignfeedback_editpdfplus_widget_admin_div_exportaxis" style="display:none;" class="card w-50 ml-2 border-primary">
</div>
</div>
</div> </div>
</td> </td>
</tr> </tr>
......
...@@ -49,6 +49,7 @@ require(['jquery','core/ajax','core/notification'], function($,ajax,notification ...@@ -49,6 +49,7 @@ require(['jquery','core/ajax','core/notification'], function($,ajax,notification
if ('{{action}}' === 'add'){ if ('{{action}}' === 'add'){
var divAxis = "<div id='editpdlplus_toolbar_"+axe[0].axeid+"' class='btn-group toolbar' style='display: none;'><ul></ul></div>"; var divAxis = "<div id='editpdlplus_toolbar_"+axe[0].axeid+"' class='btn-group toolbar' style='display: none;'><ul></ul></div>";
$('#editpdlplus_toolbars').append(divAxis); $('#editpdlplus_toolbars').append(divAxis);
$('#assignfeedback_editpdfplus_widget_admin_div_axis').hide();
$('#assignfeedback_editpdfplus_widget_admin_div_addaxis').html(""); $('#assignfeedback_editpdfplus_widget_admin_div_addaxis').html("");
$('#assignfeedback_editpdfplus_widget_admin_div_addaxis').hide(); $('#assignfeedback_editpdfplus_widget_admin_div_addaxis').hide();
var option=new Option(axe[0].axelabel, axe[0].axeid, true, true); var option=new Option(axe[0].axelabel, axe[0].axeid, true, true);
...@@ -56,6 +57,7 @@ require(['jquery','core/ajax','core/notification'], function($,ajax,notification ...@@ -56,6 +57,7 @@ require(['jquery','core/ajax','core/notification'], function($,ajax,notification
$("#editpdlplus_axes").change(); $("#editpdlplus_axes").change();
$('#editpdlplus_tool_item').html(""); $('#editpdlplus_tool_item').html("");
} else { } else {
$('#assignfeedback_editpdfplus_widget_admin_div_axis').hide();
$('#assignfeedback_editpdfplus_widget_admin_div_editaxis').html(""); $('#assignfeedback_editpdfplus_widget_admin_div_editaxis').html("");
$('#assignfeedback_editpdfplus_widget_admin_div_editaxis').hide(); $('#assignfeedback_editpdfplus_widget_admin_div_editaxis').hide();
$("#editpdlplus_axes option:selected").html(axe[0].axelabel); $("#editpdlplus_axes option:selected").html(axe[0].axelabel);
...@@ -69,9 +71,11 @@ require(['jquery','core/ajax','core/notification'], function($,ajax,notification ...@@ -69,9 +71,11 @@ require(['jquery','core/ajax','core/notification'], function($,ajax,notification
}); });
$("#axisFormCancel").on("click", function () { $("#axisFormCancel").on("click", function () {
if ('{{action}}' === 'add'){ if ('{{action}}' === 'add'){
$('#assignfeedback_editpdfplus_widget_admin_div_axis').hide();
$('#assignfeedback_editpdfplus_widget_admin_div_addaxis').html(""); $('#assignfeedback_editpdfplus_widget_admin_div_addaxis').html("");
$('#assignfeedback_editpdfplus_widget_admin_div_addaxis').hide(); $('#assignfeedback_editpdfplus_widget_admin_div_addaxis').hide();
} else { } else {
$('#assignfeedback_editpdfplus_widget_admin_div_axis').hide();
$('#assignfeedback_editpdfplus_widget_admin_div_editaxis').html(""); $('#assignfeedback_editpdfplus_widget_admin_div_editaxis').html("");
$('#assignfeedback_editpdfplus_widget_admin_div_editaxis').hide(); $('#assignfeedback_editpdfplus_widget_admin_div_editaxis').hide();
} }
......
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