diff --git a/commentaries/views.py b/commentaries/views.py index 9aeb06009d0fae098576982fe65f5b792f700848..a7028b1caa21d53869da760c22b9dd79b0127f9d 100644 --- a/commentaries/views.py +++ b/commentaries/views.py @@ -15,6 +15,7 @@ from .forms import * from comments.models import Comment, AuthorReply from comments.forms import CommentForm +from contributors.forms import AuthenticationForm from ratings.forms import CommentRatingForm, AuthorReplyRatingForm, CommentaryRatingForm ################ @@ -47,7 +48,8 @@ def request_commentary(request): form = RequestCommentaryForm() return render(request, 'commentaries/request_commentary.html', {'form': form}) else: # user is not authenticated: - return render(request, 'contributors/login.html') + form = AuthenticationForm() + return render(request, 'contributors/login.html', {'form': form}) def request_commentary_ack(request): return render(request, 'commentaries/request_commentary_ack.html') diff --git a/comments/models.py b/comments/models.py index 96fa7c120c5af8e94ab4556eb5609d7dbd96d9b4..b9d11fbe4ba3078d7d3522a7d82f50f55c25cb14 100644 --- a/comments/models.py +++ b/comments/models.py @@ -27,11 +27,6 @@ COMMENT_CATEGORIES = ( ('SUG', 'suggestion for further work'), ) -class CommentCategory(models.Model): - category = models.CharField(max_length=3, default='REM') - - def __str__ (self): - return self.category class Comment(models.Model): @@ -47,7 +42,7 @@ class Comment(models.Model): submission = models.ForeignKey(Submission, blank=True, null=True) in_reply_to = models.ForeignKey('self', blank=True, null=True) author = models.ForeignKey(Contributor) -# categories = models.ManyToManyField(CommentCategory) + # Categories: is_rem = models.BooleanField(default=False, verbose_name='remark') is_que = models.BooleanField(default=False, verbose_name='question') is_ans = models.BooleanField(default=False, verbose_name='answer to question') @@ -82,6 +77,7 @@ class AuthorReply(models.Model): # -1: rejected (unclear) # -2: rejected (incorrect) # -3: rejected (not useful) + # -4: not from author status = models.SmallIntegerField(default=0) commentary = models.ForeignKey(Commentary, blank=True, null=True) submission = models.ForeignKey(Submission, blank=True, null=True) diff --git a/scipost/static/scipost/SciPost.css b/scipost/static/scipost/SciPost.css index 597925f4903c85854dfd582f053c0e1a5ce38b62..f99b36964921f6cdcc5db85f913ef958f3569230 100644 --- a/scipost/static/scipost/SciPost.css +++ b/scipost/static/scipost/SciPost.css @@ -200,11 +200,17 @@ header h1 { } header a { text-decoration: none; +// border: 1px solid white; } header a:hover { color: #ffffff; // text-decoration: underline; } +header img { + margin: 0px; + padding: 0px; +// border: 1px solid white; +} nav { // background-color:#cccccc; diff --git a/scipost/templates/scipost/header.html b/scipost/templates/scipost/header.html index f0d6a400386b76fa4afd0acdc9609435224c866a..d3e0bb4e64b540c9be1aeed95c295e9be66e59f1 100644 --- a/scipost/templates/scipost/header.html +++ b/scipost/templates/scipost/header.html @@ -1,3 +1,4 @@ +{% load staticfiles %} <header> <div class="row"> <div class="col-3">