From 8a3043c012ebb748d57f55c6c52bd4672ace4568 Mon Sep 17 00:00:00 2001
From: Jayaram Pai
Date: Sun, 4 May 2014 16:49:50 +0530
Subject: added pretty urls to questions

---
 static/website/templates/ajax-keyword-search.html | 4 +++-
 static/website/templates/base.html                | 6 +++++-
 static/website/templates/filter.html              | 4 +++-
 static/website/templates/get-question.html        | 4 ++++
 static/website/templates/index.html               | 4 +++-
 5 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'static/website/templates')
diff --git a/static/website/templates/ajax-keyword-search.html b/static/website/templates/ajax-keyword-search.html
index b4295c7..414ae81 100644
--- a/static/website/templates/ajax-keyword-search.html
+++ b/static/website/templates/ajax-keyword-search.html
@@ -1,3 +1,5 @@
+{% load helpers %}
+
 {% if questions %}
 <br>
 <table class="table table-striped table-bordered table-hover">
@@ -48,7 +50,7 @@
 
         <td>
             <span class="title" data-toggle="tooltip" data-placement="top" title="{{ question.title }}">
-                <a href="{% url 'website:get_question' question.id %}">{{ question.title|truncatechars:40 }}</a>
+                <a href="{% url 'website:get_question' question.id %}{% prettify question.title %}">{{ question.title|truncatechars:40 }}</a>
             </span>            
         </td>
 
diff --git a/static/website/templates/base.html b/static/website/templates/base.html
index d0697dd..d29571e 100644
--- a/static/website/templates/base.html
+++ b/static/website/templates/base.html
@@ -2,7 +2,11 @@
 {% load static %}
 <html>
     <head>
-        <title>Spoken-Tutorial Forums</title>
+        <title>
+            {% block title %}
+            Spoken Tutorial Forums
+            {% endblock %}
+        </title>
         {% compress css %}
         <link rel="stylesheet" href="{% static 'website/css/bootstrap.min.css' %}" type="text/css" media="screen" charset="utf-8" />
         <link rel="stylesheet" href="{% static 'website/slick/slick.css' %}" type="text/css" media="screen" charset="utf-8" />
diff --git a/static/website/templates/filter.html b/static/website/templates/filter.html
index 1397b26..85ff760 100644
--- a/static/website/templates/filter.html
+++ b/static/website/templates/filter.html
@@ -1,4 +1,6 @@
 {% extends 'website/templates/base.html' %}
+{% load helpers %}
+
 {% block content %}
 {% if questions %}
 <h5>
@@ -71,7 +73,7 @@
 
             <td>
                 <span class="title" data-toggle="tooltip" data-placement="top" title="{{ question.title }}">
-                    <a href="{% url 'website:get_question' question.id %}">{{ question.title|truncatechars:40 }}</a>
+                    <a href="{% url 'website:get_question' question.id %}{% prettify question.title %}">{{ question.title|truncatechars:40 }}</a>
                 </span>            
             </td>
 
diff --git a/static/website/templates/get-question.html b/static/website/templates/get-question.html
index 0f43581..2983412 100644
--- a/static/website/templates/get-question.html
+++ b/static/website/templates/get-question.html
@@ -4,6 +4,10 @@
 
 {% load permission_tags %}
 
+{% block title %}
+    {{ question.category }} - {{ question.title }} - Spoken Tutorial Forums
+{% endblock %}
+
 {% block content %}
 <span class="saving hideme">saving . . .</span>
 <span class="saved hideme">saved</span>
diff --git a/static/website/templates/index.html b/static/website/templates/index.html
index 5dd19e6..c12ca8b 100644
--- a/static/website/templates/index.html
+++ b/static/website/templates/index.html
@@ -2,6 +2,7 @@
 {% load static %}
 {% load count_tags %}
 {% load notify %}
+{% load helpers %}
 
 {% block content %}
     <div id="carousel-container">
@@ -99,7 +100,7 @@
                     
                     <td>
                         <span class="title" data-toggle="tooltip" data-placement="top" title="{{ question.title }}">
-                            <a href="{% url 'website:get_question' question.id %}">{{ question.title|truncatechars:40 }}</a>
+                            <a href="{% url 'website:get_question' question.id %}{% prettify question.title %}">{{ question.title|truncatechars:40 }}</a>
                         </span>            
                     </td>
                     
@@ -173,6 +174,7 @@
             e.preventDefault();
         });
     });
+    $('span').tooltip();
 </script>
 <script src="{% static 'website/js/nice-bar.js' %}"></script>
 {% endblock %}
-- 
cgit 

