fixed some minor html interpretation and tinymce issues

This commit is contained in:
Timo Tomasini 2016-03-19 17:56:32 +01:00
parent bcfd9f67aa
commit 0c6d28b0ff
6 changed files with 19 additions and 7 deletions

View file

@ -93,3 +93,4 @@ class UserAnswerOptions(models.Model):
def __unicode__(self): def __unicode__(self):
return str(self.user_answer) + " - " + str(self.option) return str(self.user_answer) + " - " + str(self.option)

View file

@ -24,9 +24,10 @@
<img src="{{ settings.logo }}" class="mainLogo"> <img src="{{ settings.logo }}" class="mainLogo">
<h1>{{ settings.title }}</h1> <h1>{{ settings.title }}</h1>
<hr/> <hr/>
<p>{{ settings.message_access_denied }}</p> <p>{{ settings.message_access_denied|safe }}</p>
</div> </div>
</body> </body>
</html> </html>

View file

@ -77,7 +77,7 @@
</ul> </ul>
<p id="enable-{{ question.id }}" data-value="{{ question.enable }}" data-questionId= "{{ question.id }}" class="message_already_answered hide"> <p id="enable-{{ question.id }}" data-value="{{ question.enable }}" data-questionId= "{{ question.id }}" class="message_already_answered hide">
{{ settings.message_already_answered }} {{ settings.message_already_answered|safe }}
</p> </p>
<div class="container"> <div class="container">
@ -95,10 +95,11 @@
<div class="margin50" ></div> <div class="margin50" ></div>
<hr/> <hr/>
{{ settings.footer }} {{ settings.footer|safe }}
</div> </div>
<script type="text/javascript" src="{% static 'js/elearning.js' %}"></script> <script type="text/javascript" src="{% static 'js/elearning.js' %}"></script>
</body> </body>
</html> </html>

View file

@ -34,4 +34,5 @@
</div> </div>
</body> </body>
</html> </html>

View file

@ -93,4 +93,5 @@
</div> </div>
</body> </body>
</html> </html>

View file

@ -118,3 +118,10 @@ USE_TZ = True
STATIC_URL = '/static/' STATIC_URL = '/static/'
STATIC_ROOT = '/var/www/tkupek_elearning/elearning/static/' STATIC_ROOT = '/var/www/tkupek_elearning/elearning/static/'
# TinyMCE settings
TINYMCE_DEFAULT_CONFIG = {
'theme': "simple",
'custom_undo_redo_levels': 20,
'width': 500,
}