' +
- '<% if (typeof iconCls !== "undefined") { %>
<% } %>' +
+ '<% if (typeof iconCls !== "undefined") { %>
style="padding-left:10px;" <% } %>>
<%= msg %>' +
'<% if (dontshow) { %>
<% } %>' +
'
' +
diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js
index b5584e84b..4c796dc5c 100644
--- a/apps/common/main/lib/view/OpenDialog.js
+++ b/apps/common/main/lib/view/OpenDialog.js
@@ -99,7 +99,7 @@ define([
'<% if (type == Common.Utils.importTextType.DRM) { %>',
'<% if (warning) { %>',
'
',
- '
',
+ '
',
'
' + (typeof _options.warningMsg=='string' ? _options.warningMsg : t.txtProtected) + '
',
'',
'
',
diff --git a/apps/common/main/resources/img/controls/warnings.svg b/apps/common/main/resources/img/controls/warnings.svg
new file mode 100644
index 000000000..8f451e71e
--- /dev/null
+++ b/apps/common/main/resources/img/controls/warnings.svg
@@ -0,0 +1,26 @@
+
diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less
index a58a97b26..420ed6401 100644
--- a/apps/common/main/resources/less/opendialog.less
+++ b/apps/common/main/resources/less/opendialog.less
@@ -77,14 +77,13 @@
}
}
- .icon.img-commonctrl {
+ .icon {
float: left;
- width: 35px;
- height: 35px;
+ width: 40px;
+ height: 40px;
&.warn {
- height: 32px;
- background-position: @alerts-offset-x @alerts-offset-y - 105px;
+ background: ~"url('@{common-image-const-path}/controls/warnings.svg#attention')" no-repeat center;
}
}
}
diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less
index 65294ef4d..c6225f98c 100644
--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@@ -172,26 +172,24 @@
.icon {
&.warn {
- width: 35px;
- height: 32px;
- background-position: @alerts-offset-x @alerts-offset-y - 105px;
+ background: ~"url('@{common-image-const-path}/controls/warnings.svg#attention')" no-repeat center;
}
- &.error, &.info, &.confirm {
- width: 35px;
- height: 35px;
+ &.error, &.info, &.confirm, &.warn {
+ width: 40px;
+ height: 40px;
}
&.error {
- background-position: @alerts-offset-x @alerts-offset-y - 0;
+ background: ~"url('@{common-image-const-path}/controls/warnings.svg#warning')" no-repeat center;
}
&.info {
- background-position: @alerts-offset-x @alerts-offset-y - 35px;
+ background: ~"url('@{common-image-const-path}/controls/warnings.svg#info')" no-repeat center;
}
&.confirm {
- background-position: @alerts-offset-x @alerts-offset-y - 70px;
+ background: ~"url('@{common-image-const-path}/controls/warnings.svg#done')" no-repeat center;
}
}
diff --git a/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template b/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template
index ef85cbaf5..51c6e44eb 100644
--- a/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template
+++ b/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template
@@ -89,7 +89,7 @@
|