diff options
Diffstat (limited to 'static/website/templates')
-rw-r--r-- | static/website/templates/base.html | 4 | ||||
-rw-r--r-- | static/website/templates/filter.html | 29 | ||||
-rw-r--r-- | static/website/templates/get-question.html | 29 | ||||
-rw-r--r-- | static/website/templates/index.html | 45 | ||||
-rw-r--r-- | static/website/templates/new-question.html | 13 | ||||
-rw-r--r-- | static/website/templates/questions.html | 10 |
6 files changed, 25 insertions, 105 deletions
diff --git a/static/website/templates/base.html b/static/website/templates/base.html index 86ca41a..726bd0a 100644 --- a/static/website/templates/base.html +++ b/static/website/templates/base.html @@ -1,4 +1,5 @@ {% load compress %} + {% load static %} <html> <head> @@ -12,6 +13,7 @@ <link rel="stylesheet" href="{% static 'website/slick/slick.css' %}" type="text/css" media="screen" charset="utf-8" /> <link rel="stylesheet" href="{% static 'website/css/main.css' %}" type="text/css" media="screen" charset="utf-8" /> <link rel="stylesheet" href="{% static 'website/css/nice-bar.css' %}" type="text/css" media="screen" charset="utf-8" /> + <link rel="stylesheet" href="{% static 'website/css/login.css' %}" type="text/css" media="screen" charset="utf-8" /> {% endcompress %} </head> <body> @@ -30,7 +32,7 @@ </button> <a class="navbar-brand" href="{% url 'website:home' %}"> <img id="logo" src="{% static 'website/images/logo.png' %}"> - Spoken Tutorial Forums + FOSSEE Forums </a> </div> <!-- /.navbar-header --> diff --git a/static/website/templates/filter.html b/static/website/templates/filter.html index 85ff760..eb42fcb 100644 --- a/static/website/templates/filter.html +++ b/static/website/templates/filter.html @@ -27,9 +27,7 @@ <table class="table table-bordered"> <th> FOSS </th> - <th> Tutorial</th> - <th> Min </th> - <th> Sec </th> + <!--<th> Tutorial</th>--> <th> Question</th> <th> Date</th> <th> Views</th> @@ -47,31 +45,6 @@ </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 question.minute_range %}?qid={{ question.id }}"> - {{ question.minute_range }} - </a> - </span> - </td> - - <td> - <span> - <a href="{% url 'website:filter' question.category question.tutorial question.minute_range question.second_range%}?qid={{ question.id }}"> - {{ question.second_range }} - </a> - </span> - </td> - - <td> <span class="title" data-toggle="tooltip" data-placement="top" title="{{ question.title }}"> <a href="{% url 'website:get_question' question.id %}{% prettify question.title %}">{{ question.title|truncatechars:40 }}</a> </span> diff --git a/static/website/templates/get-question.html b/static/website/templates/get-question.html index 2983412..18758c9 100644 --- a/static/website/templates/get-question.html +++ b/static/website/templates/get-question.html @@ -38,31 +38,8 @@ </a> </small> </span> + - <span class="tutorial"> - <small> - <a href="{% url 'website:filter' question.category question.tutorial %}"> - {{ question.tutorial}} - </a> - </small> - </span> - - <span class="minute_range {% if question.minute_range == 'None' %}hideme{% endif %}"> - <small> - <a href="{% url 'website:filter' question.category question.tutorial question.minute_range %}"> - {{ question.minute_range }} min - </a> - </small> - </span> - - <span class="second_range {% if question.minute_range == 'None' %}hideme{% endif %}"> - <small> - <a href="{% url 'website:filter' question.category question.tutorial question.minute_range question.second_range%}"> - {{ question.second_range }} sec - </a> - </small> - </span> - <a id="question-details-edit" data-toggle="modal" data-target="#detailsModal" href="#" class="hideme"> <span class="glyphicon glyphicon-edit"></span> </a> @@ -218,14 +195,14 @@ <div class="modal-body"> <h5>The Current question is under:</h5> - {{ question.category }} + {{ question.category }} <!-- --> {{ question.tutorial }} {% if question.minute_range != 'None' %} --> {{ question.minute_range }} {% endif %} {% if question.second_range != 'None' %} --> {{ question.second_range}} - {% endif %} + {% endif %}--> <h5>Move the question to:</h5> <div class="row"> diff --git a/static/website/templates/index.html b/static/website/templates/index.html index 63890fd..48f0227 100644 --- a/static/website/templates/index.html +++ b/static/website/templates/index.html @@ -41,7 +41,7 @@ <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">Questions</h3> + <h3 align="center" 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> @@ -59,10 +59,8 @@ </div> <div class="panel-body"> <table class="table table-bordered table-hover"> - <th> FOSS </th> - <th> Tutorial</th> - <th> Min </th> - <th> Sec </th> + <th> FOSS <span class="glyphicon glyphicon-link"></span></th> + <!--<th> Tutorial</th>--> <th> Question <span class="glyphicon glyphicon-link"></span></th> <th> Date</th> <th> Views</th> @@ -71,41 +69,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> - <a class="pull-right" href="{% url 'website:filter' question.category %}?qid={{ question.id }}"> - <span class="glyphicon glyphicon-search"></span> + <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> </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 question.minute_range %}?qid={{ question.id }}"> - {{ question.minute_range }} - </a> - </span> - </td> - - <td> - <span> - <a href="{% url 'website:filter' question.category question.tutorial question.minute_range question.second_range%}?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 %}{% prettify question.title %}">{{ question.title|truncatechars:40 }}</a> </span> </td> diff --git a/static/website/templates/new-question.html b/static/website/templates/new-question.html index 28fc707..cb0439d 100644 --- a/static/website/templates/new-question.html +++ b/static/website/templates/new-question.html @@ -9,7 +9,6 @@ <hr> <form role="form" action="" method="POST">{% csrf_token %} {% with WIDGET_ERROR_CLASS='field_error' %} - <p> Please enter the tutorial details. <img id="ajax-loader" src="{% static 'website/images/ajax-loader.gif' %}" style="display:none;"> @@ -18,19 +17,13 @@ <div class="col-lg-3 col-md-3 col-sm-3"> {% render_field form.category class+="form-control"%} </div> - <div class="col-lg-3 col-md-3 col-sm-3"> + <!--<div class="col-lg-3 col-md-3 col-sm-3"> {% if category %} {% render_field form.tutorial class+="form-control" %} {% else %} - {% render_field form.tutorial class+="form-control" disabled="disabled" %} + {% render_field form.tutorial class+="form-control" %} {% endif %} - </div> - <div class="col-lg-2 col-md-2 col-sm-2"> - {% render_field form.minute_range class+="form-control" disabled="disabled" %} - </div> - <div class="col-lg-2 col-md-2 col-sm-2"> - {% render_field form.second_range class+="form-control" disabled="disabled" %} - </div> + </div>--> <div class="col-lg-2 col-md-2 col-sm-2"> <small><strong> <a id="similar-link" data-toggle="modal" data-target="#similarModal" href="#"> diff --git a/static/website/templates/questions.html b/static/website/templates/questions.html index 88c3dd3..5242236 100644 --- a/static/website/templates/questions.html +++ b/static/website/templates/questions.html @@ -10,7 +10,7 @@ </h4> <table class="table table-bordered table-hover"> <th> FOSS </th> - <th> Tutorial</th> + <!--<th> Tutorial</th>--> <th> Min </th> <th> Sec </th> <th> Question <span class="glyphicon glyphicon-link"></span></th> @@ -38,9 +38,9 @@ </a> </td> - <td> + <!--<td> <span> - <a href="{% url 'website:filter' question.category question.tutorial question.minute_range %}?qid={{ question.id }}"> + <a href="{% url 'website:filter' question.category question.tutorial %}?qid={{ question.id }}"> {{ question.minute_range }} </a> </span> @@ -48,11 +48,11 @@ <td> <span> - <a href="{% url 'website:filter' question.category question.tutorial question.minute_range question.second_range%}?qid={{ question.id }}"> + <a href="{% url 'website:filter' question.category question.tutorial %}?qid={{ question.id }}"> {{ question.second_range }} </a> </span> - </td> + </td>--> <td> <span class="title" data-toggle="tooltip" data-placement="top" title="{{ question.title }}"> |