From 176658c31968597b3157c14730a3d3fa4700128b Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Thu, 18 Oct 2018 10:04:24 +0200
Subject: [PATCH 01/14] Finished rating distribution.
---
backend/postings/models.py | 8 ++++++++
.../templates/postings/frontend/entity.html | 20 +++++++++++++++----
backend/postings/views.py | 2 ++
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/backend/postings/models.py b/backend/postings/models.py
index 0054bed..de4c017 100644
--- a/backend/postings/models.py
+++ b/backend/postings/models.py
@@ -40,6 +40,14 @@ class RateableEntity(models.Model):
return None
return rating_sum / reviews.count()
+ # Gets a 5-item list of the count of each rating.
+ def getRatingDistribution(self):
+ reviews = self.review_set.select_related()
+ distribution = [0, 0, 0, 0, 0]
+ for review in reviews:
+ distribution[review.rating-1] += 1
+ return distribution
+
# Simply returns the name as the string representation.
def __str__(self):
return self.name
diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html
index 000ecdf..52c58aa 100644
--- a/backend/postings/templates/postings/frontend/entity.html
+++ b/backend/postings/templates/postings/frontend/entity.html
@@ -9,11 +9,13 @@
{% block content %}
<div class="container entity">
- <div class="row">
- <div class="col-sm-6">
- <h1 class="muted text-center">{{ entity.name }} {{ entity.average }}</h1>
+ {% block entity_info %}
+ <div class="row">
+ <div class="col-sm-6">
+ <h1 class="muted text-center">{{ entity.name }}</h1>
+ </div>
</div>
- </div>
+ {% endblock %}
<hr>
<div class="row">
<div class="col-sm-3">
@@ -22,6 +24,16 @@
<h2 class="bold padding-bottom-7">{{ entity.average_rating|floatformat:"-2" }} <small>/ 5</small></h2>
</div>
</div>
+ {# Rating Distribution Display #}
+ <div class="col-sm-3">
+ <ul>
+ <li>5: {{ entity.rating_distribution.4 }}</li>
+ <li>4: {{ entity.rating_distribution.3 }}</li>
+ <li>3: {{ entity.rating_distribution.2 }}</li>
+ <li>2: {{ entity.rating_distribution.1 }}</li>
+ <li>1: {{ entity.rating_distribution.0 }}</li>
+ </ul>
+ </div>
</div>
<div class="row">
diff --git a/backend/postings/views.py b/backend/postings/views.py
index 7ffeeaf..bf668c8 100644
--- a/backend/postings/views.py
+++ b/backend/postings/views.py
@@ -49,6 +49,8 @@ def rateable_entity(request, entity_id):
# Set any auxiliary variables needed, like average rating.
# This MUST be done after categorizing the object above.
entity.average_rating = entity.getAverageRating()
+ entity.rating_distribution = entity.getRatingDistribution()
+ print(entity.rating_distribution)
except RateableEntity.DoesNotExist:
raise Http404("RateableEntity with id " + str(entity_id) + " does not exist.")
From 643e9ea1d39dfd30e7f6bc61189d8534a2711024 Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Thu, 18 Oct 2018 10:32:37 +0200
Subject: [PATCH 02/14] Added temporary user name shortcut for now.
---
backend/db.sqlite3 | Bin 79872 -> 79872 bytes
.../migrations/0005_review_author_name.py | 18 ++++++++++++++++++
backend/postings/models.py | 2 ++
.../templates/postings/frontend/entity.html | 4 ++--
.../templates/postings/frontend/review.html | 2 +-
backend/postings/views.py | 1 +
6 files changed, 24 insertions(+), 3 deletions(-)
create mode 100644 backend/postings/migrations/0005_review_author_name.py
diff --git a/backend/db.sqlite3 b/backend/db.sqlite3
index c569ecb7996f92af1140e34288f371bb93ae6de0..92f7380d513d38ab1a12c2d3571bbb25c167fd67 100644
GIT binary patch
delta 706
zcmYk2ZAepL6vv<QoVyL(rcS0;5ZzK@(|O08Yq}}aMiBVYBIu1J*a%4(ZZhABKC~M`
zk`UE}-5{YLr07f36fHlv5bDD|N(6n2kO@U7q)0+^##;Em|9Sg8=bZm@QrkjmTex3u
zS!axeNj)S^y8fWeOPA8lijGc|xI{DSdp*{J`Uvd;mojVED~R{-DCThi2e6xOppIwp
zBgQb6u?SDOnk^4NO8s4)Y!cB0V~O#Jk@&Uo!Q{}?$k22pzGD@Iq{X48jJ06REEuCN
zOnHU}xQ9FV1M`&W6RP>OhK#Vn1=D5;eaB5g8>ntB+nxzodzFsOGYs)r-Uo|po+ng`
zFuT0vhC0YBem!07;9K;sM#dei5o4vQrFBLhF^Db~+&QUU*=>eiHTY6gAMbuvzwKRA
z6MHx7<I&NfCi_%0d389NbaotTv4_u`vxm?3_qS*cH@p`ZgE}%~g*W?xP^IT{40D*q
z3s}o@e2&O84<5JbSVMQH)CgIYegB#<7@eFLP9z5lW!hzrU-HP3$8VSYU0zR@-0Ajv
z<aTdoCif?J#N1D&`$#g$O^LTK?F7APhT$-O%Mqe%hW?(cP$HE^2F<s{P>6v|TX(_-
zF%(b4Z;U1;#}!)zL5I>%gy|NTI|RLEf&s-xu*{~pTj9we*k&@avJ*;k5q@cfM~7gI
zks@7+p$KoeK&km((@cgrUu78MtK|C?M@1UY;u4(FY9(@bSAu%&rvy^DQhnJVo~2-)
g=5d2n`_%?b+G632PlAr;7CQ(J_jSuU84e780ap^jG5`Po
delta 612
zcmXv~OK1~O6n*#Imxd;peA<`@p-F3+rgjpsh(aiSW+Sv!Nrl9XAPPlFp$Ump!A(X%
z6j5xSbX*835)fSJ)I__m$-)*Ibfa{kn`99y=psTJL`8iw(tA0F`wr)Rc!d@#wAh`1
zr%DJpAuuXH1@d#TeL~#hZCJ$1g)an?W6!dq*pU)d;-tQeW6WQ`2yS2zPvZ!Ej~1M!
z6<no{bPsz-dBv6hjsLXeyk3+co5^38nmM08lbf8Kn!M=Zx9vVxH!cyUG5UY#Mf=$&
zz9zw6*v9Yp6`S~JJH^Zrb`P6I+2n}HA>LdL>FgzCzK!k1Z{nzTX11{{8kf)=H_U?u
zg$)Yw&*k7_R_S#!SR|;>>vUWc!!%>u4*Fu_c$b7D1RzZyZ6x=wHlzek*sh*SS^csM
z*DmwH%`lAfdcB9=YFK%8bB*8Ky2O>OBzFfHyb<>5^B;^kEwo0kh6|WRAFYWUuc%)8
zbEFT($`FIUSa!#tg>y;ELO*mkN(6KCE$xFFq{KZRijJhqMj(8}uP8vY`F>cD)E!PC
zMb#ct%0%F%r0$l4lu-98N+;1g1MomncR6gN^ROB=rPTqrC#iP3aLKCGlxCx#x+NMQ
zjI0xwChPPIjf$&RQ0+RU&B$<2V={!aH5m?|8c%Dlhv2C8)Q~<7K|nhsL);<$(|{Q~
T+OF#N>pNk-mzCLG_-*|MEik2K
diff --git a/backend/postings/migrations/0005_review_author_name.py b/backend/postings/migrations/0005_review_author_name.py
new file mode 100644
index 0000000..dae5770
--- /dev/null
+++ b/backend/postings/migrations/0005_review_author_name.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1.1 on 2018-10-18 08:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('postings', '0004_remove_reviewhelpfulvote_user'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='review',
+ name='author_name',
+ field=models.CharField(default='Anonymous', max_length=64),
+ ),
+ ]
diff --git a/backend/postings/models.py b/backend/postings/models.py
index de4c017..f6ca417 100644
--- a/backend/postings/models.py
+++ b/backend/postings/models.py
@@ -74,6 +74,8 @@ class Review(models.Model):
last_updated_date = models.DateTimeField(auto_now=True)
# A reference to the person who created this review.
author = models.ForeignKey('postings.User', on_delete=models.PROTECT, null=True, blank=True)
+ # TEMPORARY: Name of person who gave review.
+ author_name = models.CharField(max_length=64, default='Anonymous')
# Gets the total number of votes which marked this review as 'helpful'.
@property
diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html
index 52c58aa..3350487 100644
--- a/backend/postings/templates/postings/frontend/entity.html
+++ b/backend/postings/templates/postings/frontend/entity.html
@@ -55,8 +55,8 @@
{# Username input #}
<div class="form-group">
- <label for="name_input">Name:</label>
- <input type="text" class="form-control" placeholder="Name..." id="name_input">
+ <label for="name_input">Name (Optional):</label>
+ <input type="text" class="form-control" placeholder="Name..." id="name_input" name="name">
</div>
{# Title input #}
diff --git a/backend/postings/templates/postings/frontend/review.html b/backend/postings/templates/postings/frontend/review.html
index ab4f843..6e83a36 100644
--- a/backend/postings/templates/postings/frontend/review.html
+++ b/backend/postings/templates/postings/frontend/review.html
@@ -7,7 +7,7 @@
<span class="big-font glyphicon glyphicon-user img-rounded"></span>
{# Username #}
- <div class="review-block-name"><a href="#">Student</a></div>
+ <div class="review-block-name"><a href="#">{{ review.author_name }}</a></div>
{# Date at which review was posted. #}
<div class="review-block-date">{{ review.created_date|date:"j M, Y" }}<br/></div>
diff --git a/backend/postings/views.py b/backend/postings/views.py
index bf668c8..89c1225 100644
--- a/backend/postings/views.py
+++ b/backend/postings/views.py
@@ -71,6 +71,7 @@ def post_review(request):
if form.is_valid():
# Only if the request is a POST and the form is valid do we do anything.
rating = form.cleaned_data['rating']
+ name = form.cleaned_data['name']
title = form.cleaned_data['title']
content = form.cleaned_data['content']
entity_id = form.cleaned_data['entity_id']
From b666a135625c0414e47c5bc0db0234007df5a482 Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Thu, 18 Oct 2018 10:47:21 +0200
Subject: [PATCH 03/14] Added names.
---
backend/db.sqlite3 | Bin 79872 -> 79872 bytes
backend/postings/forms.py | 4 +++-
backend/postings/views.py | 8 +++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/backend/db.sqlite3 b/backend/db.sqlite3
index 92f7380d513d38ab1a12c2d3571bbb25c167fd67..2c112bb1fe9db45c079c3e36bfb0f65a8ebbc2a1 100644
GIT binary patch
delta 952
zcmZ{jL1@!Z7{~MaWsY@huG^~Ua6V9QLsybEZITw09t+}O7ZDHct$k@;mgdD|UD;uD
z;$4(oJbIFWc#whxQS>$nB8VV@2qMTX9_Gb^^WaO}Dt0cAfAaW;@Av)R_p-htukXlr
zr$#!GBwZ1A_qsQuqt26s7lW`0ORa?bAhz);Zla})pYfY#;F&bK|DhyJ9EbDB=ixH*
zs^N`*t}xn2w(bnCY@Qs3js&~#1HQvI*oH6g2|mC(cmo|#@)1nSAfaR=laWkBG9F1H
zlCjoy`;>fa7`FCne1?zk9^S%h*lLYFe+(P<Z%?<rzMNW^91-mtLGu!<!ANW~mP2hc
zFAx_|vz&}eL+8|DQ5rf?aEawGS|D6JEJrMvV-*;U#GzJNQH?oOnNtm{7<nz1&l)LR
z&6%e1e@9nTlX#VYHr6KN61r51AX5V+T;?^3t$^3?a?_^RqYd2Pfm<nh6<opr@o5DU
zyjb_jHs%&)UWE}aJOEMjl&KpzO+U;r^{dQv8L9abf}gzJ4JkX^_9|{cL?qN{ifEjO
za6&ELp?=jN)aN2SVchSJoXuylDKn#JO1h8Pb28eW$mMadud}le^0e4LmpB$>4zUWf
z;H=bxfDzlS+g6kQTPS1ZH8W+Tv$>pch@&fJ(c|7~jn_jjA%e}BT}sR<IFvBga>N9M
zFu`I1%Y89HU%dEYh`cXSQvlOqj2X?$nFoM-j;Z&6x1=#aRIhc3Fi%6Ddm&qNDGtjv
z=WYov+ss?qTVWRBD(96HF5ASbQe0cbH8IY=pkj2CL=UQ(GPG>k=-bzxlTo!^4+G*b
hBiN1puoCRH(FL>vvCBsv&LH{eStQGCSwX)Be*>)50L1_R
delta 203
zcmZqpz|!!6Wr8&CVFm^UKOpu5Vy1~2=8T6oChTQr&SuWuEXcBeY4QOsOU8!DzqksO
zg~ge*84L1@OEUA)i{pz@%Q92T`I&by@Bwu~!R9{hvK4%+%+DE^e=~n${>c1>`8m*-
ztIV69Z<l2ON<4*0yk>q1l(@{i`RRV?1PQ2iMj-72#NI$`0K|GgB`=sKX|OD3(P3oS
d&Z5Eihk3K0%6sO?3M_(?ez0z5HDLVB4gg=6IdA{~
diff --git a/backend/postings/forms.py b/backend/postings/forms.py
index 99d8065..ccd5446 100644
--- a/backend/postings/forms.py
+++ b/backend/postings/forms.py
@@ -9,4 +9,6 @@ class EntityReviewForm(forms.Form):
# The textual content of the review.
content = forms.CharField(widget=forms.Textarea)
# The id of the entity for which the review is created.
- entity_id = forms.IntegerField()
\ No newline at end of file
+ entity_id = forms.IntegerField()
+ # TEMPORARY name for author name.
+ name = forms.CharField(max_length=64, required=False)
\ No newline at end of file
diff --git a/backend/postings/views.py b/backend/postings/views.py
index 89c1225..51f26f4 100644
--- a/backend/postings/views.py
+++ b/backend/postings/views.py
@@ -71,10 +71,15 @@ def post_review(request):
if form.is_valid():
# Only if the request is a POST and the form is valid do we do anything.
rating = form.cleaned_data['rating']
- name = form.cleaned_data['name']
title = form.cleaned_data['title']
content = form.cleaned_data['content']
entity_id = form.cleaned_data['entity_id']
+
+ if 'name' in request.POST:
+ author_name = form.cleaned_data['name']
+ else:
+ author_name = None
+
try:
entity = RateableEntity.objects.get(pk=entity_id)
except RateableEntity.DoesNotExist:
@@ -83,6 +88,7 @@ def post_review(request):
# Creates the new Review object from the posted data.
review = Review.objects.create(
rating=rating,
+ author_name=author_name,
title=title,
content=content,
rateable_entity=entity
From 7814cf6626d1a8174f5c66f9127cb3e3cde989f2 Mon Sep 17 00:00:00 2001
From: ludger <ludgerlef@hotmail.com>
Date: Thu, 18 Oct 2018 10:49:54 +0200
Subject: [PATCH 04/14] Ratings updated
---
.../templates/postings/frontend/entity.html | 77 ++++++++++++++++++-
1 file changed, 76 insertions(+), 1 deletion(-)
diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html
index 3350487..7eb64a0 100644
--- a/backend/postings/templates/postings/frontend/entity.html
+++ b/backend/postings/templates/postings/frontend/entity.html
@@ -25,7 +25,9 @@
</div>
</div>
{# Rating Distribution Display #}
- <div class="col-sm-3">
+
+
+<!-- <div class="col-sm-3">
<ul>
<li>5: {{ entity.rating_distribution.4 }}</li>
<li>4: {{ entity.rating_distribution.3 }}</li>
@@ -33,9 +35,82 @@
<li>2: {{ entity.rating_distribution.1 }}</li>
<li>1: {{ entity.rating_distribution.0 }}</li>
</ul>
+ </div>-->
+
+ <div class="col-sm-3">
+ <h4>Rating breakdown</h4>
+ <div class="pull-left">
+ <div class="pull-left" style="width:35px; line-height:1;">
+ <div style="height:9px; margin:5px 0;">5 <span class="glyphicon glyphicon-star"></span></div>
+ </div>
+ <div class="pull-left" style="width:180px;">
+ <div class="progress" style="height:9px; margin:8px 0;">
+ <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="5" aria-valuemin="0" aria-valuemax="5" style="width: 0%">
+ <span class="sr-only">80% Complete (danger)</span>
+ </div>
+ </div>
+ </div>
+ <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.4 }}</div>
+ </div>
+ <div class="pull-left">
+ <div class="pull-left" style="width:35px; line-height:1;">
+ <div style="height:9px; margin:5px 0;">4 <span class="glyphicon glyphicon-star"></span></div>
+ </div>
+ <div class="pull-left" style="width:180px;">
+ <div class="progress" style="height:9px; margin:8px 0;">
+ <div class="progress-bar progress-bar-primary" role="progressbar" aria-valuenow="4" aria-valuemin="0" aria-valuemax="5" style="width: 33%">
+ <span class="sr-only">80% Complete (danger)</span>
+ </div>
+ </div>
+ </div>
+ <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.3 }}</div>
+ </div>
+ <div class="pull-left">
+ <div class="pull-left" style="width:35px; line-height:1;">
+ <div style="height:9px; margin:5px 0;">3 <span class="glyphicon glyphicon-star"></span></div>
+ </div>
+ <div class="pull-left" style="width:180px;">
+ <div class="progress" style="height:9px; margin:8px 0;">
+ <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="3" aria-valuemin="0" aria-valuemax="5" style="width: 33%">
+ <span class="sr-only">80% Complete (danger)</span>
+ </div>
+ </div>
+ </div>
+ <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.2 }}</div>
+ </div>
+ <div class="pull-left">
+ <div class="pull-left" style="width:35px; line-height:1;">
+ <div style="height:9px; margin:5px 0;">2 <span class="glyphicon glyphicon-star"></span></div>
+ </div>
+ <div class="pull-left" style="width:180px;">
+ <div class="progress" style="height:9px; margin:8px 0;">
+ <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="2" aria-valuemin="0" aria-valuemax="5" style="width: 33%">
+ <span class="sr-only">80% Complete (danger)</span>
+ </div>
+ </div>
+ </div>
+ <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.1 }}</div>
+ </div>
+ <div class="pull-left">
+ <div class="pull-left" style="width:35px; line-height:1;">
+ <div style="height:9px; margin:5px 0;">1 <span class="glyphicon glyphicon-star"></span></div>
+ </div>
+ <div class="pull-left" style="width:180px;">
+ <div class="progress" style="height:9px; margin:8px 0;">
+ <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="1" aria-valuemin="0" aria-valuemax="5" style="width: 0">
+ <span class="sr-only">80% Complete (danger)</span>
+ </div>
+ </div>
+ </div>
+ <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.0 }}</div>
+ </div>
</div>
</div>
+
+
+
+
<div class="row">
<div class="col-sm-7">
<hr/>
From f5dbbd974276b805be3af74a5ccf1dd3471c5192 Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Thu, 18 Oct 2018 11:06:55 +0200
Subject: [PATCH 05/14] Fixed distribution.
---
backend/postings/models.py | 21 ++++++++++--
.../templates/postings/frontend/entity.html | 32 ++++++-------------
backend/postings/views.py | 1 -
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/backend/postings/models.py b/backend/postings/models.py
index f6ca417..69af1a2 100644
--- a/backend/postings/models.py
+++ b/backend/postings/models.py
@@ -40,12 +40,27 @@ class RateableEntity(models.Model):
return None
return rating_sum / reviews.count()
- # Gets a 5-item list of the count of each rating.
+ # Gets a 5-item list of the count of each rating, and the percentage of total votes.
def getRatingDistribution(self):
reviews = self.review_set.select_related()
- distribution = [0, 0, 0, 0, 0]
+ distribution = [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]
+ review_count = len(reviews)
+
for review in reviews:
- distribution[review.rating-1] += 1
+ distribution[review.rating-1][0] += 1
+
+ max_val = 0
+ for rating_dist in distribution:
+ rating_dist[1] = (rating_dist[0] / review_count) * 100
+ if (rating_dist[1] > max_val):
+ max_val = rating_dist[1]
+
+ print(max_val)
+ print(distribution)
+ for rating_dist in distribution:
+ rating_dist[1] = (rating_dist[1] / max_val) * 100
+
+ print(distribution)
return distribution
# Simply returns the name as the string representation.
diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html
index 7eb64a0..3977c31 100644
--- a/backend/postings/templates/postings/frontend/entity.html
+++ b/backend/postings/templates/postings/frontend/entity.html
@@ -25,18 +25,6 @@
</div>
</div>
{# Rating Distribution Display #}
-
-
-<!-- <div class="col-sm-3">
- <ul>
- <li>5: {{ entity.rating_distribution.4 }}</li>
- <li>4: {{ entity.rating_distribution.3 }}</li>
- <li>3: {{ entity.rating_distribution.2 }}</li>
- <li>2: {{ entity.rating_distribution.1 }}</li>
- <li>1: {{ entity.rating_distribution.0 }}</li>
- </ul>
- </div>-->
-
<div class="col-sm-3">
<h4>Rating breakdown</h4>
<div class="pull-left">
@@ -45,12 +33,12 @@
</div>
<div class="pull-left" style="width:180px;">
<div class="progress" style="height:9px; margin:8px 0;">
- <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="5" aria-valuemin="0" aria-valuemax="5" style="width: 0%">
+ <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="5" aria-valuemin="0" aria-valuemax="5" style="width: {{ entity.rating_distribution.4.1 }}%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div>
- <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.4 }}</div>
+ <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.4.0 }}</div>
</div>
<div class="pull-left">
<div class="pull-left" style="width:35px; line-height:1;">
@@ -58,12 +46,12 @@
</div>
<div class="pull-left" style="width:180px;">
<div class="progress" style="height:9px; margin:8px 0;">
- <div class="progress-bar progress-bar-primary" role="progressbar" aria-valuenow="4" aria-valuemin="0" aria-valuemax="5" style="width: 33%">
+ <div class="progress-bar progress-bar-primary" role="progressbar" aria-valuenow="4" aria-valuemin="0" aria-valuemax="5" style="width: {{ entity.rating_distribution.3.1 }}%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div>
- <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.3 }}</div>
+ <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.3.0 }}</div>
</div>
<div class="pull-left">
<div class="pull-left" style="width:35px; line-height:1;">
@@ -71,12 +59,12 @@
</div>
<div class="pull-left" style="width:180px;">
<div class="progress" style="height:9px; margin:8px 0;">
- <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="3" aria-valuemin="0" aria-valuemax="5" style="width: 33%">
+ <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="3" aria-valuemin="0" aria-valuemax="5" style="width: {{ entity.rating_distribution.2.1 }}%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div>
- <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.2 }}</div>
+ <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.2.0 }}</div>
</div>
<div class="pull-left">
<div class="pull-left" style="width:35px; line-height:1;">
@@ -84,12 +72,12 @@
</div>
<div class="pull-left" style="width:180px;">
<div class="progress" style="height:9px; margin:8px 0;">
- <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="2" aria-valuemin="0" aria-valuemax="5" style="width: 33%">
+ <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="2" aria-valuemin="0" aria-valuemax="5" style="width: {{ entity.rating_distribution.1.1 }}%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div>
- <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.1 }}</div>
+ <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.1.0 }}</div>
</div>
<div class="pull-left">
<div class="pull-left" style="width:35px; line-height:1;">
@@ -97,12 +85,12 @@
</div>
<div class="pull-left" style="width:180px;">
<div class="progress" style="height:9px; margin:8px 0;">
- <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="1" aria-valuemin="0" aria-valuemax="5" style="width: 0">
+ <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="1" aria-valuemin="0" aria-valuemax="5" style="width: {{ entity.rating_distribution.0.1 }}%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div>
- <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.0 }}</div>
+ <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.0.0 }}</div>
</div>
</div>
</div>
diff --git a/backend/postings/views.py b/backend/postings/views.py
index 51f26f4..c98473d 100644
--- a/backend/postings/views.py
+++ b/backend/postings/views.py
@@ -50,7 +50,6 @@ def rateable_entity(request, entity_id):
# This MUST be done after categorizing the object above.
entity.average_rating = entity.getAverageRating()
entity.rating_distribution = entity.getRatingDistribution()
- print(entity.rating_distribution)
except RateableEntity.DoesNotExist:
raise Http404("RateableEntity with id " + str(entity_id) + " does not exist.")
From ef24a303e3e019acb08e72f1ab26dd144c299579 Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Thu, 18 Oct 2018 11:28:21 +0200
Subject: [PATCH 06/14] Fixed a divide by zero error.
---
backend/postings/models.py | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/backend/postings/models.py b/backend/postings/models.py
index 69af1a2..cc3ffdc 100644
--- a/backend/postings/models.py
+++ b/backend/postings/models.py
@@ -44,23 +44,21 @@ class RateableEntity(models.Model):
def getRatingDistribution(self):
reviews = self.review_set.select_related()
distribution = [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]
- review_count = len(reviews)
+ review_count = reviews.count()
for review in reviews:
distribution[review.rating-1][0] += 1
- max_val = 0
- for rating_dist in distribution:
- rating_dist[1] = (rating_dist[0] / review_count) * 100
- if (rating_dist[1] > max_val):
- max_val = rating_dist[1]
+ if (review_count > 0):
+ max_val = 0
+ for rating_dist in distribution:
+ rating_dist[1] = (rating_dist[0] / review_count) * 100
+ if (rating_dist[1] > max_val):
+ max_val = rating_dist[1]
- print(max_val)
- print(distribution)
- for rating_dist in distribution:
- rating_dist[1] = (rating_dist[1] / max_val) * 100
+ for rating_dist in distribution:
+ rating_dist[1] = (rating_dist[1] / max_val) * 100
- print(distribution)
return distribution
# Simply returns the name as the string representation.
From c5ee3d8ec9ea337bdd5fcb7d995c3fc86721ce24 Mon Sep 17 00:00:00 2001
From: ludger <ludgerlef@hotmail.com>
Date: Thu, 18 Oct 2018 11:43:32 +0200
Subject: [PATCH 07/14] Fixing layout
---
.../postings/static/postings/css/style.css | 17 ++++++++++++++++-
.../static/postings/css/style.css.map | 2 +-
.../postings/static/postings/css/style.scss | 19 ++++++++++++++++++-
.../templates/postings/frontend/entity.html | 3 ++-
.../templates/postings/frontend/results.html | 2 +-
5 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/backend/postings/static/postings/css/style.css b/backend/postings/static/postings/css/style.css
index 867e3fd..ffa0608 100644
--- a/backend/postings/static/postings/css/style.css
+++ b/backend/postings/static/postings/css/style.css
@@ -7,19 +7,31 @@
margin-bottom: 0;
overflow-y: hidden; }
-.fullcontainer {
+.box .fullcontainer {
display: flex;
align-items: center;
height: -webkit-calc(100vh - 50px);
height: -moz-calc(100vh - 50px);
height: calc(100vh - 50px); }
+.box3 .fullcontainer {
+ display: flex;
+ height: -webkit-calc(100vh - 50px);
+ height: -moz-calc(100vh - 50px);
+ height: calc(100vh - 50px); }
+
.fullcontainer h1 {
font-size: 60px; }
.fullcontainer h3 {
margin-bottom: 30px; }
+.whitebox {
+ background: white;
+ border-radius: 15px;
+ padding: 30px;
+ margin-top: 25px; }
+
.navbar-brand {
cursor: pointer; }
@@ -106,4 +118,7 @@ h2 {
.big-font {
font-size: 25px; }
+.box3 {
+ background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat; }
+
/*# sourceMappingURL=style.css.map */
diff --git a/backend/postings/static/postings/css/style.css.map b/backend/postings/static/postings/css/style.css.map
index 9fd736d..d7b4014 100644
--- a/backend/postings/static/postings/css/style.css.map
+++ b/backend/postings/static/postings/css/style.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,cAAe;EACb,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAIrB,aAAa;EACX,MAAM,EAAC,OAAO;;AAIhB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;;AAEpB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;;AAOhB,eAAgB;EACd,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,OAAO;EACd,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;;AAGhB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;;AAElB,OAAQ;EACN,UAAU,EAAE,KAAK;;AAGnB,YAAY;EACV,SAAS,EAAC,IAAI;;AAGhB,SAAS;EACP,SAAS,EAAC,IAAI",
+"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,mBAAoB;EAClB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,oBAAqB;EACnB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAGrB,SAAS;EACP,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,UAAU,EAAC,IAAI;;AAIjB,aAAa;EACX,MAAM,EAAC,OAAO;;AAIhB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;;AAEpB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;;AAOhB,eAAgB;EACd,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,OAAO;EACd,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;;AAGhB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;;AAElB,OAAQ;EACN,UAAU,EAAE,KAAK;;AAGnB,YAAY;EACV,SAAS,EAAC,IAAI;;AAGhB,SAAS;EACP,SAAS,EAAC,IAAI;;AAGhB,KAAK;EACH,UAAU,EAAE,0FAA0F",
"sources": ["style.scss"],
"names": [],
"file": "style.css"
diff --git a/backend/postings/static/postings/css/style.scss b/backend/postings/static/postings/css/style.scss
index d964ee3..aa8d346 100644
--- a/backend/postings/static/postings/css/style.scss
+++ b/backend/postings/static/postings/css/style.scss
@@ -8,13 +8,19 @@
margin-bottom: 0;
overflow-y:hidden;
}
-.fullcontainer {
+.box .fullcontainer {
display: flex;
align-items: center;
height: -webkit-calc(100vh - 50px);
height: -moz-calc(100vh - 50px);
height: calc(100vh - 50px);
}
+.box3 .fullcontainer {
+ display: flex;
+ height: -webkit-calc(100vh - 50px);
+ height: -moz-calc(100vh - 50px);
+ height: calc(100vh - 50px);
+}
.fullcontainer h1{
font-size: 60px;
}
@@ -22,6 +28,13 @@
margin-bottom: 30px;
}
+.whitebox{
+ background: white;
+ border-radius: 15px;
+ padding: 30px;
+ margin-top:25px;
+}
+
.navbar-brand{
cursor:pointer
@@ -124,4 +137,8 @@ h2 {
.big-font{
font-size:25px;
+}
+
+.box3{
+ background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat;
}
\ No newline at end of file
diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html
index 3977c31..81e784d 100644
--- a/backend/postings/templates/postings/frontend/entity.html
+++ b/backend/postings/templates/postings/frontend/entity.html
@@ -8,6 +8,7 @@
{% endblock %}
{% block content %}
+
<div class="container entity">
{% block entity_info %}
<div class="row">
@@ -114,6 +115,7 @@
<div class="row" id="post-review-box" style="display:none;">
<div class="col-md-12">
<form method="post" action="/reviews">
+ <div id="csrf-token">{% csrf_token %}</div>
<p class="text-right date"></p>
{# Username input #}
@@ -146,7 +148,6 @@
{# Hidden values that need to be posted with user content. #}
<input type="hidden" id="rating_input" name="rating" value="1">
- <div id="csrf-token">{% csrf_token %}</div>
<input type="hidden" name="entity_id" value="{{ entity.pk }}">
{# Submit the form #}
diff --git a/backend/postings/templates/postings/frontend/results.html b/backend/postings/templates/postings/frontend/results.html
index 60b5e1f..c4af21f 100644
--- a/backend/postings/templates/postings/frontend/results.html
+++ b/backend/postings/templates/postings/frontend/results.html
@@ -7,7 +7,7 @@
{% block content %}
<div class="fullcontainer container bootstrap snippet results">
<div class="row">
- <div class="col-lg-12">
+ <div class="col-lg-12 whitebox">
<div class="ibox float-e-margins ">
<div class="ibox-content">
<h2>
From 2a7e444ca9ecc819806085e16c02e5a696976dfe Mon Sep 17 00:00:00 2001
From: ludger <ludgerlef@hotmail.com>
Date: Thu, 18 Oct 2018 12:35:40 +0200
Subject: [PATCH 08/14] Fixing layout finally
---
.../postings/static/postings/css/style.css | 16 ++++++--
.../static/postings/css/style.css.map | 2 +-
.../postings/static/postings/css/style.scss | 14 ++++++-
.../templates/postings/frontend/entity.html | 38 +++++++++----------
.../templates/postings/frontend/results.html | 4 +-
.../templates/postings/frontend/review.html | 2 +-
6 files changed, 47 insertions(+), 29 deletions(-)
diff --git a/backend/postings/static/postings/css/style.css b/backend/postings/static/postings/css/style.css
index ffa0608..09d4a62 100644
--- a/backend/postings/static/postings/css/style.css
+++ b/backend/postings/static/postings/css/style.css
@@ -30,7 +30,8 @@
background: white;
border-radius: 15px;
padding: 30px;
- margin-top: 25px; }
+ margin-top: 25px;
+ margin-bottom: 25px; }
.navbar-brand {
cursor: pointer; }
@@ -51,8 +52,7 @@ body {
color: #FFF; }
.rating-block {
- background-color: #FAFAFA;
- border: 1px solid #EFEFEF;
+ float: right;
padding: 15px 15px 20px 15px;
border-radius: 3px; }
@@ -67,7 +67,8 @@ body {
border: 1px solid #EFEFEF;
padding: 15px;
border-radius: 3px;
- margin-bottom: 15px; }
+ margin-bottom: 15px;
+ float: right; }
.review-block-name {
font-size: 12px;
@@ -98,6 +99,10 @@ body {
font-size: 24px;
color: #d17581; }
+.selfcenter {
+ margin: 0 auto;
+ float: inherit; }
+
.hr-line-dashed {
border-top: 1px dashed #E7EAEC;
color: #ffffff;
@@ -121,4 +126,7 @@ h2 {
.box3 {
background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat; }
+.box2 {
+ background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat; }
+
/*# sourceMappingURL=style.css.map */
diff --git a/backend/postings/static/postings/css/style.css.map b/backend/postings/static/postings/css/style.css.map
index d7b4014..fbab319 100644
--- a/backend/postings/static/postings/css/style.css.map
+++ b/backend/postings/static/postings/css/style.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,mBAAoB;EAClB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,oBAAqB;EACnB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAGrB,SAAS;EACP,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,UAAU,EAAC,IAAI;;AAIjB,aAAa;EACX,MAAM,EAAC,OAAO;;AAIhB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;;AAEpB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;;AAOhB,eAAgB;EACd,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,OAAO;EACd,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;;AAGhB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;;AAElB,OAAQ;EACN,UAAU,EAAE,KAAK;;AAGnB,YAAY;EACV,SAAS,EAAC,IAAI;;AAGhB,SAAS;EACP,SAAS,EAAC,IAAI;;AAGhB,KAAK;EACH,UAAU,EAAE,0FAA0F",
+"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,mBAAoB;EAClB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAG5B,oBAAqB;EACnB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAGrB,SAAS;EACP,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,UAAU,EAAC,IAAI;EACf,aAAa,EAAC,IAAI;;AAIpB,aAAa;EACX,MAAM,EAAC,OAAO;;AAIhB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,KAAK,EAAC,KAAK;EACX,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;EAClB,KAAK,EAAE,KAAK;;AAEd,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;;AAOhB,WAAW;EACT,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,OAAO;;AAGhB,eAAgB;EACd,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,OAAO;EACd,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;;AAGhB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;;AAElB,OAAQ;EACN,UAAU,EAAE,KAAK;;AAGnB,YAAY;EACV,SAAS,EAAC,IAAI;;AAGhB,SAAS;EACP,SAAS,EAAC,IAAI;;AAGhB,KAAK;EACH,UAAU,EAAE,0FAA0F;;AAExG,KAAK;EACH,UAAU,EAAE,0FAA0F",
"sources": ["style.scss"],
"names": [],
"file": "style.css"
diff --git a/backend/postings/static/postings/css/style.scss b/backend/postings/static/postings/css/style.scss
index aa8d346..5a205fa 100644
--- a/backend/postings/static/postings/css/style.scss
+++ b/backend/postings/static/postings/css/style.scss
@@ -15,6 +15,7 @@
height: -moz-calc(100vh - 50px);
height: calc(100vh - 50px);
}
+
.box3 .fullcontainer {
display: flex;
height: -webkit-calc(100vh - 50px);
@@ -33,6 +34,7 @@
border-radius: 15px;
padding: 30px;
margin-top:25px;
+ margin-bottom:25px;
}
@@ -59,8 +61,7 @@ body {
color:#FFF;
}
.rating-block{
- background-color:#FAFAFA;
- border:1px solid #EFEFEF;
+ float:right;
padding:15px 15px 20px 15px;
border-radius:3px;
}
@@ -77,6 +78,7 @@ body {
padding:15px;
border-radius:3px;
margin-bottom:15px;
+ float: right;
}
.review-block-name{
font-size:12px;
@@ -115,6 +117,11 @@ body {
}
+.selfcenter{
+ margin: 0 auto;
+ float: inherit;
+}
+
.hr-line-dashed {
border-top: 1px dashed #E7EAEC;
color: #ffffff;
@@ -141,4 +148,7 @@ h2 {
.box3{
background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat;
+}
+.box2{
+ background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat;
}
\ No newline at end of file
diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html
index 81e784d..85e4979 100644
--- a/backend/postings/templates/postings/frontend/entity.html
+++ b/backend/postings/templates/postings/frontend/entity.html
@@ -9,89 +9,89 @@
{% block content %}
-<div class="container entity">
+<div class="fullcontainer">
+<div class="container entity whitebox">
{% block entity_info %}
<div class="row">
- <div class="col-sm-6">
+ <div class="col-sm-8 selfcenter">
<h1 class="muted text-center">{{ entity.name }}</h1>
</div>
</div>
{% endblock %}
<hr>
<div class="row">
- <div class="col-sm-3">
+ <div class="col-sm-5">
<div class="rating-block" data-rating="{{ entity.average_rating|floatformat:"-2" }}">
- <h4>Average user rating</h4>
+ <h2>Average user rating</h2>
<h2 class="bold padding-bottom-7">{{ entity.average_rating|floatformat:"-2" }} <small>/ 5</small></h2>
</div>
</div>
{# Rating Distribution Display #}
- <div class="col-sm-3">
+ <div class="col-sm-5">
<h4>Rating breakdown</h4>
<div class="pull-left">
<div class="pull-left" style="width:35px; line-height:1;">
<div style="height:9px; margin:5px 0;">5 <span class="glyphicon glyphicon-star"></span></div>
</div>
- <div class="pull-left" style="width:180px;">
+ <div class="pull-left" style="width:250px;">
<div class="progress" style="height:9px; margin:8px 0;">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="5" aria-valuemin="0" aria-valuemax="5" style="width: {{ entity.rating_distribution.4.1 }}%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div>
- <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.4.0 }}</div>
+
</div>
<div class="pull-left">
<div class="pull-left" style="width:35px; line-height:1;">
<div style="height:9px; margin:5px 0;">4 <span class="glyphicon glyphicon-star"></span></div>
</div>
- <div class="pull-left" style="width:180px;">
+ <div class="pull-left" style="width:250px;">
<div class="progress" style="height:9px; margin:8px 0;">
<div class="progress-bar progress-bar-primary" role="progressbar" aria-valuenow="4" aria-valuemin="0" aria-valuemax="5" style="width: {{ entity.rating_distribution.3.1 }}%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div>
- <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.3.0 }}</div>
+
</div>
<div class="pull-left">
<div class="pull-left" style="width:35px; line-height:1;">
<div style="height:9px; margin:5px 0;">3 <span class="glyphicon glyphicon-star"></span></div>
</div>
- <div class="pull-left" style="width:180px;">
+ <div class="pull-left" style="width:250px;">
<div class="progress" style="height:9px; margin:8px 0;">
<div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="3" aria-valuemin="0" aria-valuemax="5" style="width: {{ entity.rating_distribution.2.1 }}%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div>
- <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.2.0 }}</div>
+
</div>
<div class="pull-left">
<div class="pull-left" style="width:35px; line-height:1;">
<div style="height:9px; margin:5px 0;">2 <span class="glyphicon glyphicon-star"></span></div>
</div>
- <div class="pull-left" style="width:180px;">
+ <div class="pull-left" style="width:250px;">
<div class="progress" style="height:9px; margin:8px 0;">
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="2" aria-valuemin="0" aria-valuemax="5" style="width: {{ entity.rating_distribution.1.1 }}%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div>
- <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.1.0 }}</div>
+
</div>
<div class="pull-left">
<div class="pull-left" style="width:35px; line-height:1;">
<div style="height:9px; margin:5px 0;">1 <span class="glyphicon glyphicon-star"></span></div>
</div>
- <div class="pull-left" style="width:180px;">
+ <div class="pull-left" style="width:250px;">
<div class="progress" style="height:9px; margin:8px 0;">
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="1" aria-valuemin="0" aria-valuemax="5" style="width: {{ entity.rating_distribution.0.1 }}%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div>
- <div class="pull-right" style="margin-left:10px;">{{ entity.rating_distribution.0.0 }}</div>
</div>
</div>
</div>
@@ -101,10 +101,10 @@
<div class="row">
- <div class="col-sm-7">
+ <div class="col-sm-11">
<hr/>
<div id="review_container" class="review-block">
- <div class="row" style="margin-top:40px;">
+ <div class="row" style="margin-top:10px;">
<div class="col-md-12">
<div class="well-sm">
<div class="text-right">
@@ -139,7 +139,7 @@
<div class="text-right">
{# Rating input with star boxes. #}
<div class="stars starrr" data-rating="0"></div>
-
+
{# Close the input form with this anchor-link. #}
<a class="btn btn-danger btn-sm" href="#" id="close-review-box" style="display:none; margin-right: 10px;">
<span class="glyphicon glyphicon-remove"></span>
@@ -168,7 +168,7 @@
</div>
</div>
-
+</div>
{% endblock %}
diff --git a/backend/postings/templates/postings/frontend/results.html b/backend/postings/templates/postings/frontend/results.html
index c4af21f..ed32394 100644
--- a/backend/postings/templates/postings/frontend/results.html
+++ b/backend/postings/templates/postings/frontend/results.html
@@ -5,7 +5,7 @@
{% endblock %}
{% block content %}
-<div class="fullcontainer container bootstrap snippet results">
+
<div class="row">
<div class="col-lg-12 whitebox">
<div class="ibox float-e-margins ">
@@ -46,5 +46,5 @@
</div>
</div>
</div>
-</div>
+
{% endblock %}
\ No newline at end of file
diff --git a/backend/postings/templates/postings/frontend/review.html b/backend/postings/templates/postings/frontend/review.html
index 6e83a36..f5cbd2e 100644
--- a/backend/postings/templates/postings/frontend/review.html
+++ b/backend/postings/templates/postings/frontend/review.html
@@ -17,7 +17,7 @@
<div class="clearfix"></div>
</div>
<div class="review-block-title">{{ review.title }}</div>
- <div class="review-block-description">{{ review.content }}</div>
+ <div class="review-block-description"><p>{{ review.content }}</p></div>
<div id="review-votes-{{ review.pk }}" class="js_votes" data-review_id="{{ review.pk }}">
<div class="review-vote-buttons">
From be403d2b13ff120d008bff7debb4c983cab5931d Mon Sep 17 00:00:00 2001
From: ludger <ludgerlef@hotmail.com>
Date: Thu, 18 Oct 2018 12:40:48 +0200
Subject: [PATCH 09/14] Fixing layout finally
---
backend/postings/templates/postings/frontend/entity.html | 2 +-
backend/postings/templates/postings/frontend/review.html | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html
index 85e4979..167e42f 100644
--- a/backend/postings/templates/postings/frontend/entity.html
+++ b/backend/postings/templates/postings/frontend/entity.html
@@ -101,7 +101,7 @@
<div class="row">
- <div class="col-sm-11">
+ <div class="col-sm-12">
<hr/>
<div id="review_container" class="review-block">
<div class="row" style="margin-top:10px;">
diff --git a/backend/postings/templates/postings/frontend/review.html b/backend/postings/templates/postings/frontend/review.html
index f5cbd2e..f424a40 100644
--- a/backend/postings/templates/postings/frontend/review.html
+++ b/backend/postings/templates/postings/frontend/review.html
@@ -16,8 +16,8 @@
<div class="review-block-rate" data-rating="{{ review.rating }}">
<div class="clearfix"></div>
</div>
- <div class="review-block-title">{{ review.title }}</div>
- <div class="review-block-description"><p>{{ review.content }}</p></div>
+ <div class="review-block-title"> <p class="h3">{{ review.title }}</p></div>
+ <div class="review-block-description"><p class="h4">{{ review.content }}</p></div>
<div id="review-votes-{{ review.pk }}" class="js_votes" data-review_id="{{ review.pk }}">
<div class="review-vote-buttons">
From cd54bb8ac7fcca8159824cfd09f05e7933ab03e0 Mon Sep 17 00:00:00 2001
From: ludger <ludgerlef@hotmail.com>
Date: Thu, 18 Oct 2018 12:42:52 +0200
Subject: [PATCH 10/14] Fixing layout finally
---
backend/db.sqlite3 | Bin 79872 -> 79872 bytes
.../postings/static/postings/css/style.scss | 2 +-
.../templates/postings/frontend/review.html | 4 ++--
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/backend/db.sqlite3 b/backend/db.sqlite3
index 2c112bb1fe9db45c079c3e36bfb0f65a8ebbc2a1..4f609b8c78bf85dc3f57c170bdc3554096932b16 100644
GIT binary patch
delta 227
zcmZqpz|!!6Wr8&0sfjYqtfv_CWHxL}(d1?n+uX-pwnB!7`3M8^Z{}~zADQ1UKWBc#
ze3$tK^JV69%qN+TY!+l$!pzFT%m7q;a=SGPQ1Ky{;s?yPnXfTlWIn@uocR#*Yv!jw
z#fz9HPi|J;{B*y3f)G0+GXrxiGcVH$CNswEj6sadlLcAc`umD;F))fsIyy3NiZZ8V
z=BK8mCIXR>fuV)2p@FWUg@S>lm5G6sp|PH&shO#<1uhv2lgiAD#O*<fjO)YzM`1&s
delta 136
zcmZqpz|!!6Wr8&0$%!(~tS1?CKknF=qRGuDy19?LY=smz^GOEg-^|~bKQg~ze$M=e
z`7ZMf=F80Im``pNWLeF;`Q&zM7NDZzFhviTZ!=$GzQ}xr`8e}y=BGeKE14(HXqMaj
jbiaIp02^Zv19L4iFVhMpGsf+VK|pCc#_d6hjO)Yz`cN?x
diff --git a/backend/postings/static/postings/css/style.scss b/backend/postings/static/postings/css/style.scss
index 5a205fa..56d9754 100644
--- a/backend/postings/static/postings/css/style.scss
+++ b/backend/postings/static/postings/css/style.scss
@@ -23,7 +23,7 @@
height: calc(100vh - 50px);
}
.fullcontainer h1{
- font-size: 60px;
+ font-size: 50px;
}
.fullcontainer h3{
margin-bottom: 30px;
diff --git a/backend/postings/templates/postings/frontend/review.html b/backend/postings/templates/postings/frontend/review.html
index f424a40..39d12ba 100644
--- a/backend/postings/templates/postings/frontend/review.html
+++ b/backend/postings/templates/postings/frontend/review.html
@@ -7,10 +7,10 @@
<span class="big-font glyphicon glyphicon-user img-rounded"></span>
{# Username #}
- <div class="review-block-name"><a href="#">{{ review.author_name }}</a></div>
+ <div class="review-block-name"><p class="h5"><a href="#">{{ review.author_name }}</a></p></div>
{# Date at which review was posted. #}
- <div class="review-block-date">{{ review.created_date|date:"j M, Y" }}<br/></div>
+ <div class="review-block-date"><p class="h5">{{ review.created_date|date:"j M, Y" }}</p><br/></div>
</div>
<div class="col-sm-9">
<div class="review-block-rate" data-rating="{{ review.rating }}">
From cd60c04b6f17627e4e6177a87899266d98897575 Mon Sep 17 00:00:00 2001
From: ludger <ludgerlef@hotmail.com>
Date: Thu, 18 Oct 2018 12:43:07 +0200
Subject: [PATCH 11/14] Fixing layout finally
---
backend/postings/static/postings/css/style.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/postings/static/postings/css/style.css b/backend/postings/static/postings/css/style.css
index 09d4a62..5283c6e 100644
--- a/backend/postings/static/postings/css/style.css
+++ b/backend/postings/static/postings/css/style.css
@@ -21,7 +21,7 @@
height: calc(100vh - 50px); }
.fullcontainer h1 {
- font-size: 60px; }
+ font-size: 50px; }
.fullcontainer h3 {
margin-bottom: 30px; }
From 874e60a7971980e387bd680e7cb9c502cc518ff0 Mon Sep 17 00:00:00 2001
From: ludger <ludgerlef@hotmail.com>
Date: Thu, 18 Oct 2018 13:02:07 +0200
Subject: [PATCH 12/14] bug fixing
---
backend/postings/static/postings/css/style.css | 3 ++-
backend/postings/static/postings/css/style.css.map | 2 +-
backend/postings/static/postings/css/style.scss | 1 +
backend/postings/static/postings/js/main.js | 2 +-
backend/postings/templates/postings/frontend/results.html | 4 ++--
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/backend/postings/static/postings/css/style.css b/backend/postings/static/postings/css/style.css
index 5283c6e..ebb9f75 100644
--- a/backend/postings/static/postings/css/style.css
+++ b/backend/postings/static/postings/css/style.css
@@ -68,7 +68,8 @@ body {
padding: 15px;
border-radius: 3px;
margin-bottom: 15px;
- float: right; }
+ float: right;
+ width: 100%; }
.review-block-name {
font-size: 12px;
diff --git a/backend/postings/static/postings/css/style.css.map b/backend/postings/static/postings/css/style.css.map
index fbab319..f25b872 100644
--- a/backend/postings/static/postings/css/style.css.map
+++ b/backend/postings/static/postings/css/style.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,mBAAoB;EAClB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAG5B,oBAAqB;EACnB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAGrB,SAAS;EACP,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,UAAU,EAAC,IAAI;EACf,aAAa,EAAC,IAAI;;AAIpB,aAAa;EACX,MAAM,EAAC,OAAO;;AAIhB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,KAAK,EAAC,KAAK;EACX,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;EAClB,KAAK,EAAE,KAAK;;AAEd,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;;AAOhB,WAAW;EACT,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,OAAO;;AAGhB,eAAgB;EACd,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,OAAO;EACd,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;;AAGhB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;;AAElB,OAAQ;EACN,UAAU,EAAE,KAAK;;AAGnB,YAAY;EACV,SAAS,EAAC,IAAI;;AAGhB,SAAS;EACP,SAAS,EAAC,IAAI;;AAGhB,KAAK;EACH,UAAU,EAAE,0FAA0F;;AAExG,KAAK;EACH,UAAU,EAAE,0FAA0F",
+"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,mBAAoB;EAClB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAG5B,oBAAqB;EACnB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAGrB,SAAS;EACP,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,UAAU,EAAC,IAAI;EACf,aAAa,EAAC,IAAI;;AAIpB,aAAa;EACX,MAAM,EAAC,OAAO;;AAIhB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,KAAK,EAAC,KAAK;EACX,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;EAClB,KAAK,EAAE,KAAK;EACZ,KAAK,EAAC,IAAI;;AAEZ,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;;AAOhB,WAAW;EACT,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,OAAO;;AAGhB,eAAgB;EACd,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,OAAO;EACd,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;;AAGhB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;;AAElB,OAAQ;EACN,UAAU,EAAE,KAAK;;AAGnB,YAAY;EACV,SAAS,EAAC,IAAI;;AAGhB,SAAS;EACP,SAAS,EAAC,IAAI;;AAGhB,KAAK;EACH,UAAU,EAAE,0FAA0F;;AAExG,KAAK;EACH,UAAU,EAAE,0FAA0F",
"sources": ["style.scss"],
"names": [],
"file": "style.css"
diff --git a/backend/postings/static/postings/css/style.scss b/backend/postings/static/postings/css/style.scss
index 56d9754..bb6eb86 100644
--- a/backend/postings/static/postings/css/style.scss
+++ b/backend/postings/static/postings/css/style.scss
@@ -79,6 +79,7 @@ body {
border-radius:3px;
margin-bottom:15px;
float: right;
+ width:100%;
}
.review-block-name{
font-size:12px;
diff --git a/backend/postings/static/postings/js/main.js b/backend/postings/static/postings/js/main.js
index 64bda14..1ff3fa2 100644
--- a/backend/postings/static/postings/js/main.js
+++ b/backend/postings/static/postings/js/main.js
@@ -65,7 +65,7 @@ $(function(){
});
///Set the stars for the average
- if(i>avg){
+ if((isNaN(parseFloat(avg)))||i>avg){
$(".rating-block").append("<button value=" + i + " id = \"star" + i +"\" type=\"button\" class=\"btn btn-default btn-grey btn-sm\" aria-label=\"Left Align\">\n" +
" <span class=\"glyphicon glyphicon-star\" aria-hidden=\"true\"></span>\n" +
" </button>");
diff --git a/backend/postings/templates/postings/frontend/results.html b/backend/postings/templates/postings/frontend/results.html
index ed32394..a221189 100644
--- a/backend/postings/templates/postings/frontend/results.html
+++ b/backend/postings/templates/postings/frontend/results.html
@@ -5,7 +5,7 @@
{% endblock %}
{% block content %}
-
+<div class="fullcontainer container bootstrap snippet results">
<div class="row">
<div class="col-lg-12 whitebox">
<div class="ibox float-e-margins ">
@@ -32,7 +32,7 @@
{% for entity in results %}
<div class="hr-line-dashed"></div>
<div class="search-result">
- <h3><a href="/rateables/{{ entity.pk }}">{{ entity.name }}</a></h3>
+ <h2><a href="/rateables/{{ entity.pk }}">{{ entity.name }}</a></h2>
<h4> Reviews: {{entity.review_set.all|length}}</h4>
<span class="toright glyphicon glyphicon-icon-comments"></span>
From 439dfef614d02712836229c1b5e80b930ef3e95c Mon Sep 17 00:00:00 2001
From: ludger <ludgerlef@hotmail.com>
Date: Thu, 18 Oct 2018 14:12:47 +0200
Subject: [PATCH 13/14] Making frontpage larger
---
backend/postings/static/postings/css/style.css | 9 +++++++++
backend/postings/static/postings/css/style.css.map | 2 +-
backend/postings/static/postings/css/style.scss | 14 ++++++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/backend/postings/static/postings/css/style.css b/backend/postings/static/postings/css/style.css
index ebb9f75..21b6be6 100644
--- a/backend/postings/static/postings/css/style.css
+++ b/backend/postings/static/postings/css/style.css
@@ -26,6 +26,15 @@
.fullcontainer h3 {
margin-bottom: 30px; }
+.box .fullcontainer h1 {
+ font-size: 90px; }
+.box .fullcontainer h3 {
+ margin-bottom: 45px; }
+.box .form-control {
+ height: 68px; }
+.box .btn {
+ font-size: 38px; }
+
.whitebox {
background: white;
border-radius: 15px;
diff --git a/backend/postings/static/postings/css/style.css.map b/backend/postings/static/postings/css/style.css.map
index f25b872..c226ebb 100644
--- a/backend/postings/static/postings/css/style.css.map
+++ b/backend/postings/static/postings/css/style.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,mBAAoB;EAClB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAG5B,oBAAqB;EACnB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAGrB,SAAS;EACP,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,UAAU,EAAC,IAAI;EACf,aAAa,EAAC,IAAI;;AAIpB,aAAa;EACX,MAAM,EAAC,OAAO;;AAIhB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,KAAK,EAAC,KAAK;EACX,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;EAClB,KAAK,EAAE,KAAK;EACZ,KAAK,EAAC,IAAI;;AAEZ,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;;AAOhB,WAAW;EACT,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,OAAO;;AAGhB,eAAgB;EACd,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,OAAO;EACd,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;;AAGhB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;;AAElB,OAAQ;EACN,UAAU,EAAE,KAAK;;AAGnB,YAAY;EACV,SAAS,EAAC,IAAI;;AAGhB,SAAS;EACP,SAAS,EAAC,IAAI;;AAGhB,KAAK;EACH,UAAU,EAAE,0FAA0F;;AAExG,KAAK;EACH,UAAU,EAAE,0FAA0F",
+"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,mBAAoB;EAClB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAG5B,oBAAqB;EACnB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAGnB,sBAAiB;EACf,SAAS,EAAE,IAAI;AAEjB,sBAAiB;EACf,aAAa,EAAE,IAAI;AAErB,kBAAa;EACX,MAAM,EAAC,IAAI;AAEb,SAAI;EACF,SAAS,EAAC,IAAI;;AAIlB,SAAS;EACP,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,UAAU,EAAC,IAAI;EACf,aAAa,EAAC,IAAI;;AAIpB,aAAa;EACX,MAAM,EAAC,OAAO;;AAIhB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,KAAK,EAAC,KAAK;EACX,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;EAClB,KAAK,EAAE,KAAK;EACZ,KAAK,EAAC,IAAI;;AAEZ,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;;AAOhB,WAAW;EACT,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,OAAO;;AAGhB,eAAgB;EACd,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,OAAO;EACd,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;;AAGhB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;;AAElB,OAAQ;EACN,UAAU,EAAE,KAAK;;AAGnB,YAAY;EACV,SAAS,EAAC,IAAI;;AAGhB,SAAS;EACP,SAAS,EAAC,IAAI;;AAGhB,KAAK;EACH,UAAU,EAAE,0FAA0F;;AAExG,KAAK;EACH,UAAU,EAAE,0FAA0F",
"sources": ["style.scss"],
"names": [],
"file": "style.css"
diff --git a/backend/postings/static/postings/css/style.scss b/backend/postings/static/postings/css/style.scss
index bb6eb86..91c8f8e 100644
--- a/backend/postings/static/postings/css/style.scss
+++ b/backend/postings/static/postings/css/style.scss
@@ -28,6 +28,20 @@
.fullcontainer h3{
margin-bottom: 30px;
}
+.box{
+ .fullcontainer h1{
+ font-size: 90px;
+ }
+ .fullcontainer h3{
+ margin-bottom: 45px;
+ }
+ .form-control{
+ height:68px;
+ }
+ .btn{
+ font-size:38px;
+ }
+}
.whitebox{
background: white;
From 980c6a7ac9fa0b236cd6440aedbdd5b558b4feea Mon Sep 17 00:00:00 2001
From: ludger <ludgerlef@hotmail.com>
Date: Thu, 18 Oct 2018 14:16:11 +0200
Subject: [PATCH 14/14] Making frontpage larger
---
backend/postings/templates/postings/frontend/entity.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html
index 167e42f..6a6d489 100644
--- a/backend/postings/templates/postings/frontend/entity.html
+++ b/backend/postings/templates/postings/frontend/entity.html
@@ -20,14 +20,14 @@
{% endblock %}
<hr>
<div class="row">
- <div class="col-sm-5">
+ <div class="col-sm-6">
<div class="rating-block" data-rating="{{ entity.average_rating|floatformat:"-2" }}">
<h2>Average user rating</h2>
<h2 class="bold padding-bottom-7">{{ entity.average_rating|floatformat:"-2" }} <small>/ 5</small></h2>
</div>
</div>
{# Rating Distribution Display #}
- <div class="col-sm-5">
+ <div class="col-sm-6">
<h4>Rating breakdown</h4>
<div class="pull-left">
<div class="pull-left" style="width:35px; line-height:1;">