base data for FOSSEE Forum

6 files changed, 5 insertions, 68 deletions

diff --git a/static/website/js/custom.js b/static/website/js/custom.js
index 5565683..90ebe9c 100644
--- a/static/website/js/custom.js
+++ b/static/website/js/custom.js
@@ -4,7 +4,7 @@ $(document).ready(function() {
     $minute_range = $("#id_minute_range");
     $second_range = $("#id_second_range");
 
-    function reset() {
+/*    function reset() {
         for (var i = 0, l = arguments.length; i < l; i ++) {
             switch(arguments[i]) {
                 case "tutorial":
@@ -25,16 +25,12 @@ $(document).ready(function() {
             }
         }
     }
-
     $category.change(function() {
         $("#similar-link").hide();
-        /* resetting dropdowns */
         reset("tutorial", "minute_range", "second_range");
-        /* see thread-user.js */
         $("#question-details-ok").show();
         var category = $(this).val();
         if(category == "General") {
-            /* disabling all other fields */
             $tutorial.html("<option value='None'>Not required</option>");
             $tutorial.removeAttr("disabled");
             $minute_range.html("<option value='None'>Not required</option>");
@@ -55,7 +51,7 @@ $(document).ready(function() {
             });
         }
     });
-
+*/
     $tutorial.change(function() {
         /* resetting dropdowns */
         reset("minute_range", "second_range");
diff --git a/static/website/templates/filter.html b/static/website/templates/filter.html
index 85ff760..8a54c72 100644
--- a/static/website/templates/filter.html
+++ b/static/website/templates/filter.html
@@ -28,8 +28,6 @@
     <table class="table table-bordered">
         <th> FOSS </th>
         <th> Tutorial</th>
-        <th> Min </th>
-        <th> Sec </th>
         <th> Question</th>
         <th> Date</th>
         <th> Views</th>
@@ -56,22 +54,6 @@
             </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..4b37652 100644
--- a/static/website/templates/get-question.html
+++ b/static/website/templates/get-question.html
@@ -47,22 +47,6 @@
             </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>
diff --git a/static/website/templates/index.html b/static/website/templates/index.html
index 63890fd..95a5360 100644
--- a/static/website/templates/index.html
+++ b/static/website/templates/index.html
@@ -61,8 +61,6 @@
             <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> Date</th>
                 <th> Views</th>
@@ -89,22 +87,6 @@
                     </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/new-question.html b/static/website/templates/new-question.html
index 28fc707..aa135ca 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;">
@@ -22,16 +21,10 @@
             {% 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 class="col-lg-2 col-md-2 col-sm-2">
             <small><strong>
             <a id="similar-link" data-toggle="modal" data-target="#similarModal" href="#">
                 0 similar questions
diff --git a/static/website/templates/questions.html b/static/website/templates/questions.html
index 88c3dd3..7a259a9 100644
--- a/static/website/templates/questions.html
+++ b/static/website/templates/questions.html
@@ -40,7 +40,7 @@
             
             <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,7 +48,7 @@
             
             <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>