Skip to content
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

Jump to bottom

Update base.html #34

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update base.html #34

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6abd3c8
Update base.html
ketakitankk Mar 10, 2021
4533312
Merge branch 'master' into patch-2
ketakitankk Mar 13, 2021
f45abf2
Merge branch 'master' into patch-2
ketakitankk Mar 15, 2021
65989d9
Merge branch 'master' into patch-2
ketakitankk Mar 19, 2021
5e0795f
Merge branch 'master' into patch-2
ketakitankk Apr 5, 2021
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
84 changes: 53 additions & 31 deletions templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,46 @@
<!DOCTYPE html>
<html lang="en">


<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<link rel="shortcut icon" href="{% static 'favicon.jpg' %}" />
<title>Elektra | Electricity Outage prediction
</title>
<meta charset="UTF-8">

<meta name="viewport" content="width=device-width, initial-scale=1.0">


<link rel="shortcut icon" href="{% static 'favicon.jpg' %}">

<title>Elektra | Electricity Outage prediction

</title>

<!-- Google Fonts -->
<link
href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i|Raleway:300,300i,400,400i,500,500i,600,600i,700,700i|Poppins:300,300i,400,400i,500,500i,600,600i,700,700i"
rel="stylesheet" />
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i|Raleway:300,300i,400,400i,500,500i,600,600i,700,700i|Poppins:300,300i,400,400i,500,500i,600,600i,700,700i" rel="stylesheet" />
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Exo:wght@500&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Cinzel:wght@720&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Source+Serif+Pro:ital@1&display=swap" rel="stylesheet">

<!-- Vendor CSS Files -->
<link href="{% static 'vendor/bootstrap/css/bootstrap.min.css' %}" rel="stylesheet" />
<link href="{% static 'vendor/icofont/icofont.min.css' %}" rel="stylesheet">
<link href="{% static 'vendor/icofont/icofont.min.css' %}" rel="stylesheet" />
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />



<!-- Main CSS File -->
<link href="{% static 'style.css' %}" rel="stylesheet" />
<link href="static/style.css" rel="stylesheet">



<script type="text/javascript" src="{% static 'main.js' %}">

</script>

<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
crossorigin=""/>
Expand Down Expand Up @@ -58,46 +73,52 @@
<div class="container d-flex align-items-center">
<div class="logo mr-auto">
<h1>
<!-- Icon -->
<a href="/"><img src="{% static 'Elektra_Logo.png' %}" style="margin-top: -10px;" alt=""></a>

<!-- <img src="assets/img/Icon.png" style="margin-top: -10px;"> -->
<img src="{% static 'Icon.png' %}" alt="">
<a href="/"><img src="{% static 'Elektra_Logo.png' %}" alt=""></a>

</h1>
</div>

<!--NAVBAR-->

<nav class="nav-menu d-none d-lg-block ml-auto">
<ul>

<li><a href="{% url 'home' %}" style="font-size: 1.3rem;">Home</a></li>
<li><a href="{% url 'map' %}" style="font-size: 1.3rem;">Map</a></li>
<li><a href="{% url 'dashboard' %}" style="font-size: 1.3rem;">Dashboard</a></li>
<li><a href="{% url 'announcements' %}" style="font-size: 1.3rem;">Announcements</a></li>
<li><a href="{% url 'feedback' %}" style="font-size: 1.3rem;">Feedback</a></li>

{% with request.resolver_match.url_name as url_name %}
<li><a {% if url_name == 'home' %}class="active"{% endif %} href="{% url 'home' %}">Home</a></li>
<li><a {% if url_name == 'map' %}class="active"{% endif %} href="{% url 'map' %}">Map</a></li>
<li><a {% if url_name == 'dashboard' %}class="active"{% endif %} href="{% url 'dashboard' %}">Dashboard</a></li>
<li><a {% if url_name == 'announcements' %}class="active"{% endif %} href="{% url 'announcements' %}">Announcements</a></li>
<li><a {% if url_name == 'feedback' %}class="active"{% endif %} href="{% url 'feedback' %}">Feedback</a></li>
<li><a {% if url_name == 'contact' %}class="active"{% endif %} href="{% url 'contact' %}">Contact Us</a></li>

{%endwith%}

{% if user.is_authenticated %}
<li><a class="usernamelink" href="#" >Welcome, {{ user.first_name }} {{user.last_name}}</a></li>
<li style=" font-weight: 800;
font-size: 13px;
display: inline-block;
padding: 1px 1px 1px 1px;
border-radius: 50px;
padding: 5px 5px 5px 5px;
border-radius: 23px;
transition: 0.5s;
background: #FED103;
background: #fcf876;
border-style: none;
color: #fff;"><a href="{% url 'logout' %}">Logout</a></li>
{% else %}
<li style=" font-weight: 800;
<li style=" font-weight: 800;
font-size: 13px;
display: inline-block;
padding: 1px 1px 1px 1px;
border-radius: 50px;
padding: 5px 5px 5px 5px;
border-radius: 23px;
transition: 0.5s;
background: #FED103;
background: #fcf876;
border-style: none;
color: #fff;"><a href="{% url 'login' %}">Login/Signup</a></li>
{% endif %}


</ul>
</nav>
Expand All @@ -113,12 +134,14 @@ <h1>
<br>
<br>


{% block content %}

{% endblock %}


<!-- ======= Footer ======= -->

<!--If on contact page then don't use the contact footer-->
{% with request.resolver_match.url_name as url_name %}
{% if url_name != 'contact' %}
Expand All @@ -135,12 +158,12 @@ <h3>
<img src="{% static 'Elektra_Logo.png' %}" style="width: 130px; margin-left: 80px;" />
</h3>
<p>
An ML powered Electricity Outage prediction tool.
<b>An ML powered Electricity Blackout Prediction tool.</b>
</p>
</div>

<div class="col-lg-4 col-md-6 footer-links">
<h4>Useful Links</h4>
<h4>Some useful links</h4>
<ul>
<li>
<i class="ion-ios-arrow-right"></i> <a href="{% url 'home' %}">Home</a>
Expand All @@ -159,7 +182,7 @@ <h4>Useful Links</h4>
</div>

<div class="col-lg-4 col-md-6 footer-contact">
<h4>Contact Us</h4>
<h4>Reach us</h4>
<p>
<b><a href="mailto:[email protected]">[email protected]</a></b>
<b><a href="mailto:[email protected]">[email protected]</a></b>
Expand All @@ -184,7 +207,6 @@ <h4>Contact Us</h4>
{% endif %}
{% endwith %}
<!-- End Footer -->
</section>



Expand Down