Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Text and design tweaks #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fredfalcon merged 1 commit into from
Sep 12, 2016
Merged

Text and design tweaks #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ django-storages==1.5.0
gunicorn==19.4.5
oauthlib==1.1.2
Pillow==3.3.1
psycopg2==2.6.1
#psycopg2==2.6.1
python-openid==2.2.5
pytz==2016.6.1
requests==2.11.1
Expand Down
4 changes: 2 additions & 2 deletions website/templates/base_full.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<!-- /.navbar-header -->
<ul class="nav navbar-top-links navbar-right">
<a href="https://chrome.google.com/webstore/detail/bugheist/bififchikfckcnblimmncopjinfgccme?hl=en" target="_new">
<img src="{% static 'img/ChromeWebStore_Badge_v2_496x150.png' %}" style="margin-right:200px;">
<img src="{% static 'img/ChromeWebStore_Badge_v2_496x150.png' %}" style="margin-right:200px; border:1px solid gray; border-radius:5px">
</a>
{% if user.is_authenticated %}
<li class="dropdown">
Expand All @@ -63,7 +63,7 @@
</li>
{% else %}
<a href="/accounts/login/">
<button class="btn btn-outline btn-danger" style="float:right; height:43px; font-size:24px;margin-top:3px; margin-right:15px;color:black;">
<button class="btn btn-default" style="float:right; height:43px; font-size:14px;margin-top:3px; margin-right:15px; color:#4252">
Login</button></a>
{% endif %}
<!-- /.dropdown -->
Expand Down
33 changes: 18 additions & 15 deletions website/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div id="page-wrapper">
<div class="row">
<div class="col-lg-6">
<h1 class="page-header">Get points for testing and finding issues.</h1>
<h1 class="page-header">Find bugs on the internet</h1>
</div>
<div class="col-lg-6">
<h1 class="page-header">
Expand All @@ -27,24 +27,24 @@ <h1 class="page-header">
<form role="form" action="/issue/" method="post" enctype="multipart/form-data" >
{% csrf_token %}
<div class="form-group">
<label>Find an issue on any website: e.g. example.com/page-with-issue
<label>Find a bug on any website
{% if not user.is_authenticated %}
<span style="color:#DD4351; margin-left:170px;">* login required</span>
<span style="color:#DD4252; margin-left:70px;">* login required</span>
{% endif %}
</label>{{form.url.errors}}
{% if request.GET.url %}
<input class="form-control" placeholder="Website URL" name="url" value="{{request.GET.url}}">
<input class="form-control" placeholder="www.testsite.com/bug-found" name="url" value="{{request.GET.url}}">
{% else %}
<input class="form-control" placeholder="Website URL" name="url" value="{{form.url.value|default:""}}">
<input class="form-control" placeholder="www.testsite.com/bug-found" name="url" value="{{form.url.value|default:""}}">
{% endif %}
</div>
<div class="form-group">
<label>Describe Issue:</label>{{form.description.errors}}
<textarea class="form-control" rows="3" placeholder="Describe the issue..." name="description">{{form.description.value|default:""}}</textarea>
<label>Describe the Bug</label>{{form.description.errors}}
<textarea class="form-control" rows="3" placeholder="I found a bug on this site and..." name="description">{{form.description.value|default:""}}</textarea>
</div>

<div class="form-group">
<label>Attach Screenshot (+2pts)</label>{{form.screenshot.errors}}
<label>Attach Screenshot</label>{{form.screenshot.errors}}
{% if request.GET.hash %}</br>
<img src="{{ MEDIA_URL }}uploads/{{request.GET.hash}}.png" height="100" style=" border: 1px solid #d43f3a;">
<input type="hidden" name="screenshot-hash" value="{{request.GET.hash}}">
Expand All @@ -54,7 +54,7 @@ <h1 class="page-header">
</div>

<div class="form-group">
<button type="submit" class="btn btn-default btn-danger" style="height:44px; font-size:24px;">Enter Issue (+1pt)</button>
<button type="submit" class="btn btn-default btn-danger" style="background:#dd4252; height:43px; font-size:14px;">Enter Issue</button>
{% if not user.is_authenticated %}
<a href="/accounts/login">
<button class="btn btn-default btn-caution" style="float:right;">
Expand All @@ -77,7 +77,7 @@ <h1 class="page-header">
</button>
</a>
<a href="/accounts/login">
<button class="btn btn-default btn-caution" style="float:right; height:43px; font-size:24px;"><i class="fa fa-sign-in fa-fw"></i>Login</button>
<button class="btn btn-default btn-caution" style="color:#bb4252; float:right; height:43px; font-size:14px;">Login</button>
</a>
{% endif %}
</div>
Expand All @@ -91,9 +91,7 @@ <h1 class="page-header">
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">Sponsored Bug Hunts
<a href="/start">
<button type="submit" class="btn btn-default btn-danger" style="height:40px; font-size:20px;margin-left:20px;">Start a Hunt</button>
</a>

</h1>

</div>
Expand Down Expand Up @@ -179,8 +177,13 @@ <h1 class="page-header">Sponsored Bug Hunts

</div>
<!-- /.row -->
<div class="row">
<div class="col-lg-12">
<div class="row">
</div>
<a href="/start">
<button type="submit" class="btn btn-default btn-caution" style="color:#dd4252; height:43px; font-size:14px;">Start a Hunt</button>
</a>
<div class="row">
<div class="col-lg-9">
<h1 class="page-header">Activity</h1>
</div>
<!-- /.col-lg-12 -->
Expand Down