Skip to content

Commit e6fdee3

Browse files
kunagpalkunagpal
committed
Semantic overhaul, added bower as a django dependency.
1 parent d8fcd4b commit e6fdee3

26 files changed

+1212
-1440
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PyCharm
22
.idea/
3-
3+
bower_components/
44
# Byte-compiled / optimized / DLL files
55
__pycache__/
66
*.py[cod]

‎ieeecsvit/settings.py‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@
3737
# Allow all host headers
3838
ALLOWED_HOSTS = ['*']
3939

40+
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
41+
42+
STATIC_URL = '/static/'
43+
44+
BOWER_COMPONENTS_ROOT = os.path.join(BASE_DIR, 'bower_components')
45+
46+
STATICFILES_FINDERS = (
47+
'django.contrib.staticfiles.finders.FileSystemFinder',
48+
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
49+
'djangobower.finders.BowerFinder',
50+
)
4051

4152
# Application definition
4253

@@ -50,6 +61,7 @@
5061
'general',
5162
'internal',
5263
'twitter_bootstrap',
64+
'djangobower',
5365
)
5466

5567
MIDDLEWARE_CLASSES = (
@@ -98,11 +110,8 @@
98110

99111
USE_TZ = True
100112

101-
102113
# Static files (CSS, JavaScript, Images)
103114
# https://docs.djangoproject.com/en/1.7/howto/static-files/
104-
STATIC_ROOT = 'staticfiles'
105-
STATIC_URL = '/static/'
106115

107116
STATICFILES_DIRS = (
108117
os.path.join(BASE_DIR, 'static'),
@@ -111,3 +120,7 @@
111120
TEMPLATE_DIRS = (
112121
os.path.join(BASE_DIR, 'templates'),
113122
)
123+
BOWER_INSTALLED_APPS = (
124+
'jquery',
125+
'bootstrap',
126+
)

‎requirements.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ dj-static==0.0.6
33
Django==1.8.0
44
psycopg2==2.5.4
55
static3==0.5.1
6-
waitress==0.8.9
6+
waitress==0.8.9
7+
django-bower==5.0.4

‎static/styles/hud.css‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ default width = 800/5 = 160px;
3333
*/
3434

3535
.accordian {
36-
width: 100%; height: 100%;
36+
width: 100%;
37+
height: 100%;
3738
overflow: hidden;
38-
3939
/*Time for some styling*/
40-
margin: 0px auto;
40+
margin: 0 auto;
4141
box-shadow: 0 0 10px 1px rgba(0, 0, 0, 0.35);
4242
-webkit-box-shadow: 0 0 10px 1px rgba(0, 0, 0, 0.35);
4343
-moz-box-shadow: 0 0 10px 1px rgba(0, 0, 0, 0.35);
@@ -55,13 +55,10 @@ default width = 800/5 = 160px;
5555
display: block;
5656
width: 160px;
5757
float: left;
58-
5958
border-left: 1px solid #888;
60-
6159
box-shadow: 0 0 25px 10px rgba(0, 0, 0, 0.5);
6260
-webkit-box-shadow: 0 0 25px 10px rgba(0, 0, 0, 0.5);
6361
-moz-box-shadow: 0 0 25px 10px rgba(0, 0, 0, 0.5);
64-
6562
/*Transitions to give animation effect*/
6663
transition: all 0.5s;
6764
-webkit-transition: all 0.5s;
@@ -71,11 +68,14 @@ default width = 800/5 = 160px;
7168
}
7269

7370
/*Reduce with of un-hovered elements*/
74-
.accordian ul:hover li {width: 40px;}
71+
.accordian ul:hover li {
72+
width: 40px;
73+
}
7574
/*Lets apply hover effects now*/
7675
/*The LI hover style should override the UL hover style*/
77-
.accordian ul li:hover {width: 900px;}
78-
76+
.accordian ul li:hover {
77+
width: 900px;
78+
}
7979

8080
.accordian li img {
8181
display: block;
@@ -86,6 +86,5 @@ default width = 800/5 = 160px;
8686
background: rgba(0, 0, 0, 0.5);
8787
position: absolute;
8888
left: 0; bottom: 0;
89-
width: 640px;
90-
89+
width: 640px;
9190
}

templates/IEEECS.html renamed to templates/IEEECS (redundant).html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div id="tab">
1818
<table id="box">
1919

20-
<td class="active"><a href="IEEECS.html">Home</a></td>
20+
<td class="active"><a href="IEEECS (redundant).html">Home</a></td>
2121
<td>About</td>
2222
<td>Photos</td>
2323
<td>Events</td>

‎templates/about.html‎

Lines changed: 55 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,61 @@
1-
2-
31
<!DOCTYPE html>
4-
5-
<head>
2+
<html>
3+
<head>
64
<title>About Us</title>
7-
<link rel="stylesheet" href="../static/styles/about.css">
5+
<link rel="stylesheet" href="../static/styles/about.css">
86
<link rel="shortcut icon" href="../static/images/favicon.ico" >
9-
10-
</head>
11-
12-
<body>
13-
14-
<header id="head">
15-
<nav id="nav-wrap">
16-
<ul id="nav" class="nav">
17-
<li><a href="#">Home</a></li>
18-
<li><a href="#">About</a></li>
19-
<li><a href="#">Events</a></li>
20-
<li><a href="#">Our Team</a></li>
21-
<li><a href="#">History</a></li>
22-
</ul>
23-
</nav>
24-
25-
<div class="row banner">
26-
<div class="banner-text">
27-
<h1 class="responsive-headline">IEEE-CS</h1>
28-
<h3>Text</h3>
29-
<hr />
30-
<ul class="social">
31-
<li><a href="#"><img src="../static/images/facebook.webp" alt="" /></a></li>
32-
</ul>
33-
</div>
34-
</div>
35-
36-
</header>
37-
38-
39-
40-
<section id="about">
41-
42-
<div class="row">
43-
44-
<div class="nine columns main-col">
45-
46-
<h2>About Us</h2>
47-
48-
<p>Detailed Info</p>
49-
7+
</head>
8+
<body>
9+
<header id="head">
10+
<nav id="nav-wrap">
11+
<ul id="nav" class="nav">
12+
<li><a href="#">Home</a></li>
13+
<li><a href="#">About</a></li>
14+
<li><a href="#">Events</a></li>
15+
<li><a href="#">Our Team</a></li>
16+
<li><a href="#">History</a></li>
17+
</ul>
18+
</nav>
19+
<div class="row banner">
20+
<div class="banner-text">
21+
<h1 class="responsive-headline">IEEE-CS</h1>
22+
<h3>Text</h3>
23+
<hr>
24+
<ul class="social">
25+
<li><a href="#"><img src="../static/images/facebook.webp" alt="" /></a></li>
26+
</ul>
27+
</div>
28+
</div>
29+
</header>
30+
<section id="about">
5031
<div class="row">
51-
52-
<div class="columns contact-details">
53-
54-
<h2>Contact Details</h2>
55-
<p class="address">
56-
<span>Name</span><br>
57-
<span>Address Line<br>
58-
Address Line
59-
</span><br>
60-
<span>Contact no.</span><br>
61-
<span>Email</span>
62-
</p>
63-
64-
</div>
32+
<div class="nine columns main-col">
33+
<h2>About Us</h2>
34+
<p>Detailed Info</p>
35+
<div class="row">
36+
<div class="columns contact-details">
37+
<h2>Contact Details</h2>
38+
<p class="address">
39+
<span>Name</span><br>
40+
<span>Address Line<br>
41+
Address Line
42+
</span><br>
43+
<span>Contact no.</span><br>
44+
<span>Email</span>
45+
</p>
46+
</div>
47+
</div>
48+
</div>
49+
</div>
50+
</section>
51+
<footer>
52+
<div class="row">
53+
<div class="twelve columns">
54+
<ul class="social-links">
55+
<li><a href="#"><img src="../static/images/facebook.webp" alt="" /></a></li>
56+
</ul>
6557
</div>
66-
</div>
67-
</div>
68-
</section>
69-
70-
71-
<footer>
72-
73-
<div class="row">
74-
<div class="twelve columns">
75-
<ul class="social-links">
76-
<li><a href="#"><img src="../static/images/facebook.webp" alt="" /></a></li>
77-
</ul>
78-
</div>
79-
</div>
80-
81-
</footer>
82-
</body>
58+
</div>
59+
</footer>
60+
</body>
8361
</html>

‎templates/contact.html‎

Lines changed: 43 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,46 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<title>IEEE Computer Society VIT</title>
5-
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1">
6-
<link rel="stylesheet" href="/static/bower_components/bootstrap/dist/css/bootstrap.min.css"/>
7-
<script src="/static/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
8-
<script src="/static/bower_components/jquery/dist/jquery.min.js"></script>
9-
<script src="/static/scripts/scroll.js"></script>
10-
<link rel="stylesheet" href="/static/styles/ieee-cs.css"/>
11-
</head>
12-
<body>
13-
<section id="contact" class="page-section">
14-
<div class="container-fluid">
15-
<nav class="nav navbar navbar-default navbar-fixed-top">
16-
<div class="navbar-header">
17-
<button type="button" class="navbar-toggle" data-toggle="toggle" data-target="#navbar">
18-
<span class="icon-bar"></span>
19-
<span class="icon-bar"></span>
20-
<span class="icon-bar"></span>
21-
</button>
3+
<head>
4+
<title>IEEE Computer Society VIT</title>
5+
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1">
6+
<link rel="stylesheet" href="../bower_components/bower_components/bootstrap/dist/css/bootstrap.min.css">
7+
<script src="../bower_components/bower_components/jquery/dist/jquery.min.js"></script>
8+
<script src="../bower_components/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
9+
<script src="/static/scripts/scroll.js"></script>
10+
<link rel="stylesheet" href="/static/styles/ieee-cs.css"/>
11+
</head>
12+
<body>
13+
<section id="contact" class="page-section">
14+
<div class="container-fluid">
15+
<nav class="nav navbar navbar-default navbar-fixed-top">
16+
<div class="navbar-header">
17+
<button type="button" class="navbar-toggle" data-toggle="toggle" data-target="#navbar">
18+
<span class="icon-bar"></span>
19+
<span class="icon-bar"></span>
20+
<span class="icon-bar"></span>
21+
</button>
22+
</div>
23+
<div class="collapse navbar-collapse">
24+
<ul class="navbar-nav">
25+
<li><a href="#" class="scroll-link" data-id="home">HOME</a></li>
26+
<li><a href="#" class="scroll-link" data-id="about">ABOUT US</a></li>
27+
<li><a href="#" class="scroll-link" data-id="events">EVENTS</a></li>
28+
<li><a href="#" class="scroll-link" data-id="team">OUR TEAM</a></li>
29+
<li><a href="#" class="scroll-link" data-id="history">HISTORY</a></li>
30+
<li><a href="#" class="scroll-link" data-id="contact">CONTACT US</a></li>
31+
</ul>
32+
</div>
33+
</nav>
2234
</div>
23-
<div class="collapse navbar-collapse">
24-
<ul class="navbar-nav">
25-
<li><a href="#" class="scroll-link" data-id="home">HOME</a></li>
26-
<li><a href="#" class="scroll-link" data-id="about">ABOUT US</a></li>
27-
<li><a href="#" class="scroll-link" data-id="events">EVENTS</a></li>
28-
<li><a href="#" class="scroll-link" data-id="team">OUR TEAM</a></li>
29-
<li><a href="#" class="scroll-link" data-id="history">HISTORY</a></li>
30-
<li><a href="#" class="scroll-link" data-id="contact">CONTACT US</a></li>
31-
</ul>
32-
</div>
33-
</nav>
34-
</div>
35-
36-
37-
<!-- YOUR WORK HERE -->
38-
<body>
39-
<h1> Kindly fill in the following form in order to get in touch with us.. </h1>
40-
<form>
41-
<p> Name : <input type="text" name="username" maxlength="30" size="15" required="required" /> <br/>
42-
Tell us more about what you think about us...
43-
</p>
44-
<textarea name="comments" cols=50 rows=10>Enter your comments...
45-
</textarea>
46-
<br/>
47-
Submit your response <input type="Submit" name="Submit" value="Submit" />
48-
</form>
49-
</body>
50-
51-
52-
</section>
35+
<h1> Kindly fill in the following form in order to get in touch with us.. </h1>
36+
<form>
37+
<p> Name : <input type="text" name="username" maxlength="30" size="15" required="required" /> <br/>
38+
Tell us more about what you think about us...
39+
</p>
40+
<textarea name="comments" cols=50 rows=10>Enter your comments...</textarea>
41+
<br>
42+
Submit your response <input type="Submit" name="Submit" value="Submit" />
43+
</form>
44+
</section>
45+
</body>
46+
</html>

0 commit comments

Comments
 (0)