From 37fe203783d2e0bb7d312e6480b462a921000671 Mon Sep 17 00:00:00 2001 From: Charles Connell Date: Tue, 25 Mar 2014 16:15:55 -0400 Subject: [PATCH] Account pages on same template tree --- karmaworld/assets/css/note_course_pages.css | 6 +- karmaworld/templates/about.html | 2 +- karmaworld/templates/account/base.html | 74 ++-------- karmaworld/templates/base.html | 2 +- .../templates/courses/course_detail.html | 41 +++--- karmaworld/templates/courses/course_list.html | 2 +- karmaworld/templates/header.html | 4 +- karmaworld/templates/notes/note_detail.html | 131 +++++++++--------- .../templates/notes/search_results.html | 2 +- .../templates/quizzes/keyword_edit.html | 2 +- karmaworld/templates/quizzes/quiz.html | 2 +- karmaworld/templates/terms.html | 2 +- karmaworld/templates/user_profile.html | 2 +- 13 files changed, 117 insertions(+), 155 deletions(-) diff --git a/karmaworld/assets/css/note_course_pages.css b/karmaworld/assets/css/note_course_pages.css index 6db9ced..ec86d76 100644 --- a/karmaworld/assets/css/note_course_pages.css +++ b/karmaworld/assets/css/note_course_pages.css @@ -4,6 +4,10 @@ span.course-header-school font-weight: bold; } +div.header-byline { + margin-bottom: 10px; +} + #course-header-name { font-size: 2.5em; @@ -11,7 +15,6 @@ span.course-header-school #course-header { - line-height: 2em; margin: 20px 0 0 0; } @@ -80,6 +83,7 @@ div.header-title-row { .header-title { font-size: 2.5em; + vertical-align: middle; } .modify-button { diff --git a/karmaworld/templates/about.html b/karmaworld/templates/about.html index bb76cdb..b08d05f 100644 --- a/karmaworld/templates/about.html +++ b/karmaworld/templates/about.html @@ -10,7 +10,7 @@ Mission, Vision, Team & Scoreboard {% endblock %} -{% block content %} +{% block raw_content %}
diff --git a/karmaworld/templates/account/base.html b/karmaworld/templates/account/base.html index ab64a01..dae2b6b 100644 --- a/karmaworld/templates/account/base.html +++ b/karmaworld/templates/account/base.html @@ -1,66 +1,12 @@ -{% load url from future %} - - - - - - KarmaNotes -- {% block head_title %}{% endblock %} - - - - - - - - - - - - - - - - - {% block pagescripts %} - {% endblock %} - - - - {% block pagestyle %} - {% endblock %} - - - {% include 'partial/trackers.html' %} - - - - - - -{% include 'header.html' %} - - - - -
-
-
- {% block content %} - {% endblock %} +{% extends "base.html" %} + +{% block raw_content %} +
+
+
+ {% block content %} + {% endblock %} +
-
-
- - - - -{% include 'footer.html' %} - - - -{% block extra_body %} +
{% endblock %} - - - - diff --git a/karmaworld/templates/base.html b/karmaworld/templates/base.html index 462a653..c0f5d1b 100644 --- a/karmaworld/templates/base.html +++ b/karmaworld/templates/base.html @@ -42,7 +42,7 @@ - {% block content %} + {% block raw_content %} {% endblock %} diff --git a/karmaworld/templates/courses/course_detail.html b/karmaworld/templates/courses/course_detail.html index 896058a..d2bcd12 100644 --- a/karmaworld/templates/courses/course_detail.html +++ b/karmaworld/templates/courses/course_detail.html @@ -30,11 +30,11 @@ Share Notes for {{ course.name }} | {{ course.school.name }} {% endblock %} -{% block content %} +{% block raw_content %}
-
+
{{ course.school.name }}  •   {% if course.department %}{{ course.department.name }}  •  {% endif %} @@ -44,24 +44,32 @@
- {{ course.name }} + {{ course.name }}   
- {% if user.is_authenticated %} - {% if user.get_profile.can_edit_items %} -    - {% endif %} - - {% if already_flagged %} - You have reported this course as inappropriate - {% else %} - - {% endif %} - {% else %} - Log in to flag a course as inappropraite - {% endif %} + + + {% if user.is_authenticated %} + {% if user.get_profile.can_edit_items %} +    + {% endif %} + + {% if already_flagged %} + You have reported this course as inappropriate + {% else %} + + {% endif %} + {% else %} + + {% endif %} + + +
@@ -142,6 +150,7 @@
+
diff --git a/karmaworld/templates/courses/course_list.html b/karmaworld/templates/courses/course_list.html index ce0463e..44553c4 100644 --- a/karmaworld/templates/courses/course_list.html +++ b/karmaworld/templates/courses/course_list.html @@ -33,7 +33,7 @@ {% endblock %} -{% block content %} +{% block raw_content %}
diff --git a/karmaworld/templates/header.html b/karmaworld/templates/header.html index a1905a3..1446dc0 100644 --- a/karmaworld/templates/header.html +++ b/karmaworld/templates/header.html @@ -32,7 +32,7 @@