diff options
| -rw-r--r-- | ReadMe.rst | 10 | ||||
| -rw-r--r-- | static/website/css/main.css | 12 | ||||
| -rw-r--r-- | static/website/images/logo1.png | bin | 0 -> 19335 bytes | |||
| -rw-r--r-- | static/website/templates/ajax-keyword-search.html | 11 | ||||
| -rw-r--r-- | static/website/templates/index.html | 10 | ||||
| -rw-r--r-- | website/models.py | 2 |
6 files changed, 26 insertions, 19 deletions
@@ -33,7 +33,7 @@ Installation cd /path/to/spoken-tutorial-forums -- Install pre-requisites using the command :: +- Install pre-requisites using the command (please don't use sudo) :: pip install -r requirement.txt @@ -45,12 +45,12 @@ Installation Usage ----- -- Using MySql (For development server only). Though, we recommend to use `mysql` for deployment +- Using MySQL (For development server only). Though, we recommend to use `MySQL` for deployment server. See `settings.py` file for usage. - Create 'forum' database in 'MySQL'. -- Only for Server deployment, Open `spoken-tutorial-forums/forums/settings.py` file and do the following changes :: +- Only for Server deployment, open `spoken-tutorial-forums/forums/settings.py` file and make the following changes :: DATABASES = { 'default': { @@ -64,13 +64,13 @@ Usage } -- For development on your machine, create a file `config.py` to `spoken-tutorial-forums/forums/` and write :: +- For development on your machine, create a file `config.py` in `spoken-tutorial-forums/forums/` and add :: db_user='root' #(MySql username) db_pass = 'root' #(MySql password) -- For development on your machine, Open `spoken-tutorial-forums/forums/settings.py` file and do the following changes :: +- For development on your machine, open `spoken-tutorial-forums/forums/settings.py` file and make the following changes :: DATABASES = { 'default': { diff --git a/static/website/css/main.css b/static/website/css/main.css index 855a3bb..b847cd3 100644 --- a/static/website/css/main.css +++ b/static/website/css/main.css @@ -14,7 +14,11 @@ hr { } #filter-container { background: #f5f5f5; - padding: 15px; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 20px; + padding-right: 20px; + } #filter-form { margin-bottom: 0; @@ -50,15 +54,15 @@ body { #header-inner { } #logo { - width: 25px; - margin-top: -3px; + width: 90px; + margin-top: -7px; margin-right: 4px; } #content-wrapper { position: relative; max-width: 970px; margin:0 auto; - padding: 30px 0 55px 0; + padding: 25px 0 15px 0; background: #ffffff; } #content-inner { diff --git a/static/website/images/logo1.png b/static/website/images/logo1.png Binary files differnew file mode 100644 index 0000000..ecd7e44 --- /dev/null +++ b/static/website/images/logo1.png diff --git a/static/website/templates/ajax-keyword-search.html b/static/website/templates/ajax-keyword-search.html index 414ae81..6200d95 100644 --- a/static/website/templates/ajax-keyword-search.html +++ b/static/website/templates/ajax-keyword-search.html @@ -1,17 +1,19 @@ {% load helpers %} + +{{ quesions }} + + {% if questions %} <br> <table class="table table-striped table-bordered table-hover"> <th> FOSS </th> - <th> Tutorial</th> - <th> Min </th> - <th> Sec </th> <th> Question</th> <th> Date</th> <th> Views</th> <th> Answers</th> <th> User</th> + {% for question in questions %} <tr> <td> @@ -23,6 +25,7 @@ </a> </td> + <!-- <td> <span class="tutorial" data-toggle="tooltip" data-placement="top" title="{{ question.tutorial}}"> {{ question.tutorial|truncatechars:12 }} @@ -46,7 +49,7 @@ {{ question.second_range }} </a> </span> - </td> + </td> --> <td> <span class="title" data-toggle="tooltip" data-placement="top" title="{{ question.title }}"> diff --git a/static/website/templates/index.html b/static/website/templates/index.html index fa076b9..fcdf8cb 100644 --- a/static/website/templates/index.html +++ b/static/website/templates/index.html @@ -34,18 +34,18 @@ <div class="row"> <form class ="" id="filter-form" action="" role="form"> <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> - <a class="btn btn-block btn-primary" href="{% url 'website:questions' %}" style="margin-top: 30px;">View all previous questions.</a> + <a class="btn btn-block btn-primary" href="{% url 'website:questions' %}" style="margin-top: 18px;">View all previous questions.</a> </div> <!-- /.col --> </form> <div class="col-lg-6 col-md-6 col-sm-6"> <div class="row"> <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> - <h3 align="center"><strong>{% total_question_count %}</strong></h3> - <h3 align="center" text-color="#7395d9" >Questions</h3> + <h3 style="font-size: 18px" align="center"><strong>{% total_question_count %}</strong></h3> + <h3 style="font-size: 18px" align="center" style="margin-top:0px " text-color="#7395d9" >Questions</h3> </div> <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> - <h3 align="center"><strong>{% total_answer_count %}</strong></h3> - <h3 align="center">Answers</h3> + <h3 style="font-size: 18px" align="center"><strong>{% total_answer_count %}</strong></h3> + <h3 style="font-size: 18px" align="center">Answers</h3> </div> </div> </div> diff --git a/website/models.py b/website/models.py index 28f251d..da87cb5 100644 --- a/website/models.py +++ b/website/models.py @@ -31,7 +31,7 @@ class Question(models.Model): views = models.IntegerField(default=1) # votes = models.IntegerField(default=0) def __unicode__(self): - return self.user + return '%s' % (self.user) class Meta: get_latest_by = "date_created" |
