diff options
| author |  godofdream <soilfiction@gmail.com>
| 2012-08-16 17:49:14 +0200 |
|---|---|---|
| committer | godofdream <soilfiction@gmail.com>
| 2012-08-16 17:49:14 +0200 |
| commit | 11c3393c73f9faeff80466e7c9ec4b7a05f97eaf (patch) | |
| tree | c26b69ba384f82216e01537331405d03fbe592b6 /module/web | |
| parent | Added Mobile WebIf, some Layouting (diff) | |
| parent | added tooltip (diff) | |
| download | pyload-11c3393c73f9faeff80466e7c9ec4b7a05f97eaf.tar.xz | |
Merge
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/static/css/omniwindow.css | 8 | ||||
| -rw-r--r-- | module/web/templates/default/base.html | 27 |
2 files changed, 27 insertions, 8 deletions
diff --git a/module/web/static/css/omniwindow.css b/module/web/static/css/omniwindow.css index 12f4d451c..4947ea3c7 100644 --- a/module/web/static/css/omniwindow.css +++ b/module/web/static/css/omniwindow.css @@ -5,15 +5,16 @@ width: 100%; position: absolute; left: 0; - top: 0; - background: -moz-radial-gradient(center, ellipse cover, rgba(127,127,0,0) 0%, rgba(127,127,127,0.9) 100%); + top: 0; /* TODO change gradient at all browser */ + background: -moz-radial-gradient(center, ellipse cover, rgba(236,208,66,0) 0%, rgba(40,119,171,0.9) 100%); + /*background: -moz-radial-gradient(center, ellipse cover, rgba(127,127,0,0) 0%, rgba(127,127,127,0.9) 100%);*/ background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,rgba(127,127,127,0)), color-stop(100%,rgba(127,127,127,0.9))); background: -webkit-radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); background: -o-radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); background: -ms-radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); background: radial-gradient(center, ellipse cover, rgba(127,127,127,0) 0%,rgba(127,127,127,0.9) 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#007f7f7f', endColorstr='#e67f7f7f',GradientType=1 ); - z-index: 50; + z-index: 50; } /* Default class for both hidden overlay and modal window */ @@ -35,7 +36,6 @@ .window-container { background: #fcfcfc; opacity: 0; - margin: 8em auto; width: 500px; padding: 10px 20px 20px; text-align: left; diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index d075fe792..d5d96eef3 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -186,7 +186,27 @@ style:{
classes:'ui-tooltip-dark ui-tooltip-shadow'
}
- })
+ });
+
+ $("#notification_div").qtip({
+ content:{
+ title: {text: "Running Tasks", button:true},
+ text: "Content"
+ },
+ position:{
+ my:'top center',
+ at:'bottom center'
+ },
+ show:{ delay:500, effect: function(offset) {
+ $(this).slideDown(250); // "this" refers to the tooltip
+ }},
+ style:{
+ classes:'ui-tooltip-light ui-tooltip-shadow',
+ width: $("#notification_div").outerWidth(),
+ height: 100
+ },
+ hide: false
+ });
});
</script>
<script type="text/javascript">
@@ -199,7 +219,6 @@ internalCallback(subjects); // call internal callback
})
},
-
show:function (subjects, internalCallback) {
subjects.overlay.fadeIn(250, function () {
internalCallback(subjects); // call internal callback
@@ -209,13 +228,13 @@ animations:{
hide:function (subjects, internalCallback) {
subjects.modal.removeClass('window-container-visible');
- subjects.modal.fadeOut(function () {
+ subjects.modal.fadeOut(250, function () {
internalCallback(subjects); // call internal callback
});
},
show:function (subjects, internalCallback) {
- subjects.modal.fadeIn(function () {
+ subjects.modal.fadeIn(0, function () {
subjects.modal.addClass('window-container-visible');
internalCallback(subjects); // call internal callback
});
|