diff options
| -rw-r--r-- | static/website/css/main.css | 5 | ||||
| -rw-r--r-- | static/website/css/nice-bar.css | 40 | ||||
| -rw-r--r-- | static/website/js/nice-bar.js | 6 | ||||
| -rw-r--r-- | static/website/templates/get-question.html | 1 | ||||
| -rw-r--r-- | static/website/templates/index.html | 1 | ||||
| -rw-r--r-- | website/forms.py | 1 | ||||
| -rw-r--r-- | website/views.py | 5 |
7 files changed, 56 insertions, 3 deletions
diff --git a/static/website/css/main.css b/static/website/css/main.css index 61c411c..b07b73c 100644 --- a/static/website/css/main.css +++ b/static/website/css/main.css @@ -160,6 +160,11 @@ body { right: 0px; bottom: 0px; } +#content .reply .meta{ + position: absolute; + right: 0px; + bottom: 0px; +} #content .question .user{ background: #f5f5f5; padding: 2px 7px; diff --git a/static/website/css/nice-bar.css b/static/website/css/nice-bar.css new file mode 100644 index 0000000..6159b09 --- /dev/null +++ b/static/website/css/nice-bar.css @@ -0,0 +1,40 @@ +.nice-bar { + display: none; + width: 100%; + background: #70a865; + border-bottom: 3px solid #27ae60; + font-size: 0.85em; +} +.nice-bar .nice-text { + width: 960px; + margin: 0 auto; + padding: 12px 0; + color: #ffffff; + font-weight: bold; +} +.nice-bar .nice-button { + padding: 2px 5px; + background: #111111; + color: #ffffff; + margin: 0 0 0 10px; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; +} +.nice-bar .nice-close { + float: right; + padding: 1px 7px 2px 7px; + background: #111111; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; +} +.nice-bar .nice-close:hover { + cursor: pointer; +} +.nice-bar span.ext{ + display: none; +} diff --git a/static/website/js/nice-bar.js b/static/website/js/nice-bar.js new file mode 100644 index 0000000..b27ba2b --- /dev/null +++ b/static/website/js/nice-bar.js @@ -0,0 +1,6 @@ +$(document).ready(function() { + $(".nice-bar").slideDown(); + $(".nice-close").click(function() { + $(".nice-bar").slideUp(); + }); +}); diff --git a/static/website/templates/get-question.html b/static/website/templates/get-question.html index 2b0371e..af9e4a2 100644 --- a/static/website/templates/get-question.html +++ b/static/website/templates/get-question.html @@ -96,7 +96,6 @@ {% for answer in answers %} <div class="row"> - <div class="col-lg-12 answer-wrapper"> <div class="answer {% if user|can_edit:answer %}editable{% endif %}" id="answer{{answer.id}}"> diff --git a/static/website/templates/index.html b/static/website/templates/index.html index a5e746e..4162e42 100644 --- a/static/website/templates/index.html +++ b/static/website/templates/index.html @@ -168,4 +168,5 @@ }); }); </script> +<script src="{% static 'website/js/nice-bar.js' %}"></script> {% endblock %} diff --git a/website/forms.py b/website/forms.py index ebf552e..f1e29be 100644 --- a/website/forms.py +++ b/website/forms.py @@ -35,6 +35,7 @@ categories = ( ('Ngspice', 'Ngspice'), ('OpenFOAM', 'OpenFOAM'), ('Orca', 'Orca'), + ('Oscad', 'Oscad'), ('PERL', 'PERL'), ('PHP-and-MySQL', 'PHP-and-MySQL'), ('Python', 'Python'), diff --git a/website/views.py b/website/views.py index 7e7e813..81283f7 100644 --- a/website/views.py +++ b/website/views.py @@ -27,7 +27,7 @@ categories = ( 'LibreOffice-Suite-Base', 'LibreOffice-Suite-Calc', 'LibreOffice-Suite-Draw', 'LibreOffice-Suite-Impress', 'LibreOffice-Suite-Math', 'LibreOffice-Suite-Writer', - 'Linux', 'Netbeans', 'Ngspice', 'OpenFOAM', 'Orca', + 'Linux', 'Netbeans', 'Ngspice', 'OpenFOAM', 'Orca', 'Oscad', 'PERL', 'PHP-and-MySQL', 'Python', 'Python-Old-Version', 'QCad', 'R', 'Ruby', 'Scilab', 'Selenium', 'Single-Board-Heater-System', 'Spoken-Tutorial-Technology', @@ -49,7 +49,8 @@ def recent_questions(request): total = Question.objects.all().count() total = int(total - (total % 10 - 10)) - questions = Question.objects.all().order_by('date_created').reverse()[marker:marker+10] + #questions = Question.objects.all().order_by('date_created').reverse()[marker:marker+10] + questions = Question.objects.all().order_by('date_created').reverse() context = { 'questions': questions, 'total': total, |