diff --git a/app/src/Template/Element/Flash/default.ctp b/app/src/Template/Element/Flash/default.ctp index 5386cb904..c8bced80c 100644 --- a/app/src/Template/Element/Flash/default.ctp +++ b/app/src/Template/Element/Flash/default.ctp @@ -1,4 +1,6 @@ + - -*/ ?> - -', $filteredMessage); - print ""; + print ""; } ?> diff --git a/app/src/Template/Element/Flash/information.ctp b/app/src/Template/Element/Flash/information.ctp new file mode 100644 index 000000000..edf52fbd1 --- /dev/null +++ b/app/src/Template/Element/Flash/information.ctp @@ -0,0 +1,14 @@ +', $filteredMessage); + print ""; + } +?> + diff --git a/app/src/Template/Element/Flash/success.ctp b/app/src/Template/Element/Flash/success.ctp index 402186144..864d55de3 100644 --- a/app/src/Template/Element/Flash/success.ctp +++ b/app/src/Template/Element/Flash/success.ctp @@ -1,18 +1,13 @@ - -*/ ?> + if (!isset($params['escape']) || $params['escape'] !== false) { + $message = h($message); // XXX probably redundant + } -', $filteredMessage); - print ""; + print ""; } ?> diff --git a/app/src/Template/Element/javascript.ctp b/app/src/Template/Element/javascript.ctp index 49969f870..0fcdb32c7 100644 --- a/app/src/Template/Element/javascript.ctp +++ b/app/src/Template/Element/javascript.ctp @@ -27,7 +27,7 @@ */ ?> - + +Flash->render() ?> \ No newline at end of file diff --git a/app/src/Template/Layout/default.ctp b/app/src/Template/Layout/default.ctp index 4ad39ec4e..8a8dbdbe6 100644 --- a/app/src/Template/Layout/default.ctp +++ b/app/src/Template/Layout/default.ctp @@ -165,9 +165,7 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M ]) . "\n"; ?> - element('javascript'); ?> + element('javascript'); ?> - - Flash->render() ?> diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index 2c1dd0369..577d61bc7 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -297,25 +297,15 @@ body.logged-in #user-menu { padding: 1em 0; } /* NOTICES */ -.noty_text{ - font-weight: bold; -} -.noty_icon{ - display: inline-block !important; - position: relative; - top: 3px; -} -.warbg{ - background-image: url("../js/jquery/jquery-ui-1.11.4.custom/images-comanage/ui-icons_826262_256x240.png") !important; -} -.sucbg{ - background-image: url("../js/jquery/jquery-ui-1.11.4.custom/images-comanage/ui-icons_006400_256x240.png") !important; -} -.errbg{ - background-image: url("../js/jquery/jquery-ui-1.11.4.custom/images-comanage/ui-icons_ffffff_256x240.png") !important; +.noty_text { + letter-spacing: 0.3px; + font-size: 14px; } -.notbg{ - background-image: url("../js/jquery/jquery-ui-1.11.4.custom/images-comanage/ui-icons_444444_256x240.png") !important; +.noty_text .material-icons { + font-size: 20px !important; + padding: 0; + margin: 0 4px 0 -10px; + vertical-align: text-bottom; } /* General icon and box styling */ .co-info { /* info icon */ diff --git a/app/webroot/js/jquery/noty/themes/comanage.js b/app/webroot/js/jquery/noty/themes/comanage.js index 52553a41a..ca8f1433a 100644 --- a/app/webroot/js/jquery/noty/themes/comanage.js +++ b/app/webroot/js/jquery/noty/themes/comanage.js @@ -129,23 +129,17 @@ switch (this.options.type) { case 'alert': case 'notification': - $('').prependTo(this.$message); this.$bar.css({backgroundColor: '#FFF', borderColor: '#CCC', color: '#444'}); break; case 'warning': - $('').prependTo(this.$message); this.$bar.css({backgroundColor: '#FFEAA8', borderColor: '#FFC237', color: '#826200'}); this.$buttons.css({borderTop: '1px solid #FFC237'}); break; case 'error': - $('').prependTo(this.$message); this.$bar.css({backgroundColor: 'red', borderColor: 'darkred', color: '#FFF'}); - this.$message.css({fontWeight: 'bold'}); this.$buttons.css({borderTop: '1px solid darkred'}); break; case 'information': - $('').prependTo(this.$message); this.$bar.css({backgroundColor: '#57B7E2', borderColor: '#0B90C4', color: '#FFF'}); this.$buttons.css({borderTop: '1px solid #0B90C4'}); break; case 'success': - $('').prependTo(this.$message); this.$bar.css({backgroundColor: 'lightgreen', borderColor: '#50C24E', color: 'darkgreen'}); this.$buttons.css({borderTop: '1px solid #50C24E'}); break;