From 6dce25767952b963121e9af01802149c2e0a2d56 Mon Sep 17 00:00:00 2001 From: Raghav Jajodia Date: Tue, 6 Jun 2017 12:11:40 +0530 Subject: [PATCH 1/7] Modify tweet and share btn of issue-page --- website/templates/issue.html | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/website/templates/issue.html b/website/templates/issue.html index 8e2a8ec1e1..cfa697c4e7 100644 --- a/website/templates/issue.html +++ b/website/templates/issue.html @@ -43,20 +43,26 @@
-

{{object.description}} {{object.views}}

- {{object.url}}
-
- {{object.url}} +
+ -
- Share -
+ + Share +
-
+
From 1ccb4f323b0ff52be87cd9d25629aa6b812b7607 Mon Sep 17 00:00:00 2001 From: Raghav Jajodia Date: Tue, 6 Jun 2017 12:44:47 +0530 Subject: [PATCH 2/7] Improve design of issue-panel in /issue --- website/static/css/style.css | 14 ++++++++++--- website/templates/issue.html | 39 +++++++++++++++++------------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/website/static/css/style.css b/website/static/css/style.css index a0bb1ba569..740a60b9b3 100644 --- a/website/static/css/style.css +++ b/website/static/css/style.css @@ -231,14 +231,12 @@ a:hover{ height:120px; overflow:hidden; } - .activity-strip .activity-strip-section { overflow:hidden; float:left; width:80%; display:inline-flex; } - .activity-strip-section > div { margin-left: 20px; font-size: 20px; @@ -259,4 +257,14 @@ a:hover{ .activity-screenshot img { width: 100px; height: 95%; -} \ No newline at end of file +} +.panel-image { + width: 100%; + height: 30%; + margin-bottom: -20px; +} +.panel-footer .btn { + width: 100%; + width: -moz-available; + width: -webkit-fill-available; +} diff --git a/website/templates/issue.html b/website/templates/issue.html index cfa697c4e7..c229a52f37 100644 --- a/website/templates/issue.html +++ b/website/templates/issue.html @@ -64,30 +64,27 @@

-
-
-
Issue on: +
+
+
-
-
- - -
-
-
{{object.domain_title}}
-
{{issue_count}} issues
-
-
+ +
-
-
- - - - -
+
+ Issue on: {{object.domain_name}} + +
# of issues - {{issue_count}}

+
+ + + + +
+
+
From 9d5b2e774f299d48767d1d7c94555fad2ef89430 Mon Sep 17 00:00:00 2001 From: Raghav Jajodia Date: Tue, 6 Jun 2017 13:05:01 +0530 Subject: [PATCH 3/7] Improve design of second-panel in /issue --- website/templates/issue.html | 47 +++++++++++++++++------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/website/templates/issue.html b/website/templates/issue.html index c229a52f37..1e2f1cf532 100644 --- a/website/templates/issue.html +++ b/website/templates/issue.html @@ -86,34 +86,31 @@

-
-
-
Found {{object.created}} by: +
+
+
-
-
- {% if object.user.socialaccount_set.all.0.get_avatar_url %} - - {% else %} - {% gravatar object.user.email 75 %} - {% endif %} -
-
-
{{object.user.username}}
-
{{users_score}} points
-
-
+ {% if object.user.socialaccount_set.all.0.get_avatar_url %} + + {% else %} + + {% endif %}
-
-
- - - - - -
+
+ Found {{object.created}} by: + {{object.user.username}} +
Points - {{users_score}} Points

+
+ + + + + +
+
+
From c80e6409b196ace97cdfa1294d5f8c1031371a0f Mon Sep 17 00:00:00 2001 From: Raghav Jajodia Date: Tue, 6 Jun 2017 13:29:17 +0530 Subject: [PATCH 4/7] Improve design of third-panel in /issue --- website/static/css/style.css | 14 ++++++++++++++ website/templates/issue.html | 32 +++++++++++++++----------------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/website/static/css/style.css b/website/static/css/style.css index 740a60b9b3..7d745d1ae3 100644 --- a/website/static/css/style.css +++ b/website/static/css/style.css @@ -268,3 +268,17 @@ a:hover{ width: -moz-available; width: -webkit-fill-available; } +.panel-issue { + display: inline-flex; +} +.panel-issue-title { + color: white; + font-size: 46px; + padding-left: 10px; +} +.issue-panel { + height:295px; +} +.issue-panel .panel-footer { + padding-top: 20px; +} \ No newline at end of file diff --git a/website/templates/issue.html b/website/templates/issue.html index 1e2f1cf532..93839a280b 100644 --- a/website/templates/issue.html +++ b/website/templates/issue.html @@ -112,36 +112,34 @@

-
-
-
-
-
- - - - {% if object.status == "closed" %} - - {% else %} - +
+
+
+ + + + {% if object.status == "closed" %} + + {% else %} + {% endif %} +
+ {{object.status|default:"Open"|title}} +
-
-
{{object.status|default:"open"|title}}
+
{% csrf_token %} - +
-
-
From 6da43982ab8c7e7c4467d5b73ca1814965a266ca Mon Sep 17 00:00:00 2001 From: Raghav Jajodia Date: Tue, 6 Jun 2017 13:57:52 +0530 Subject: [PATCH 5/7] Improve design of fourth-panel in /issue --- website/static/css/style.css | 10 ++++-- website/templates/issue.html | 66 ++++++++++++------------------------ 2 files changed, 29 insertions(+), 47 deletions(-) diff --git a/website/static/css/style.css b/website/static/css/style.css index 7d745d1ae3..5c4fe4a4ab 100644 --- a/website/static/css/style.css +++ b/website/static/css/style.css @@ -276,9 +276,13 @@ a:hover{ font-size: 46px; padding-left: 10px; } -.issue-panel { - height:295px; -} .issue-panel .panel-footer { padding-top: 20px; +} +.issue-panels .panel { + max-height: 300px; +} +.issue-panels .panel .operations .btn { + margin-top: 5px; + margin-bottom: 5px; } \ No newline at end of file diff --git a/website/templates/issue.html b/website/templates/issue.html index 93839a280b..73c56775fb 100644 --- a/website/templates/issue.html +++ b/website/templates/issue.html @@ -63,7 +63,7 @@

-
+
@@ -141,56 +141,34 @@

-
-
-
-
-
-
-
- {% if browser_family %} -
- - {% with 'img/browser-logos/'|add:browser_family|add:'/'|add:browser_family|add:'_64x64.png'|lower as image_static %} - - {{browser_version}} - {% endwith %} -
- -
{{os_family}} {{os_version}}
- {% endif %} -
-
- +
+
+
+ {% if browser_family %} + {% with 'img/browser-logos/'|add:browser_family|add:'/'|add:browser_family|add:'_64x64.png'|lower as image_static %} + + {% endwith %} + {% endif %}
-
- {% if object.domain.github %} +
+
+ {{browser_version}} | {{os_family}} | {{os_version}} +
+
+ {% if object.domain.github %} + {% if request.user.is_superuser or request.user == object.user %} + Add to Github + {% endif %} + {% endif %} {% if request.user.is_superuser or request.user == object.user %} -

- - - -

+ Edit + Delete {% endif %} - {% endif %} - {% if request.user.is_superuser or request.user == object.user %} -

- - - -

-

- - - -

- {% endif %} -
-
+
Screenshot: From 55a3e4e3531eaa3449fe4f8575d697a33872c75c Mon Sep 17 00:00:00 2001 From: Raghav Jajodia Date: Tue, 6 Jun 2017 14:06:08 +0530 Subject: [PATCH 6/7] Improve design of /issue page --- website/static/css/style.css | 4 ++ website/templates/issue.html | 121 ++++++++++++++++------------------- 2 files changed, 60 insertions(+), 65 deletions(-) diff --git a/website/static/css/style.css b/website/static/css/style.css index 5c4fe4a4ab..422181126c 100644 --- a/website/static/css/style.css +++ b/website/static/css/style.css @@ -285,4 +285,8 @@ a:hover{ .issue-panels .panel .operations .btn { margin-top: 5px; margin-bottom: 5px; +} +.screenshot-img { + border: 1px solid #d43f3a; + width:90%; } \ No newline at end of file diff --git a/website/templates/issue.html b/website/templates/issue.html index 73c56775fb..be765b40e6 100644 --- a/website/templates/issue.html +++ b/website/templates/issue.html @@ -63,7 +63,7 @@

-
+
@@ -114,91 +114,82 @@

-
- - - - {% if object.status == "closed" %} - - {% else %} - - {% endif %} +
+ + + + {% if object.status == "closed" %} + + {% else %} + + {% endif %} + - - -
- {{object.status|default:"Open"|title}} + +
+ {{object.status|default:"Open"|title}} +
+
+
+
+ {% csrf_token %} + + + +
-
-
-
- {% csrf_token %} - - - -
-
- -
-
-
- {% if browser_family %} - {% with 'img/browser-logos/'|add:browser_family|add:'/'|add:browser_family|add:'_64x64.png'|lower as image_static %} - - {% endwith %} - {% endif %} -
-
-
- {{browser_version}} | {{os_family}} | {{os_version}} +
+
+
+ {% if browser_family %} + {% with 'img/browser-logos/'|add:browser_family|add:'/'|add:browser_family|add:'_64x64.png'|lower as image_static %} + + {% endwith %} + {% endif %}
-
- {% if object.domain.github %} +
+
+ {{browser_version}} | {{os_family}} | {{os_version}} +
+
+ {% if object.domain.github %} + {% if request.user.is_superuser or request.user == object.user %} + Add to Github + {% endif %} + {% endif %} {% if request.user.is_superuser or request.user == object.user %} - Add to Github + Edit + Delete {% endif %} - {% endif %} - {% if request.user.is_superuser or request.user == object.user %} - Edit - Delete - {% endif %} +
-
-
- Screenshot: -
- -
-
-
- OCR Results: -
-
- {{object.get_ocr}} +
+

Screenshot:

+
+
+
+

OCR Results:

+
{{object.get_ocr}}
-
-
-

Comments

- +

Comments

{% for comment in all_comment %} -
{{ comment.created_date }}
{{ comment.author }}

{{ comment.text|linebreaks }}

{% empty %} -

Be the first to comment.

+

Be the first to comment.

{% endfor %} -Add comment - - +

+ Add comment +

{% endblock %} From bbdff34d950151dec938193535aff9ca604778d3 Mon Sep 17 00:00:00 2001 From: Raghav Jajodia Date: Tue, 6 Jun 2017 14:21:40 +0530 Subject: [PATCH 7/7] Improve design of comments page --- website/templates/add_comment_to_post.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/website/templates/add_comment_to_post.html b/website/templates/add_comment_to_post.html index fc0f95f2ff..92b50bfd02 100644 --- a/website/templates/add_comment_to_post.html +++ b/website/templates/add_comment_to_post.html @@ -1,7 +1,11 @@ +{% extends "base.html" %} {% block content %} -

New comment

-
{% csrf_token %} - {{ form.as_p }} - -
+
+

New comment

+
+ {% csrf_token %} +
+ +
+
{% endblock %} \ No newline at end of file