git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b7681ef
)
mysliceMessage() js function can be used to display a message
author
Ciro Scognamiglio
<ciro.scognamiglio@cslash.net>
Tue, 6 May 2014 16:12:54 +0000
(18:12 +0200)
committer
Ciro Scognamiglio
<ciro.scognamiglio@cslash.net>
Tue, 6 May 2014 16:12:54 +0000
(18:12 +0200)
portal/static/js/myslice-ui.js
patch
|
blob
|
history
portal/templates/_widget-message.html
patch
|
blob
|
history
portal/templates/home-view.html
patch
|
blob
|
history
portal/templates/onelab/onelab_widget-topmenu.html
patch
|
blob
|
history
diff --git
a/portal/static/js/myslice-ui.js
b/portal/static/js/myslice-ui.js
index
060269a
..
4d06895
100644
(file)
--- a/
portal/static/js/myslice-ui.js
+++ b/
portal/static/js/myslice-ui.js
@@
-7,7
+7,7
@@
function mysliceAlert(msg, level) {
var el = $('#myslice-message');
el.find('.message').text(msg);
el.addClass('alert-' + level);
var el = $('#myslice-message');
el.find('.message').text(msg);
el.addClass('alert-' + level);
- el.fadeIn('fast');
+ el.
parent().
fadeIn('fast');
};
/* Table initialisation */
$(document).ready(function() {
};
/* Table initialisation */
$(document).ready(function() {
@@
-17,7
+17,6
@@
$(document).ready(function() {
-
$("#objectList").load("/table/resource/", {"fields" : ["hostname","hrn","country","type"], "options": ["checkbox"] }, function(data) {
$(this).dataTable( {
"sScrollY": window.innerHeight - 275,
$("#objectList").load("/table/resource/", {"fields" : ["hostname","hrn","country","type"], "options": ["checkbox"] }, function(data) {
$(this).dataTable( {
"sScrollY": window.innerHeight - 275,
diff --git
a/portal/templates/_widget-message.html
b/portal/templates/_widget-message.html
index
5985f9a
..
8ffad25
100644
(file)
--- a/
portal/templates/_widget-message.html
+++ b/
portal/templates/_widget-message.html
@@
-1,5
+1,7
@@
-<div class="alert alert-dismissable" id="myslice-message" style="display:none;">
+<div style="display:none;position:fixed;left:50%;border:1px solid red;width:0;top:80px;z-index:999;">
+<div class="alert alert-dismissable" id="myslice-message" style="position:relative;left:-491px;width:980px;margin:0 auto;box-shadow: 10px 10px 5px #888888;">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="message"></span>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="message"></span>
+</div>
</div>
\ No newline at end of file
</div>
\ No newline at end of file
diff --git
a/portal/templates/home-view.html
b/portal/templates/home-view.html
index
440ba28
..
383aa95
100644
(file)
--- a/
portal/templates/home-view.html
+++ b/
portal/templates/home-view.html
@@
-4,8
+4,6
@@
{% block content %}
<div class="row">
{% widget '_widget-news.html' %}
{% block content %}
<div class="row">
{% widget '_widget-news.html' %}
-{% widget '_widget-message.html' %}
-
</div>
<div class="row" id="home-dashboard">
<ul class="nav nav-tabs">
</div>
<div class="row" id="home-dashboard">
<ul class="nav nav-tabs">
diff --git
a/portal/templates/onelab/onelab_widget-topmenu.html
b/portal/templates/onelab/onelab_widget-topmenu.html
index
6236344
..
7b858bd
100644
(file)
--- a/
portal/templates/onelab/onelab_widget-topmenu.html
+++ b/
portal/templates/onelab/onelab_widget-topmenu.html
@@
-1,4
+1,4
@@
-
+{% load portal_filters %}
<div id="header">
<div class="wrapper">
<div class="logo">
<div id="header">
<div class="wrapper">
<div class="logo">
@@
-46,6
+46,9
@@
</div>
{% endif %}
</div>
</div>
{% endif %}
</div>
+<div class="row">
+{% widget '_widget-message.html' %}
+</div>
<script>
$(document).ready(function() {
$('li.slices').mouseenter(function() {
<script>
$(document).ready(function() {
$('li.slices').mouseenter(function() {