From 73c31012d99f166025482b8835523a08e9420dee Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 14 Mar 2017 10:36:10 +0100
Subject: [PATCH] Added new visual styles to um and rr systems. Ticket #486
---
pandora_console/images/icono_error_mr.png | Bin 0 -> 2027 bytes
pandora_console/images/icono_exito_mr.png | Bin 0 -> 2114 bytes
.../include/ajax/rolling_release.ajax.php | 32 +++-
.../include/javascript/update_manager.js | 176 +++++++++++++++---
.../styles/jquery-ui-1.10.0.custom.css | 8 +-
5 files changed, 187 insertions(+), 29 deletions(-)
create mode 100644 pandora_console/images/icono_error_mr.png
create mode 100644 pandora_console/images/icono_exito_mr.png
diff --git a/pandora_console/images/icono_error_mr.png b/pandora_console/images/icono_error_mr.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3ef21f5c4bb6cb5d74064e161e1631f8d49b5a2
GIT binary patch
literal 2027
zcmV<H2Nd{;P)<h;3K|Lk000e1NJLTq002?|002@51^@s7uq(3-0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU(jY&j7RCwBAU?2f7B6I$@xco;~z_Mo#
zBZgvZ3ehz%5>kk)feBrZdG~HO%~V>7B8Q>)ud6Fq;s0H`82)v4<5vt*$mr&V;S>zT
zFcU#G;0!vVLxb3GCJ6up5b043v|a&7-A9xE0Ca*Na?HI4QUb)pngAiInUH<Vyna0-
zdU<%@(F_X}M)aToDF!J-j{ww|0xAIGFJDkh#G4F3CjSi#gmDvzO0OVa6O4C~qY@y1
z2&%?mQz6i%2}B!8C`O6#3ZXQ_K#t+aafx9d(~KDyaSBU0jLOP5gNk5u!crEt>`rts
zg;5g4#$t%!G7vo}Ct`Ia(3>Eaf?Nj51K@lBP39QEf+M0pVX8olh+-r%T@nI@Km#uj
zmG}u*kO(wr0X7MM0HR&tiNlrifm8x11py-&-o<M$H6mvL(BMR@MJ$;yodDF=k6|F0
zhQUAqih)4G94L)ln1f(0+>b9SVu<0%h6D=?a8U*|6rVv*S2hqX*030Yt@T2*3(+;>
zGmIz$(OrlhrX(4NY#7{SNMVWvTwuZ%8R&)~8;T<<8ZzQ7XrT=gQVLrpC_@pe3K9$h
zf<W{zG^DU9*nnanv?yOdreTcuiZ4=H81U9B!4ex+X-&VDI1~T`(2zhR2L&*AK|wp8
z0y{qdu_7=UK2X(>K!<_Kga8@^lq1l=2PkPm{HJ5AqEz(6G)rh1awIhuso4&tHrN1k
zXdqRZPvBk;fqIcpPY4GHfR=w4-2}XaB8uaBdKeh>^)V_Xq~0{%diZZl3<JZ<m!x+)
z$cbib-8`^kfju>Bj>Fdl#8>q&QX?&5bu49$Bdz~R48YdMMGjeV9SC<QMY{2~{ZKLu
z)-+3oBR>#5s)ECD=+TOj49IhAB1Sn$Qo2NPD4{fm>{vp51A>DJKu3Z?^8H|F`QUAx
z4uV<-qs7aF#}^9*z=4A34kW6n2I}Pksd_p%?gLdCy`)r~#Pru-T`a1%%yEQtJOl3G
zK~RHsAti%s00G!H7n_D*APlFOAS<u|BZLv?6x{-t0CfVy2Hhappk1IM8^8oW4mmWn
zeYuBULE=;isV&N<v+wNxxBLGpCd6jL3_JJdisu5ukb|!}<Wh@ZwzUC?c^Y9KlRzfW
zJ@KkL@lyHWYu=6$AOPFMYk9+2f@{L5=yFsq1&VDjZpS~zk~<$xCbI*Y<h-*Wu`gzd
z#w@cqq$!l9DjN?}CcA0{VHOM*(iDqKDKf1SwjFbc7RzKO0yGZ=fF;o1&pGnfZGjFX
zdoJ1!!$6()WuPxtkmhKB9iO`$350=b41y_>B1!OdJ}-izfCA0!tT@{3*964!i*$fL
zetPYzrqGPW%HYHm?5a_q0f4-%8hhBSn|St=C=SW)le##~A^Q}75kQAI<ZCQIn1h@?
z%G_UGGAVTzs6I&b(ISQ8t6~gvv)zj3qYZiB{x>`vAgDHDg9=X}?!6jEb0WrR<}k#N
zLCGlu>hx-^OeTt}t8S}20JT-4uW$~98E?3{yHqy42lE@PtB}(dTFdo@MdPa0*dCGN
zL^*3Uv(oxRfY55lOJWie6~x+GB)9>+78e3(!5)=OzaQc5R6;Dk4rz^dv!s#WR|0#j
zssCr<TYz@X=BQy9h{8&SV-C4-H673abU+%&fePS|22w$wf~16WV0S>MfLwFJ4KR?k
zmyG0C*2>mOa-28hz)Z#@ANtu{z18){k%IdlaUR~|>w#DX*h{ZZTxzpHfW+$Oiztt)
zd_=5}e7uX&^_KS*Brc#U9BDBqN3d@kU`LMOz2fdO74d6}!A%|oNSv}z15bLqS6Cmv
zI|J#!X&$4r-fWI&7uLR1T(+!%+T=D<OcxR{9Ff~D$3%#*iF^+XB4~a5?jKG@WZ)K!
zm~_{a=b9W#=@sHhUrnvGV*|uTwvRQLlpQDz&Ks3yE|+efsVdd^Q*;$*m!4uXK<L|8
zER^G*;LmK%kj@$e>kdU`7-0J!fwo_s<C(;)NbXwGP3;v+Qh$3}yo_Mbe$@zv`aXQG
z#VIRQGaPXBBa&@2%6|}SImc1d)I+8nO_u9wmtHi2lv4UARH$PM^!IRx1)!``vrF*P
zZ7ZPh0Q}df$-BBndM|&$v;}Ws;fb)j5kdi2_<H<86mobt7Llj`I-gtbuJ8{C0PsvV
zQBdp<oELslzL=5zIV!*JyaS|$F+QHtV&~R@%whysY$B93)H6`|<g&VJ^EL%Jhyy#t
zp>CxVf9q02mRJ(5EUmj>v~3t;3-kv@G~tR33n^u_I*@$bh=vi_CJr<KWr{7&4$E}a
zAE^ASeNAx}U$zRAF*vVvSv7eifjIAd0+x5YkpzViw^LY_)<<XZaq`3Lj~dO0lrtMh
zgVKRRG@2$UeprZ=z*M^*D8y%q^VIfQ6W&cIF72?oL-Gc-vaGP4>4aB~0IkyHuHNTM
z0@@0o6Oa<n8BY0W4*_mOc_n@)d!KWoX-_<ondorsj~9>?s0l(1J^lBX)@``{fOj)K
z?)*=pEYow0T3F+tHF@i^CndUDoh5%wBI@05nUrY^HMYH6{Q>3L$6g$J?gRh;002ov
JPDHLkV1kbBftdgR
literal 0
HcmV?d00001
diff --git a/pandora_console/images/icono_exito_mr.png b/pandora_console/images/icono_exito_mr.png
new file mode 100644
index 0000000000000000000000000000000000000000..140f20627db27b9e6f20e95c31a5a7bddb10af45
GIT binary patch
literal 2114
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
literal 0
HcmV?d00001
diff --git a/pandora_console/include/ajax/rolling_release.ajax.php b/pandora_console/include/ajax/rolling_release.ajax.php
index 0cf1ead3b7..bb2de94a9d 100644
--- a/pandora_console/include/ajax/rolling_release.ajax.php
+++ b/pandora_console/include/ajax/rolling_release.ajax.php
@@ -38,7 +38,13 @@ if (is_ajax ()) {
if ($dangerous_query) {
$error_file = fopen($config["homedir"] . "/extras/mr/error.txt", "w");
- $message = "The sql file contains a dangerous query";
+
+ $message = "<div>";
+ $message .= "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_error_mr.png'></div>";
+ $message .= "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
+ $message .= "<p style='font-family:Verdana; font-size:12pt;'>The sql file contains a dangerous query</p></div>";
+ $message .= "</div>";
+
fwrite($error_file, $message);
fclose($error_file);
}
@@ -76,7 +82,13 @@ if (is_ajax ()) {
}
else {
$error_file = fopen($config["homedir"] . "/extras/mr/error.txt", "w");
- $message = "An error occurred while updating the database schema to the minor release " . $number;
+
+ $message = "<div>";
+ $message .= "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_error_mr.png'></div>";
+ $message .= "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
+ $message .= "<p style='font-family:Verdana; font-size:12pt;'>An error occurred while updating the database schema to the minor release " . $number . "</p></div>";
+ $message .= "</div>";
+
fwrite($error_file, $message);
fclose($error_file);
}
@@ -84,14 +96,26 @@ if (is_ajax ()) {
}
else {
$error_file = fopen($config["homedir"] . "/extras/mr/error.txt", "w");
- $message = "The directory ' . $dir . ' should have read permissions in order to update the database schema";
+
+ $message = "<div>";
+ $message .= "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_error_mr.png'></div>";
+ $message .= "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
+ $message .= "<p style='font-family:Verdana; font-size:12pt;'>The directory " . $dir . " should have read permissions in order to update the database schema</p></div>";
+ $message .= "</div>";
+
fwrite($error_file, $message);
fclose($error_file);
}
}
else {
$error_file = fopen($config["homedir"] . "/extras/mr/error.txt", "w");
- $message = "The directory ' . $dir . ' does not exist";
+
+ $message = "<div>";
+ $message .= "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_error_mr.png'></div>";
+ $message .= "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
+ $message .= "<p style='font-family:Verdana; font-size:12pt;'>The directory " . $dir . " does not exist</p></div>";
+ $message .= "</div>";
+
fwrite($error_file, $message);
fclose($error_file);
}
diff --git a/pandora_console/include/javascript/update_manager.js b/pandora_console/include/javascript/update_manager.js
index 5d841bb318..ab17c108f0 100644
--- a/pandora_console/include/javascript/update_manager.js
+++ b/pandora_console/include/javascript/update_manager.js
@@ -202,7 +202,7 @@ function install_package (package, homeurl) {
background: 'black'
},
width: 600,
- height: 350,
+ height: 250,
buttons: {
"Apply package": function () {
$("#pkg_apply_dialog").dialog("close");
@@ -227,7 +227,7 @@ function install_package (package, homeurl) {
background: 'black'
},
width: 600,
- height: 350,
+ height: 270,
buttons: {
"Apply minor releases": function () {
var no_error = apply_minor_release(data['mr']);
@@ -278,6 +278,36 @@ function install_package (package, homeurl) {
},
"Cancel": function () {
$("#mr_dialog2").dialog("close");
+
+ $("<div id='cancel_mr' class='dialog ui-dialog-content' title='Menor release available'></div>").dialog ({
+ resizable: true,
+ draggable: true,
+ modal: true,
+ overlay: {
+ opacity: 0.5,
+ background: 'black'
+ },
+ width: 600,
+ height: 220,
+ buttons: {
+ "Ok": function () {
+ $(this).dialog("close");
+ }
+ }
+ });
+
+ var dialog_cancel_mr_text = "<div>";
+ dialog_cancel_mr_text = dialog_cancel_mr_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
+ dialog_cancel_mr_text = dialog_cancel_mr_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
+ dialog_cancel_mr_text = dialog_cancel_mr_text + "<p style='font-family:Verdana; font-size:12pt;'>These database changes will not apply.</p></div>";
+ dialog_cancel_mr_text = dialog_cancel_mr_text + "</div>";
+
+ $('#cancel_mr').html(dialog_cancel_mr_text);
+ $('#cancel_mr').dialog('open');
+
+ $("#box_online .loading").hide();
+ $("#box_online .downloading_package").hide();
+ $("#box_online .content").html("MR not accepted");
$('#form-offline_update ul').find('li').addClass('error');
$('#form-offline_update ul').find('li').find('p').html(error_in_mr_accept)
.append("<i>"+data.message+"</i>");
@@ -285,14 +315,17 @@ function install_package (package, homeurl) {
}
});
- $('button:contains(Apply minor releases)').attr("id","apply_rr_button");
+ $('button:contains(Apply MR)').attr("id","apply_rr_button");
$('button:contains(Cancel)').attr("id","cancel_rr_button");
- var dialog_text = "<div><h3>Do you want to apply minor releases?</h3></br>";
- dialog_text = dialog_text + "<h2>We recommend launch a planned downtime to this process</h2></br>";
- dialog_text = dialog_text + "<a href=\"<?php echo $config['homeurl']; ?>index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list\">Planned downtimes</a></div>"
-
- $('#mr_dialog2').html(dialog_text);
+ var dialog_have_mr_mr_text = "<div>";
+ dialog_have_mr_mr_text = dialog_have_mr_mr_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
+ dialog_have_mr_mr_text = dialog_have_mr_mr_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>There are a DB changes</strong></h3>";
+ dialog_have_mr_mr_text = dialog_have_mr_mr_text + "<p style='font-family:Verdana; font-size:12pt;'>There are a new database changes available to apply. Do you want to start the DB update process?</p>";
+ dialog_have_mr_mr_text = dialog_have_mr_mr_text + "<p style='font-family:Verdana; font-size:12pt;'>We recommend launch a <a style='font-family:Verdana bold; font-size:12pt; color:#82B92E'href=\"index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list\">Planned downtime</a> to this process</p></div>";
+ dialog_have_mr_mr_text = dialog_have_mr_mr_text + "</div>";
+
+ $('#mr_dialog2').html(dialog_have_mr_mr_text);
$('#mr_dialog2').dialog('open');
}
else {
@@ -340,6 +373,29 @@ function install_package (package, homeurl) {
"Cancel": function () {
$(this).dialog("close");
+ $("<div id='cancel_pkg' class='dialog ui-dialog-content' title='Menor release available'></div>").dialog ({
+ resizable: true,
+ draggable: true,
+ modal: true,
+ overlay: {
+ opacity: 0.5,
+ background: 'black'
+ },
+ width: 600,
+ height: 220,
+ buttons: {
+ "Ok": function () {
+ $(this).dialog("close");
+ }
+ }
+ });
+
+ var dialog_cancel_pkg_text = "<div>";
+ dialog_cancel_pkg_text = dialog_cancel_pkg_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
+ dialog_cancel_pkg_text = dialog_cancel_pkg_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
+ dialog_cancel_pkg_text = dialog_cancel_pkg_text + "<p style='font-family:Verdana; font-size:12pt;'>These changes will not apply.</p></div>";
+ dialog_cancel_pkg_text = dialog_cancel_pkg_text + "</div>";
+
var parameters = {};
parameters['page'] = 'include/ajax/update_manager.ajax';
parameters['install_package'] = 1;
@@ -379,7 +435,11 @@ function install_package (package, homeurl) {
}
});
- var dialog_text = "<div><h3>Do you want to apply the package?</h3></br>";
+ var dialog_text = "<div>";
+ dialog_text = dialog_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
+ dialog_text = dialog_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>There are a new update available</strong></h3>";
+ dialog_text = dialog_text + "<p style='font-family:Verdana; font-size:12pt;'>There are a new update available to apply. Do you want to start the update process?</p></div>";
+ dialog_text = dialog_text + "</div>";
$('#pkg_apply_dialog').html(dialog_text);
$('#pkg_apply_dialog').dialog('open');
@@ -460,9 +520,9 @@ function update_last_package(package, version, homeurl) {
background: 'black'
},
width: 600,
- height: 350,
+ height: 250,
buttons: {
- "Apply package": function () {
+ "OK": function () {
$(this).dialog("close");
var parameters = {};
@@ -486,9 +546,9 @@ function update_last_package(package, version, homeurl) {
background: 'black'
},
width: 600,
- height: 350,
+ height: 270,
buttons: {
- "Apply minor releases": function () {
+ "Apply MR": function () {
var no_error = apply_minor_release(data['mr']);
if (no_error) {
@@ -527,6 +587,33 @@ function update_last_package(package, version, homeurl) {
},
"Cancel": function () {
$(this).dialog("close");
+
+ $("<div id='cancel_mr' class='dialog ui-dialog-content' title='Menor release available'></div>").dialog ({
+ resizable: true,
+ draggable: true,
+ modal: true,
+ overlay: {
+ opacity: 0.5,
+ background: 'black'
+ },
+ width: 600,
+ height: 220,
+ buttons: {
+ "Ok": function () {
+ $(this).dialog("close");
+ }
+ }
+ });
+
+ var dialog_cancel_mr_text = "<div>";
+ dialog_cancel_mr_text = dialog_cancel_mr_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
+ dialog_cancel_mr_text = dialog_cancel_mr_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
+ dialog_cancel_mr_text = dialog_cancel_mr_text + "<p style='font-family:Verdana; font-size:12pt;'>These database changes will not apply.</p></div>";
+ dialog_cancel_mr_text = dialog_cancel_mr_text + "</div>";
+
+ $('#cancel_mr').html(dialog_cancel_mr_text);
+ $('#cancel_mr').dialog('open');
+
$("#box_online .loading").hide();
$("#box_online .downloading_package").hide();
$("#box_online .content").html("MR not accepted");
@@ -534,14 +621,17 @@ function update_last_package(package, version, homeurl) {
}
});
- $('button:contains(Apply minor releases)').attr("id","apply_rr_button");
+ $('button:contains(Apply MR)').attr("id","apply_rr_button");
$('button:contains(Cancel)').attr("id","cancel_rr_button");
- var dialog_text = "<div><h3>Do you want to apply minor releases?</h3></br>";
- dialog_text = dialog_text + "<h2>We recommend launch a planned downtime to this process</h2></br>";
- dialog_text = dialog_text + "<a href=\"<?php echo $config['homeurl']; ?>index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list\">Planned downtimes</a></div>"
-
- $('#mr_dialog2').html(dialog_text);
+ var dialog_have_mr_mr_text = "<div>";
+ dialog_have_mr_mr_text = dialog_have_mr_mr_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
+ dialog_have_mr_mr_text = dialog_have_mr_mr_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>There are a DB changes</strong></h3>";
+ dialog_have_mr_mr_text = dialog_have_mr_mr_text + "<p style='font-family:Verdana; font-size:12pt;'>There are a new database changes available to apply. Do you want to start the DB update process?</p>";
+ dialog_have_mr_mr_text = dialog_have_mr_mr_text + "<p style='font-family:Verdana; font-size:12pt;'>We recommend launch a <a style='font-family:Verdana bold; font-size:12pt; color:#82B92E'href=\"index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list\">Planned downtime</a> to this process</p></div>";
+ dialog_have_mr_mr_text = dialog_have_mr_mr_text + "</div>";
+
+ $('#mr_dialog2').html(dialog_have_mr_mr_text);
$('#mr_dialog2').dialog('open');
}
else {
@@ -580,6 +670,32 @@ function update_last_package(package, version, homeurl) {
"Cancel": function () {
$(this).dialog("close");
+ $("<div id='cancel_pkg' class='dialog ui-dialog-content' title='Menor release available'></div>").dialog ({
+ resizable: true,
+ draggable: true,
+ modal: true,
+ overlay: {
+ opacity: 0.5,
+ background: 'black'
+ },
+ width: 600,
+ height: 220,
+ buttons: {
+ "Ok": function () {
+ $(this).dialog("close");
+ }
+ }
+ });
+
+ var dialog_cancel_pkg_text = "<div>";
+ dialog_cancel_pkg_text = dialog_cancel_pkg_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
+ dialog_cancel_pkg_text = dialog_cancel_pkg_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
+ dialog_cancel_pkg_text = dialog_cancel_pkg_text + "<p style='font-family:Verdana; font-size:12pt;'>These changes will not apply.</p></div>";
+ dialog_cancel_pkg_text = dialog_cancel_pkg_text + "</div>";
+
+ $('#cancel_pkg').html(dialog_cancel_pkg_text);
+ $('#cancel_pkg').dialog('open');
+
var parameters = {};
parameters['page'] = 'include/ajax/update_manager.ajax';
parameters['update_last_free_package'] = 1;
@@ -612,7 +728,11 @@ function update_last_package(package, version, homeurl) {
}
});
- var dialog_text = "<div><h3>Do you want to apply the package?</h3></br>";
+ var dialog_text = "<div>";
+ dialog_text = dialog_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_info_mr.png'></div>";
+ dialog_text = dialog_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>There are a new update available</strong></h3>";
+ dialog_text = dialog_text + "<p style='font-family:Verdana; font-size:12pt;'>There are a new update available to apply. Do you want to start the update process?</p></div>";
+ dialog_text = dialog_text + "</div>";
$('#pkg_apply_dialog').html(dialog_text);
$('#pkg_apply_dialog').dialog('open');
@@ -722,13 +842,14 @@ function apply_minor_release (n_mr) {
type: "POST",
url: "ajax.php",
success: function (data) {
+ $('#mr_dialog2').append("</div style='max-height:50px'>");
if (data != "") {
$('#mr_dialog2').empty();
- $('#mr_dialog2').html("<h2>" + data + "</h2>");
+ $('#mr_dialog2').html(data);
error = true;
}
else {
- $('#mr_dialog2').append("<p>- Applying DB MR #" + mr + "</p>");
+ $('#mr_dialog2').append("<p style='font-family:Verdana; font-size:12pt;'>- Applying DB MR #" + mr + "</p>");
}
}
});
@@ -737,12 +858,21 @@ function apply_minor_release (n_mr) {
return false;
}
});
+ $('#mr_dialog2').append("</div>");
+ $(".ui-dialog-buttonset").empty();
if (error) {
return false;
}
else{
- $('#mr_dialog2').append("<h2>Updated finished successfully</h2>");
+ $('#mr_dialog2').empty();
+ var dialog_ok_mr_text = "<div>";
+ dialog_ok_mr_text = dialog_ok_mr_text + "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_exito_mr.png'></div>";
+ dialog_ok_mr_text = dialog_ok_mr_text + "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>";
+ dialog_ok_mr_text = dialog_ok_mr_text + "<p style='font-family:Verdana; font-size:12pt;'>Updated finished successfully.</p></div>";
+ dialog_ok_mr_text = dialog_ok_mr_text + "</div>";
+ $('#mr_dialog2').html(dialog_ok_mr_text);
+
return true;
}
}
\ No newline at end of file
diff --git a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
index 728e0dbb9b..4d189b5493 100644
--- a/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
+++ b/pandora_console/include/styles/jquery-ui-1.10.0.custom.css
@@ -159,6 +159,9 @@ button.ui-button-icons-only {
}
.ui-button-text-only .ui-button-text {
padding: .4em 1em;
+ font-family: nunito;
+ font-size: 9pt;
+ color: #82B92E
}
.ui-button-icon-only .ui-button-text,
.ui-button-icons-only .ui-button-text {
@@ -409,8 +412,8 @@ button.ui-button::-moz-focus-inner {
text-align: center;
padding: .4em 1em;
padding-top: 8px;
- padding-bottom: 12px;
- height: 37px;
+ padding-bottom: 14px;
+ height: 30px;
/*margin: 3px;*/
position: relative;
}
@@ -452,6 +455,7 @@ button.ui-button::-moz-focus-inner {
.ui-dialog .ui-dialog-buttonpane button {
margin: .5em 1em .5em 0;
cursor: pointer;
+ background: white;
background-color: white;
border: 1px solid #82b92e;
height:30px;