Skip to content

GitLab

Commit 0df0fcf6 authored by Jerome Mariette's avatar Jerome Mariette
Browse files

revert

parent 6350c437
Hide whitespace changes
Inline Side-by-side
ui/nG6/pi1/analysis_table.tpl
View file @ 0df0fcf6
......@@ -36,12 +36,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<th align="left" colspan="5">
With selection :
<div class="btn-group">
<button id="hide_analysis" type="button" class="btn multiple-selection-btn btn-small"><i class=" icon-eye-close"></i> hide</button>
<button id="unhide_analysis" type="button" class="btn multiple-selection-btn btn-small"><i class="icon-eye-open"></i> unhide</button>
<button id="hide_analysis" type="button" class="btn btn-small"><i class=" icon-eye-close"></i> hide</button>
<button id="unhide_analysis" type="button" class="btn btn-small"><i class="icon-eye-open"></i> unhide</button>
</div>
<div class="btn-group">
<button id="add_analysis" type="button" class="btn btn-small"><i class="icon-plus"></i> add</button>
<button id="delete_analysis" type="button" class="btn multiple-selection-btn btn-small"><i class="icon-minus"></i> delete</button>
<button id="delete_analysis" type="button" class="btn btn-small"><i class="icon-minus"></i> delete</button>
</div>
</th>
</tr>
......
ui/nG6/pi1/project_table.tpl
View file @ 0df0fcf6
......@@ -79,16 +79,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<th align="left" colspan="4">
With selection :
<div class="btn-group">
<button id="hide_project" type="button" class="btn multiple-selection-btn btn-small"><i class=" icon-eye-close"></i> hide</button>
<button id="unhide_project" type="button" class="btn multiple-selection-btn btn-small"><i class="icon-eye-open"></i> unhide</button>
<button id="hide_project" type="button" class="btn btn-small"><i class=" icon-eye-close"></i> hide</button>
<button id="unhide_project" type="button" class="btn btn-small"><i class="icon-eye-open"></i> unhide</button>
</div>
<div class="btn-group">
<button id="publish_project" type="button" class="btn multiple-selection-btn btn-small"><i class="icon-thumbs-up"></i> publish</button>
<button id="unpublish_project" type="button" class="btn multiple-selection-btn btn-small"><i class="icon-thumbs-down"></i> unpublish</button>
<button id="publish_project" type="button" class="btn btn-small"><i class="icon-thumbs-up"></i> publish</button>
<button id="unpublish_project" type="button" class="btn btn-small"><i class="icon-thumbs-down"></i> unpublish</button>
</div>
<div class="btn-group">
<button id="add_project" type="button" class="btn btn-small"><i class="icon-plus"></i> add</button>
<button id="delete_project" type="button" class="btn multiple-selection-btn btn-small"><i class="icon-minus"></i> delete</button>
<button id="delete_project" type="button" class="btn btn-small"><i class="icon-minus"></i> delete</button>
</div>
</th>
</tr>
......
ui/nG6/pi1/project_view.tpl
View file @ 0df0fcf6
......@@ -206,7 +206,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
With selection :
<div class="btn-group">
<button id="add_user" type="button" class="btn btn-small"><i class="icon-plus"></i> add user</button>
<button id="del_user" type="button" class="btn multiple-selection-btn btn-small"><i class="icon-minus"></i> delete user</button>
<button id="del_user" type="button" class="btn btn-small"><i class="icon-minus"></i> delete user</button>
</div>
</th>
</tr>
......@@ -258,6 +258,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<div id="modal-foot-tmpl" class="modal-footer"></div>
</div>
{* Error No raw selected modal *}
<div id="ng6modal-DTnoraw" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="modalLabel-DTnoraw" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3>Error</h3>
</div>
<div class="modal-body">
<div class='tx-nG6-pi1-error'>No raw selected, please select a raw to access this fonctionality.</div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>
</div>
</div>
{* setAndRunModal *}
<div id="setAndRunModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="setAndRunModalLabel" aria-hidden="true">
<div class="modal-header">
......
ui/nG6/pi1/run_table.tpl
View file @ 0df0fcf6
......@@ -92,12 +92,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<th align="left" colspan="11">
With selection :
<div class="btn-group">
<button id="hide_run" type="button" class="btn multiple-selection-btn btn-small"><i class=" icon-eye-close"></i> hide</button>
<button id="unhide_run" type="button" class="btn multiple-selection-btn btn-small"><i class="icon-eye-open"></i> unhide</button>
<button id="hide_run" type="button" class="btn btn-small"><i class=" icon-eye-close"></i> hide</button>
<button id="unhide_run" type="button" class="btn btn-small"><i class="icon-eye-open"></i> unhide</button>
</div>
<div class="btn-group">
<button id="add_run" type="button" class="btn btn-small"><i class="icon-plus"></i> add</button>
<button id="delete_run" type="button" class="btn multiple-selection-btn btn-small"><i class="icon-minus"></i> delete</button>
<button id="delete_run" type="button" class="btn btn-small"><i class="icon-minus"></i> delete</button>
</div>
</th>
</tr>
......
ui/nG6/pi1/run_view.tpl
View file @ 0df0fcf6
......@@ -147,6 +147,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<div id="modal-foot-tmpl" class="modal-footer"></div>
</div>
{* Error No raw selected modal *}
<div id="ng6modal-DTnoraw" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="modalLabel-DTnoraw" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3>Error</h3>
</div>
<div class="modal-body">
<div class='tx-nG6-pi1-error'>No raw selected, please select a raw to access this fonctionality.</div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>
</div>
</div>
{* setAndRunModal *}
<div id="setAndRunModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="setAndRunModalLabel" aria-hidden="true">
<div class="modal-header">
......
ui/nG6/res/js/tx_nG6_pi1.js
View file @ 0df0fcf6
......@@ -257,7 +257,7 @@ $(function () {
/* delete user from project option */
$(":button[id=del_user]").click(function(){
if ($(':checked[id^=chk_user]').size() > 0) {
if ($(':checked[id^=chk_user]').size() != 0) {
$("#modal-label-tmpl").html("Delete user");
$("#modal-body-tmpl").html("Are you sure you want to delete the selected elements ?");
......@@ -335,7 +335,9 @@ $(function () {
}
});
});
}
} else {
$("#ng6modal-DTnoraw").modal();
}
});
/* add user to project option */
......@@ -782,7 +784,7 @@ function initEditableFields() {
}
function deletePRAHandler() {
if ($(':checked[id^=chk_'+ $(this).attr("id").split("_")[1] +']').size() > 0) {
if ($(':checked[id^=chk_'+ $(this).attr("id").split("_")[1] +']').size() != 0) {
var del_level = $(this).attr("id").split("_")[1];
$("#modal-label-tmpl").html("Delete");
$("#modal-body-tmpl").html("Are you sure you want to delete the selected elements ?");
......@@ -849,11 +851,13 @@ function deletePRAHandler() {
});
});
});
}
} else {
$("#ng6modal-DTnoraw").modal();
}
}
function hideHandler() {
if ($(':checked[id^=chk_'+ $(this).attr("id").split("_")[1] +']').size() > 0) {
if ($(':checked[id^=chk_'+ $(this).attr("id").split("_")[1] +']').size() != 0) {
var hide_level = $(this).attr("id").split("_")[1];
// First confirm with the user if he wants to hide
$("#modal-label-tmpl").html("Hide");
......@@ -897,11 +901,13 @@ function hideHandler() {
}
});
});
} else {
$("#ng6modal-DTnoraw").modal();
}
}
function unhideHandler() {
if ($(':checked[id^=chk_'+ $(this).attr("id").split("_")[1] +']').size() > 0) {
if ($(':checked[id^=chk_'+ $(this).attr("id").split("_")[1] +']').size() != 0) {
var unhide_level = $(this).attr("id").split("_")[1];
// First confirm with the user
$("#modal-label-tmpl").html("Unhide");
......@@ -935,11 +941,13 @@ function unhideHandler() {
}
});
});
} else {
$("#ng6modal-DTnoraw").modal();
}
}
function unpublishHandler() {
if ($(':checked[id^=chk_project_]').size() > 0) {
if ($(':checked[id^=chk_project_]').size() != 0) {
// First confirm with the user
$("#modal-label-tmpl").html("Unpublish");
$("#modal-body-tmpl").html("Are you sure you want to unpublish the selected project(s) ?<br/><br/>When done analysis and data related to the project(s) will be no longer visible by all users.");
......@@ -971,11 +979,13 @@ function unpublishHandler() {
}
});
});
} else {
$("#ng6modal-DTnoraw").modal();
}
}
function publishHandler () {
if ($(':checked[id^=chk_project_]').size() > 0) {
if ($(':checked[id^=chk_project_]').size() != 0) {
// First confirm with the user
$("#modal-label-tmpl").html("Publish");
$("#modal-body-tmpl").html("Are you sure you want to publish the selected project(s) ?<br/><br/> When done analysis and data related to the project(s) will be visible by all users.");
......@@ -1012,6 +1022,8 @@ function publishHandler () {
}
});
});
} else {
$("#ng6modal-DTnoraw").modal();
}
}
......
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