diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index 10d32c13..2e430538 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -46,8 +46,11 @@ #mypointer { cursor: pointer; } + div.columns { width: 100%; } + div.columns div { width: 20%; padding: 10px; float: left; } + {% if team %}

{{ team.name }} Team Workouts

{% else %} @@ -153,50 +156,52 @@

-
  • {% if workouts %} - - {% for workout in workouts %} - - - - - + href={% url rower.defaultlandingpage id=workout.id|encode %} + title="Edit"> + + {% else %} +   + {% endif %} + + + {% endfor %} - -
    - {{ workout.workouttype }} - - {% if workout.name != '' %} -

    +
  • +
    + {% if workout.name != '' %} +

    {{ workout.name }}

    - {% else %} -

    + {% else %} +

    No Name

    - {% endif %} -

    {{ workout.date|date:"Y-m-d" }} {{ workout.starttime|date:"H:i" }}

    -

    {{ workout.distance }}m {{ workout.duration |durationprint:"%H:%M:%S.%f" }}

    -

    		• -

    {% if workout|may_edit:request %} + {% endif %} + +

    +
    + {{ workout.workouttype }} +
    +
    + {{ workout.date|date:"Y-m-d" }} {{ workout.starttime|date:"H:i" }} +
    +
    + {{ workout.distance }}m +
    +
    + {{ workout.duration |durationprint:"%H:%M:%S.%f" }} +
    +
    + {% if workout|may_edit:request %} - - - {% else %} -   - {% endif %} -

    -
    + {% else %} -

    No workouts found

    +
  • No workouts found
    • {% endif %} - {% if announcements %}

  • What's New?

    diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 00b1e4a5..ccb11dea 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -2357,7 +2357,7 @@ def workouts_view(request,message='',successmessage='', else: searchform = SearchForm() - paginator = Paginator(workouts,20) # show 25 workouts per page + paginator = Paginator(workouts,10) # show 25 workouts per page page = request.GET.get('page',1) try: diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css index e4054cb8..9c62a2e5 100644 --- a/static/css/rowsandall2.css +++ b/static/css/rowsandall2.css @@ -1,3 +1,5 @@ + + #main { background-color: transparent; -webkit-background-size: cover; @@ -320,6 +322,16 @@ th.rotate > div > span { margin: 2px; } +.divlines { + display: block; + overflow-x: hidden; + border-width: 1px 0 0 0; + border-color: #333 #333 #333 #333; + border-style: solid; + padding: 5px; + margin: 2px; +} + .whiteborder { border: solid 2px #aaa; } diff --git a/templates/newbase.html b/templates/newbase.html index 5273af76..b05a4421 100644 --- a/templates/newbase.html +++ b/templates/newbase.html @@ -46,7 +46,7 @@ - + {% block meta %} {% endblock %}