File tree Expand file tree Collapse file tree 6 files changed +19
-33
lines changed Expand file tree Collapse file tree 6 files changed +19
-33
lines changed Original file line number Diff line number Diff line change 12
12
from ocfweb .component .lab_status import get_lab_status
13
13
14
14
15
- @periodic (60 )
15
+ @periodic (60 , ttl = 86400 )
16
16
def get_staff_hours ():
17
17
return get_staff_hours_soonest_first ()[:2 ]
18
18
Original file line number Diff line number Diff line change @@ -12,8 +12,8 @@ <h2>Have questions? Drop by for help from a friendly volunteer staffer!</h2>
12
12
< div class = "day ">
13
13
< div class ="daytitle ">
14
14
< strong > < big > {{staff_day.day}}</ big > </ strong >
15
- {%if staff_day.holiday != None %}
16
- < span class ="cancelled-text "> {{staff_day.holiday}} </ span >
15
+ {%if staff_day.holiday is not None %}
16
+ < span class ="cancelled-text "> {{staff_day.holiday}}</ span >
17
17
{% endif %}
18
18
</ div >
19
19
{% for staff_hour in staff_day.hours %}
@@ -40,7 +40,6 @@ <h5>{{staffer.position}}</h5>
40
40
</ div >
41
41
{% endfor %}
42
42
</ div >
43
- </ script >
44
43
< div class ="col-sm-4 ocf-sidebar ">
45
44
< h4 > Open Computing Facility Lab</ h4 >
46
45
< p > {% google_map '100%' '250px' %}</ p >
Original file line number Diff line number Diff line change 1
1
from django import template
2
2
3
- from ocfweb .templatetags .lab_hours import lab_hours_holiday as holiday_hours
4
-
5
3
register = template .Library ()
6
4
7
5
8
6
@register .filter
9
7
def gravatar (staffer , size ):
10
8
return staffer .gravatar (size )
11
-
12
-
13
- @register .filter
14
- def lab_holidays (hours ):
15
- return holiday_hours (hours )
16
-
17
-
18
- @register .filter
19
- def get_bio (staffer ):
20
- return staffer .get_bio ()
Original file line number Diff line number Diff line change @@ -6,8 +6,6 @@ $(document).ready(function() {
6
6
$ ( 'body' ) . css ( 'margin-bottom' , height ) ;
7
7
} ;
8
8
9
- $ ( '[data-toogle="tooltip"]' ) . tooltip ( ) ;
10
-
11
9
$ ( window ) . resize ( function ( ) {
12
10
clearTimeout ( resizeTimeout ) ;
13
11
setTimeout ( updateFooterHeight , 10 ) ;
Original file line number Diff line number Diff line change 1
- .mirrors-pie-chart {
2
- width : 1100px ;
3
- height : 500px ;
4
- padding : 10px ;
5
- margin : 0 ;
6
- }
1
+ .page-stats_mirrors {
2
+ .mirrors-pie-chart {
3
+ width : 1100px ;
4
+ height : 500px ;
5
+ padding : 10px ;
6
+ margin : 0 ;
7
+ }
7
8
8
- .mirrors-mirror-usage {
9
- width : 1100px ;
10
- height : 500px ;
11
- padding : 10px ;
12
- margin : 0 ;
9
+ .mirrors-mirror-usage {
10
+ width : 1100px ;
11
+ height : 500px ;
12
+ padding : 10px ;
13
+ margin : 0 ;
14
+ }
13
15
}
Original file line number Diff line number Diff line change 8
8
{% stats_navbar %}
9
9
< h2 > Bandwidth usage per mirrored project </ h2 >
10
10
< div class ="mirrors-pie-chart ">
11
- < iframe src ="https://metabase.ocf.berkeley.edu/public/question/b8783817-1e98-4658-ae8a-2826dbeff4ab " frameborder ="0 " width ="100% " height ="100% "allowtransparen > </ iframe >
11
+ < iframe src ="https://metabase.ocf.berkeley.edu/public/question/b8783817-1e98-4658-ae8a-2826dbeff4ab " frameborder ="0 " width ="100% " height ="100% " allowtranspareny > </ iframe >
12
12
</ div >
13
13
< div class = "mirrors-mirror-usage ">
14
- < iframe src ="https://metabase.ocf.berkeley.edu/public/question/23f5e403-315c-432e-ae9f-3db0970517f7 "
15
- frameborder ="0 "width ="100% "height ="100% "allowtransparency > </ iframe >
14
+ < iframe src ="https://metabase.ocf.berkeley.edu/public/question/23f5e403-315c-432e-ae9f-3db0970517f7 " frameborder ="0 " width ="100% " height ="100% " allowtransparency > </ iframe >
16
15
</ div >
17
16
< div class ="row ">
18
17
< div class ="col-md-6 ">
19
18
< h4 > Bandwidth Usage Since {{ start_date }} </ h4 >
20
- < br />
19
+ < br />
21
20
< table class ="table table-striped table-hover ">
22
21
< tr >
23
22
< th > Mirrored Project </ th >
You can’t perform that action at this time.
0 commit comments