Account pages on same template tree
authorCharles Connell <charles@connells.org>
Tue, 25 Mar 2014 20:15:55 +0000 (16:15 -0400)
committerCharles Connell <charles@connells.org>
Tue, 25 Mar 2014 20:15:55 +0000 (16:15 -0400)
13 files changed:
karmaworld/assets/css/note_course_pages.css
karmaworld/templates/about.html
karmaworld/templates/account/base.html
karmaworld/templates/base.html
karmaworld/templates/courses/course_detail.html
karmaworld/templates/courses/course_list.html
karmaworld/templates/header.html
karmaworld/templates/notes/note_detail.html
karmaworld/templates/notes/search_results.html
karmaworld/templates/quizzes/keyword_edit.html
karmaworld/templates/quizzes/quiz.html
karmaworld/templates/terms.html
karmaworld/templates/user_profile.html

index 6db9ced37c015e3e91a901f13f49b1fde33a1679..ec86d7651c254566d4e6e5be1664280532438079 100644 (file)
@@ -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 {
index bb76cdbcb9474a5417b41b14e3a7057292a11242..b08d05ff3862fd208ca7fe9b942857147a6a9399 100644 (file)
@@ -10,7 +10,7 @@
   Mission, Vision, Team &amp; Scoreboard
 {% endblock %}
 
-{% block content %}
+{% block raw_content %}
   <section id="about_content">
 
     <div class="row">
index ab64a015414524d7bb54f830bfc6f55e0251cc2e..dae2b6b97a6ce5875855101835a67ce8c5fccaea 100644 (file)
@@ -1,66 +1,12 @@
-{% load url from future %}
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width" />
-  <title>KarmaNotes -- {% block head_title %}{% endblock %}</title>
-       
-  <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico">
-  <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/fontface/fontface.css">
-  <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}vendor/foundation-4.2.3/css/foundation.css">
-  <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/global.css">
-  <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/media.css">
-  <link rel="stylesheet" href="http://code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css">
-  <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/accounts.css">
-  <!-- include Font Awesome -->
-  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
-
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
-  <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
-  <script src="{{ STATIC_URL }}js/jquery-scrollto.js" ></script>
-
-  <!-- block pagescripts -->
-  {% block pagescripts %}
-  {% endblock %}
-  <!-- end block pagescripts -->
-
-  <!-- block pagestyle -->
-  {% block pagestyle %}
-  {% endblock %}
-  <!-- end block pagescripts -->
-
-  {% include 'partial/trackers.html' %}
-
-       
-</head>
-<body>
-
-<!-- include header -->
-{% include 'header.html' %}
-<!-- end include header -->
-
-<!-- block content -->
-
-<section id="account_content">
-  <div class="row">
-    <div class="small-12 large-6 columns small-centered center">
-      {% block content %}
-      {% endblock %}
+{% extends "base.html" %}
+
+{% block raw_content %}
+  <section id="account_content">
+    <div class="row">
+      <div class="small-12 large-6 columns small-centered center">
+        {% block content %}
+        {% endblock %}
+      </div>
     </div>
-  </div>
-</section>
-
-<!-- end block content -->
-
-<!-- include footer-->
-{% include 'footer.html' %}
-<!-- end include footer-->
-
-<!-- block bodyscripts -->
-{% block extra_body %}
+  </section>
 {% endblock %}
-<!-- end block bodyscripts -->
-
-</body>
-</html>
index 462a6533f14598bacc3b803cbdfe7d6ba7b1ede2..c0f5d1b79786151cc9bd7f248c39fd6286fd1eea 100644 (file)
@@ -42,7 +42,7 @@
     <!-- end include header -->
 
     <!-- block content -->
-    {% block content %}
+    {% block raw_content %}
     {% endblock %}
     <!-- end block content -->
 
index 896058aa36c648ff4a0a950d9e7f1629fe4b68f2..d2bcd12e9672537b502898c2709327a31e980cbe 100644 (file)
   Share Notes for {{ course.name }} | {{ course.school.name }}
 {% endblock %}
 
-{% block content %}
+{% block raw_content %}
   <section id="course_content">
 
     <div id="course-header">
-      <div class="row">
+      <div class="row header-byline">
         <div class="small-12 columns">
           <span class="course-header-school">{{ course.school.name }}</span>&nbsp;&nbsp;&bull;&nbsp;&nbsp;
           {% if course.department %}<span class="course-header-department">{{ course.department.name }}</span>&nbsp;&nbsp;&bull;&nbsp;&nbsp;{% endif %}
 
       <div class="row museo700">
         <div class="small-12 columns">
-          <span id="course-header-name">{{ course.name }}</span>
+          <span id="course-header-name" class="header-title">{{ course.name }}</span>
 
           &nbsp;&nbsp;
           <div class="hide-for-large-up"></div>
 
-          {% if user.is_authenticated %}
-            {% if user.get_profile.can_edit_items %}
-              <button id="edit-button" class="modify-button"> <i class="fa fa-edit"></i> Edit this course</button>&nbsp;&nbsp;
-            {% endif %}
-
-            {% if already_flagged %}
-              <i class="fa fa-flag"></i> You have reported this course as inappropriate
-            {% else %}
-              <button id="flag-button" class="modify-button"><i class="fa fa-flag"></i> Report course as inappropriate</button>
-            {% endif %}
-          {% else %}
-            <i class="fa fa-flag"></i> Log in to flag a course as inappropraite
-          {% endif %}
+          <span style="display: inline;">
+            <span class="show-for-large-up">
+              {% if user.is_authenticated %}
+                {% if user.get_profile.can_edit_items %}
+                  <button id="edit-button" class="modify-button"> <i class="fa fa-edit"></i> Edit this course</button>&nbsp;&nbsp;
+                {% endif %}
+
+                {% if already_flagged %}
+                  <i class="fa fa-flag"></i> You have reported this course as inappropriate
+                {% else %}
+                  <button id="flag-button" class="modify-button"><i class="fa fa-flag"></i> Report course as inappropriate</button>
+                {% endif %}
+              {% else %}
+                <button id="flag-button-disabled" class="modify-button disabled opentip"
+                        data-ot="Log in to report a course"
+                        {% include 'partial/opentip_settings.html' %}>
+                        <i class="fa fa-flag"></i> Report course as inappropriate</button>
+              {% endif %}
+            </span>
+          </span>
+
         </div>
       </div>
 
         <form class="search-notes adelle-sans" action="{% url 'note_search' %}" method="GET">
           <input name="query" class="search-notes" type="text" placeholder="Search Notes" />
           <input type="hidden" name="course_id" value="{{ course.id }}">
+          <button type="submit" class="inline-button">Search</button>
         </form>
       </div>
       <div class="large-4 columns show-for-large-up">
index ce0463e3fcdc77eb4d372eed1ab9456f076bef34..44553c402dd6c3292208b2b2a662666b1cf61e63 100644 (file)
@@ -33,7 +33,7 @@
   </script>
 {% endblock %}
 
-{% block content %}
+{% block raw_content %}
 <section id="home_content">
   <div id="page_header">
     <div id="splash">
index a1905a39a251ef4263b80f437768a017c9c91431..1446dc0d6496468bf683dc0b02a4d16e0f9a9681 100644 (file)
@@ -32,7 +32,7 @@
       <div id="header-nav" class="large-8 columns nav-list show-for-large-up">
         {% if request.user.is_authenticated %}
           <ul>
-            <li>Courses</li>
+            <li><a href="/">Courses</a></li>
             <li>My Courses</li>
             <li>My Notes</li>
             <li>My Quizzes</li>
@@ -53,7 +53,7 @@
 
 <aside class="left-off-canvas-menu mobile-nav-list museo700">
   <ul>
-    <li><div class="mobile-nav-item">Courses</div></li>
+    <li><div class="mobile-nav-item"><a href="/">Courses</a></div></li>
     <li><div class="mobile-nav-item">My Courses</div></li>
     <li><div class="mobile-nav-item">My Notes</div></li>
     <li><div class="mobile-nav-item">My Quizzes</div></li>
index fc4c3a5574186295a9c22a686ed5efafb10fbb09..8408475c11d4d79e2162c98734a27806ac907e68 100644 (file)
   <script src="{{ STATIC_URL }}js/marked.js" ></script>
 {% endblock %}
 
-{% block content %}
+{% block raw_content %}
   <section id="note_content">
 
-    <div class="return-to-course">
+    <div class="return-to-course show-for-large-up">
       <div class="row">
         <div class="small-12 columns">
           <a href="{{note.course.get_absolute_url}}">
@@ -43,7 +43,7 @@
 
     <div id="note_header">
 
-      <div class="row">
+      <div class="row header-byline">
         <div class="small-12 columns">
           <strong>Lecture note for {{ note.course.name }} </strong>
           at
             {{ note.course.school.name }}
           {% endif %}
           &nbsp;&nbsp;
-          <i class="fa fa-thumbs-up"></i> <span id="thank-number">{{ note.thanks }}</span> Thanks
+          <span style="display: inline;"><span class="show-for-large-up"><i class="fa fa-thumbs-up"></i> <span id="thank-number">{{ note.thanks }}</span> Thanks</span></span>
         </div>
       </div>
 
       <div class="row museo700">
         <div class="small-12 columns header-title-row">
           <span class="header-title">{{ note.name }} </span>
-          {% if user.is_authenticated %}
-            {% if already_thanked %}
-              <button id="thank-button-disabled" class="modify-button disabled opentip"
-                      data-ot="You've already thanked this note"
-                       {% include 'partial/opentip_settings.html' %}>
-                <i class="fa fa-thumbs-up"></i> Thank Note</button>
-            {% else %}
-              <button id="thank-button" class="modify-button"><i class="fa fa-thumbs-up"></i> Thank Note</button>
-              <button id="thank-button-disabled" class="modify-button disabled opentip hide"
-                      data-ot="You've already thanked this note"
-                       {% include 'partial/opentip_settings.html' %}>
-                <i class="fa fa-thumbs-up"></i> Thank Note</button>
-            {% endif %}
-          {% else %}
-            <button id="thank-button-disabled" class="modify-button disabled opentip"
-                      data-ot="Log in to thank this note"
-                       {% include 'partial/opentip_settings.html' %}>
-                <i class="fa fa-thumbs-up"></i> Thank Note</button>
-          {% endif %}
-
-          {% if user.is_authenticated %}
-            {% if already_flagged %}
-              <button id="flag-button-disabled" class="modify-button disabled opentip"
-                      data-ot="You've already reported this note"
-                       {% include 'partial/opentip_settings.html' %}>
-                <i class="fa fa-thumbs-up"></i> Report Note</button>
-            {% else %}
-              <button id="flag-button" class="modify-button"><i class="fa fa-thumbs-up"></i> Report Note</button>
-              <button id="flag-button-disabled" class="modify-button disabled opentip hide"
-                      data-ot="You've already reported this note"
-                       {% include 'partial/opentip_settings.html' %}>
-                <i class="fa fa-thumbs-up"></i> Report Note</button>
-            {% endif %}
-          {% else %}
-            <button id="flag-button-disabled" class="modify-button disabled opentip"
-                      data-ot="Log in to report this note"
-                       {% include 'partial/opentip_settings.html' %}>
-                <i class="fa fa-thumbs-up"></i> Report Note</button>
-          {% endif %}
-
-          {% if user.is_authenticated %}
-            <a href="{{ note.get_fp_url }}">
-              <button id="note-download-button" class="modify-button opentip"
-                      data-ot="It costs 2 karma points to download a note"
-                      {% include 'partial/opentip_settings.html' %}>
-                <i class="fa fa-download"></i> Download Note</button></a>
-          {% else %}
-            <button id="note-download-button-disabled" class="modify-button disabled opentip"
-                      data-ot="Log in to download this note"
-                       {% include 'partial/opentip_settings.html' %}>
-              <i class="fa fa-download"></i> Download Note</button>
-          {% endif %}
-
-          {% if user.get_profile.can_edit_items %}
-            <button id="edit-note-tags" class="modify-button">
-              <i class="fa fa-pencil-square-o"></i> Edit Tags
-            </button>
-          {% endif %}
-
+          <span style="display: inline;">
+            <span class="show-for-large-up">
+              {% if user.is_authenticated %}
+                {% if already_thanked %}
+                  <button id="thank-button-disabled" class="modify-button disabled opentip"
+                          data-ot="You've already thanked this note"
+                           {% include 'partial/opentip_settings.html' %}>
+                    <i class="fa fa-thumbs-up"></i> Thank Note</button>
+                {% else %}
+                  <button id="thank-button" class="modify-button"><i class="fa fa-thumbs-up"></i> Thank Note</button>
+                  <button id="thank-button-disabled" class="show-for-large-up modify-button disabled opentip hide"
+                          data-ot="You've already thanked this note"
+                           {% include 'partial/opentip_settings.html' %}>
+                    <i class="fa fa-thumbs-up"></i> Thank Note</button>
+                {% endif %}
+              {% else %}
+                <button id="thank-button-disabled" class="modify-button disabled opentip"
+                          data-ot="Log in to thank this note"
+                           {% include 'partial/opentip_settings.html' %}>
+                    <i class="fa fa-thumbs-up"></i> Thank Note</button>
+              {% endif %}
+
+              {% if user.is_authenticated %}
+                {% if already_flagged %}
+                  <button id="flag-button-disabled" class="modify-button disabled opentip"
+                          data-ot="You've already reported this note"
+                           {% include 'partial/opentip_settings.html' %}>
+                    <i class="fa fa-thumbs-up"></i> Report Note</button>
+                {% else %}
+                  <button id="flag-button" class="modify-button"><i class="fa fa-thumbs-up"></i> Report Note</button>
+                  <button id="flag-button-disabled" class="modify-button disabled opentip hide"
+                          data-ot="You've already reported this note"
+                           {% include 'partial/opentip_settings.html' %}>
+                    <i class="fa fa-thumbs-up"></i> Report Note</button>
+                {% endif %}
+              {% else %}
+                <button id="flag-button-disabled" class="modify-button disabled opentip"
+                          data-ot="Log in to report this note"
+                           {% include 'partial/opentip_settings.html' %}>
+                    <i class="fa fa-thumbs-up"></i> Report Note</button>
+              {% endif %}
+
+              {% if user.is_authenticated %}
+                <a href="{{ note.get_fp_url }}">
+                  <button id="note-download-button" class="modify-button opentip"
+                          data-ot="It costs 2 karma points to download a note"
+                          {% include 'partial/opentip_settings.html' %}>
+                    <i class="fa fa-download"></i> Download Note</button></a>
+              {% else %}
+                <button id="note-download-button-disabled" class="modify-button disabled opentip"
+                          data-ot="Log in to download this note"
+                           {% include 'partial/opentip_settings.html' %}>
+                  <i class="fa fa-download"></i> Download Note</button>
+              {% endif %}
+
+              {% if user.get_profile.can_edit_items %}
+                <button id="edit-note-tags" class="modify-button">
+                  <i class="fa fa-pencil-square-o"></i> Edit Tags
+                </button>
+              {% endif %}
+            </span>
+          </span>
         </div>
       </div>
 
-      <div id="note-tags" class="row">
+      <div id="note-tags" class="row show-for-large-up">
         <div class="small-12 columns">
           <strong>Tags: </strong>
           <span class="tags">
index ca954cbb9f2e8a103f6b9484145ab85bdbf10008..4b0965bbd1fe7612095ef5b54e2ea2347a661260 100644 (file)
@@ -87,7 +87,7 @@
 </script>
 {% endblock %}
 
-{% block content %}
+{% block raw_content %}
 <section id="results_content">
 
   <div id="results_header" class="hero_gradient_bar">
index 00adcd86d6e520953c0c0248a34fdedacf016939..0e6bff63e6de366e1cf76301d03eb80f00e56270 100644 (file)
@@ -14,7 +14,7 @@
   {{ note.name }}
 {% endblock %}
 
-{% block content %}
+{% block raw_content %}
   <section id="dashboard_content">
     <div id="stats_container" class="hero_gradient_bar">
 
index 3ac6e8a1e172d008d3abf0435b61118bd131438c..2d53cff60a421bbe23d71602dac6f292b1b45e70 100644 (file)
@@ -21,7 +21,7 @@
   {{ quiz.name }}
 {% endblock %}
 
-{% block content %}
+{% block raw_content %}
   <section id="dashboard_content">
     <div id="stats_container" class="hero_gradient_bar">
       <div class="row">
index 4e08d9f105614b9e9c3b46127399e234dcbad067..540f53e8497458f17edd124e9a8881935cc65aa5 100644 (file)
@@ -7,7 +7,7 @@
 {% endblock %}
 
 
-{% block content %}
+{% block raw_content %}
   <section id="about_content">
 
     <div class="row">
index 78c9921ddd664f862db09581955be452812069a9..71ab51b8621c1b72c6755264c0191c2c8a8a62f9 100644 (file)
@@ -10,7 +10,7 @@
   Your KarmaNotes Profile
 {% endblock %}
 
-{% block content %}
+{% block raw_content %}
   <section id="dashboard_content">
     <div id="stats_container" class="hero_gradient_bar">
       <div class="row">