git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
[myslice.git]
/
ui
/
templates
/
messages-transient-header.html
diff --git
a/ui/templates/messages-transient-header.html
b/ui/templates/messages-transient-header.html
index
0c292e7
..
2c2495c
100644
(file)
--- a/
ui/templates/messages-transient-header.html
+++ b/
ui/templates/messages-transient-header.html
@@
-1,7
+1,7
@@
-<
script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.js" type="text/javascript"></script
>
+<
!--<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.js" type="text/javascript"></script>--
>
<!-- <script type="text/javascript">{{ STATIC_URL }}js/ui.widget.js</script> -->
<!-- <script type="text/javascript">{{ STATIC_URL }}js/ui.widget.js</script> -->
-<
script src="{{ STATIC_URL }}js/jquery.notify.js" type="text/javascript"></script
>
-<
link rel='stylesheet' href='{{ STATIC_URL }}css/ui.notify.css' type='text/css' /
>
+<
!--<script src="{{ STATIC_URL }}js/jquery.notify.js" type="text/javascript"></script>--
>
+<
!--<link rel='stylesheet' href='{{ STATIC_URL }}css/ui.notify.css' type='text/css' />--
>
<script type="text/javascript">
function create( template, vars, opts ){
<script type="text/javascript">
function create( template, vars, opts ){
@@
-13,7
+13,9
@@
$(function(){
// the defaults will apply to any notification created within this
// container, but can be overwritten on notification-by-notification
// basis.
// the defaults will apply to any notification created within this
// container, but can be overwritten on notification-by-notification
// basis.
- $container = $("#notifications").notify();
+
+ // XXX disabled since jquery ui conflicts with bootstrap!
+ //$container = $("#notifications").notify();
// create two when the pg loads
//create("default", { title:'Default Notification', text:'Example of a default notification. I will fade out after 5 seconds'});
// create two when the pg loads
//create("default", { title:'Default Notification', text:'Example of a default notification. I will fade out after 5 seconds'});
@@
-23,10
+25,10
@@
$(function(){
$(document).ready(function(){
{% for message in messages %}
$("#notifications").notify("create", {
$(document).ready(function(){
{% for message in messages %}
$("#notifications").notify("create", {
- title: '
Test
Notification',
+ title: 'Notification',
text: '{{ message }}'
},{
text: '{{ message }}'
},{
- expires:
fals
e,
+ expires:
tru
e,
speed: 1000
});
{% endfor %}
speed: 1000
});
{% endfor %}