Merge pull request #250 from jdufresne/merge-base

Merge base and site_base templates.
llazzaro · Sep 8, 2016 · bfb0ccc · bfb0ccc
2 parents fc9494d + 2478ad7
commit bfb0ccc
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 53 deletions.
diff --git a/schedule/templates/base.html b/schedule/templates/base.html
@@ -1,18 +1,36 @@
-{% extends "site_base.html" %}
-{% load staticfiles i18n %}
-{% block extra_head %}
-{{ block.super }}
-{% endblock %}
+{% load i18n static %}
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{% if LANGUAGE_BIDI %}rtl{% else %}ltr{% endif %}" xml:lang="{{ LANGUAGE_CODE }}" lang="{{ LANGUAGE_CODE }}">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <title>{% if site_name %}{{ site_name }} : {% endif %}{% block head_title %}{% endblock %}</title>
+        <link rel="stylesheet" href="{% static "bootstrap/dist/css/bootstrap.css" %}" type="text/css" media="screen">
+        <script type="text/javascript" src="{% static "jquery/dist/jquery.js" %}"></script>
+        <script type="text/javascript" src="{% static "bootstrap/dist/js/bootstrap.js" %}"></script>
+        <link rel="stylesheet" href="{% static "schedule.css" %}" type="text/css" media="screen">
+        {% block extra_head %}
+        {% endblock %}
+    </head>
 
-{% block rtab_id %}id="schedule_tab"{% endblock %}
+    <body>
+    <h3 id="demo">{% trans "This is a demo of a django-schedule calendar" %}</h3>
+    <p style="clear:both">
 
-{% block subnav %}
-<ul>
-    {% if user.is_authenticated %}
-        <li><a href="">{% trans "Create a Calendar" %}</a></li>
-        <li><a href="">{% trans "Your Calendars" %}</a></li>
-    {% endif %}
+        <div id="body">
+            {% if messages %}
+                <ul id="messages">
+                    {% for message in messages %}
+                    <li id="message_{{ forloop.counter }}"><a href="#" onclick="$('#message_{{ forloop.counter }}').fadeOut(); return false;"><small>{% trans "clear" %}</small></a> {{ message }}</li>
+                    {% endfor %}
+                </ul>
+            {% endif %}
 
-        <li><a href="">{% trans "All Calendars" %}</a></li>
-    </ul>
-{% endblock %}
+            {% block body %}
+            {% endblock %}
+
+        </div>
+
+        <div id="footer">{% block footer %}{% endblock %}</div>
+
+    </body>
+</html>
diff --git a/schedule/templates/fullcalendar.html b/schedule/templates/fullcalendar.html
@@ -1,4 +1,4 @@
-{% extends 'site_base.html' %}
+{% extends 'base.html' %}
 {% load i18n staticfiles scheduletags %}
 {% load static from staticfiles %}
 
@@ -19,4 +19,4 @@
     <div id='calendar'></div>
 
     {% include "fullcalendar_modal.html" %}
-{% endblock %}
+{% endblock %}
diff --git a/schedule/templates/site_base.html b/schedule/templates/site_base.html