diff options
| -rw-r--r-- | static/website/css/main.css | 8 | ||||
| -rw-r--r-- | static/website/templates/get-question.html | 15 | ||||
| -rw-r--r-- | website/views.py | 8 |
3 files changed, 16 insertions, 15 deletions
diff --git a/static/website/css/main.css b/static/website/css/main.css index b07b73c..54fbd3f 100644 --- a/static/website/css/main.css +++ b/static/website/css/main.css @@ -160,7 +160,7 @@ body { right: 0px; bottom: 0px; } -#content .reply .meta{ +#content .answer .meta{ position: absolute; right: 0px; bottom: 0px; @@ -226,9 +226,6 @@ table .title a { .saved { background: lightgreen; } -/* .answer-wrapper { */ -/* padding-left: 0px; */ -/* } */ #content .answer { position: relative; border-bottom: 1px solid #f5f5f5; @@ -239,9 +236,6 @@ table .title a { #content .answer .body { } #content .answer .user { - position: absolute; - right: 0px; - bottom: 0px; padding: 2px 7px; background: #f5f5f5; } diff --git a/static/website/templates/get-question.html b/static/website/templates/get-question.html index af9e4a2..b746f00 100644 --- a/static/website/templates/get-question.html +++ b/static/website/templates/get-question.html @@ -103,10 +103,17 @@ {{ answer.body|safe }} </div> - <span class="user"> - {{ answer.user }} + <span class="meta"> + <small> + <i> + {{ answer.date_created|date:"d-m-y" }}, {{ answer.date_created|time }} + </i> + </small> + + <span class="user"> + {{ answer.user }} + </span> </span> - {% if user|can_edit:answer %} <span class="modify" style="display:block"> <a class="edit btn btn-xs btn-info vs" href="#body{{ answer.id}}" data-target="body{{ answer.id }}">Edit</a> @@ -127,7 +134,7 @@ <span class="meta"> <small> <i> - {{ comment.date_created|date:"d-m-y" }}, {{ question.date_created|time }} + {{ comment.date_created|date:"d-m-y" }}, {{ comment.date_created|time }} </i> </small> diff --git a/website/views.py b/website/views.py index bc58b79..b6f9903 100644 --- a/website/views.py +++ b/website/views.py @@ -355,10 +355,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 |