@@ -233,12 +235,11 @@ POSSIBILITY OF SUCH DAMAGE.
-
+
-
{# include dialogs #}
{{ partial("layout_partials/base_dialog",['fields':formDialogZone,'id':'DialogZone','label':'Edit zone'])}}
diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
index c65ad2527..12e0d096e 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
@@ -154,17 +154,7 @@ POSSIBILITY OF SUCH DAMAGE.
if (data['details'] != undefined) {
details = data['details'];
}
- BootstrapDialog.show({
- type:BootstrapDialog.TYPE_INFO,
- title: "{{ lang._('Plugin details') }}",
- message: details,
- buttons: [{
- label: "{{ lang._('Close') }}",
- action: function(dialogRef){
- dialogRef.close();
- }
- }]
- });
+ stdDialogInform("{{ lang._('Plugin details') }}", details, "{{ lang._('Close') }}");
});
}
@@ -178,17 +168,7 @@ POSSIBILITY OF SUCH DAMAGE.
if (data['license'] != undefined) {
license = data['license'];
}
- BootstrapDialog.show({
- type:BootstrapDialog.TYPE_INFO,
- title: "{{ lang._('License details') }}",
- message: license,
- buttons: [{
- label: "{{ lang._('Close') }}",
- action: function(dialogRef){
- dialogRef.close();
- }
- }]
- });
+ stdDialogInform("{{ lang._('License details') }}", license, "{{ lang._('Close') }}");
});
}
diff --git a/src/opnsense/www/js/opnsense_bootgrid_plugin.js b/src/opnsense/www/js/opnsense_bootgrid_plugin.js
index 651ba3976..6dd43b346 100644
--- a/src/opnsense/www/js/opnsense_bootgrid_plugin.js
+++ b/src/opnsense/www/js/opnsense_bootgrid_plugin.js
@@ -209,6 +209,7 @@ $.fn.UIBootgrid = function (params) {
{
if (gridParams['del'] != undefined) {
var uuid=$(this).data("row-id");
+ // XXX must be replaced, cannot translate
stdDialogRemoveItem('Remove selected item?',function() {
ajaxCall(url=gridParams['del'] + uuid,
sendData={},callback=function(data,status){
@@ -269,6 +270,7 @@ $.fn.UIBootgrid = function (params) {
// link delete selected items action
$(this).find("*[data-action=deleteSelected]").click(function(){
if ( gridParams['del'] != undefined) {
+ // XXX must be replaced, cannot translate
stdDialogRemoveItem("Remove selected items?",function(){
var rows =$("#"+gridId).bootgrid('getSelectedRows');
if (rows != undefined){
diff --git a/src/opnsense/www/js/opnsense_ui.js b/src/opnsense/www/js/opnsense_ui.js
index 0038c171b..e4fbb2fdf 100644
--- a/src/opnsense/www/js/opnsense_ui.js
+++ b/src/opnsense/www/js/opnsense_ui.js
@@ -270,19 +270,59 @@ function initFormAdvancedUI() {
});
}
+/**
+ * standard dialog when information is required, wrapper around BootstrapDialog
+ */
+function stdDialogInform(title, message, close, callback, type) {
+ var types = {
+ "danger": BootstrapDialog.TYPE_DANGER,
+ "default": BootstrapDialog.TYPE_DEFAULT,
+ "info": BootstrapDialog.TYPE_INFO,
+ "primary": BootstrapDialog.TYPE_PRIMARY,
+ "success": BootstrapDialog.TYPE_SUCCESS,
+ "warning": BootstrapDialog.TYPE_WARNING
+ };
+ if (!(type in types)) {
+ type = 'info';
+ }
+ BootstrapDialog.show({
+ title: title,
+ message: message,
+ type: types[type],
+ buttons: [{
+ label: close,
+ action: function (dialogRef) {
+ if (typeof callback !== 'undefined') {
+ callback();
+ }
+ dialogRef.close();
+ }
+ }]
+ });
+}
+
/**
* standard dialog when confirmation is required, wrapper around BootstrapDialog
*/
-function stdDialogConfirmation(title, message, accept, decline, callback) {
+function stdDialogConfirm(title, message, accept, decline, callback, type) {
+ var types = {
+ // only types that make sense for confirmation
+ "danger": BootstrapDialog.TYPE_DANGER,
+ "default": BootstrapDialog.TYPE_DEFAULT,
+ "warning": BootstrapDialog.TYPE_WARNING
+ };
+ if (!(type in types)) {
+ type = 'warning';
+ }
BootstrapDialog.confirm({
title: title,
message: message,
- type:BootstrapDialog.TYPE_DANGER,
+ type: types[type],
btnCancelLabel: decline,
btnOKLabel: accept,
- btnOKClass: 'btn-primary',
+ btnOKClass: 'btn-' + type,
callback: function(result) {
- if(result) {
+ if (result) {
callback();
}
}
@@ -290,8 +330,8 @@ function stdDialogConfirmation(title, message, accept, decline, callback) {
}
/**
- * wrapper for backwards compatibility
+ * wrapper for backwards compatibility (do not use)
*/
function stdDialogRemoveItem(message, callback) {
- stdDialogConfirmation('Remove', message, 'Yes', 'Cancel', callback)
+ stdDialogConfirm('Remove', message, 'Yes', 'Cancel', callback);
}