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

Skip to content

Fix Navbar and report a bug form UI #981

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 4 commits into from
Nov 23, 2022
Merged

Fix Navbar and report a bug form UI #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42e180d
Code restructured | moved nav code to navbar.html
AtmegaBuzz Nov 19, 2022
39dc375
Navbar modified | created navbar.css
AtmegaBuzz Nov 19, 2022
c092084
hover styling added
AtmegaBuzz Nov 19, 2022
ebbdd2a
fix Report Bug page form
AtmegaBuzz Nov 19, 2022
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
73 changes: 73 additions & 0 deletions website/static/css/navbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
.user-menu, .login-menu {
height: 80px !important;
display: flex !important;
justify-content: center !important;
align-items: center !important;
margin-right: 30px;
}

.user-menu img {
height: 30px;
width: 30px;
border-radius: 50px;
margin-right: 5px;
}

.login-menu li{
margin-right: 20px;
}

.login-menu li a{
padding: 9px 25px 9px 25px;
border-radius: 1px;
background-color: red;
text-decoration: none;
color: white;
font-size: 1.5rem;
font-weight: 700;
}

.navbar-form{
height: 60px !important;
width: 40%;
}


#nav-search{
display: flex;
align-items: center;
width: 100%;
height: 100%;
}

#nav-search input{
margin-right: 10px;
height: 35px;
padding: 5px;
width: 250px;
font-size: 1.3rem;
}
#nav-search a{
height: 100%;
}

.nav-report-bug{
border-radius: 1px;
background-color: red;
height: 38px !important;
padding: 8px 25px 8px 25px;
font-size: 1.4rem;
font-weight: 700;
color: white !important;
text-decoration: none !important;
cursor: pointer;
}

.nav-report-bug:hover{
background-color: rgb(196, 0, 0);
}

.nav{
align-items: center !important;
justify-content: center !important;
}
8 changes: 0 additions & 8 deletions website/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,14 +215,6 @@ a:hover {

}

.user-menu {
float: right;
}

.user-menu img {
height: 25px;
width: 25px;
}

@media only screen and (max-width: 1200px) {
.panel-footer li {
Expand Down
198 changes: 12 additions & 186 deletions website/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<meta property="og:description"
content="{% block og_description %}Bugheist allows anyone to submit an issue from any website. For example if you saw a broken button on Amazon.com you can report the issue on Bugheist and then get a point! The more bugs you find the more points you get. Bugs can be verified for extra points and companies can get involved and help out.{% endblock %}" />
<meta property="og:type" content="website" />

<link href="{% static "vendor/bootstrap/css/bootstrap.css" %}" rel="stylesheet">
<link href="{% static "css/style.css" %}" rel="stylesheet">
<link href="{% static "css/lightbox.min.css" %}" rel="stylesheet">
Expand All @@ -29,14 +30,20 @@
<link href="{% static "css/main.css" %}" rel="stylesheet" type="text/css">
<link href="{% static "css/text-slider.css" %}" rel="stylesheet" type="text/css">
<link href="{% static "css/activity.css" %}" rel="stylesheet" type="text/css">
<link href="{% static "css/navbar.css" %}" rel="stylesheet" type="text/css">

<script src="{% static "vendor/jquery/jquery.min.js" %}"></script>
<script src="{% static "js/notify.js" %}"></script>
<script src="{% static "js/text-slider.js" %}"></script>
<script src="{% static "js/embed.js" %}"></script>

<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->

{% block head %}
{% endblock %}

{% block style %}
{% endblock %}
Expand All @@ -46,158 +53,11 @@
</head>

<body>
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">
<img src="{% static "img/logo-small-transparent.png" %}">
</a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Menu
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="https://chrome.google.com/webstore/detail/bugheist/bififchikfckcnblimmncopjinfgccme?hl=en"
target="_new">{% trans "Add to chrome" %}</a></li>
<li><a href="/social">{% trans "Social" %}</a></li>
<li><a href="/start">{% trans "Bug Hunt" %}</a></li>
</ul>
</li>
<li><a href="/start" class="sponsor-hunt">{% trans "Start a Bug Hunt" %}</a></li>

{% if request.user.is_authenticated %}
<li class="dropdown user-menu">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
{% if request.user.userprofile.avatar %}
<img src="{{ request.user.userprofile.avatar }}">
{% elif request.user.socialaccount_set.all.0.get_avatar_url %}
<img src="{{ request.user.socialaccount_set.all.0.get_avatar_url }}">
{% else %}
{% gravatar request.user.email 20 %}
{% endif %}
{{ request.user.username }} ({{ request.user|score|default:"0" }} Pts) <i
class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu dropdown-user">
<li>
<a href="/accounts/profile/">
<i class="fa fa-user fa-fw"></i> {% trans "User Profile" %}
</a>
</li>
<li>
<a href="/accounts/password/change/">
<i class="fa fa-gear fa-fw"></i> {% trans "Change Password" %}
</a>
</li>
<li>
<a href="/invite/">
<i class="fa fa-paper-plane fa-fw"></i> {% trans "Invite Friends" %}
</a>
</li>
<li class="divider"></li>
<li>
<a href="/accounts/logout/">
<i class="fa fa-sign-out fa-fw"></i> {% trans "Logout" %}
</a>
</li>
</ul>
</li>
{% else %}
<li><a href="/accounts/signup">{% trans "Signup" %}</a></li>
<li><a href="/accounts/login" data-toggle="modal">{% trans "Login" %}</a></li>
{% endif %}
</ul>

<form class="navbar-form navbar-right" action="/search" method="get">
<div class="form-group">
<a href="/report/" class="btn btn-primary ">Report a Bug</a>
</div>
<div class="form-group">
<input type="text" name="query" class="form-control" placeholder="{% trans "Search" %}">
</div>
<button type="submit" class="btn btn-default">
<i class="fa fa-search"></i>
</button>
</form>


{% comment %} navbar {% endcomment %}
{% include "navbar.html" %}
{% comment %} navbar {% endcomment %}


{% comment %} <ul class="nav navbar-nav navbar-right">
<li>
<p class="navbar-text">Found a bug ?</p>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-intro="Click here to report any kind of bug."
data-step="1" data-toggle="dropdown"><b>Report here</b> <span class="caret"></span></a>
<ul id="issue-dp" class="dropdown-menu">
<li>
<div class="row">
<div class="col-md-12">
<form class="form" action="/issue/" method="post" enctype="multipart/form-data">
{% csrf_token %}
<div class="form-group">
<input class="form-control required"
placeholder="www.testsite.com/bug-found" name="url"
value="{{ form.url.value|default:"" }}">
</div>
<div class="form-group">
<textarea data-required="true" name="description" id="description"
class="form-control required" rows="3"
placeholder="{% trans "Describe bug issue" %}">{{ form.description.value|default:"" }}</textarea>
</div>
<div class="form-group">
<select required name="label" class="form-control">
<option value="0" selected="selected">General</option>
<option value="1">Number error</option>
<option value="2">Functional</option>
<option value="3">Performance</option>
<option value="4">Security</option>
<option value="5">Typo</option>
<option value="6">Design</option>
</select>
</div>
<div class="form-group">
<span>
<input type="file" class="required" id='${multipartFilePath}'
name="screenshot" />
<button style="width: 100%" class="btn btn-primary"
name="test_files" type="button">
<i class="fa fa-upload" aria-hidden="true"></i>
{% trans "Upload Screenshot" %}
</button>
<center><span style="margin-top: 10px;"
class="badge badge-important"></span></center>
</span>
</div>
{% csrf_token %}
{{ captcha_form.captcha }}
<div class="bottom text-center">
<button type="submit" id="report-bug-btn" class="btn btn-default">
<i style="display: none;" id="spinner" class="fa fa-spinner fa-spin"
aria-hidden="true"></i>
{% trans "Report Bug" %}
<i class="fa fa-trophy" aria-hidden="true">+3</i>
</button>
</div>
</form>
</div>
</div>
</li>
</ul>
</li>
</ul> {% endcomment %}
</div>
</div>
</nav>
<br><br><br><br>
<div id="wrapper">
<div id="page-wrapper">
Expand All @@ -206,41 +66,7 @@
{% endblock %}
</div>
</div>

{% comment %} <div id="login" class="modal" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body text-center">
<a href="/">
<img src="{% static "img/logo-small-transparent.png" %}">
</a>
<hr>
<a href="/accounts/login">
<button class="btn btn-default btn-caution">
<i class="fa fa-envelope fa-2x"></i>
</button>
</a>
<a href="{% provider_login_url "facebook" method="js_sdk" %}">
<button class="btn btn-default btn-caution">
<i class="fa fa-facebook fa-2x"></i>
</button>
</a>
<a href="{% provider_login_url "google" method="js_sdk" %}">
<button class="btn btn-default btn-caution">
<i class="fa fa-google fa-2x"></i>
</button>
</a>
<a href="{% provider_login_url "github" method="js_sdk" %}">
<button class="btn btn-default btn-caution">
<i class="fa fa-github fa-2x"></i>
</button>
</a>
<p>Sign in using any of the services listed above and start winning prizes for reporting bugs.
</p>
</div>
</div>
</div>
</div> {% endcomment %}

</div>
<footer id="myFooter">
<div class="container-footer">
Expand Down
Loading