summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrabhu Ramachandran2017-10-05 19:54:59 +0530
committerGitHub2017-10-05 19:54:59 +0530
commit9249ba66edecb68d5d946425974625b743386635 (patch)
treefc926ac4420143ce79015f7919c276c5dbea18d9
parent52bb77f0afeec8233702dd854e5a2aa81b89855d (diff)
parent6aa8fbc417df79befd51eee53cfe87d6883dbfb3 (diff)
downloadonline_test-9249ba66edecb68d5d946425974625b743386635.tar.gz
online_test-9249ba66edecb68d5d946425974625b743386635.tar.bz2
online_test-9249ba66edecb68d5d946425974625b743386635.zip
Merge pull request #345 from prathamesh920/multiline-snippet
Changed snippet to textfield.
-rw-r--r--yaksh/models.py2
-rw-r--r--yaksh/static/yaksh/css/dashboard.css5
-rw-r--r--yaksh/templates/base.html2
3 files changed, 5 insertions, 4 deletions
diff --git a/yaksh/models.py b/yaksh/models.py
index 68bde48..2fcb767 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -350,7 +350,7 @@ class Question(models.Model):
tags = TaggableManager(blank=True)
# Snippet of code provided to the user.
- snippet = models.CharField(max_length=256, blank=True)
+ snippet = models.TextField(blank=True)
# user for particular question
user = models.ForeignKey(User, related_name="user")
diff --git a/yaksh/static/yaksh/css/dashboard.css b/yaksh/static/yaksh/css/dashboard.css
index 94005e1..20a0339 100644
--- a/yaksh/static/yaksh/css/dashboard.css
+++ b/yaksh/static/yaksh/css/dashboard.css
@@ -88,10 +88,11 @@ body {
float: right;
}
-.info {
+.logged_user_info {
height: 70px;
padding:0 5%;
position:absolute;
bottom:0;
width: 100%;
-} \ No newline at end of file
+}
+
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index efac26d..e7cc15c 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -53,7 +53,7 @@
{% endblock %}
</div>
<footer class="footer" id="footer_div">
- <div class="info" align="center">
+ <div class="logged_user_info" align="center">
{% block info %}
{% endblock %}
</div>