From 67ecb001e258da167819fb31dd66bd442fe87aa6 Mon Sep 17 00:00:00 2001
From: Hariom Verma <hariom18599@gmail.com>
Date: Wed, 5 Dec 2018 19:43:38 +0530
Subject: [PATCH] Introduced new navbar

---
 pro1/blog/static/blog/css/style.css |   2 +-
 pro1/blog/templates/blog/base.html  |  75 +++++++++++++++-------------
 pro1/db.sqlite3                     | Bin 147456 -> 147456 bytes
 3 files changed, 41 insertions(+), 36 deletions(-)
diff --git a/pro1/blog/static/blog/css/style.css b/pro1/blog/static/blog/css/style.css
index 3ca327a..7f6d44d 100644
--- a/pro1/blog/static/blog/css/style.css
+++ b/pro1/blog/static/blog/css/style.css
@@ -11,7 +11,7 @@
 }
 
 .navbar li a, .navbar .navbar-brand {
-    color: #fff !important;
+    color: green !important;
 }
 
 .navbar-nav li a:hover, .navbar-nav li.active a {
diff --git a/pro1/blog/templates/blog/base.html b/pro1/blog/templates/blog/base.html
index 3f865b7..b6b3e0e 100644
--- a/pro1/blog/templates/blog/base.html
+++ b/pro1/blog/templates/blog/base.html
@@ -10,9 +10,14 @@
 	<link rel="SHORTCUT ICON" href="{% static 'blog/images/dgpicon.png' %}" type="image/png" />
 
     <!-- Bootstrap CSS-->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+
+	<!-- local css -->
+	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+	<link rel="stylesheet" type="text/css" href="{% static 'blog/css/style.css' %}">
+	<script src="{% static 'blog/js/jquery.min.js' %}"></script>
+	<script src="{% static 'blog/js/bootstrap.min.js' %}"></script>
 
-    <link rel="stylesheet" type="text/css" href="{% static 'blog/css/main.css' %}">
 	{% if title %}
 		<title> {{ post.title}}</title>
 	{% else %}
@@ -20,39 +25,41 @@
 	{% endif %}
 </head>
 <body>
-	<header class="site-header">
-	  <nav class="navbar navbar-expand-md navbar-dark bg-steel fixed-top">
+
+	  <nav class="navbar navbar-default navbar-fixed-top">
 	    <div class="container">
-	      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggle" aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
-	      <span class="navbar-toggler-icon"></span>
-	      </button>
+	      <div class="navbar-header">
+			  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbarToggle">
+				  <span class="icon-bar"></span>
+				  <span class="icon-bar"></span>
+				  <span class="icon-bar"></span>
+			  </button>
+			  <a class="navbar-brand" href="{% url 'blog-about' %}">
+				  <span>
+					  <img class="" src="{% static 'blog/images/dgpicon.png' %}" type="image/png" height="28" width="28">
+					  Student Portal
+				  </span>
+			  </a>
+		  </div>
 	      <div class="collapse navbar-collapse" id="navbarToggle">
-	        <div class="navbar navbar-default navbar-left">
-            {% if user.is_authenticated %}
-                   <a class="nav-item nav-link" href="{% url 'blog-home'  %}">Home</a>
-                   <a class="nave-item nav-link" href="{% url 'notice-home' %}">Notice Board</a>
-                   <a class="nave-item nav-link" href="/study">Study Zone</a>
-                   <a class="nave-item nav-link" href="/interviews">Placement/Internships</a>
-                   <a class="nav-item nav-link" href="{% url 'blog-about' %}">About</a>
-
-            {% else %}
-                   <a class="nav-item nav-link" href="{% url 'blog-about' %}">About</a>
-            {% endif %}
-	        </div>
-	        <!-- Navbar Right Side -->
-	        <div class="navbar navbar-default navbar-right">
-	        	{% if user.is_authenticated %}
-                  <a class="nav-item nav-link" href="{% url 'profile' %}">Profile</a>
-	        	  <a class="nav-item nav-link" href="{% url 'logout' %}">Logout</a>
-	        	{% else %}
-		          <a class="nav-item nav-link" href="{% url 'login'%}">Login</a>
-		          <a class="nav-item nav-link" href="{% url 'register'%}">Register</a>
-		        {% endif %}
-	        </div>
-	      </div>
+			  <ul class="nav navbar-nav navbar-right">
+				  {% if user.is_authenticated %}
+				  	<li><a href="{% url 'blog-home'  %}">Home</a></li>
+				  	<li><a href="{% url 'notice-home' %}">Notice Board</a></li>
+				  	<li><a href="/study">Study Zone</a></li>
+				  	<li><a href="/interviews">Placement/Internships</a></li>
+				  	<li><a href="{% url 'profile' %}">Profile</a></li>
+	        	  	<li><a href="{% url 'logout' %}">Logout</a></li>
+				  {% else %}
+		          	<li><a href="{% url 'login'%}">Login</a></li>
+		          	<li><a href="{% url 'register'%}">Register</a></li>
+				  {% endif %}
+			  </ul>
+		  </div>
 	    </div>
 	  </nav>
-	</header>
+
+	<br><br><br><br><br>
 	<main role="main" class="container">
 	  <div class="row">
 	    <div class="col-md-8">
@@ -82,7 +89,7 @@
 	    </div>
 	  </div>
 	</main>
-
+	<br><br><br>
 	<!-- Optional JavaScript -->
     <!-- jQuery first, then Popper.js, then Bootstrap JS -->
     <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
@@ -98,9 +105,7 @@
             <a href="https://github.com/monsij/StudentPortal" class="navbar-btn btn-danger btn pull-right">
             <span class="glyphicon glyphicon-star"></span>  Give us a star on Github</a>
           </div>
-
-
-    </div>
+	  </div>
     <!-- Footer -->
 </body>
 </html>
diff --git a/pro1/db.sqlite3 b/pro1/db.sqlite3
index d0be128558b895f412175b77271d28342317eb2b..7d4f2d579336b7f6d737c80a3b249e4b7dd992a7 100644
GIT binary patch
delta 1128
zcmd^8%}>*C818Rlj)80OU<hII5iyYi&|kZ5>k<viCi~D9A!S{A5W1DE?b;Pq#<pI7
z#Iy1dqlt;}q9-p}l|R6Lz{Hc$7;mB`>cI<`pcA9Pc;FB4y*|(T=E?Is@9L^=b=9}t
z3$%?u9B2>c5@R5+b#H70c%2txaIW2jwj*de#yQ8=pP(+}#@4et8!KzW0Y9=f9P@Si
z!#-ckzmPA>MPk-cB!UVJK>}~h5GTcx;h+I8R&6*`oF=P@xR6OUI6Ec5%Uq-q;pF;Q
zs>x5zq_~ol7pImjOVaB2IRb}~5lD>S)Bp@daWYDfqjZQ2lcXY5t4&1;S5?!15sIeA
zONONCqXpAAyhKEUktn1_BRGUqr~^R|7q)|7J5I;lH&~C)-3<;71^n(opQSF%&q}hP
zR{RcF_}>5Md0Q9gbUbfwd9QTzfb+~%PYj2}a=vUWQz6M#OY>SoQA%W3waf^)WYj}T
zq9*GCpVb*VqY8E*$l4{FHAI84XBw;~D`G+~3tZM<IibNM8B*kDDAwNk_O558IT=q|
zX`NQ&+_ae^v$mMa6a`~KlZb3hjHg3sV|r2GsY<>{X?cRe3x=*<GA5v$EY<$-QcR8G
z>9WW-;sVcBMV>0B)w-G^e)5!}oMZKZPMboGHPf2e(wHevCZ=$~PGt>-5OqNlD1j>w
zEYG&YDk_`2&|rARW|L`xNeE3wE8t8sL;p4z(ua}>hagEguXe_P3rTF9`jE=n%Xx~d
z6d=??3$=!2=#AQ9iIz=8(@eZ9E&i8&9h8!wM(H3PgtT+}qxv<_iE0SCk6uR~W2Z3#
z+eTkvudz)mg=(ng3=W({C(azzJ#@&;fTIlGzV-=Npsn=?o!g!-U=uw_jQpD+dh@|P
z=<n-u$H3vB{}#UeejoILV*uMluwCcG+-J<|@wOrDAn>%y)z;Ml_7H6E7l3%&00g}E
HaaY$5ot0t>

delta 601
zcmZo@;B08%oFL7ZI8nx#F>zypi$0_D<fZz$jBJ}P>l-F;F!FIQ@Nw{aZ|0e>m5+(h
zaq{7L6IsN0Jvk;P&X<Tt$?_=ib<c@1%ydsv@eIhy3QI3`cMQ!>Gj-1nP4qC=E)Dmr
zOsn)YH89UMiij%62rVwE%J3<+H8L=?&^0vFH84>yFtsu?vNE;QGq*4|G&U(RE-6Zx
zJZ+A;G)&6COwYmusNRH&fq{XM{}TiMr_Edo?(s_kxm;l7(!9)yoW+?Xsqu*^xtV#q
zn;8rK%Wt~CBEZPCnf1X8b`79DJKq*oM<Wx9%5sy$Vhh7;%i`3E#H5VkV$)<}i`2C8
zEc5iLw9U*fSs4W_z-}_JGBnpSH#IXeFyDOpg##lKW7A~WR~`x_rn$M6<_4J+>BR=w
zhJ_Z1X*ngy897D8W(E0a#ksj~Gc2u4%&ZK}^vq2xOiV2{&wicxMTU#7pMmcmUq9a#
zer5h#{_T7>`S0*g;`iY9;LF;qsGz~;rb@_-yg+ZO5^}`$zITkpj4XVo8MwByeqfx$
zCu*o`h~Y2Z>1+Nm%F6)_l!rwKND->Tx4-<yD9y;mAi%)D|8uio!h3#ppaymhM(J$=
XOe_KriC<uei2*FkY|?DY444D}VEL_)

