Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Enhance style of jnotify

Browse Source
This commit is contained in:
Laurent Destailleur
2011-06-26 00:42:05 +00:00
parent 578cc374fe
commit fbe250b223
4 changed files with 187 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css vendored Executable file
View File

@@ -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;
}

75
htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css Executable file
View File

@@ -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;
}

24
htdocs/lib/functions.lib.php
View File

@@ -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 = '<script type="text/javascript">
$(document).ready(function() {
$.jnotify("'.dol_escape_js($out).'", "'.($style=="ok" ? 3000 : $style).'", '.($style=="ok" ? "false" : "true").');
jQuery(document).ready(function() {
jQuery.jnotify("'.dol_escape_js($out).'",
"'.($style=="ok" ? 3000 : $style).'",
'.($style=="ok" ? "false" : "true").',
{
closeLabel: "&times;" // the HTML to use for the "Close" link
, showClose: true // determines if the "Close" link should be shown if notification is also sticky
, fadeSpeed: 1000 // the speed to fade messages out (in milliseconds)
, slideSpeed: 250 // the speed used to slide messages out (in milliseconds)
, classContainer: "jnotify-container"
, classNotification: "jnotify-notification"
, classBackground: "jnotify-background"
, classClose: "jnotify-close"
, classMessage: "jnotify-message"
, init: null // callback that occurs when the main jnotify container is created
, create: null // callback that occurs when when the note is created (occurs just before
// appearing in DOM)
, beforeRemove: null // callback that occurs when before the notification starts to fade away
},
{ remove: function (){} } );
});
</script>';
}

4
htdocs/main.inc.php
View File

@@ -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 '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" type="text/css" />'."\n"; // JQuery
print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tooltip/jquery.tooltip.css" type="text/css" />'."\n"; // Tooltip
print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.css" type="text/css" />'."\n"; // JNotify
print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css" type="text/css" />'."\n"; // JNotify
//print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/lightbox/css/jquery.lightbox-0.5.css" media="screen" />'."\n"; // Lightbox
}