diff --git a/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css b/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css new file mode 100755 index 00000000000..1ae36413379 --- /dev/null +++ b/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css @@ -0,0 +1,89 @@ +.jnotify-container { + position: fixed; + top: 0; + right: 0; + width: 70%; + z-index: 100000; + + /* set maximum number of notes to show */ + max-height: 270px; + overflow-x: hidden; + overflow-y: auto; +} + +.jnotify-container .jnotify-notification { + position: relative; + margin-top: 4px; + margin-bottom: 10px; + margin-right: 4px; +} + +.jnotify-container .jnotify-notification .jnotify-background { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: #4c4c4c; + filter: alpha(opacity=90); + -moz-opacity: 0.90; + opacity: 0.90; + z-index: 1; + + /* round the corners */ + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; + -moz-box-shadow: 4px 4px 4px #bbb; +} + +.jnotify-container .jnotify-notification a.jnotify-close, +.jnotify-container .jnotify-notification a.jnotify-close:link, +.jnotify-container .jnotify-notification a.jnotify-close:visited, +.jnotify-container .jnotify-notification a.jnotify-close:focus, +.jnotify-container .jnotify-notification a.jnotify-close:hover { + position: absolute; + top: 2px; + right: 5px; + padding: 0 5px; + font: bold 1.4em Arial,Helvetica,sans-serif; + line-height: 1em; + color: #fff; + text-decoration: none; + z-index: 3; + cursor: pointer; +} + +.jnotify-container .jnotify-notification .jnotify-message { + position: relative; + z-index: 2; + padding: 20px; + text-align: left; + color: #fff; + font: bold 1.4em Arial,Helvetica,sans-serif; + line-height: 1.2em; +} + +.jnotify-container .jnotify-notification .jnotify-message * { + font-size: 1em; +} + +/* notification type == "error" */ +.jnotify-container .jnotify-notification-error .jnotify-background { + background-color: #d79eac; +} + +.jnotify-container .jnotify-notification-error .jnotify-close, +.jnotify-container .jnotify-notification-error .jnotify-message { + color: #a72947 !important; +} + +/* notification type == "warning" */ +.jnotify-container .jnotify-notification-warning .jnotify-background { + background-color: #fff7d1; +} + +.jnotify-container .jnotify-notification-warning .jnotify-close, +.jnotify-container .jnotify-notification-warning .jnotify-message { + color: #c2a928 !important; +} diff --git a/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css b/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css new file mode 100755 index 00000000000..b3547afbd2a --- /dev/null +++ b/htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css @@ -0,0 +1,75 @@ +.jnotify-container { + position: fixed; + top: 0; + left: 0; + width: 100%; + z-index: 100000; +} + +.jnotify-container .jnotify-notification { + position: relative; +} + +.jnotify-container .jnotify-notification .jnotify-background { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: #e3f0db; + filter: alpha(opacity=90); + -moz-opacity: 0.90; + opacity: 0.90; + z-index: 1; +} + +.jnotify-container .jnotify-notification a.jnotify-close, +.jnotify-container .jnotify-notification a.jnotify-close:link, +.jnotify-container .jnotify-notification a.jnotify-close:visited, +.jnotify-container .jnotify-notification a.jnotify-close:focus, +.jnotify-container .jnotify-notification a.jnotify-close:hover { + position: absolute; + top: 2px; + right: 5px; + padding: 0 5px; + font: bold 1.4em Arial,Helvetica,sans-serif; + line-height: 1em; + color: #567b1b; + text-decoration: none; + z-index: 3; + cursor: pointer; +} + +.jnotify-container .jnotify-notification .jnotify-message { + position: relative; + z-index: 2; + padding: 20px; + text-align: center; + color: #567b1b; + font: bold 1.4em Arial,Helvetica,sans-serif; + line-height: 1.2em; +} + +.jnotify-container .jnotify-notification .jnotify-message * { + font-size: 1em; +} + +/* notification type == "error" */ +.jnotify-container .jnotify-notification-error .jnotify-background { + background-color: #d79eac; +} + +.jnotify-container .jnotify-notification-error .jnotify-close, +.jnotify-container .jnotify-notification-error .jnotify-message { + color: #a72947 !important; +} + +/* notification type == "warning" */ +.jnotify-container .jnotify-notification-warning .jnotify-background { + background-color: #fff7d1; +} + +.jnotify-container .jnotify-notification-warning .jnotify-close, +.jnotify-container .jnotify-notification-warning .jnotify-message { + color: #c2a928 !important; +} \ No newline at end of file diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index e410561526f..7f7995178a9 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -29,7 +29,7 @@ * \file htdocs/lib/functions.lib.php * \brief A set of functions for Dolibarr * This file contains all frequently used functions. - * \version $Id$ + * \version $Id: functions.lib.php,v 1.532 2011/06/26 00:42:23 eldy Exp $ */ // For compatibility during upgrade @@ -3772,8 +3772,26 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded)) { $return = ''; } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 3d97c4dc1f8..1dea511f8f0 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -26,7 +26,7 @@ * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id$ + * \version $Id: main.inc.php,v 1.744 2011/06/26 00:42:06 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP @@ -906,7 +906,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; print ''."\n"; // JQuery print ''."\n"; // Tooltip - print ''."\n"; // JNotify + print ''."\n"; // JNotify //print ''."\n"; // Lightbox }