diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index bb67af4b..edd84608 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -137,7 +137,7 @@ {% endif %}
-
+
{% with workout.workouttype|icon|safe as templateName %} {% include templateName %} {% endwith %} @@ -160,6 +160,16 @@   {% endif %}
+
+ {% if workout|may_edit:request %} + + + {% else %} +   + {% endif %} +
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 95a477e9..2a7e74ba 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -1981,7 +1981,7 @@ def workouts_view(request,message='',successmessage='', else: searchform = SearchForm() - paginator = Paginator(workouts,10) # show 25 workouts per page + paginator = Paginator(workouts,15) # 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 62e92d7d..fa84ba80 100644 --- a/static/css/rowsandall2.css +++ b/static/css/rowsandall2.css @@ -328,20 +328,28 @@ th.rotate > div > span { border-width: 1px 0 0 0; border-color: #333 #333 #333 #333; border-style: solid; - padding: 2px; + padding: 0px; margin: 0px; } .workoutcontainer { display: grid; - grid-template-columns: 50px repeat(auto-fit, minmax(calc((100% - 100px)/4), 1fr)); + grid-template-columns: 50px repeat(auto-fit, minmax(calc((100% - 100px)/5), 1fr)); /* grid-template-columns: 50px repeat(auto-fit, minmax(100px, 1fr)) 50px; ????*/ padding: 5px; + margin: 0px; } .workoutelement { margin-left: auto; margin-right: auto; + padding: 0px; + margin: 0px; +} + +.icondiv { + padding: 0px; + margin: 0px; } .divlines h3 {