Skip to content

Commit

Permalink
Moved issue reporting form to top navbar and minor changes. #181
Browse files Browse the repository at this point in the history
  • Loading branch information
souravbadami committed Jun 6, 2017
1 parent 52eb7f6 commit 0d84255
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 77 deletions.
6 changes: 3 additions & 3 deletions website/static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ body{
}

.navbar-default .tagline{
font-size: 18px;
font-size: 14px;
color: #999;
line-height: 54px;

line-height: 20px;
padding-left: 5px;
font-weight: 300;
}

Expand Down
49 changes: 48 additions & 1 deletion website/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0;">
<div class="navbar-header" style="z-index:4;">
<a class="navbar-brand" href="/" ><img src="{% static "img/logo-small-transparent.png" %}" style="margin-left:20px;"></a>
<span class="tagline">| Make the web a better place</span>
</div>

<ul class="nav navbar-top-links navbar-right">
Expand Down Expand Up @@ -87,6 +86,54 @@
+ Add to chrome
</a></li>
</ul>
<div class="col-md-12">
<div class="col-md-4">
<span class="tagline">Win prizes for reporting bugs</span><br>
<span class="tagline">We want everyone to love your website</span>
</div>
<div class="col-md-8" style="padding-right: 0px;">
<form class="navbar-form navbar-right" action="/issue/" method="post" enctype="multipart/form-data">
{% csrf_token %}
<div class="form-group">
{% if request.GET.url %}
<input class="form-control required" placeholder="www.testsite.com/bug-found" name="url" value="{{request.GET.url}}">
{% else %}
<input class="form-control required" placeholder="www.testsite.com/bug-found" name="url" value="{{form.url.value|default:""}}">
{% endif %}
{% if form.url.errors %}
<label id="description-error" class="error" for="description">{{form.url.errors}}</label>
{% endif %}
</div>
<div class="form-group">
<textarea data-required="true" class="form-control required" rows="3" placeholder="Describe bug issue" id="description" name="description" style="resize:vertical; height: 34px;" >{{form.description.value|default:""}}</textarea>

{% if form.description.errors %}
<label id="description-error" class="error" for="description">{{form.description.errors}}</label>
{% endif %}
</div>
<div class="form-group">
<!-- <label>Attach Screenshot</label> -->
{% if request.GET.hash %}</br>
<img src="{{ MEDIA_URL }}uploads/{{request.GET.hash}}.png" height="100" style=" border: 1px solid #d43f3a;">
<input type="hidden" class="required" name="screenshot-hash" value="{{request.GET.hash}}">
{% else %}
<span>
<input type="file" class="required" style="opacity: 0; width: 1px;height:1px;" id='${multipartFilePath}' name="screenshot" onchange="$(this).parent().find('span').html($(this).val().replace('C:\\fakepath\\', ''))" />
<button class="btn btn-primary" name="test_files" type="button" onclick="$(this).parent().find('input[type=file]').click();"> <i class="fa fa-upload" aria-hidden="true"></i> Upload Screenshot </button>
&nbsp;
<span class="badge badge-important" ></span>
</span>
{% endif %}
{% if form.screenshot.errors %}
<label id="description-error" class="error" for="description">{{form.screenshot.errors}}</label>
{% endif %}
</div>
<button type="submit" id="btn" class="btn btn-default">Report Bug</button>
<i class="fa fa-trophy" aria-hidden="true">+3</i>
</form>
</div>
</div>
</div>
</nav>
<div id="page-wrapper" >
<div class="container" >
Expand Down
76 changes: 3 additions & 73 deletions website/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,82 +12,12 @@
.ds-btn li a span small{width:100%; display:inline-block; text-align:left;}
.huge {overflow:auto;}
</style>
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">Win points for reporting bugs on any website!
<!-- <a id="chrome_ext" style="float:right;" href="https://chrome.google.com/webstore/detail/bugheist/bififchikfckcnblimmncopjinfgccme?hl=en" target="_new">
<img src="{% static 'img/chrome-button.png' %}" >
</a> --></h1>
</div>
</div>
<div class="row">
<div class="col-lg-6">
<form role="form" action="/issue/" method="post" id="form1" enctype="multipart/form-data" class="form">
{% csrf_token %}
<div class="form-group">
<label style="display:block">Find a bug on any website
{% if not user.is_authenticated %}
<span style="color:#DD4252; float:right">* login required</span>
{% endif %}
</label>
{% if request.GET.url %}
<input class="form-control required" placeholder="www.testsite.com/bug-found" name="url" value="{{request.GET.url}}">
{% else %}
<input class="form-control required" placeholder="www.testsite.com/bug-found" name="url" value="{{form.url.value|default:""}}">
{% endif %}
{% if form.url.errors %}
<label id="description-error" class="error" for="description">{{form.url.errors}}</label>
{% endif %}
</div>
<div class="form-group">

<label style="display:block">Describe the bug</label>
<textarea data-required="true" class="form-control required" rows="3" placeholder="I found a bug on a site." id="description" name="description" style="resize:vertical" >{{form.description.value|default:""}}</textarea>

{% if form.description.errors %}
<label id="description-error" class="error" for="description">{{form.description.errors}}</label>
{% endif %}
</div>

<div class="form-group">
<!-- <label>Attach Screenshot</label> -->
{% if request.GET.hash %}</br>
<img src="{{ MEDIA_URL }}uploads/{{request.GET.hash}}.png" height="100" style=" border: 1px solid #d43f3a;">
<input type="hidden" class="required" name="screenshot-hash" value="{{request.GET.hash}}">
{% else %}
<span>
<input type="file" class="required" style="opacity: 0; width: 1px;height:1px;" id='${multipartFilePath}' name="screenshot" onchange="$(this).parent().find('span').html($(this).val().replace('C:\\fakepath\\', ''))" />
<button class="btn btn-primary" name="test_files" type="button" onclick="$(this).parent().find('input[type=file]').click();"> <i class="fa fa-upload" aria-hidden="true"></i> Upload Screenshot </button>
&nbsp;
<span class="badge badge-important" ></span>
</span>
{% endif %}
{% if form.screenshot.errors %}
<label id="description-error" class="error" for="description">{{form.screenshot.errors}}</label>
{% endif %}
</div>

<div class="form-group">

<button type="submit" id="btn" class="btn btn-default btn-danger submit_button" style=" height:43px; font-size:14px;">Report Bug</button>

</form>

<label style="color:#dd4252; float:right"> Win +3 points!</label>
<br>

</div>
</form>
</div>

<div class="col-lg-6 col-xs-12">
<div class="row">
<center>
<span id="video_span">
<iframe width="560" height="315" id="video_iframe" src="https://www.youtube.com/embed/o-t6HDXjpP8?rel=0&amp;controls=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
<iframe width="700" height="315" id="video_iframe" src="https://www.youtube.com/embed/o-t6HDXjpP8?rel=0&amp;controls=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
</span>
</center>
</div>

</center>
</div>
<div class="col-lg-9">
<div class="row">
Expand Down

0 comments on commit 0d84255

Please sign in to comment.