From a89a21f56fcc46bbf1049190959d343c3f9b1ce1 Mon Sep 17 00:00:00 2001 From: Jayaram Pai Date: Sun, 20 Apr 2014 16:29:29 +0530 Subject: added questions page, other minor fixes, nicedit configs --- forums/wsgi.py | 4 +- static/website/images/originals/Advanced-C++.jpg | Bin 0 -> 1855 bytes static/website/images/originals/BASH.jpg | Bin 0 -> 1320 bytes static/website/images/originals/Blender.jpg | Bin 0 -> 1474 bytes static/website/images/originals/C-and-C++.jpg | Bin 0 -> 1449 bytes static/website/images/originals/CellDesigner.jpg | Bin 0 -> 1928 bytes static/website/images/originals/Digital-Divide.jpg | Bin 0 -> 1911 bytes static/website/images/originals/Drupal.jpg | Bin 0 -> 2052 bytes static/website/images/originals/Firefox.jpg | Bin 0 -> 2328 bytes static/website/images/originals/GChemPaint.jpg | Bin 0 -> 2112 bytes static/website/images/originals/GIMP.jpg | Bin 0 -> 1895 bytes static/website/images/originals/GNS3.jpg | Bin 0 -> 2300 bytes static/website/images/originals/GSchem.jpg | Bin 0 -> 1553 bytes .../originals/GeoGebra-for-Engineering-drawing.jpg | Bin 0 -> 1947 bytes static/website/images/originals/Geogebra.jpg | Bin 0 -> 1947 bytes .../images/originals/Java-Business-Application.jpg | Bin 0 -> 2153 bytes static/website/images/originals/Java.jpg | Bin 0 -> 1646 bytes static/website/images/originals/KTouch.jpg | Bin 0 -> 1476 bytes static/website/images/originals/KTurtle.jpg | Bin 0 -> 2090 bytes static/website/images/originals/KiCad.jpg | Bin 0 -> 2225 bytes static/website/images/originals/LaTeX.jpg | Bin 0 -> 1575 bytes .../images/originals/LibreOffice-Suite-Base.jpg | Bin 0 -> 1067 bytes .../images/originals/LibreOffice-Suite-Calc.jpg | Bin 0 -> 1764 bytes .../images/originals/LibreOffice-Suite-Draw.jpg | Bin 0 -> 1712 bytes .../images/originals/LibreOffice-Suite-Impress.jpg | Bin 0 -> 1764 bytes .../images/originals/LibreOffice-Suite-Math.jpg | Bin 0 -> 1461 bytes .../images/originals/LibreOffice-Suite-Writer.jpg | Bin 0 -> 1810 bytes static/website/images/originals/Linux.jpg | Bin 0 -> 1580 bytes static/website/images/originals/Netbeans.jpg | Bin 0 -> 1379 bytes static/website/images/originals/Ngspice.jpg | Bin 0 -> 1810 bytes static/website/images/originals/OpenFOAM.jpg | Bin 0 -> 1343 bytes static/website/images/originals/Orca.jpg | Bin 0 -> 1592 bytes static/website/images/originals/PERL.jpg | Bin 0 -> 1715 bytes static/website/images/originals/PHP-and-MySQL.jpg | Bin 0 -> 2159 bytes .../images/originals/Python-Old-Version.jpg | Bin 0 -> 2165 bytes static/website/images/originals/Python.jpg | Bin 0 -> 1365 bytes static/website/images/originals/QCad.jpg | Bin 0 -> 2027 bytes static/website/images/originals/R.jpg | Bin 0 -> 1635 bytes static/website/images/originals/Rlogo.jpg | Bin 0 -> 3173 bytes static/website/images/originals/Ruby.jpg | Bin 0 -> 1846 bytes static/website/images/originals/Scilab.jpg | Bin 0 -> 2150 bytes static/website/images/originals/Selenium.jpg | Bin 0 -> 1927 bytes .../originals/Single-Board-Heater-System.jpg | Bin 0 -> 2015 bytes .../originals/Spoken-Tutorial-Technology.jpg | Bin 0 -> 2458 bytes static/website/images/originals/Step.jpg | Bin 0 -> 1336 bytes static/website/images/originals/Thunderbird.jpg | Bin 0 -> 1658 bytes static/website/images/originals/Tux-Typing.jpg | Bin 0 -> 1732 bytes .../images/originals/What-is-Spoken-Tutorial.jpg | Bin 0 -> 2458 bytes static/website/images/originals/Xfig.jpg | Bin 0 -> 2049 bytes static/website/images/originals/logo_openfoam.jpg | Bin 0 -> 2083 bytes static/website/js/thread-user.js | 6 +- static/website/templates/index.html | 7 +- static/website/templates/new-question.html | 2 +- static/website/templates/questions.html | 117 ++++++++++++++++ static/website/templates/recent-questions.html | 156 ++++++++++----------- website/urls.py | 1 + website/views.py | 30 ++-- 57 files changed, 224 insertions(+), 99 deletions(-) create mode 100644 static/website/images/originals/Advanced-C++.jpg create mode 100644 static/website/images/originals/BASH.jpg create mode 100644 static/website/images/originals/Blender.jpg create mode 100644 static/website/images/originals/C-and-C++.jpg create mode 100644 static/website/images/originals/CellDesigner.jpg create mode 100644 static/website/images/originals/Digital-Divide.jpg create mode 100644 static/website/images/originals/Drupal.jpg create mode 100644 static/website/images/originals/Firefox.jpg create mode 100644 static/website/images/originals/GChemPaint.jpg create mode 100644 static/website/images/originals/GIMP.jpg create mode 100644 static/website/images/originals/GNS3.jpg create mode 100644 static/website/images/originals/GSchem.jpg create mode 100644 static/website/images/originals/GeoGebra-for-Engineering-drawing.jpg create mode 100644 static/website/images/originals/Geogebra.jpg create mode 100644 static/website/images/originals/Java-Business-Application.jpg create mode 100644 static/website/images/originals/Java.jpg create mode 100644 static/website/images/originals/KTouch.jpg create mode 100644 static/website/images/originals/KTurtle.jpg create mode 100644 static/website/images/originals/KiCad.jpg create mode 100644 static/website/images/originals/LaTeX.jpg create mode 100644 static/website/images/originals/LibreOffice-Suite-Base.jpg create mode 100644 static/website/images/originals/LibreOffice-Suite-Calc.jpg create mode 100644 static/website/images/originals/LibreOffice-Suite-Draw.jpg create mode 100644 static/website/images/originals/LibreOffice-Suite-Impress.jpg create mode 100644 static/website/images/originals/LibreOffice-Suite-Math.jpg create mode 100644 static/website/images/originals/LibreOffice-Suite-Writer.jpg create mode 100644 static/website/images/originals/Linux.jpg create mode 100644 static/website/images/originals/Netbeans.jpg create mode 100644 static/website/images/originals/Ngspice.jpg create mode 100644 static/website/images/originals/OpenFOAM.jpg create mode 100644 static/website/images/originals/Orca.jpg create mode 100644 static/website/images/originals/PERL.jpg create mode 100644 static/website/images/originals/PHP-and-MySQL.jpg create mode 100644 static/website/images/originals/Python-Old-Version.jpg create mode 100644 static/website/images/originals/Python.jpg create mode 100644 static/website/images/originals/QCad.jpg create mode 100644 static/website/images/originals/R.jpg create mode 100644 static/website/images/originals/Rlogo.jpg create mode 100644 static/website/images/originals/Ruby.jpg create mode 100644 static/website/images/originals/Scilab.jpg create mode 100644 static/website/images/originals/Selenium.jpg create mode 100644 static/website/images/originals/Single-Board-Heater-System.jpg create mode 100644 static/website/images/originals/Spoken-Tutorial-Technology.jpg create mode 100644 static/website/images/originals/Step.jpg create mode 100644 static/website/images/originals/Thunderbird.jpg create mode 100644 static/website/images/originals/Tux-Typing.jpg create mode 100644 static/website/images/originals/What-is-Spoken-Tutorial.jpg create mode 100644 static/website/images/originals/Xfig.jpg create mode 100644 static/website/images/originals/logo_openfoam.jpg create mode 100644 static/website/templates/questions.html diff --git a/forums/wsgi.py b/forums/wsgi.py index 728eed4..3901802 100644 --- a/forums/wsgi.py +++ b/forums/wsgi.py @@ -24,8 +24,8 @@ sys.path.append('/Sites/venv/forums/') # os.environ["DJANGO_SETTINGS_MODULE"] = "forums.settings" os.environ["DJANGO_SETTINGS_MODULE"] = "forums.settings" -activate_this = '/Sites/venv/bin/activate_this.py' -execfile(activate_this, dict(__file__=activate_this)) +# activate_this = '/Sites/venv/bin/activate_this.py' +# execfile(activate_this, dict(__file__=activate_this)) # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION diff --git a/static/website/images/originals/Advanced-C++.jpg b/static/website/images/originals/Advanced-C++.jpg new file mode 100644 index 0000000..4550d61 Binary files /dev/null and b/static/website/images/originals/Advanced-C++.jpg differ diff --git a/static/website/images/originals/BASH.jpg b/static/website/images/originals/BASH.jpg new file mode 100644 index 0000000..9d29c7e Binary files /dev/null and b/static/website/images/originals/BASH.jpg differ diff --git a/static/website/images/originals/Blender.jpg b/static/website/images/originals/Blender.jpg new file mode 100644 index 0000000..14e8734 Binary files /dev/null and b/static/website/images/originals/Blender.jpg differ diff --git a/static/website/images/originals/C-and-C++.jpg b/static/website/images/originals/C-and-C++.jpg new file mode 100644 index 0000000..b1e972b Binary files /dev/null and b/static/website/images/originals/C-and-C++.jpg differ diff --git a/static/website/images/originals/CellDesigner.jpg b/static/website/images/originals/CellDesigner.jpg new file mode 100644 index 0000000..17f9d00 Binary files /dev/null and b/static/website/images/originals/CellDesigner.jpg differ diff --git a/static/website/images/originals/Digital-Divide.jpg b/static/website/images/originals/Digital-Divide.jpg new file mode 100644 index 0000000..e6595cf Binary files /dev/null and b/static/website/images/originals/Digital-Divide.jpg differ diff --git a/static/website/images/originals/Drupal.jpg b/static/website/images/originals/Drupal.jpg new file mode 100644 index 0000000..a01f8bc Binary files /dev/null and b/static/website/images/originals/Drupal.jpg differ diff --git a/static/website/images/originals/Firefox.jpg b/static/website/images/originals/Firefox.jpg new file mode 100644 index 0000000..189daf4 Binary files /dev/null and b/static/website/images/originals/Firefox.jpg differ diff --git a/static/website/images/originals/GChemPaint.jpg b/static/website/images/originals/GChemPaint.jpg new file mode 100644 index 0000000..f1c7d20 Binary files /dev/null and b/static/website/images/originals/GChemPaint.jpg differ diff --git a/static/website/images/originals/GIMP.jpg b/static/website/images/originals/GIMP.jpg new file mode 100644 index 0000000..af6b211 Binary files /dev/null and b/static/website/images/originals/GIMP.jpg differ diff --git a/static/website/images/originals/GNS3.jpg b/static/website/images/originals/GNS3.jpg new file mode 100644 index 0000000..7656f84 Binary files /dev/null and b/static/website/images/originals/GNS3.jpg differ diff --git a/static/website/images/originals/GSchem.jpg b/static/website/images/originals/GSchem.jpg new file mode 100644 index 0000000..e0cf4e1 Binary files /dev/null and b/static/website/images/originals/GSchem.jpg differ diff --git a/static/website/images/originals/GeoGebra-for-Engineering-drawing.jpg b/static/website/images/originals/GeoGebra-for-Engineering-drawing.jpg new file mode 100644 index 0000000..3ff0a5e Binary files /dev/null and b/static/website/images/originals/GeoGebra-for-Engineering-drawing.jpg differ diff --git a/static/website/images/originals/Geogebra.jpg b/static/website/images/originals/Geogebra.jpg new file mode 100644 index 0000000..3ff0a5e Binary files /dev/null and b/static/website/images/originals/Geogebra.jpg differ diff --git a/static/website/images/originals/Java-Business-Application.jpg b/static/website/images/originals/Java-Business-Application.jpg new file mode 100644 index 0000000..e8046e4 Binary files /dev/null and b/static/website/images/originals/Java-Business-Application.jpg differ diff --git a/static/website/images/originals/Java.jpg b/static/website/images/originals/Java.jpg new file mode 100644 index 0000000..9934a4a Binary files /dev/null and b/static/website/images/originals/Java.jpg differ diff --git a/static/website/images/originals/KTouch.jpg b/static/website/images/originals/KTouch.jpg new file mode 100644 index 0000000..4221d96 Binary files /dev/null and b/static/website/images/originals/KTouch.jpg differ diff --git a/static/website/images/originals/KTurtle.jpg b/static/website/images/originals/KTurtle.jpg new file mode 100644 index 0000000..733e2c1 Binary files /dev/null and b/static/website/images/originals/KTurtle.jpg differ diff --git a/static/website/images/originals/KiCad.jpg b/static/website/images/originals/KiCad.jpg new file mode 100644 index 0000000..8df8ac0 Binary files /dev/null and b/static/website/images/originals/KiCad.jpg differ diff --git a/static/website/images/originals/LaTeX.jpg b/static/website/images/originals/LaTeX.jpg new file mode 100644 index 0000000..8fb73db Binary files /dev/null and b/static/website/images/originals/LaTeX.jpg differ diff --git a/static/website/images/originals/LibreOffice-Suite-Base.jpg b/static/website/images/originals/LibreOffice-Suite-Base.jpg new file mode 100644 index 0000000..0d9816a Binary files /dev/null and b/static/website/images/originals/LibreOffice-Suite-Base.jpg differ diff --git a/static/website/images/originals/LibreOffice-Suite-Calc.jpg b/static/website/images/originals/LibreOffice-Suite-Calc.jpg new file mode 100644 index 0000000..51d6cc0 Binary files /dev/null and b/static/website/images/originals/LibreOffice-Suite-Calc.jpg differ diff --git a/static/website/images/originals/LibreOffice-Suite-Draw.jpg b/static/website/images/originals/LibreOffice-Suite-Draw.jpg new file mode 100644 index 0000000..9c42a88 Binary files /dev/null and b/static/website/images/originals/LibreOffice-Suite-Draw.jpg differ diff --git a/static/website/images/originals/LibreOffice-Suite-Impress.jpg b/static/website/images/originals/LibreOffice-Suite-Impress.jpg new file mode 100644 index 0000000..ce82703 Binary files /dev/null and b/static/website/images/originals/LibreOffice-Suite-Impress.jpg differ diff --git a/static/website/images/originals/LibreOffice-Suite-Math.jpg b/static/website/images/originals/LibreOffice-Suite-Math.jpg new file mode 100644 index 0000000..b33de64 Binary files /dev/null and b/static/website/images/originals/LibreOffice-Suite-Math.jpg differ diff --git a/static/website/images/originals/LibreOffice-Suite-Writer.jpg b/static/website/images/originals/LibreOffice-Suite-Writer.jpg new file mode 100644 index 0000000..adce0fb Binary files /dev/null and b/static/website/images/originals/LibreOffice-Suite-Writer.jpg differ diff --git a/static/website/images/originals/Linux.jpg b/static/website/images/originals/Linux.jpg new file mode 100644 index 0000000..491bddb Binary files /dev/null and b/static/website/images/originals/Linux.jpg differ diff --git a/static/website/images/originals/Netbeans.jpg b/static/website/images/originals/Netbeans.jpg new file mode 100644 index 0000000..66c5753 Binary files /dev/null and b/static/website/images/originals/Netbeans.jpg differ diff --git a/static/website/images/originals/Ngspice.jpg b/static/website/images/originals/Ngspice.jpg new file mode 100644 index 0000000..a319e31 Binary files /dev/null and b/static/website/images/originals/Ngspice.jpg differ diff --git a/static/website/images/originals/OpenFOAM.jpg b/static/website/images/originals/OpenFOAM.jpg new file mode 100644 index 0000000..7e20f33 Binary files /dev/null and b/static/website/images/originals/OpenFOAM.jpg differ diff --git a/static/website/images/originals/Orca.jpg b/static/website/images/originals/Orca.jpg new file mode 100644 index 0000000..cf7797c Binary files /dev/null and b/static/website/images/originals/Orca.jpg differ diff --git a/static/website/images/originals/PERL.jpg b/static/website/images/originals/PERL.jpg new file mode 100644 index 0000000..5159d78 Binary files /dev/null and b/static/website/images/originals/PERL.jpg differ diff --git a/static/website/images/originals/PHP-and-MySQL.jpg b/static/website/images/originals/PHP-and-MySQL.jpg new file mode 100644 index 0000000..d8d7efa Binary files /dev/null and b/static/website/images/originals/PHP-and-MySQL.jpg differ diff --git a/static/website/images/originals/Python-Old-Version.jpg b/static/website/images/originals/Python-Old-Version.jpg new file mode 100644 index 0000000..cf40bb8 Binary files /dev/null and b/static/website/images/originals/Python-Old-Version.jpg differ diff --git a/static/website/images/originals/Python.jpg b/static/website/images/originals/Python.jpg new file mode 100644 index 0000000..4023cce Binary files /dev/null and b/static/website/images/originals/Python.jpg differ diff --git a/static/website/images/originals/QCad.jpg b/static/website/images/originals/QCad.jpg new file mode 100644 index 0000000..293046b Binary files /dev/null and b/static/website/images/originals/QCad.jpg differ diff --git a/static/website/images/originals/R.jpg b/static/website/images/originals/R.jpg new file mode 100644 index 0000000..b1fb8da Binary files /dev/null and b/static/website/images/originals/R.jpg differ diff --git a/static/website/images/originals/Rlogo.jpg b/static/website/images/originals/Rlogo.jpg new file mode 100644 index 0000000..656a6b1 Binary files /dev/null and b/static/website/images/originals/Rlogo.jpg differ diff --git a/static/website/images/originals/Ruby.jpg b/static/website/images/originals/Ruby.jpg new file mode 100644 index 0000000..f1e9245 Binary files /dev/null and b/static/website/images/originals/Ruby.jpg differ diff --git a/static/website/images/originals/Scilab.jpg b/static/website/images/originals/Scilab.jpg new file mode 100644 index 0000000..56f6e22 Binary files /dev/null and b/static/website/images/originals/Scilab.jpg differ diff --git a/static/website/images/originals/Selenium.jpg b/static/website/images/originals/Selenium.jpg new file mode 100644 index 0000000..756eac4 Binary files /dev/null and b/static/website/images/originals/Selenium.jpg differ diff --git a/static/website/images/originals/Single-Board-Heater-System.jpg b/static/website/images/originals/Single-Board-Heater-System.jpg new file mode 100644 index 0000000..b08dd00 Binary files /dev/null and b/static/website/images/originals/Single-Board-Heater-System.jpg differ diff --git a/static/website/images/originals/Spoken-Tutorial-Technology.jpg b/static/website/images/originals/Spoken-Tutorial-Technology.jpg new file mode 100644 index 0000000..8c12ba1 Binary files /dev/null and b/static/website/images/originals/Spoken-Tutorial-Technology.jpg differ diff --git a/static/website/images/originals/Step.jpg b/static/website/images/originals/Step.jpg new file mode 100644 index 0000000..a34d275 Binary files /dev/null and b/static/website/images/originals/Step.jpg differ diff --git a/static/website/images/originals/Thunderbird.jpg b/static/website/images/originals/Thunderbird.jpg new file mode 100644 index 0000000..91e3723 Binary files /dev/null and b/static/website/images/originals/Thunderbird.jpg differ diff --git a/static/website/images/originals/Tux-Typing.jpg b/static/website/images/originals/Tux-Typing.jpg new file mode 100644 index 0000000..4a22d6e Binary files /dev/null and b/static/website/images/originals/Tux-Typing.jpg differ diff --git a/static/website/images/originals/What-is-Spoken-Tutorial.jpg b/static/website/images/originals/What-is-Spoken-Tutorial.jpg new file mode 100644 index 0000000..8c12ba1 Binary files /dev/null and b/static/website/images/originals/What-is-Spoken-Tutorial.jpg differ diff --git a/static/website/images/originals/Xfig.jpg b/static/website/images/originals/Xfig.jpg new file mode 100644 index 0000000..3f142aa Binary files /dev/null and b/static/website/images/originals/Xfig.jpg differ diff --git a/static/website/images/originals/logo_openfoam.jpg b/static/website/images/originals/logo_openfoam.jpg new file mode 100644 index 0000000..9ef30e8 Binary files /dev/null and b/static/website/images/originals/logo_openfoam.jpg differ diff --git a/static/website/js/thread-user.js b/static/website/js/thread-user.js index d2c8f22..1c43342 100644 --- a/static/website/js/thread-user.js +++ b/static/website/js/thread-user.js @@ -1,6 +1,6 @@ bkLib.onDomLoaded(function() { var questionNicEditor = new nicEditor({ - buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link'], + buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link', 'forecolor', 'bgcolor'], iconsPath: "/static/website/js/nicEditorIcons.gif", }); questionNicEditor.setPanel('questionNicPanel'); @@ -156,7 +156,7 @@ $(document).ready(function() { $answerPanelWrapper = $("#answerPanelWrapper"); var answerNicEditor = new nicEditor({ - buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link'], + buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link', 'forecolor', 'bgcolor'], iconsPath: "/static/website/js/nicEditorIcons.gif", }); answerNicEditor.panelInstance('answerNicPanel'); @@ -217,7 +217,7 @@ $(document).ready(function() { $(this).find(".modify-wrapper").hide(); }); var commentNicEditor = new nicEditor({ - buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link'], + buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link', 'forecolor', 'bgcolor'], iconsPath: "/static/website/js/nicEditorIcons.gif", }); commentNicEditor.panelInstance('commentNicPanel'); diff --git a/static/website/templates/index.html b/static/website/templates/index.html index 4162e42..39afa9f 100644 --- a/static/website/templates/index.html +++ b/static/website/templates/index.html @@ -60,7 +60,12 @@
- Recent Questions + Recent questions + + + View all questions + +
diff --git a/static/website/templates/new-question.html b/static/website/templates/new-question.html index 63ae19a..d9576bb 100644 --- a/static/website/templates/new-question.html +++ b/static/website/templates/new-question.html @@ -74,7 +74,7 @@ bkLib.onDomLoaded(function() { new nicEditor({ iconsPath: "{% static 'website/js/nicEditorIcons.gif' %}", - buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link'] + buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link', 'forecolor', 'bgcolor'] }).panelInstance('id_body'); }); diff --git a/static/website/templates/questions.html b/static/website/templates/questions.html new file mode 100644 index 0000000..c6c77e3 --- /dev/null +++ b/static/website/templates/questions.html @@ -0,0 +1,117 @@ +{% extends 'website/templates/base.html' %} +{% load static %} +{% load count_tags %} + +{% block content %} +

+

+ Showing {{ questions.start_index }} - {{ questions.end_index }} of {{ questions.paginator.count }} questions. +
+ +
+ + + + + + + + + + {% for question in questions %} + + + + + + + + + + + + + + + + + + + + {% endfor %} + +
FOSS Tutorial Min Sec Question Date Views Answers User
+ + {{ question.category|truncatechars:12 }} + + + + + + + {{ question.tutorial|truncatechars:12 }} + + + + + + + + {{ question.minute_range }} + + + + + + {{ question.second_range }} + + + + + {{ question.title|truncatechars:40 }} + + + + + {{ question.date_created|date:"d-m-y" }} + + + + {{ question.views}} + + {{ question.answer_set.count }} + + + {{ question.user|truncatechars:10 }} + +
+ +