Skip to content

Commit

Permalink
Merge branch 'master' of github.com:hacklabr/timtec
Browse files Browse the repository at this point in the history
  • Loading branch information
bgola committed Nov 14, 2013
2 parents afeb8e6 + b74ebe4 commit f577ad7
Show file tree
Hide file tree
Showing 3 changed files with 240 additions and 149 deletions.
3 changes: 3 additions & 0 deletions Makefile
Expand Up @@ -86,3 +86,6 @@ reset_db:
python manage.py reset_db --router=default --noinput -U $(USER)
python manage.py syncdb --noinput
python manage.py migrate --noinput

messages:
python manage.py makemessages -a -d django
4 changes: 2 additions & 2 deletions core/templates/course.html
Expand Up @@ -55,13 +55,13 @@ <h1 class="course-name bottom top">{{course.name}}</h1>
<section class="course-info row">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
<div class="page-header-double">
<h3 class="top"><i class="icon-double-angle-right"></i> {% trans "Course Application" %}</h3>
<h3 class="top"><i class="icon-double-angle-right"></i> {% trans "Why do this course?" %}</h3>
</div>
<p>{{ course.application|timtec_markdown }}</p>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
<div class="page-header-double">
<h3 class="top"><i class="icon-double-angle-right"></i> {% trans "Requirements" %}</h3>
<h3 class="top"><i class="icon-double-angle-right"></i> {% trans "What do I have to know?" %}</h3>
</div>
<p>{{ course.requirement|timtec_markdown }}</p>
</div>
Expand Down

0 comments on commit f577ad7

Please sign in to comment.