Skip to content

Commit ff851cb

Browse files
committed
Merge branch 'iamskab-getting_started' into testing
2 parents ccc9e1b + 00ec7a8 commit ff851cb

File tree

14 files changed

+1002
-391
lines changed

14 files changed

+1002
-391
lines changed
6.98 KB
Loading

website/forum/templates/base.html

Lines changed: 115 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,79 @@
11
<!DOCTYPE html>
22
<html lang="en">
3+
34
<head>
45

56
<meta charset="UTF-8">
6-
<meta name="viewport"
7-
content="width=device-width, user-scalab=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
7+
<meta name="viewport" content="width=device-width, user-scalab=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
88
<meta http-equiv="X-UA-Compatible" content="ie=edge">
99

1010
<!-- BACKEND Import -->
1111

1212
<!-- FRONTEND Import-->
13-
<!--Package Imports-->
14-
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
15-
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
16-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
17-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
18-
13+
<!--Package Imports-->
14+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
15+
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
16+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
17+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
18+
1919
<!-- Import Font Awesome Icons -->
20-
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.1/css/all.css" integrity="sha384-gfdkjb5BdAXd+lj+gudLWI+BXq4IuLW5IT+brZEZsLFm++aCMlF1V92rMkPaX4PP" crossorigin="anonymous">
20+
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.1/css/all.css" integrity="sha384-gfdkjb5BdAXd+lj+gudLWI+BXq4IuLW5IT+brZEZsLFm++aCMlF1V92rMkPaX4PP" crossorigin="anonymous">
2121
<!-- Import Google Fonts-->
22-
<!-- <link href="https://fonts.googleapis.com/css?family=PT+Sans+Narrow" rel="stylesheet">
23-
-->
24-
<link href="https://fonts.googleapis.com/css?family=Ubuntu:400,700" rel="stylesheet">
25-
<!--File Imports-->
26-
{% load staticfiles %}
27-
<link rel="stylesheet" href="{% static 'css/base_css.css' %}">
28-
<link rel="stylesheet" href="{% static 'css/custom_checkbox.css' %}">
29-
30-
<!-- Favicon import -->
31-
<link rel="icon" type="image/png" sizes="96x96" href="/static/image/favicon-96x96.png">
32-
33-
<!--File Imports-->
34-
{% load staticfiles %}
35-
<link rel="stylesheet" href="{% static 'css/base_css.css' %}">
36-
<link rel="stylesheet" href="{% static 'css/loader_css.css' %}">
37-
38-
<!-- Favicon import -->
39-
<link rel="icon" type="image/png" sizes="96x96" href="/static/image/favicon-96x96.png">
40-
41-
<!-- Import Google Font Montserrat -->
42-
<link href="https://fonts.googleapis.com/css?family=Montserrat:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i" rel="stylesheet">
43-
44-
45-
{% block css %}
46-
{% endblock %}
47-
48-
{% block js %}
49-
50-
{% endblock js %}
51-
52-
53-
<title>
54-
{% block title %}
55-
{% endblock %}
56-
</title>
57-
22+
<!-- <link href="https://fonts.googleapis.com/css?family=PT+Sans+Narrow" rel="stylesheet">
23+
-->
24+
<link href="https://fonts.googleapis.com/css?family=Ubuntu:400,700" rel="stylesheet">
25+
<!--File Imports-->
26+
{% load staticfiles %}
27+
<link rel="stylesheet" href="{% static 'css/base_css.css' %}">
28+
<link rel="stylesheet" href="{% static 'css/custom_checkbox.css' %}">
29+
30+
<!-- Favicon import -->
31+
<link rel="icon" type="image/png" sizes="96x96" href="/static/image/favicon-96x96.png">
32+
33+
<!--File Imports-->
34+
{% load staticfiles %}
35+
<link rel="stylesheet" href="{% static 'css/base_css.css' %}">
36+
<link rel="stylesheet" href="{% static 'css/loader_css.css' %}">
37+
38+
<!-- Favicon import -->
39+
<link rel="icon" type="image/png" sizes="96x96" href="/static/image/favicon-96x96.png">
40+
41+
<!-- Import Google Font Montserrat -->
42+
<link href="https://fonts.googleapis.com/css?family=Montserrat:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i" rel="stylesheet"> {% block css %} {% endblock %} {% block js %} {% endblock js %}
43+
44+
45+
<title>
46+
{% block title %} {% endblock %}
47+
</title>
48+
5849
</head>
50+
5951
<body onload="loaderfunction()">
60-
<div id="loader">
61-
<div id="loading">
62-
<div class="loading-screen">
63-
<div class="loading-animation">
64-
<img src="{% static 'image/Loader.jpeg' %}" alt="" class="logo">
65-
<div class="loading-bar"></div>
52+
<div id="loader">
53+
<div id="loading">
54+
<div class="loading-screen">
55+
<div class="loading-animation">
56+
<img src="{% static 'image/Loader.jpeg' %}" alt="" class="logo">
57+
<div class="loading-bar"></div>
58+
</div>
59+
</div>
60+
</div>
6661
</div>
67-
</div></div></div>
68-
<body>
69-
<nav class="navbar navbar-expand-md navbar-dark bg-dark py-0 sticky-top" style="background-color: #f19066;z-index:1;">
70-
<div class="d-flex flex-grow-1 py-0">
71-
<span class="w-100 d-lg-none d-block"><!-- hidden spacer to center brand on mobile --></span>
72-
<a class="navbar-brand" href="{% url 'home' %}">
62+
63+
<body>
64+
<nav class="navbar navbar-expand-md navbar-dark bg-dark py-0 sticky-top" style="background-color: #f19066;z-index:1;">
65+
<div class="d-flex flex-grow-1 py-0">
66+
<span class="w-100 d-lg-none d-block"><!-- hidden spacer to center brand on mobile --></span>
67+
<a class="navbar-brand" href="{% url 'home' %}">
7368
{% load staticfiles %}
7469
<img id="logoREC" src="{% static 'image/logoInverted.png'%}" style="max-width:50px; padding-bottom: 4px" alt="logo">
7570
<strong>REC</strong>ursion
7671
</a>
77-
<!-- <a class="navbar-brand-two mx-auto d-lg-none d-inline-block py-0" href="#">
72+
<!-- <a class="navbar-brand-two mx-auto d-lg-none d-inline-block py-0" href="#">
7873
<img src="/static/image/logo.png" width="20%" alt="logo">
7974
</a> -->
80-
<div class="w-100 text-right py-0">
81-
<button class="navbar-toggler mt-2" type="button" data-toggle="collapse" data-target="#myNavbar">
75+
<div class="w-100 text-right py-0">
76+
<button class="navbar-toggler mt-2" type="button" data-toggle="collapse" data-target="#myNavbar">
8277
<span class="navbar-toggler-icon"></span>
8378
</button>
8479
</div>
@@ -98,7 +93,7 @@
9893
<a href="{% url 'events:calender' %}" class="nav-link m-2 menu-item">Events</a>
9994
</li>
10095
<li class="nav-item {% block getStart_active %}{% endblock %}">
101-
<a href="{% url 'forum:getting_started' %}" class="nav-link m-2 menu-item">Get Started</a>
96+
<a href="{% url 'getting_started:getting_started' %}" class="nav-link m-2 menu-item">Get Started</a>
10297
</li>
10398
<li class="nav-item {% block team_page %}{% endblock %}">
10499
<a href="{% url 'team:team_page'%}" class="nav-link m-2 menu-item">Team</a>
@@ -116,74 +111,73 @@
116111
<li><a href="{% url 'user_profile:edit_profile' %}">&nbsp;&nbsp; Edit Profile</a></li>
117112
<li><a href="{% url 'logout' %}">&nbsp;&nbsp; Logout</a></li>
118113
</ul>
119-
</li>
114+
</li>
120115
</ul>
121-
{% endif %}
122116
</ul>
123-
</div>
124-
</nav>
117+
</div>
118+
</nav>
119+
120+
{% block nav %}{% endblock nav%}
121+
</header>
122+
{% block content %} {% endblock %}
125123

126-
{% block nav %}{% endblock nav%}
127-
</header>
128-
{% block content %}
129-
{% endblock %}
130124

131-
132-
<footer class="section footer-classic context-dark bg-image" style="background:linear-gradient(135deg, #3e4446 22%, rgba(255,0,0,0) 10%),
125+
<footer class="section footer-classic context-dark bg-image" style="background:linear-gradient(135deg, #3e4446 22%, rgba(255,0,0,0) 10%),
133126
linear-gradient(135deg, #2d3436 90%, #3e4446 1%),
134127
linear-gradient(45deg, #353b48 95%, rgba(0,0,255,0) 30%);">
135128
<a id="goTop">
136-
<center class="circle" onclick="window.scrollTo(0,-1000000)">
137-
{% load static %}
138-
<img src="{% static 'image/rocket.png'%}" alt="go Top" onclick="window.scrollTo(0,-1000000)" style="margin-top: 2px;">
139-
</center>
140-
</a>
141-
<div class="container">
142-
<div class="row row-30">
143-
<div class="col-md-4 col-xl-5">
144-
<div class="pr-xl-4">
145-
<strong>Contribute to this community</strong><br>
146-
<a href="https://www.facebook.com/recursion.nit/"><i class="fab fa-facebook-f"></i></a>&nbsp;
147-
<a href="https://github.com/RECursion-NITD"><i class="fab fa-github"></i></a><br>
148-
<!-- Credits -->
149-
<strong>Developed & designed with <i class="fas fa-heart" style="color: red"></i> by <a href="{% url 'forum:webd_team' %}">Web Team '18-19</a></strong>
150-
<!-- Rights-->
151-
<p class="rights"><span>©  </span>
152-
<span class="copyright-year">
129+
<center class="circle" onclick="window.scrollTo(0,-1000000)">
130+
{% load static %}
131+
<img src="{% static 'image/rocket.png'%}" alt="go Top" onclick="window.scrollTo(0,-1000000)" style="margin-top: 2px;">
132+
</center>
133+
</a>
134+
<div class="container">
135+
<div class="row row-30">
136+
<div class="col-md-4 col-xl-5">
137+
<div class="pr-xl-4">
138+
<strong>Contribute to this community</strong><br>
139+
<a href="https://www.facebook.com/recursion.nit/"><i class="fab fa-facebook-f"></i></a>&nbsp;
140+
<a href="https://github.com/RECursion-NITD"><i class="fab fa-github"></i></a><br>
141+
<!-- Credits -->
142+
<strong>Developed & designed with <i class="fas fa-heart" style="color: red"></i> by <a href="{% url 'forum:webd_team' %}">Web Team '18-19</a></strong>
143+
<!-- Rights-->
144+
<p class="rights"><span>©  </span>
145+
<span class="copyright-year">
153146
<script>document.write(new Date().getFullYear())</script>
154147
</span><span>RECursion</span><span></span><span>All Rights Reserved.</span></p>
155-
</div>
148+
</div>
149+
</div>
150+
<div class="col-md-4">
151+
<h3>Contacts</h3>
152+
<dl class="contact-list">
153+
<dt>Address:</dt>
154+
<dd><i class="fas fa-map-marked-alt"></i> NIT Durgapur, Durgapur, W.B.</dd>
155+
</dl>
156+
<dl class="contact-list">
157+
<dt>Email:</dt>
158+
<dd><i class="fas fa-envelope"></i><a href="mailto:recursion.nit@gmail.com"> recursion.nit@gmail.com</a></dd>
159+
</dl>
160+
<dl class="contact-list">
161+
<dt>Phones:</dt>
162+
<dd><i class="fas fa-phone-square"></i><a href="tel:+918436053080"> Raghav Grover: +918436053080 </a>
163+
</dd>
164+
</dl>
165+
</div>
166+
<div class="col-md-4 col-xl-3">
167+
<h3 class="ml-0">Links</h3>
168+
<ul class="nav-list ml-1">
169+
<li><a href="{% url 'forum:list_questions' %}">AskREC</a></li>
170+
<li><a href="{% url 'events:calender' %}">Events</a></li>
171+
<li><a href="{% url 'getting_started:getting_started' %}">Get Started</a></li>
172+
<li><a href="{% url 'forum:faculty'%}">Faculty Advisors</a></li>
173+
<li><a href="{% url 'team:team_page'%}">Team</a></li>
174+
<li><a href="{% url 'forum:webd_team'%}">WebD Team</a></li>
175+
</ul>
176+
</div>
177+
</div>
156178
</div>
157-
<div class="col-md-4">
158-
<h3>Contacts</h3>
159-
<dl class="contact-list">
160-
<dt>Address:</dt>
161-
<dd><i class="fas fa-map-marked-alt"></i> NIT Durgapur, Durgapur, W.B.</dd>
162-
</dl>
163-
<dl class="contact-list">
164-
<dt>Email:</dt>
165-
<dd><i class="fas fa-envelope"></i><a href="mailto:recursion.nit@gmail.com"> recursion.nit@gmail.com</a></dd>
166-
</dl>
167-
<dl class="contact-list">
168-
<dt>Phones:</dt>
169-
<dd><i class="fas fa-phone-square"></i><a href="tel:+918436053080"> Raghav Grover: +918436053080 </a>
170-
</dd>
171-
</dl>
172-
</div>
173-
<div class="col-md-4 col-xl-3">
174-
<h3 class="ml-0">Links</h3>
175-
<ul class="nav-list ml-1">
176-
<li><a href="{% url 'forum:list_questions' %}">AskREC</a></li>
177-
<li><a href="{% url 'events:calender' %}">Events</a></li>
178-
<li><a href="{% url 'forum:getting_started' %}">Get Started</a></li>
179-
<li><a href="{% url 'forum:faculty'%}">Faculty Advisors</a></li>
180-
<li><a href="{% url 'team:team_page'%}">Team</a></li>
181-
<li><a href="{% url 'forum:webd_team'%}">WebD Team</a></li>
182-
</ul>
183-
</div>
184-
</div>
185-
</div>
186-
</footer>
187-
<script src="{% static 'js/loader.js' %}"></script>
188-
</body>
179+
</footer>
180+
<script src="{% static 'js/loader.js' %}"></script>
181+
</body>
182+
189183
</html>

0 commit comments

Comments
 (0)