added local and pro settings,added blovk title

agiliq · Feb 20, 2014 · c700d57 · c700d57
1 parent edba91c
commit c700d57
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 39 deletions.
diff --git a/accounts/admin.py b/accounts/admin.py
diff --git a/accounts/models.py b/accounts/models.py
diff --git a/accounts/templates/change_password.html b/accounts/templates/change_password.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block title %} Change Password {% endblock title %}
+
 {% block content %}
 
 <form action="{% url 'change_password' %}" method="POST" class="form-horizontal">

diff --git a/accounts/templates/signup.html b/accounts/templates/signup.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block title %} SignUp {% endblock title %}
+
 {% block content %}
 
 <form action="{% url 'signup' %}" method="POST" class="form-horizontal">

diff --git a/accounts/tests.py b/accounts/tests.py
diff --git a/accounts/views.py b/accounts/views.py
@@ -42,17 +42,16 @@ def signin(request):
     if request.method == 'POST':
         username = request.POST.get('username')
         password = request.POST.get('password')
-
         user = authenticate(username=username, password=password)
         if user is not None:
             if user.is_active:
                 login(request, user)
                 return redirect('index')
-            else:   
-                messages.error(request, 'Your account is inactive')             
+            else:
+                messages.error(request, 'Your account is inactive')
                 return redirect('index')
-        else: 
-            messages.error(request, 'Invalid login credentials')             
+        else:
+            messages.error(request, 'Invalid login credentials')
             return redirect('index')
 
 

diff --git a/lint.sh b/lint.sh
@@ -1,2 +1,2 @@
 pep8 --ignore E501 --exclude=migrations opentavern tavern
-pylint --rcfile=.pylintrc opentavern tavern
+pylint --rcfile=.pylintrc opentavern tavern accounts --ignore=migrations,config
diff --git a/manage.py b/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "opentavern.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "opentavern.config")
 
     from django.core.management import execute_from_command_line
 

diff --git a/opentavern/config/__init__.py b/opentavern/config/__init__.py
@@ -0,0 +1 @@
+from .settings_local import *
diff --git a/opentavern/settings.py → opentavern/config/settings_base.py b/opentavern/settings.py → opentavern/config/settings_base.py
@@ -1,16 +1,11 @@
 """
 Django settings for opentavern project.
 
-For more information on this file, see
-https://docs.djangoproject.com/en/1.6/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.6/ref/settings/
 """
 
 from unipath import Path
 
-SITE_PATH = Path(__file__).ancestor(2)
+SITE_PATH = Path(__file__).ancestor(3)
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/

diff --git a/opentavern/config/settings_local.py b/opentavern/config/settings_local.py
@@ -0,0 +1 @@
+from .settings_base import *
diff --git a/opentavern/config/settings_prod.py b/opentavern/config/settings_prod.py
@@ -0,0 +1 @@
+from .settings_base import *
diff --git a/tavern/templates/base.html b/tavern/templates/base.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>Open Tavern</title>
+    <title>{% block title %} {% endblock title %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- Bootstrap -->
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}bootstrap/css/bootstrap.css">
@@ -9,19 +9,6 @@
     <script type="text/javascript" src="{{ STATIC_URL }}bootstrap/js/bootstrap.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}eternicode-bootstrap-datepicker-b374f23/js/bootstrap-datepicker.js"></script>
 
-    <!-- Date Picker -->
-    <link rel="stylesheet" href="{{ STATIC_URL }}css/jquery-ui.css">
-    <script src="{{ STATIC_URL }}js/jquery-1.9.1.js"></script>
-    <script src="{{ STATIC_URL }}js/jquery-ui.js"></script>
-
-     <script>
-        $(function() {
-		$( "#id_starts_at" ).datepicker({'minDate': 0});
-		$( "#id_ends_at" ).datepicker({'minDate': 0});
-        });
-    </script>
-    <!-- Date Picker -->
-
     <style>
     .list-group{
 		width: 300px;

diff --git a/tavern/templates/create_event.html b/tavern/templates/create_event.html
@@ -1,6 +1,21 @@
 {% extends "base.html" %}
 
+{% block title %} Create Event {% endblock title %}
+
 {% block content %}
+
+<!-- Date Picker -->
+<link rel="stylesheet" href="{{ STATIC_URL }}css/jquery-ui.css">
+<script src="{{ STATIC_URL }}js/jquery-ui.js"></script>
+
+<script>
+$(function() {
+	$( "#id_starts_at" ).datepicker({'minDate': 0});
+	$( "#id_ends_at" ).datepicker({'minDate': 0});
+});
+</script>
+<!-- Date Picker -->
+
 <form action="" method="POST" class="form-horizontal">
 {% csrf_token %}
 

diff --git a/tavern/templates/create_group.html b/tavern/templates/create_group.html
@@ -1,7 +1,8 @@
 {% extends "base.html" %}
 
-{% block content %}
+{% block title %} Create Group {% endblock title %}
 
+{% block content %}
 
 <form action="" method="POST">
 {% csrf_token %}

diff --git a/tavern/templates/event_details.html b/tavern/templates/event_details.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block title %} Event - {{ event.name }} {% endblock title %}
+
 {% block content %}
     <h1> Event Name: {{ event.name }} </h1>
     <hr/>

diff --git a/tavern/templates/group_details.html b/tavern/templates/group_details.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block title %} Group - {{ group.name }} {% endblock title %}
+
 {% block content %}
     <h1> Group Name: {{ group.name }} </h1>
     <h1> Recently Joined: {{ user.name }} </h1>

diff --git a/tavern/templates/home.html b/tavern/templates/home.html
@@ -1,5 +1,7 @@
 {% extends 'base.html' %}
 
+{% block title %} {% if user.is_authenticated %} Open Tavern {% else %} Welcome to Open Tavern - SignIn {% endif %} {% endblock title %}
+
 {% block content %}
 
   {% if messages %}

diff --git a/tavern/templates/tavern_event_update.html b/tavern/templates/tavern_event_update.html
@@ -1,11 +1,13 @@
 {% extends "base.html" %}
 
+{% block title %} Edit event - {{ form.name.value }} {% endblock title %}
+
 {% block content %}
 
 <form action="" method="post">{% csrf_token %}
 
     <fieldset>  
-          <legend>Create Event</legend>  
+          <legend>Edit Event</legend>  
 
 	  {% if form.errors %}
  		<p>Please fill all the fields.</p>

diff --git a/tavern/templates/tavern_group_update.html b/tavern/templates/tavern_group_update.html
@@ -1,11 +1,13 @@
 {% extends "base.html" %}
 
+{% block title %} Edit group - {{ form.name.value }} {% endblock title %}
+
 {% block content %}
 
 <form action="" method="post">{% csrf_token %}
 
     <fieldset>  
-          <legend>Create Group</legend>  
+          <legend>Edit Group</legend>  
 
  	  {% if form.errors %}
  		<p>Please fill all the fields.</p>