git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6891e18
)
fixed design issues with scheduler2 and apply
author
Jordan Augé
<jordan.auge@lip6.fr>
Thu, 24 Jul 2014 15:45:41 +0000
(17:45 +0200)
committer
Jordan Augé
<jordan.auge@lip6.fr>
Thu, 24 Jul 2014 15:45:41 +0000
(17:45 +0200)
plugins/apply/static/js/apply.js
patch
|
blob
|
history
plugins/apply/templates/apply.html
patch
|
blob
|
history
plugins/scheduler2/static/css/scheduler2.css
patch
|
blob
|
history
plugins/scheduler2/templates/scheduler.html
patch
|
blob
|
history
diff --git
a/plugins/apply/static/js/apply.js
b/plugins/apply/static/js/apply.js
index
1973028
..
b94fcd6
100644
(file)
--- a/
plugins/apply/static/js/apply.js
+++ b/
plugins/apply/static/js/apply.js
@@
-46,10
+46,10
@@
bAutoWidth: true,
});
bAutoWidth: true,
});
-
//this.elmt('update').click(this, this.do_ok
);
- //this.elmt('
refresh
').click(this, this.do_cancel);
+
this.elmt('close').click(this, this.do_close
);
+ //this.elmt('
apply_cancel
').click(this, this.do_cancel);
- this.elmt('apply').on('shown.bs.modal', function() {
+ this.elmt('apply
__window
').on('shown.bs.modal', function() {
self.do_update();
})
self.do_update();
})
@@
-80,7
+80,6
@@
clear: function()
{
clear: function()
{
-
},
find_row: function(value)
},
find_row: function(value)
@@
-131,11
+130,13
@@
},
},
- do_
ok
: function(e)
+ do_
close
: function(e)
{
{
- throw 'queryupdater.do_reset Not implemented';
+ var self = e.data;
+ self.table.fnClearTable();
},
},
+ // Not used today
do_cancel: function(e)
{
throw 'queryupdater.do_clear_annotations Not implemented';
do_cancel: function(e)
{
throw 'queryupdater.do_clear_annotations Not implemented';
diff --git
a/plugins/apply/templates/apply.html
b/plugins/apply/templates/apply.html
index
6507012
..
31a22ee
100644
(file)
--- a/
plugins/apply/templates/apply.html
+++ b/
plugins/apply/templates/apply.html
@@
-1,6
+1,6
@@
<div id={{ domid }}>
<!-- Modal - columns selector -->
<div id={{ domid }}>
<!-- Modal - columns selector -->
- <div class="modal fade" id="{{domid}}__apply" tabindex="-1" role="dialog" aria-labelledby="{{domid}}__apply__label" aria-hidden="true">
+ <div class="modal fade" id="{{domid}}__apply
__window
" tabindex="-1" role="dialog" aria-labelledby="{{domid}}__apply__label" aria-hidden="true">
<div class="modal-dialog modal-dialog-large">
<div class="modal-content">
<div class="modal-header">
<div class="modal-dialog modal-dialog-large">
<div class="modal-content">
<div class="modal-header">
@@
-28,7
+28,7
@@
-->
</div>
<div class="modal-footer">
-->
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+ <button
id="{{domid}}__close"
type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</div>
</div>
@@
-36,6
+36,6
@@
<!-- Button toolbar -->
<!-- Button toolbar -->
- <button class="btn btn-onelab btn-sm"
data-toggle="modal" data-target="#{{domid}}__apply
">Apply</button>
- <
button class="btn btn-default btn-sm" data-toggle="modal" data-target="#{{domid}}__cancel">Cancel</button
>
+ <button class="btn btn-onelab btn-sm"
id="{{domid}}__apply" data-toggle="modal" data-target="#{{domid}}__apply__window
">Apply</button>
+ <
!-- <button class="btn btn-default btn-sm" id="{{domid}}__cancel">Cancel</button> --
>
</div>
</div>
diff --git
a/plugins/scheduler2/static/css/scheduler2.css
b/plugins/scheduler2/static/css/scheduler2.css
index
cda74b1
..
9d0cda1
100755
(executable)
--- a/
plugins/scheduler2/static/css/scheduler2.css
+++ b/
plugins/scheduler2/static/css/scheduler2.css
@@
-241,7
+241,7
@@
}
\r
\r
#scheduler-reservation-table tbody tr td.free:hover ,#scheduler-reservation-table tbody tr td.selected, #scheduler-reservation-table tbody tr td.selected_tmp {
\r
}
\r
\r
#scheduler-reservation-table tbody tr td.free:hover ,#scheduler-reservation-table tbody tr td.selected, #scheduler-reservation-table tbody tr td.selected_tmp {
\r
- background: #2
5BA25
;
\r
+ background: #2
6c9e2
;
\r
}
\r
\r
td.no-image {
\r
}
\r
\r
td.no-image {
\r
@@
-269,10
+269,11
@@
td.no-image {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#a6c9e2', endColorstr='#e0e0e0',GradientType=1 ); /* IE6-9 */
\r
\r
padding: 3px 0 3px 30px;
\r
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#a6c9e2', endColorstr='#e0e0e0',GradientType=1 ); /* IE6-9 */
\r
\r
padding: 3px 0 3px 30px;
\r
- width:
1
50px;
\r
+ width:
2
50px;
\r
}
\r
\r
.legend ol li.free{
\r
}
\r
\r
.legend ol li.free{
\r
+ background: #FFFFFF;
\r
\r
}
\r
.legend ol li.pendingin{
\r
\r
}
\r
.legend ol li.pendingin{
\r
@@
-295,6
+296,10
@@
background: #E8E8E8;
background: #25BA25;
\r
}
\r
\r
background: #25BA25;
\r
}
\r
\r
+.legend ol li.disabled {
\r
+ background: url("../img/forbidden.png") no-repeat scroll 2px 50% #FFFFFF;
\r
+}
\r
+
\r
/* latest stuff */
\r
.sliderContainer {
\r
margin-left: -15px;
\r
/* latest stuff */
\r
.sliderContainer {
\r
margin-left: -15px;
\r
diff --git
a/plugins/scheduler2/templates/scheduler.html
b/plugins/scheduler2/templates/scheduler.html
index
e07637a
..
7c29877
100755
(executable)
--- a/
plugins/scheduler2/templates/scheduler.html
+++ b/
plugins/scheduler2/templates/scheduler.html
@@
-118,10
+118,11
@@
<div class="legend">
\r
<ol>
\r
<li class="free">Free</li>
\r
<div class="legend">
\r
<ol>
\r
<li class="free">Free</li>
\r
- <li class="pendingin">Pending selected</li>
\r
- <li class="pendingout">Pending deselected</li>
\r
- <li class="selected">Selected</li>
\r
- <li class="closed">Reserved</li>
\r
+ <li class="selected">Reserved</li>
\r
+ <li class="pendingin">Reservation pending</li>
\r
+ <li class="pendingout">Reservation cancellation pending</li>
\r
+ <li class="closed">Unavailable</li>
\r
+ <li class="disabled">Forbidden</li>
\r
<li class="maintenance">Maintenance</li>
\r
</ol>
\r
</div>
\r
<li class="maintenance">Maintenance</li>
\r
</ol>
\r
</div>
\r