diff --git a/ocfweb/main/templates/main/home.html b/ocfweb/main/templates/main/home.html index c3b9ecba8..7dc2beabe 100644 --- a/ocfweb/main/templates/main/home.html +++ b/ocfweb/main/templates/main/home.html @@ -108,8 +108,11 @@

OCF Computer Lab

+ + Staff Hours + {% for staff_hour in staff_hours %} -

Staff Hours {{staff_hour.day}}

+

{{staff_hour.day}}

{{staff_hour.time}} diff --git a/ocfweb/main/templates/main/staff-hours.html b/ocfweb/main/templates/main/staff-hours.html index 0288e4ac9..07906af35 100644 --- a/ocfweb/main/templates/main/staff-hours.html +++ b/ocfweb/main/templates/main/staff-hours.html @@ -8,30 +8,38 @@

Have questions? Drop by for help from a friendly volunteer staffer!

OCF staff members hold regular drop-in staff hours to provide assistance with account issues or with OCF services. We're always happy to help troubleshoot account or service issues!

Keep in mind the OCF volunteers sometimes have last-minute conflicts, so it's a good idea to check this page before coming in for cancellations.

- {% for staff_hour in staff_hours %} -
-
- {{staff_hour.day}} - {{staff_hour.time}} - {% if staff_hour.cancelled or staff_hour.day == today and lab_status.force_lab_closed %} - cancelled this week + {% for staff_day in staff_hours %} +
+
+ {{staff_day.day}} + {%if staff_day.holiday is not None %} + {{staff_day.holiday}} {% endif %}
-
-
    - {% for staffer in staff_hour.staff %} -
  • - {{staffer.user_name}} -

    {{staffer.real_name}}

    -
    {{staffer.position}}
    -
  • - {% endfor %} -
-
+ {% for staff_hour in staff_day.hours %} +
+
+ {{staff_hour.time}} + {% if staff_hour.cancelled or lab_status.force_lab_closed and staff_day == today%} + cancelled this week + {% endif %} +
+
+
    + {%for staffer in staff_hour.staff %} +
  • + {{staffer.user_name}} +

    {{staffer.real_name}}

    +
    {{staffer.position}}
    +
  • + {% endfor %} +
+
+
+ {% endfor %}
{% endfor %}
-

Open Computing Facility Lab

{% google_map '100%' '250px' %}

diff --git a/ocfweb/static/scss/pages/_home.scss b/ocfweb/static/scss/pages/_home.scss index f054bc3dc..c502b4d8d 100644 --- a/ocfweb/static/scss/pages/_home.scss +++ b/ocfweb/static/scss/pages/_home.scss @@ -58,12 +58,23 @@ } .ocf-staffhours { + border-width: thin; + font-size: 18px; + + .title { + margin-bottom: 0; + font-size: 28px; + font-weight: bold; + } + p { margin: 0; } h3 { + margin-top: 0; margin-bottom: 0; + font-size: 20px; } .cancelled p { diff --git a/ocfweb/static/scss/pages/_mirrors.scss b/ocfweb/static/scss/pages/_mirrors.scss new file mode 100644 index 000000000..e0606ae1c --- /dev/null +++ b/ocfweb/static/scss/pages/_mirrors.scss @@ -0,0 +1,15 @@ +.page-stats_mirrors { + .mirrors-pie-chart { + width: 1100px; + height: 500px; + padding: 10px; + margin: 0; + } + + .mirrors-mirror-usage { + width: 1100px; + height: 500px; + padding: 10px; + margin: 0; + } +} diff --git a/ocfweb/static/scss/pages/_staff-hours.scss b/ocfweb/static/scss/pages/_staff-hours.scss index 75cd93942..2fc2a05cd 100644 --- a/ocfweb/static/scss/pages/_staff-hours.scss +++ b/ocfweb/static/scss/pages/_staff-hours.scss @@ -1,25 +1,13 @@ .page-staff-hours { - .hour { - border: solid 1px #ddd; - margin-bottom: 15px; + .day { + border-width: thin; + padding: 20px; - .title { - font-size: 16px; - padding: 7px 10px 5px; - border-bottom: solid 1px #ddd; + .daytitle { + font-size: 22px; + padding: 0 10px 5px; background-color: #eee; - - strong { - margin-right: 3px; - } - - span { - margin-left: 3px; - } - } - - .content { - padding: 13px; + border: solid 1px #ddd; } &.cancelled .title { @@ -31,39 +19,68 @@ font-weight: bold; } - .ocf-staffhours-faces { - @extend .list-inline; - margin-bottom: 0; + .hour { + margin-bottom: 15px; + border-width: thin; - li { - h4, - h5 { - text-align: center; - } + .title { + font-size: 16px; + padding: 7px 10px 5px; + border-bottom: solid 2px #eee; - h4 { - margin-top: 5px; - margin-bottom: 4px; - font-size: 16px; + strong { + margin-right: 3px; } - h5 { - margin-top: 0; - margin-bottom: 0; - font-size: 14px; - font-weight: normal; + span { + margin-left: 3px; } + } - img { - display: block; - margin-left: auto; - margin-right: auto; + .content { + padding: 13px; + } + + .ocf-staffhours-faces { + @extend .list-inline; + margin-bottom: 0; + + li { + width: 165px; + display: inline-block; + margin-bottom: 20px; + + h4, + h5 { + text-align: center; + } + + h4 { + text-align: center; + margin-top: 5px; + margin-bottom: 4px; + font-size: 16px; + } + + h5 { + text-align: center; + margin-top: 0; + margin-bottom: 0; + font-size: 14px; + font-weight: normal; + } + + img { + display: block; + margin-left: auto; + margin-right: auto; + } } } - } - &.cancelled .ocf-staffhours-faces { - opacity: 0.6; + &.cancelled .ocf-staffhours-faces { + opacity: 0.6; + } } - } + } } diff --git a/ocfweb/static/scss/site.scss b/ocfweb/static/scss/site.scss index e0190e7e0..0147845bf 100644 --- a/ocfweb/static/scss/site.scss +++ b/ocfweb/static/scss/site.scss @@ -277,3 +277,4 @@ h6 { @import 'pages/staff-hours'; @import 'pages/printing-announcement'; @import 'pages/tv'; +@import 'pages/mirrors'; diff --git a/ocfweb/stats/templates/stats/mirrors.html b/ocfweb/stats/templates/stats/mirrors.html index 1553e1cf6..6240bea86 100644 --- a/ocfweb/stats/templates/stats/mirrors.html +++ b/ocfweb/stats/templates/stats/mirrors.html @@ -2,11 +2,12 @@ {% load common %} {% load stats %} + {% block content %}
- {% stats_navbar %} -

Bandwidth usage per mirrored project

-
+ {% stats_navbar %} +

Bandwidth usage per mirrored project

+

Bandwidth Usage Since {{ start_date }}