From 41b0da723cc8cebd28d678ab140c226cb8113bbb Mon Sep 17 00:00:00 2001
From: kinitrupti
Date: Thu, 31 Mar 2016 17:21:26 +0530
Subject: modified-funcnames-frontpg

---
 tbc/templates/base.html                     | 188 +++++++++++++++++++++++-----
 tbc/templates/tbc/aicte-books.html          |   4 +-
 tbc/templates/tbc/book-details.html         |  11 +-
 tbc/templates/tbc/book-review-details.html  |   4 +-
 tbc/templates/tbc/book-review.html          |   4 +-
 tbc/templates/tbc/books_under_progress.html |   2 +-
 tbc/templates/tbc/browse-books.html         |   4 +-
 tbc/templates/tbc/completed_books.html      |   2 +-
 tbc/templates/tbc/get-certificate.html      |   2 +-
 tbc/templates/tbc/link_image.html           |   2 +-
 tbc/templates/tbc/login.html                |   4 +-
 tbc/templates/tbc/review-proposal.html      |  12 +-
 12 files changed, 181 insertions(+), 58 deletions(-)
 mode change 100755 => 100644 tbc/templates/base.html
 mode change 100755 => 100644 tbc/templates/tbc/login.html

(limited to 'tbc/templates')
diff --git a/tbc/templates/base.html b/tbc/templates/base.html
old mode 100755
new mode 100644
index 40812eb..3cece1c
--- a/tbc/templates/base.html
+++ b/tbc/templates/base.html
@@ -1,4 +1,5 @@
 {% load static %}
+{% load taggit_templatetags2_tags %}
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -16,7 +17,14 @@
    
    <link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}" type="text/css" /> 
    <link rel ="stylesheet" href="{% static 'css/responsive.css' %}" type="text/css"/>
-    <style>
+<style>
+.showonhover .hovertext { display: none;}
+.showonhover:hover .hovertext {display: inline;}
+a.viewdescription {color:#999;}
+a.viewdescription:hover {background-color:#999; color: White;}
+.hovertext {position:absolute;z-index:1000;border:1px solid #ffd971;background-color:#fffdce;padding:11px;width:250px;font-size: 0.75em;}
+</style>    
+<style>
         .module-list {
             float: left;
             height: 220px;
@@ -56,7 +64,7 @@
         .gsc-search-button,
         .gsc-clear-button {
             position: relative;
-            top: -2px;
+            top: 2px;
         }
        .badge-custom {
             padding: 1.5px 7px 1.5px;
@@ -79,7 +87,25 @@
             border-bottom: 5px solid #1ABC9C;
         }
     </style>
+<style>
+      
+span.question {
+  cursor: pointer;
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  background-color: #89A4CC;
+  line-height: 16px;
+  color: White;
+  font-size: 13px;
+  font-weight: bold;
+  border-radius: 8px;
+  text-align: center;
+  position: relative;
+}
+span.question:hover { background-color: #3D6199; }
 
+    </style>
    {% block css %}
     <style type="text/css">
       body {
@@ -106,7 +132,7 @@
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="{% url 'tbc:AboutPytbc' %}">TBC Coding Guidelines</a></li>
+                  
                   <li><a href="http://fossee.in" target="_blank">FOSSEE</a></li>
                   <li><a href="http://python.fossee.in" target="_blank">Python Team</a></li>
                 </ul>
@@ -114,11 +140,11 @@
 	            <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Textbooks<b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                  <li><a href="{% url 'tbc:CompletedBooks' %}">Completed Books</a></li>
-                  <li><a href="{% url 'tbc:BooksUnderProgress' %}">Books Under Progress</a></li>
+                  <li><a href="{% url 'tbc:completed_books' %}">Completed Books</a></li>
+                  <li><a href="{% url 'tbc:books_under_progress' %}">Books Under Progress</a></li>
                 </ul>
               </li>
-              <li><a href="{% url 'tbc:InternshipForms' %}">Internship Forms</a></li>
+              <li><a href="{% url 'tbc:internship_forms' %}">Internship Forms</a></li>
 
             {% if user %}
                 {% if proposal_position %}
@@ -126,28 +152,28 @@
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.first_name }}<span class="badge-custom" rel="tooltip" title="Pending Proposal Position: {{ proposal_position }}" data-placement="bottom" style="margin-left:5px; margin-right:5px; display: inline-block">{{ proposal_position }}</span>
                         <b class="caret"></b></a>
                         <ul class="dropdown-menu">
-                          <li><a href="{% url 'tbc:SubmitBook' %}">Submit Book (OLD)</a></li>
-                          <li><a href="{% url 'tbc:ListAICTE' %}">Submit Proposal</a></li>
-                          <li><a href="{% url 'tbc:SubmitSample' %}">Submit Sample Notebook</a></li>
-                          <li><a href="{% url 'tbc:ConfirmBookDetails' %}">Submit Codes</a></li>
-                          <li><a href="{% url 'tbc:GetCertificate' %}">Get Certificate</a></li>
-                          <li><a href="{% url 'tbc:UpdateProfile' %}">Update Profile</a></li>
-                          <li><a href="{% url 'tbc:UpdatePassword' %}">Update Password</a></li>
-                          <li><a href="{% url 'tbc:UserLogout' %}">Logout</a></li>
+                          <li><a href="{% url 'tbc:submit_book' %}">Submit Book (OLD)</a></li>
+                          <li><a href="{% url 'tbc:list_aicte' %}">Submit Proposal</a></li>
+                          <li><a href="{% url 'tbc:submit_sample' %}">Submit Sample Notebook</a></li>
+                          <li><a href="{% url 'tbc:confirm_book_details' %}">Submit Codes</a></li>
+                          <li><a href="{% url 'tbc:get_certificate' %}">Get Certificate</a></li>
+                          <li><a href="{% url 'tbc:update_profile' %}">Update Profile</a></li>
+                          <li><a href="{% url 'tbc:update_password' %}">Update Password</a></li>
+                          <li><a href="{% url 'tbc:user_logout' %}">Logout</a></li>
                         </ul>
                      </li>
                 {% else %}
                      <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.first_name }}<b class="caret"></b></a>
                         <ul class="dropdown-menu">
-                          <li><a href="{% url 'tbc:SubmitBook' %}">Submit Book (OLD)</a></li>
-                          <li><a href="{% url 'tbc:ListAICTE' %}">Submit Proposal</a></li>
-                          <li><a href="{% url 'tbc:SubmitSample' %}">Submit Sample Notebook</a></li>
-                          <li><a href="{% url 'tbc:ConfirmBookDetails' %}">Submit Codes</a></li>
-                          <li><a href="{% url 'tbc:GetCertificate' %}">Get Certificate</a></li>
-                          <li><a href="{% url 'tbc:UpdateProfile' %}">Update Profile</a></li>
-                          <li><a href="{% url 'tbc:UpdatePassword' %}">Update Password</a></li>
-                          <li><a href="{% url 'tbc:UserLogout' %}">Logout</a></li>
+                          <li><a href="{% url 'tbc:submit_book' %}">Submit Book (OLD)</a></li>
+                          <li><a href="{% url 'tbc:list_aicte' %}">Submit Proposal</a></li>
+                          <li><a href="{% url 'tbc:submit_sample' %}">Submit Sample Notebook</a></li>
+                          <li><a href="{% url 'tbc:confirm_book_details' %}">Submit Codes</a></li>
+                          <li><a href="{% url 'tbc:get_certificate' %}">Get Certificate</a></li>
+                          <li><a href="{% url 'tbc:update_profile' %}">Update Profile</a></li>
+                          <li><a href="{% url 'tbc:update_password' %}">Update Password</a></li>
+                          <li><a href="{% url 'tbc:user_logout' %}">Logout</a></li>
                         </ul>
                      </li>
                 {% endif %}
@@ -157,18 +183,17 @@
                  <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ reviewer.first_name }} {{ reviewer.last_name }} <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                      <li><a href="{% url 'tbc:BookReview' %}">Review Books</a></li>
-                      <li><a href="{% url 'tbc:ReviewProposals' %}">Review Proposals</a></li>
+                      <li><a href="{% url 'tbc:book_review' %}">Review Books</a></li>
+                      <li><a href="{% url 'tbc:review_proposals' %}">Review Proposals</a></li>
                       <li><a href="{% url 'tbc:admin_tools' %}">Admin Tools </a></li>
-                      <li><a href="{% url 'tbc:UserLogout' %}">Logout</a></li>
-
+                      <li><a href="{% url 'tbc:user_logout' %}">Logout</a></li>
                     </ul>
                  </li>
             {% endif %}
 
             {% if anonymous %}
-                  <li><a href="{% url 'tbc:UserLogin' %}">Login</a></li>
-                  <li><a href="{% url 'tbc:UserRegister' %}">Sign Up</a></li>
+                  <li><a href="{% url 'tbc:user_login' %}">Login</a></li>
+                  <li><a href="{% url 'tbc:user_register' %}">Sign Up</a></li>
             {% endif %}
 
             </ul> <!--/.nav  -->
@@ -286,6 +311,101 @@
         </center>
         <div class="clearfix"></div>
     {% endif %}
+<div style="float:right; margin-right: 50px; width: 400px;"><gcse:search></gcse:search>
+    </div>
+    <script src="http://code.jquery.com/jquery-1.4.min.js" type="text/javascript"></script>
+    <script type="text/javascript">
+        $(document).ready(function(){
+            
+            $("#objective").click(function(){
+            $('#details').load('{% static "templates/objectives.html" %}');
+            });
+
+        
+            $("#who").click(function(){
+            $('#details').load('{% static "templates/who.html" %}');
+            });
+
+            $("#how").click(function(){
+            $('#details').load('{% static "templates/how.html" %}');
+            });
+
+            $("#guidelines").click(function(){
+            $('#details').load('{% static "templates/guidelines.html" %}');
+            });
+
+            $("#goodies").click(function(){
+            $('#details').load('{% static "templates/goodie.html" %}');
+            });
+
+            $("#disclaimer").click(function(){
+            $('#details').load('{% static "templates/disclaimer.html" %}');
+            });
+
+            $("#faqs").click(function(){
+            $('#details').load('{% static "templates/faq.html" %}');
+            });
+
+            $("#contact").click(function(){
+            $('#details').load('{% static "templates/contactus.html" %}');
+            });
+        });
+    </script>
+
+
+    <div class="well span3" style="width:18%;margin-left:5px;margin-top:60px;">
+        <div class="nav nav-list">
+            <ul>
+                <li><a id="objective" href="#"><strong>Objective</strong></a></li>
+                <li><a id="who" href="#"><strong>Who can contribute ?</strong></a></li>
+                <li><a id="how" href="#"><strong>How to contribute ?</strong></a></li>
+                <li><a id="guidelines" href="#"><strong>Guidelines for Coding</strong></a></li>
+                <li><a id="goodies" href="#"><strong>Goodies</strong></a></li>
+                <li><a id="disclaimer" href="#"><strong>Disclaimer</strong></a></li>
+                <li><a id="faqs" href="#"><strong>FAQs</strong></a></li>
+                <li><a id="contact" href="#"><strong>Contact</strong></a></li>
+            </ul>
+        </div>
+    </div>
+    <div class="well span9" id="details" style="float:right;width:74%;margin-left:5px;min-height:150px;">
+        <p>The Textbook Companion activity aims to create a repository of reference material for Python by coding solved examples of standard engineering textbooks using Python. This activity intends to,</p>
+         <ul>
+             <li>Make individuals learn Python through a practical approach</li>
+             <li>Provide a huge database of Companions as a learning resource</li>
+             <li>To make it easy for users of such textbooks to start using Python.</li>
+             <li>To improve the documentation available for Python</li>
+        </ul>
+    </div>
+</div>
+
+<div class="row-fluid">
+ <h3 style='float: left;margin-left: 50px; display: inline-block;'>Editors' Picks</h3>
+
+<td>
+
+    <span class="showonhover">
+     <span class="question">?</span>
+        <span class="hovertext">
+            Books with maximum usage of scientific libraries
+        </span>
+    </span>
+</td>
+      {% get_taglist as tags for 'tbc.book' %}
+ <div style="clear:both;"></div>
+      {% for item in items %}
+       {% if item.book.tags.all %}
+<div class ="module-list">
+                <a href="{% url 'tbc:book_details' item.book.id %}"><img src="{% static 'Python-Textbook-Companions/' %}{{ item.image.image }}"></a>
+                <center><a href="{% url 'tbc:book_details' item.book.id %}">{{ item.book.title }}</a></center>
+            </div>
+      {% endif %}
+   {% endfor %}
+
+
+</div>
+
+
+
     <div class="row-fluid">
     <h3 style='float: left;margin-left: 50px; display: inline-block;'>Recent Submissions</h3>
     <div style="float:right; margin-right: 50px; width: 400px;">
@@ -301,24 +421,26 @@
             s.parentNode.insertBefore(gcse, s);
           })();
         </script>
-        <gcse:search></gcse:search>
+        
     </div>
     <div style="clear:both;"></div>
-        {% for item in items %}
+        {% for item in items|slice:":3" %}
             <div class ="module-list">
-                <a href="{% url 'tbc:BookDetails' item.book.id %}"><img src="{% static 'Python-Textbook-Companions/' %}{{ item.image.image }}"></a>
-                <center><a href="{% url 'tbc:BookDetails' item.book.id %}">{{ item.book.title }}</a></center>
+                <a href="{% url 'tbc:book_details' item.book.id %}"><img src="{% static 'Python-Textbook-Companions/' %}{{ item.image.image }}"></a>
+                <center><a href="{% url 'tbc:book_details' item.book.id %}">{{ item.book.title }}</a></center>
             </div>
         {% endfor %}
     </div>
     <br>
     <center> 
-        <a  class="btn btn-primary" href="{% url 'tbc:BrowseBooks' %}">Browse All Books</a>
+        <a  class="btn btn-primary" href="{% url 'tbc:browse_books' %}">Browse All Books</a>
     </center>
     <br>
     <!-- 
         <input type=text> <input type=submit value=Search>
     -->
+ 
+    
     {% endblock %}
       <hr>
       
diff --git a/tbc/templates/tbc/aicte-books.html b/tbc/templates/tbc/aicte-books.html
index a15d686..eb68e2b 100644
--- a/tbc/templates/tbc/aicte-books.html
+++ b/tbc/templates/tbc/aicte-books.html
@@ -16,7 +16,7 @@ function submitCategory()
     <hr>
     <div id="content-wrap">
         <p>Below is the list of AICTE recommended books. You can propose a book just by clicking on the link. However, if you wish to submit your own preferences other than AICTE books, click the button given below.</p>
-        <a href="{% url 'tbc:SubmitProposal' %}" class="btn btn-primary">I don't want to propose AICTE book</a>
+        <a href="{% url 'tbc:submit_proposal' %}" class="btn btn-primary">I don't want to propose AICTE book</a>
         <hr>
         <center><h4>Select a Category</h4></center>
         <form name="aictebooks" action="/submit-aicte-proposal/" method=POST enctype="multipart/form-data">
@@ -52,7 +52,7 @@ function submitCategory()
                         {{ forloop.counter }}
                     </td>
                     <td>
-                        <a href="{% url 'tbc:SubmitAICTEProposal' book.id %}">{{ book.title }} by {{ book.author }}, {{ book.edition }} Edition</a>
+                        <a href="{% url 'tbc:submit_aicte_proposal' book.id %}">{{ book.title }} by {{ book.author }}, {{ book.edition }} Edition</a>
                     </td>
                 </tr>
             {% endfor %}
diff --git a/tbc/templates/tbc/book-details.html b/tbc/templates/tbc/book-details.html
index b161c76..fc67847 100644
--- a/tbc/templates/tbc/book-details.html
+++ b/tbc/templates/tbc/book-details.html
@@ -20,7 +20,7 @@ function redirectToIpynb(notebook)
 {% for image in images %}
     <div class ="module-list">
         {% if image.chapters_set.get.notebook %}
-            <a href="{% url 'tbc:ConvertNotebook' image.chapters_set.get.notebook %}"><img src="{% static 'Python-Textbook-Companions/' %}{{ image.image }}"></a>
+            <a href="{% url 'tbc:convert_notebook' image.chapters_set.get.notebook %}"><img src="{% static 'Python-Textbook-Companions/' %}{{ image.image }}"></a>
         {% else %}
             <img src="{% static 'Python-Textbook-Companions/' %}{{ image.image }}">
         {% endif %}
@@ -36,7 +36,7 @@ function redirectToIpynb(notebook)
 {% for chapter in chapters %}
     <tr>
         <td>
-            <a href="{% url 'tbc:ConvertNotebook' chapter.notebook %}">{{ chapter.name }}</a>
+            <a href="{% url 'tbc:convert_notebook' chapter.notebook %}">{{ chapter.name }}</a>
         </td>
         <td>
             <a href="{% static 'uploads/' %}{{ chapter.notebook }}">Download</a>
@@ -45,7 +45,7 @@ function redirectToIpynb(notebook)
 {% endfor %}
 </table>
 <hr>
-<a class="btn btn-primary btn-large" href="{% url 'tbc:GetZip' book.id %}" style="float:right; margin-top:20px;">Download Book as Zip</a>
+<a class="btn btn-primary btn-large" href="{% url 'tbc:get_zip' book.id %}" style="float:right; margin-top:20px;">Download Book as Zip</a>
 <table>
     <tr>
         <td>Author: &nbsp;&nbsp;</td>
@@ -57,7 +57,7 @@ function redirectToIpynb(notebook)
     </tr>
     <tr>
         <td>ISBN: &nbsp;&nbsp;</td>
-        <td><a href= http://www.isbnsearch.org/isbn/{{book.isbn}} target="_blank">{{book.isbn }}</a></td>
+        <td><a href= http://www.isbnsearch.org/isbn/{{ book.isbn }} target="_blank">{{ book.isbn }}</a></td>
     </tr>
     <tr>
         <td>Contributor: &nbsp;&nbsp;</td>
@@ -77,8 +77,9 @@ function redirectToIpynb(notebook)
     </tr>
     <tr>
         <td>GitHub: &nbsp;&nbsp;</td>
-        <td><a href= 'https://github.com/FOSSEE/Python-Textbook-Companions/tree/master/{{book.title.split|join:"_"}}_by_{{book.author.split|join:"_"}}' target="_blank">{{book.title}}</a></td>
+        <td><a href= 'https://github.com/FOSSEE/Python-Textbook-Companions/tree/master/{{ book.title.split|join:"_" }}_by_{{ book.author.split|join:"_" }}' target="_blank">{{ book.title }}</a></td>
     </tr>
+
 </table>
 
 </div>
diff --git a/tbc/templates/tbc/book-review-details.html b/tbc/templates/tbc/book-review-details.html
index 33401d5..26bf85f 100644
--- a/tbc/templates/tbc/book-review-details.html
+++ b/tbc/templates/tbc/book-review-details.html
@@ -6,7 +6,7 @@
 {% for image in images %}
     <div class ="module-list">
         {% if image.chapters_set.get.notebook %}
-            <a href="{% url 'tbc:ConvertNotebook' image.chapters_set.get.notebook %}"><img src="{% static 'Python-Textbook-Companions/' %}{{ image.image }}"></a>
+            <a href="{% url 'tbc:convert_notebook' image.chapters_set.get.notebook %}"><img src="{% static 'Python-Textbook-Companions/' %}{{ image.image }}"></a>
         {% else %}
             <img src="{% static 'Python-Textbook-Companions/' %}{{ image.image }}">
         {% endif %}
@@ -18,7 +18,7 @@
 <table class="table table-bordered table-hover">
     {% for chapter in chapters %}
         <tr>
-            <td><a href="{% url 'tbc:ConvertNotebook' chapter.notebook %}">{{ chapter.name }}</a></td>
+            <td><a href="{% url 'tbc:convert_notebook' chapter.notebook %}">{{ chapter.name }}</a></td>
         </tr>
     {% endfor %}
 </table>
diff --git a/tbc/templates/tbc/book-review.html b/tbc/templates/tbc/book-review.html
index 7bb88ff..f26c7ba 100644
--- a/tbc/templates/tbc/book-review.html
+++ b/tbc/templates/tbc/book-review.html
@@ -20,13 +20,13 @@
 <center><h3>Books to be reviewed</h3></center>
 <ol>
 {% for book in books %}
-    <li><a href="{% url 'tbc:BookReview' book.id %}">{{ book.title }} {{ book.edition }} Edition</a>
+    <li><a href="{% url 'tbc:book_review' book.id %}">{{ book.title }} {{ book.edition }} Edition</a>
 {% endfor %}
 </ol>
 <center><h3>Reviewed Books</h3></center>
 <ol>
 {% for book in approved_books %}
-<li><a href="{% url 'tbc:BookReview' book.id %}">{{ book.title }} {{ book.edition }} Edition</a></li>
+<li><a href="{% url 'tbc:book_review' book.id %}">{{ book.title }} {{ book.edition }} Edition</a></li>
 {% endfor %}
 <ol>
 {% endblock %}
diff --git a/tbc/templates/tbc/books_under_progress.html b/tbc/templates/tbc/books_under_progress.html
index 494214b..90803ec 100644
--- a/tbc/templates/tbc/books_under_progress.html
+++ b/tbc/templates/tbc/books_under_progress.html
@@ -44,7 +44,7 @@ function submitCategory()
                 {{ forloop.counter }}
             </td>
             <td>
-                    <a href="{% url 'tbc:BookDetails' book.id %}">{{ book.title }} by {{ book.author }}</a>
+                    <a href="{% url 'tbc:book_details' book.id %}">{{ book.title }} by {{ book.author }}</a>
             </td>
         </tr>
         {% endfor %}
diff --git a/tbc/templates/tbc/browse-books.html b/tbc/templates/tbc/browse-books.html
index 1c20ea5..31929b1 100644
--- a/tbc/templates/tbc/browse-books.html
+++ b/tbc/templates/tbc/browse-books.html
@@ -34,8 +34,8 @@ function submitCategory()
 <div class="row-fluid">
     {% for item in items %}
         <div class ="module-list">
-            <a href="{% url 'tbc:BookDetails' item.book.id %}"><img src="{% static 'Python-Textbook-Companions/' %}{{ item.image.image }}"></a>
-            <center><a href="{% url 'tbc:BookDetails' item.book.id %}">{{ item.book.title }}</a></center>
+            <a href="{% url 'tbc:book_details' item.book.id %}"><img src="{% static 'Python-Textbook-Companions/' %}{{ item.image.image }}"></a>
+            <center><a href="{% url 'tbc:book_details' item.book.id %}">{{ item.book.title }}</a></center>
         </div>
     {% endfor %}
     </div>
diff --git a/tbc/templates/tbc/completed_books.html b/tbc/templates/tbc/completed_books.html
index 11bdeb0..44acdc9 100644
--- a/tbc/templates/tbc/completed_books.html
+++ b/tbc/templates/tbc/completed_books.html
@@ -42,7 +42,7 @@ function submitCategory()
                 {{ forloop.counter }}
             </td>
             <td>
-                    <a href="{% url 'tbc:BookDetails' book.id %}">{{ book.title }} by {{ book.author }}</a>
+                    <a href="{% url 'tbc:book_details' book.id %}">{{ book.title }} by {{ book.author }}</a>
             </td>
         </tr>
         {% endfor %}
diff --git a/tbc/templates/tbc/get-certificate.html b/tbc/templates/tbc/get-certificate.html
index 6b6b622..5273efa 100644
--- a/tbc/templates/tbc/get-certificate.html
+++ b/tbc/templates/tbc/get-certificate.html
@@ -16,7 +16,7 @@
                     {{ book.title }} by {{ book.author }}, {{ book.edition }} Edition
                 </td>
                 <td>
-                    <a class="btn btn-primary" href="{% url 'tbc:GetCertificate' book.id %}">Get Certificate</a>
+                    <a class="btn btn-primary" href="{% url 'tbc:get_certificate' book.id %}">Get Certificate</a>
                 </td>
             </tr>
         {% endfor %}
diff --git a/tbc/templates/tbc/link_image.html b/tbc/templates/tbc/link_image.html
index 03cdcec..35d55d5 100644
--- a/tbc/templates/tbc/link_image.html
+++ b/tbc/templates/tbc/link_image.html
@@ -37,7 +37,7 @@
         <b><u> Below are the links to the chapters:</u></b><br>
 
         {% for chapter in chapters %}
-        <a href="{% url 'tbc:ConvertNotebook' chapter.notebook %}" target="_blank">{{ chapter }}</a>
+        <a href="{% url 'tbc:convert_notebook' chapter.notebook %}" target="_blank">{{ chapter }}</a>
         <br>
         {% endfor %}
     </div>
diff --git a/tbc/templates/tbc/login.html b/tbc/templates/tbc/login.html
old mode 100755
new mode 100644
index fc71732..74c6405
--- a/tbc/templates/tbc/login.html
+++ b/tbc/templates/tbc/login.html
@@ -70,8 +70,8 @@
     {% csrf_token %}
         {{ form.as_p }}
         <input class="btn btn-primary"type=submit value=Login>
-        <a href="{% url 'tbc:UserRegister' %}" class="btn btn-primary">Sign Up</a>
-        <a href="{% url 'tbc:ForgotPassword' %}" class="btn btn-primary">Forgot Password</a>
+        <a href="{% url 'tbc:user_register' %}" class="btn btn-primary">Sign Up</a>
+        <a href="{% url 'tbc:forgot_password' %}" class="btn btn-primary">Forgot Password</a>
     </form>
 </div>
 {% endblock %}
diff --git a/tbc/templates/tbc/review-proposal.html b/tbc/templates/tbc/review-proposal.html
index 2499b45..f8b67e0 100644
--- a/tbc/templates/tbc/review-proposal.html
+++ b/tbc/templates/tbc/review-proposal.html
@@ -25,13 +25,13 @@
                                 ISBN: {{ textbook.isbn }}<br>
                                 Year of Pub.: {{ textbook.year_of_pub }}<br>
                                 Category: {{ textbook.category }}<br>
-                                <a class="btn btn-primary btn-mini" href="{% url 'tbc:ReviewProposals' proposal.id textbook.id %}">Approve & Ask for Samples</a>
+                                <a class="btn btn-primary btn-mini" href="{% url 'tbc:review_proposals' proposal.id textbook.id %}">Approve & Ask for Samples</a>
                             </div>
                         </div>
                     </div>
                 {% endfor %}
                 <h5><b>Status:</b> You are yet to review this proposal</h5>
-                <a class="btn btn-primary" href="{% url 'tbc:RejectProposal' proposal.id %}">Reject</a>
+                <a class="btn btn-primary" href="{% url 'tbc:reject_proposal' proposal.id %}">Reject</a>
             </div>
     {% endfor %}
     </ol>
@@ -71,8 +71,8 @@
                 {% ifequal proposal.proposal.status "sample resubmitted" %}
                     {% if proposal.sample.sample_notebook %}
                         <h5><a href="{% static 'Python-Textbook-Companions/' %}{{ proposal.sample.sample_notebook }}">sample notebook</a><br></h5>
-                        <a class="btn btn-primary" href="{% url 'tbc:DisapproveProposal' proposal.proposal.id %}">Disapprove Samples</a>
-                        <a class="btn btn-primary" href="{% url 'tbc:AllotBook' proposal.proposal.id %}">Alot Book</a>
+                        <a class="btn btn-primary" href="{% url 'tbc:disapprove_proposal' proposal.proposal.id %}">Disapprove Samples</a>
+                        <a class="btn btn-primary" href="{% url 'tbc:allot_book' proposal.proposal.id %}">Alot Book</a>
                         <h5>This is resubmission of the sample notebook</h5>
                     {% else %}
                         <h5>Contributor has not re submitted sample notebook yet.</h5>
@@ -81,8 +81,8 @@
                 {% ifequal proposal.proposal.status "sample submitted" %}
                     {% if proposal.sample.sample_notebook %}
                         <h5><a href="{% static 'Python-Textbook-Companions/' %}{{ proposal.sample.sample_notebook }}">sample notebook</a><br></h5>
-                        <a class="btn btn-primary" href="{% url 'tbc:DisapproveProposal' proposal.proposal.id %}">Disapprove Samples</a>
-                        <a class="btn btn-primary" href="{% url 'tbc:AllotBook' proposal.proposal.id %}">Alot Book</a>
+                        <a class="btn btn-primary" href="{% url 'tbc:disapprove_proposal' proposal.proposal.id %}">Disapprove Samples</a>
+                        <a class="btn btn-primary" href="{% url 'tbc:allot_book' proposal.proposal.id %}">Alot Book</a>
                     {% else %}
                         <h5>Contributor has not submitted sample notebook yet.</h5>
                     {% endif %}
-- 
cgit 


From 34dcf8cd6a22bb93b8a9a6532f1373fd64048f1c Mon Sep 17 00:00:00 2001
From: kinitrupti
Date: Thu, 21 Apr 2016 11:46:24 +0530
Subject: Add tags module, minor css changes to base.html

---
 tbc/templates/base.html | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'tbc/templates')

diff --git a/tbc/templates/base.html b/tbc/templates/base.html
index 3cece1c..645ceed 100644
--- a/tbc/templates/base.html
+++ b/tbc/templates/base.html
@@ -89,30 +89,30 @@ a.viewdescription:hover {background-color:#999; color: White;}
     </style>
 <style>
       
-span.question {
-  cursor: pointer;
-  display: inline-block;
-  width: 20px;
-  height: 20px;
-  background-color: #89A4CC;
-  line-height: 16px;
-  color: White;
-  font-size: 13px;
-  font-weight: bold;
-  border-radius: 8px;
-  text-align: center;
-  position: relative;
-}
-span.question:hover { background-color: #3D6199; }
+	span.question {
+	  cursor: pointer;
+	  display: inline-block;
+	  width: 20px;
+	  height: 20px;
+	  background-color: #89A4CC;
+	  line-height: 16px;
+	  color: White;
+	  font-size: 13px;
+	  font-weight: bold;
+	  border-radius: 8px;
+	  text-align: center;
+	  position: relative;
+	}
+	span.question:hover { background-color: #3D6199; }
 
-    </style>
-   {% block css %}
-    <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
-      }
-    </style>
+	    </style>
+	   {% block css %}
+	    <style type="text/css">
+	      body {
+		padding-top: 60px;
+		padding-bottom: 40px;
+	      }
+</style>
    {% endblock %}
    </head>
 
-- 
cgit 

