diff options
| -rw-r--r-- | forums/wsgi.py | 4 | ||||
| -rw-r--r-- | static/website/css/main.css | 2 | ||||
| -rw-r--r-- | static/website/js/thread-user.js | 6 | ||||
| -rw-r--r-- | static/website/templates/ajax-tutorials.html | 1 | ||||
| -rw-r--r-- | website/views.py | 10 |
5 files changed, 13 insertions, 10 deletions
diff --git a/forums/wsgi.py b/forums/wsgi.py index 3a52e8b..728eed4 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/css/main.css b/static/website/css/main.css index ab5226f..4f1f495 100644 --- a/static/website/css/main.css +++ b/static/website/css/main.css @@ -151,7 +151,7 @@ table .title a { } .saving, .saved { position: fixed; - z-index: 10; + z-index: 2000; left: 45%; top: 45%; padding: 5px 10px; diff --git a/static/website/js/thread-user.js b/static/website/js/thread-user.js index 189d126..e44448a 100644 --- a/static/website/js/thread-user.js +++ b/static/website/js/thread-user.js @@ -100,7 +100,7 @@ $(document).ready(function() { $question_second_range = $('#id_second_range'); $question_details_ok.click(function() { - console.log($(this).data("qid")); + $saving.show(); var category = $question_category.val(); var tutorial = $question_tutorial.val(); var minute_range = $question_minute_range.val(); @@ -141,7 +141,9 @@ $(document).ready(function() { } else { $(".second_range").hide() } - console.log(data); + $saving.hide(); + $saved.show(); + $saved.fadeOut("slow"); } }); }); diff --git a/static/website/templates/ajax-tutorials.html b/static/website/templates/ajax-tutorials.html index 7429f59..63e6000 100644 --- a/static/website/templates/ajax-tutorials.html +++ b/static/website/templates/ajax-tutorials.html @@ -2,3 +2,4 @@ {% for tutorial in tutorials %} <option value="{{ tutorial.tutorial_name }}">{{ tutorial.tutorial_name }}</option> {% endfor %} +<option value="General">General Question</option> diff --git a/website/views.py b/website/views.py index 38bd973..4c9d8dd 100644 --- a/website/views.py +++ b/website/views.py @@ -13,7 +13,7 @@ from website.forms import NewQuestionForm, ReplyQuesitionForm from website.helpers import get_video_info admins = ( - 99999, + 9, 4376, 4915, 14595, 12329, 22467, 5518 ) categories = ( @@ -251,10 +251,10 @@ def ajax_duration(request): Q(tutorial_detail_id=video_detail.id), Q(language='English') ) - #video_path = '/Sites/spoken_tutorial_org/sites/default/files/{0}'.format( - # video_resource.tutorial_video - #) - video_path = '/home/cheese/test-video.ogv' + video_path = '/Sites/spoken_tutorial_org/sites/default/files/{0}'.format( + video_resource.tutorial_video + ) + #video_path = '/home/cheese/test-video.ogv' video_info = get_video_info(video_path) # convert minutes to 1 if less than 0 |