From eee5a55522cb48c4a2066854746fc27572b3fb6a Mon Sep 17 00:00:00 2001 From: Kevin Pittman Date: Fri, 8 Sep 2017 16:54:02 -0700 Subject: [PATCH 1/3] adjusts margins and padding so students aren't cut off --- myuw/static/css/photo_list.less | 12 +- .../handlebars/teaching/photo_list.html | 225 ++++++++++++++++++ 2 files changed, 235 insertions(+), 2 deletions(-) diff --git a/myuw/static/css/photo_list.less b/myuw/static/css/photo_list.less index d88922d7e4..c2601db859 100644 --- a/myuw/static/css/photo_list.less +++ b/myuw/static/css/photo_list.less @@ -2,6 +2,14 @@ .myuw-photo-list { + @media @two-column { + margin-top: 0; + margin-left: -16px; + margin-right: -16px; + margin-bottom: 16px; + padding: 16px !important; + } + .myuw-photo-list-controls { .myuw-photo-list-controls-view { display:inline-block; margin-right:16px; } .myuw-photo-list-controls-sort { display:inline-block; } @@ -39,9 +47,9 @@ &:after { visibility: hidden; display: block; content: ""; clear: both; height: 0; } - li { float: left; margin-right: 16px; width: 100%; height: 230px; + li { float: left; margin-right: 16px; width: 100%; height: 230px; padding: 8px; - @media @two-column { width: 200px; margin-bottom: 0;} + @media @two-column { width: 200px; margin-bottom: 16px;} &:last-child { margin: 0; } diff --git a/myuw/templates/handlebars/teaching/photo_list.html b/myuw/templates/handlebars/teaching/photo_list.html index 5bddda2b28..8aebd706c4 100644 --- a/myuw/templates/handlebars/teaching/photo_list.html +++ b/myuw/templates/handlebars/teaching/photo_list.html @@ -72,6 +72,231 @@

{{ toTitleCase quarter }} {{ year }} + + +
  • + + + +
    +
    + {{ surname }}, {{ name }}
    + Email:  {{ email }} +
    +
    +
    + Student Number:  {{ student_number }}
    + UW NetID:  {{ netid }}
    + Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    + Class:  {{ class }} +
    +
    + Credits:  {{ credits }}
    + {{ #if linked_sections }} + {{ #each linked_sections }} + {{ ucfirst type }} Section:   + {{ #each sections }} + {{ this }} + {{ /each }} +
    + {{ /each }} + {{ /if }} +
    +
    +
    + +
    • + +
  • + + + +
    +
    + {{ surname }}, {{ name }}
    + Email:  {{ email }} +
    +
    +
    + Student Number:  {{ student_number }}
    + UW NetID:  {{ netid }}
    + Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    + Class:  {{ class }} +
    +
    + Credits:  {{ credits }}
    + {{ #if linked_sections }} + {{ #each linked_sections }} + {{ ucfirst type }} Section:   + {{ #each sections }} + {{ this }} + {{ /each }} +
    + {{ /each }} + {{ /if }} +
    +
    +
    + +
    • +
  • + + + +
    +
    + {{ surname }}, {{ name }}
    + Email:  {{ email }} +
    +
    +
    + Student Number:  {{ student_number }}
    + UW NetID:  {{ netid }}
    + Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    + Class:  {{ class }} +
    +
    + Credits:  {{ credits }}
    + {{ #if linked_sections }} + {{ #each linked_sections }} + {{ ucfirst type }} Section:   + {{ #each sections }} + {{ this }} + {{ /each }} +
    + {{ /each }} + {{ /if }} +
    +
    +
    + +
    • +
  • + + + +
    +
    + {{ surname }}, {{ name }}
    + Email:  {{ email }} +
    +
    +
    + Student Number:  {{ student_number }}
    + UW NetID:  {{ netid }}
    + Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    + Class:  {{ class }} +
    +
    + Credits:  {{ credits }}
    + {{ #if linked_sections }} + {{ #each linked_sections }} + {{ ucfirst type }} Section:   + {{ #each sections }} + {{ this }} + {{ /each }} +
    + {{ /each }} + {{ /if }} +
    +
    +
    + +
    • +
  • + + + +
    +
    + {{ surname }}, {{ name }}
    + Email:  {{ email }} +
    +
    +
    + Student Number:  {{ student_number }}
    + UW NetID:  {{ netid }}
    + Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    + Class:  {{ class }} +
    +
    + Credits:  {{ credits }}
    + {{ #if linked_sections }} + {{ #each linked_sections }} + {{ ucfirst type }} Section:   + {{ #each sections }} + {{ this }} + {{ /each }} +
    + {{ /each }} + {{ /if }} +
    +
    +
    + +
    • +
  • + + + +
    +
    + {{ surname }}, {{ name }}
    + Email:  {{ email }} +
    +
    +
    + Student Number:  {{ student_number }}
    + UW NetID:  {{ netid }}
    + Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    + Class:  {{ class }} +
    +
    + Credits:  {{ credits }}
    + {{ #if linked_sections }} + {{ #each linked_sections }} + {{ ucfirst type }} Section:   + {{ #each sections }} + {{ this }} + {{ /each }} +
    + {{ /each }} + {{ /if }} +
    +
    +
    + +
    • +
  • + + + +
    +
    + {{ surname }}, {{ name }}
    + Email:  {{ email }} +
    +
    +
    + Student Number:  {{ student_number }}
    + UW NetID:  {{ netid }}
    + Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    + Class:  {{ class }} +
    +
    + Credits:  {{ credits }}
    + {{ #if linked_sections }} + {{ #each linked_sections }} + {{ ucfirst type }} Section:   + {{ #each sections }} + {{ this }} + {{ /each }} +
    + {{ /each }} + {{ /if }} +
    +
    +
    • {{ /each }} From 3eecbe84e59ab8afb1825a17fcf498597696dfbd Mon Sep 17 00:00:00 2001 From: Kevin Pittman Date: Fri, 8 Sep 2017 17:25:18 -0700 Subject: [PATCH 2/3] condenses the print version of the grid photo class list. --- myuw/static/css/photo_list.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/myuw/static/css/photo_list.less b/myuw/static/css/photo_list.less index c2601db859..e4029248c6 100644 --- a/myuw/static/css/photo_list.less +++ b/myuw/static/css/photo_list.less @@ -76,7 +76,8 @@ } &.grid-view { - li { width: 200px; } + li { width: 120px; overflow: hidden; padding: 0; margin: 0 4px; + } } } } From 3f30dac65e99c9dd541c66f7fbe826819a2f11bb Mon Sep 17 00:00:00 2001 From: Kevin Pittman Date: Fri, 8 Sep 2017 17:29:37 -0700 Subject: [PATCH 3/3] removing duplicated photolist rows used for testing --- .../handlebars/teaching/photo_list.html | 226 ------------------ 1 file changed, 226 deletions(-) diff --git a/myuw/templates/handlebars/teaching/photo_list.html b/myuw/templates/handlebars/teaching/photo_list.html index 8aebd706c4..f81521bf2d 100644 --- a/myuw/templates/handlebars/teaching/photo_list.html +++ b/myuw/templates/handlebars/teaching/photo_list.html @@ -73,232 +73,6 @@

    {{ toTitleCase quarter }} {{ year }} - -
  • - - - -
    -
    - {{ surname }}, {{ name }}
    - Email:  {{ email }} -
    -
    -
    - Student Number:  {{ student_number }}
    - UW NetID:  {{ netid }}
    - Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    - Class:  {{ class }} -
    -
    - Credits:  {{ credits }}
    - {{ #if linked_sections }} - {{ #each linked_sections }} - {{ ucfirst type }} Section:   - {{ #each sections }} - {{ this }} - {{ /each }} -
    - {{ /each }} - {{ /if }} -
    -
    -
    - -
    • - -
  • - - - -
    -
    - {{ surname }}, {{ name }}
    - Email:  {{ email }} -
    -
    -
    - Student Number:  {{ student_number }}
    - UW NetID:  {{ netid }}
    - Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    - Class:  {{ class }} -
    -
    - Credits:  {{ credits }}
    - {{ #if linked_sections }} - {{ #each linked_sections }} - {{ ucfirst type }} Section:   - {{ #each sections }} - {{ this }} - {{ /each }} -
    - {{ /each }} - {{ /if }} -
    -
    -
    - -
    • -
  • - - - -
    -
    - {{ surname }}, {{ name }}
    - Email:  {{ email }} -
    -
    -
    - Student Number:  {{ student_number }}
    - UW NetID:  {{ netid }}
    - Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    - Class:  {{ class }} -
    -
    - Credits:  {{ credits }}
    - {{ #if linked_sections }} - {{ #each linked_sections }} - {{ ucfirst type }} Section:   - {{ #each sections }} - {{ this }} - {{ /each }} -
    - {{ /each }} - {{ /if }} -
    -
    -
    - -
    • -
  • - - - -
    -
    - {{ surname }}, {{ name }}
    - Email:  {{ email }} -
    -
    -
    - Student Number:  {{ student_number }}
    - UW NetID:  {{ netid }}
    - Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    - Class:  {{ class }} -
    -
    - Credits:  {{ credits }}
    - {{ #if linked_sections }} - {{ #each linked_sections }} - {{ ucfirst type }} Section:   - {{ #each sections }} - {{ this }} - {{ /each }} -
    - {{ /each }} - {{ /if }} -
    -
    -
    - -
    • -
  • - - - -
    -
    - {{ surname }}, {{ name }}
    - Email:  {{ email }} -
    -
    -
    - Student Number:  {{ student_number }}
    - UW NetID:  {{ netid }}
    - Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    - Class:  {{ class }} -
    -
    - Credits:  {{ credits }}
    - {{ #if linked_sections }} - {{ #each linked_sections }} - {{ ucfirst type }} Section:   - {{ #each sections }} - {{ this }} - {{ /each }} -
    - {{ /each }} - {{ /if }} -
    -
    -
    - -
    • -
  • - - - -
    -
    - {{ surname }}, {{ name }}
    - Email:  {{ email }} -
    -
    -
    - Student Number:  {{ student_number }}
    - UW NetID:  {{ netid }}
    - Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    - Class:  {{ class }} -
    -
    - Credits:  {{ credits }}
    - {{ #if linked_sections }} - {{ #each linked_sections }} - {{ ucfirst type }} Section:   - {{ #each sections }} - {{ this }} - {{ /each }} -
    - {{ /each }} - {{ /if }} -
    -
    -
    - -
    • -
  • - - - -
    -
    - {{ surname }}, {{ name }}
    - Email:  {{ email }} -
    -
    -
    - Student Number:  {{ student_number }}
    - UW NetID:  {{ netid }}
    - Major:  {{ #each majors }}{{ full_name }}{{#unless @last}}, {{/unless}}{{ /each }}
    - Class:  {{ class }} -
    -
    - Credits:  {{ credits }}
    - {{ #if linked_sections }} - {{ #each linked_sections }} - {{ ucfirst type }} Section:   - {{ #each sections }} - {{ this }} - {{ /each }} -
    - {{ /each }} - {{ /if }} -
    -
    -
    - -
    • {{ /each }}