diff options
| author | holyantony | 2015-03-26 12:41:22 +0530 |
|---|---|---|
| committer | holyantony | 2015-03-26 12:41:22 +0530 |
| commit | 8f1163e44643ba6bdfd8aa21d9afc6ba9a6b1639 (patch) | |
| tree | 4a28b16ac5917707a4070589809b7b1aa6d088aa | |
| parent | ad9f4ac915d8f74b02298c93ff2b24782c661e98 (diff) | |
| download | FOSSEE-Forum-8f1163e44643ba6bdfd8aa21d9afc6ba9a6b1639.tar.gz FOSSEE-Forum-8f1163e44643ba6bdfd8aa21d9afc6ba9a6b1639.tar.bz2 FOSSEE-Forum-8f1163e44643ba6bdfd8aa21d9afc6ba9a6b1639.zip | |
Subject:Disabled serach by time option
Description:
1. Changed title to FOSSEE Forum
2. Updated Footer text in login page
3. Disabled search by time option
| -rw-r--r-- | static/forums/templates/user-login.html | 7 | ||||
| -rw-r--r-- | static/website/css/main.css | 2 | ||||
| -rw-r--r-- | static/website/templates/base.html | 4 | ||||
| -rw-r--r-- | static/website/templates/get-question.html | 2 | ||||
| -rw-r--r-- | static/website/templates/new-question.html | 2 | ||||
| -rw-r--r-- | static/website/templates/search.html | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/static/forums/templates/user-login.html b/static/forums/templates/user-login.html index cb09a06..295b7f6 100644 --- a/static/forums/templates/user-login.html +++ b/static/forums/templates/user-login.html @@ -4,7 +4,7 @@ <br><br><br> <div class="row"> <div class="col-lg-6" style="border-right: 1px dashed #424242;"> - <h4>Please login with your <br>Spoken-Tutorial.org account.</h4> + <h4>Please login with your <br>FOSSEE Forum account.</h4> <form action="accounts/login/" method="POST"> {% csrf_token %} {% if form.errors %} <div class="alert alert-danger"> @@ -33,12 +33,11 @@ <div class="col-lg-6"> <h4>Rules and Regulations</h4> <ul> - <li>This forum is a place to discuss questions and doubts related to the Spoken-Tutorial's</li> - <li>Please restrain yourself from using abusive language.</li> + <li>This forum is a place to discuss questions and doubts related to the FOSSEE FOSS.</li> <li>This is not a place for self promotion.</li> <li>Any violation of the above may lead to the permanent account deletion.</li> </ul> - <h4>Dont have a Spoken-Tutorial.org account yet ?</h4> + <h4>Dont have a FOSSEE Forum account yet ?</h4> <p> <a class="btn btn-sm btn-success" href="/accounts/register/" >Register</a> </p> diff --git a/static/website/css/main.css b/static/website/css/main.css index 7d9f533..855a3bb 100644 --- a/static/website/css/main.css +++ b/static/website/css/main.css @@ -58,7 +58,7 @@ body { position: relative; max-width: 970px; margin:0 auto; - padding: 15px 0 25px 0; + padding: 30px 0 55px 0; background: #ffffff; } #content-inner { diff --git a/static/website/templates/base.html b/static/website/templates/base.html index 8fb39bd..a2f2534 100644 --- a/static/website/templates/base.html +++ b/static/website/templates/base.html @@ -5,7 +5,7 @@ <head> <title> {% block title %} - Spoken Tutorial Forums + FOSSEE Forums {% endblock %} </title> {% compress css %} @@ -106,7 +106,7 @@ <div class="cc"> <a class="cc-logo" rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/" target="_blank"> <img src="/static/website/images/cc-logo-88x31.png" alt="CC logo"> - </a> Spoken Tutorial Forum by <a href="http://www.iitb.ac.in" target="_blank">IIT Bombay</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Creative Commons Attribution-ShareAlike 4.0 International License</a> + </a> FOSSEE Forum by <a href="http://www.iitb.ac.in" target="_blank">IIT Bombay</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Creative Commons Attribution-ShareAlike 4.0 International License</a> </div> </div> <!-- /#footer-inner --> </div> <!-- /#footer-wrapper --> diff --git a/static/website/templates/get-question.html b/static/website/templates/get-question.html index f90681c..04d9118 100644 --- a/static/website/templates/get-question.html +++ b/static/website/templates/get-question.html @@ -5,7 +5,7 @@ {% load permission_tags %} {% block title %} - {{ question.category }} - {{ question.title }} - Spoken Tutorial Forums + {{ question.category }} - {{ question.title }} - FOSSEE Forums {% endblock %} {% block content %} diff --git a/static/website/templates/new-question.html b/static/website/templates/new-question.html index da803de..85900f7 100644 --- a/static/website/templates/new-question.html +++ b/static/website/templates/new-question.html @@ -10,7 +10,7 @@ <form role="form" action="" method="POST">{% csrf_token %} {% with WIDGET_ERROR_CLASS='field_error' %} <p> - Please enter the tutorial details. + Please enter the FOSS details. <img id="ajax-loader" src="{% static 'website/images/ajax-loader.gif' %}" style="display:none;"> </p> <div class="row"> diff --git a/static/website/templates/search.html b/static/website/templates/search.html index 3ffc871..a7ac917 100644 --- a/static/website/templates/search.html +++ b/static/website/templates/search.html @@ -6,7 +6,7 @@ <!-- Nav tabs --> <ul class="nav nav-tabs"> <li class="active" ><a href="#search-by-keyword" data-toggle="tab">Search by Keyword</a></li> - <li><a href="#search-by-time" data-toggle="tab">Search by Time</a></li> + <!--<li><a href="#search-by-time" data-toggle="tab">Search by Time</a></li> --> </ul> <!-- Tab panes --> |