summaryrefslogtreecommitdiff
path: root/static
diff options
context:
space:
mode:
authorashwinishinde2015-03-24 16:01:35 +0530
committerashwinishinde2015-03-24 16:01:35 +0530
commitaf6409ed6b3c24bc865a3bc1b1ac5c73898d5485 (patch)
treeb6ce4b498e7ff43c2ad013f26f5ebad2037fbc9d /static
parent54bd70b5d4338f9d2737c4403352ce45c111216e (diff)
downloadFOSSEE-Forum-af6409ed6b3c24bc865a3bc1b1ac5c73898d5485.tar.gz
FOSSEE-Forum-af6409ed6b3c24bc865a3bc1b1ac5c73898d5485.tar.bz2
FOSSEE-Forum-af6409ed6b3c24bc865a3bc1b1ac5c73898d5485.zip
Subject:Resolved View all questions and validate ask new answer
Description: 1) display view all questions. 2) validate all the fields in ask new answer. 3) validate submit answer.
Diffstat (limited to 'static')
-rw-r--r--static/website/css/main.css1
-rw-r--r--static/website/templates/get-question.html18
-rw-r--r--static/website/templates/new-question.html10
-rw-r--r--static/website/templates/questions.html44
4 files changed, 24 insertions, 49 deletions
diff --git a/static/website/css/main.css b/static/website/css/main.css
index fc96f5b..171503d 100644
--- a/static/website/css/main.css
+++ b/static/website/css/main.css
@@ -282,6 +282,7 @@ table .question a{
#footer-inner a{
color: #ffffff;
}
+
#footer-inner .cc{
font-size: 13px;
text-align: center;
diff --git a/static/website/templates/get-question.html b/static/website/templates/get-question.html
index 3a0e4eb..f90681c 100644
--- a/static/website/templates/get-question.html
+++ b/static/website/templates/get-question.html
@@ -168,14 +168,17 @@
{% with WIDGET_ERROR_CLASS='field_error' %}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+ {{ form.body.errors }}
<div class="form-group">
{% render_field form.question value=question.id %}
- <label for="id_body">Answer</label>
- {% render_field form.body class+='form-control body' %}
+ <label for="id_body"><h4><u>Your Answer:</u></h4></label>
+ {% render_field form.body class+='form-control' %}
</div>
- {{ form.body.errors }}
+
</div>
</div>
+
+
{% endwith %}
<input class="btn btn-sm btn-info" type="submit" value="Submit Answer">
</form>
@@ -197,14 +200,7 @@
<h5>The Current question is under:</h5>
{{ question.category }} <!--
- --&gt; {{ question.tutorial }}
- {% if question.minute_range != 'None' %}
- --&gt; {{ question.minute_range }}
- {% endif %}
- {% if question.second_range != 'None' %}
- --&gt; {{ question.second_range}}
- {% endif %}-->
-
+
<h5>Move the question to:</h5>
<div class="row">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
diff --git a/static/website/templates/new-question.html b/static/website/templates/new-question.html
index cb0439d..da803de 100644
--- a/static/website/templates/new-question.html
+++ b/static/website/templates/new-question.html
@@ -14,8 +14,9 @@
<img id="ajax-loader" src="{% static 'website/images/ajax-loader.gif' %}" style="display:none;">
</p>
<div class="row">
+ {{ form.category.errors }}
<div class="col-lg-3 col-md-3 col-sm-3">
- {% render_field form.category class+="form-control"%}
+ {% render_field form.category class+="form-control category"%}
</div>
<!--<div class="col-lg-3 col-md-3 col-sm-3">
{% if category %}
@@ -37,14 +38,17 @@
<p>Please enter your question details.</p>
<div class="row">
<div class="col-lg-12">
+ {{ form.title.errors }}
<div class="form-group">
<label for="id_title">Title:</label>
- {% render_field form.title class+="form-control" %}
+ {% render_field form.title class+="form-control title" %}
</div>
+ {{ form.body.errors }}
<div class="form-group">
<label for="id_body">Question:</label>
- {% render_field form.body class+="form-control" %}
+ {% render_field form.body class+="form-control body" %}
</div>
+
</div>
</div>
<input class="btn btn-success" type="submit" value="Submit Question">
diff --git a/static/website/templates/questions.html b/static/website/templates/questions.html
index 5242236..98d016d 100644
--- a/static/website/templates/questions.html
+++ b/static/website/templates/questions.html
@@ -10,10 +10,7 @@
</h4>
<table class="table table-bordered table-hover">
<th> FOSS </th>
- <!--<th> Tutorial</th>-->
- <th> Min </th>
- <th> Sec </th>
- <th> Question <span class="glyphicon glyphicon-link"></span></th>
+ <th> Question <span class="glyphicon glyphicon-link"></span></th>
<th> Date</th>
<th> Views</th>
<th> Answers</th>
@@ -21,41 +18,18 @@
{% for question in questions %}
<tr>
<td>
- <span href="#" class="category" data-toggle="tooltip" data-placement="top" title="{{ question.category}}">
- {{ question.category|truncatechars:12 }}
+ <span class="category" data-toggle="tooltip" data-placement="top" title="{{ question.category}}">
+
+ <a class="pull-left" href="{% url 'website:filter' question.category %}?qid={{ question.id }}">
+ {{ question.category|truncatechars:12 }}
+ </a>
+
</span>
- <a class="pull-right" href="{% url 'website:filter' question.category %}?qid={{ question.id }}">
- <span class="glyphicon glyphicon-search"></span>
- </a>
</td>
+
<td>
- <span class="tutorial" data-toggle="tooltip" data-placement="top" title="{{ question.tutorial}}">
- {{ question.tutorial|truncatechars:12 }}
- </span>
- <a class="pull-right" href="{% url 'website:filter' question.category question.tutorial %}?qid={{ question.id }}">
- <span class="glyphicon glyphicon-search"></span>
- </a>
- </td>
-
- <!--<td>
- <span>
- <a href="{% url 'website:filter' question.category question.tutorial %}?qid={{ question.id }}">
- {{ question.minute_range }}
- </a>
- </span>
- </td>
-
- <td>
- <span>
- <a href="{% url 'website:filter' question.category question.tutorial %}?qid={{ question.id }}">
- {{ question.second_range }}
- </a>
- </span>
- </td>-->
-
- <td>
- <span class="title" data-toggle="tooltip" data-placement="top" title="{{ question.title }}">
+ <span class="question" data-toggle="tooltip" data-placement="top" title="{{ question.title }}">
<a href="{% url 'website:get_question' question.id %}">{{ question.title|truncatechars:40 }}</a>
</span>
</td>