diff --git a/rowers/templates/course_edit_view.html b/rowers/templates/course_edit_view.html index 50668820..436a07a7 100644 --- a/rowers/templates/course_edit_view.html +++ b/rowers/templates/course_edit_view.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} {% block scripts %} @@ -7,49 +7,32 @@ {% block title %}{{ course.name }} {% endblock %} {% block og_title %}{{ course.name }} {% endblock %} -{% block content %} -
-
- {% if nosessions %} - Delete - {% else %} - - Update - {% endif %} -
-
- {% if course.manager == rower %} - View Course - {% else %} -   - {% endif %} -
-
- Courses -
-
-
+{% block main %} +

{{ course.name }}

-

{{ course.name }}

- -
+
-
- {{ mapdiv|safe }} + +
  • +
    + {{ mapdiv|safe }} - {{ mapscript|safe }} -
    + {{ mapscript|safe }} +
    • + -
    + {% endblock %} + +{% block sidebar %} +{% include 'menu_racing.html' %} +{% endblock %} diff --git a/rowers/templates/course_replace.html b/rowers/templates/course_replace.html index c1420323..c639962e 100644 --- a/rowers/templates/course_replace.html +++ b/rowers/templates/course_replace.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} {% block scripts %} @@ -7,24 +7,12 @@ {% block title %}{{ course.name }} {% endblock %} {% block og_title %}{{ course.name }} {% endblock %} -{% block content %} -
    -
    - {% if course.manager == rower %} - View Course - {% else %} -   - {% endif %} -
    -
    - Courses -
    -
    -
    +{% block main %} +

    Replace {{ course.name }}

    -

    Replace {{ course.name }}

    +
    + +
  • +
    + {{ mapdiv|safe }} + + + {{ mapscript|safe }} +
    +
    • + {% endblock %} + +{% block sidebar %} +{% include 'menu_racing.html' %} +{% endblock %} diff --git a/rowers/templates/course_view.html b/rowers/templates/course_view.html index 408dda86..7a68f77d 100644 --- a/rowers/templates/course_view.html +++ b/rowers/templates/course_view.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} {% block scripts %} @@ -7,34 +7,11 @@ {% block title %}{{ course.name }} {% endblock %} {% block og_title %}{{ course.name }} {% endblock %} -{% block content %} -
    -
    - {% if nosessions %} - Delete - {% else %} -   - {% endif %} -
    -
    - {% if course.manager == rower %} - Edit - {% else %} -   - {% endif %} -
    -
    - Courses -
    -
    - Export to KML -
    -
    -
    +{% block main %} +

    {{ course.name }}

    -

    {{ course.name }}

    - -
    +
    -
    - {{ mapdiv|safe }} - - - {{ mapscript|safe }} -
    - -
    + +
  • +
    + {{ mapdiv|safe }} + + + {{ mapscript|safe }} +
    +
    • + {% endblock %} + +{% block sidebar %} +{% include 'menu_racing.html' %} +{% endblock %} diff --git a/rowers/templates/coursemap.html b/rowers/templates/coursemap.html index f1ac2f9a..8af84b05 100644 --- a/rowers/templates/coursemap.html +++ b/rowers/templates/coursemap.html @@ -1,7 +1,23 @@ -
    - {{ mapscript|safe }} +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} +{% block scripts %} +{% include "monitorjobs.html" %} +{% endblock %} + +{% block title %}{{ course.name }} {% endblock %} +{% block og_title %}{{ course.name }} {% endblock %} +{% block main %} +

    {{ course.name }}

    +
    {{ mapdiv|safe }} + {{ mapscript|safe }}
    +{% endblock %} + +{% block sidebar %} +{% include 'menu_racing.html' %} +{% endblock %} diff --git a/rowers/templates/menu_racing.html b/rowers/templates/menu_racing.html index acf82e8b..95660480 100644 --- a/rowers/templates/menu_racing.html +++ b/rowers/templates/menu_racing.html @@ -14,5 +14,43 @@  Courses - + + {% if course %} +
  • + + + +
    • + {% endif %} diff --git a/rowers/views.py b/rowers/views.py index 28a86331..3c51167b 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -9187,23 +9187,46 @@ def workout_comment_view(request,id=0): # for ajax calls def course_map_view(request,id=0): - if id != 0: - try: - course = GeoCourse.objects.get(id=id) - except GeoCourse.DoesNotExist: - return Http404("Course doesn't exist") + try: + course = GeoCourse.objects.get(id=id) + except GeoCourse.DoesNotExist: + return Http404("Course doesn't exist") - script,div = course_map(course) + script,div = course_map(course) + + breadcrumbs = [ + { + 'url': reverse(virtualevents_view), + 'name': 'Racing' + }, + { + 'url': reverse(courses_view), + 'name': 'Courses' + }, + { + 'url': reverse(course_view,kwargs={'id':course.id}), + 'name': course.name + }, + { + 'url': reverse(course_map_view,kwargs={'id':course.id}), + 'name': 'Map' + } + ] + + r = getrower(request.user) + + + return render(request, + 'coursemap.html', + { + 'mapdiv':div, + 'course':course, + 'mapscript':script, + 'active':'nav-racing', + 'rower':r, + 'breadcrumbs':breadcrumbs, + }) - return render(request, - 'coursemap.html', - { - 'mapdiv':div, - 'mapscript':script - }) - - else: - return "" @login_required() def course_replace_view(request,id=0): @@ -9238,9 +9261,31 @@ def course_replace_view(request,id=0): script,div = course_map(course) + breadcrumbs = [ + { + 'url': reverse(virtualevents_view), + 'name': 'Racing' + }, + { + 'url': reverse(courses_view), + 'name': 'Courses' + }, + { + 'url': reverse(course_view,kwargs={'id':course.id}), + 'name': course.name + }, + { + 'url': reverse(course_replace_view,kwargs={'id':course.id}), + 'name': 'Replace Markers' + } + ] + return render(request, 'course_replace.html', {'course':course, + 'active':'nav-racing', + 'breadcrumbs':breadcrumbs, + 'rower':r, 'mapdiv':div, 'mapscript':script, 'form':form}) @@ -9301,10 +9346,31 @@ def course_edit_view(request,id=0): course.save() form = GeoCourseEditForm(instance=course) + + breadcrumbs = [ + { + 'url': reverse(virtualevents_view), + 'name': 'Racing' + }, + { + 'url': reverse(courses_view), + 'name': 'Courses' + }, + { + 'url': reverse(course_view,kwargs={'id':course.id}), + 'name': course.name + }, + { + 'url': reverse(course_edit_view,kwargs={'id':course.id}), + 'name': 'Edit' + } + ] return render(request, 'course_edit_view.html', { 'course':course, + 'active':'nav-racing', + 'breadcrumbs':breadcrumbs, 'mapscript':script, 'mapdiv':div, 'nosessions':nosessions, @@ -9324,8 +9390,25 @@ def course_view(request,id=0): script,div = course_map(course) + breadcrumbs = [ + { + 'url': reverse(virtualevents_view), + 'name': 'Racing' + }, + { + 'url': reverse(courses_view), + 'name': 'Courses' + }, + { + 'url': reverse(course_view,kwargs={'id':course.id}), + 'name': course.name + }, + ] + return render(request, 'course_view.html', { + 'active':'nav-racing', + 'breadcrumbs':breadcrumbs, 'course':course, 'mapscript':script, 'mapdiv':div, diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css index d0277526..0a324392 100644 --- a/static/css/rowsandall2.css +++ b/static/css/rowsandall2.css @@ -930,3 +930,17 @@ a.wh:hover { text-decoration: none; } + +.mapdiv { + padding: 0 !important; +} + +.mapdiv img { + float: left !important; + padding: 0 !important; +} + +.paypalpix { + width: auto !important; + max-width: 1px; +} diff --git a/static/css/styles2.css b/static/css/styles2.css index d890eb33..7714b404 100644 --- a/static/css/styles2.css +++ b/static/css/styles2.css @@ -639,16 +639,3 @@ aside .cd-accordion-menu.animated label::before { } -.mapdiv { - padding: 0 !important; -} - -.mapdiv img { - float: left !important; - padding: 0 !important; -} - -.paypalpix { - width: auto !important; - max-width: 1px; -}