Skip to content

Commit 062d0d8

Browse files
author
Kishore kumar J
committed
New Look: Blue theme
1 parent 3f34aca commit 062d0d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+688
-14
lines changed

output

+154
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
diff --git a/settings.py b/settings.py
2+
index 85ae30e..ea2580a 100644
3+
--- a/settings.py
4+
+++ b/settings.py
5+
@@ -100,6 +100,7 @@ ACCOUNT_ACTIVATION_DAYS = 10
6+
LOGIN_URL = '/account/signin'
7+
LOGOUT_URL = '/account/signout'
8+
LOGIN_REDIRECT_URL = '/'
9+
+REGISTRATION_OPEN = False
10+
11+
DEFAULT_FROM_EMAIL = '[email protected]'
12+
13+
diff --git a/static/css/base.css b/static/css/base.css
14+
index 852b621..491c22f 100644
15+
--- a/static/css/base.css
16+
+++ b/static/css/base.css
17+
@@ -1,11 +1,17 @@
18+
-body {
19+
- background-color:#100;
20+
- margin-left: 50px;
21+
- margin-right: 50px;
22+
+body {
23+
+
24+
+ background-color: #020f22;
25+
+ background-image: url(/static/images/background1.jpg);
26+
+ background-position: center;
27+
+ background-attachment: fixed;
28+
+ width: 1010px;
29+
+ background-repeat: no-repeat;
30+
+ margin: 0 auto;
31+
color:#fff;
32+
}
33+
a {
34+
- color: #5ff;
35+
+/* color: #5ff; */
36+
+ color: #0ff;
37+
}
38+
a:hover {
39+
color: #0f0;
40+
@@ -13,8 +19,11 @@ a:hover {
41+
a:visited {
42+
color: #099;
43+
}
44+
+a:visited:hover {
45+
+ color: #0f0;
46+
+}
47+
.content {
48+
- min-height: 600px;
49+
+ min-height: 400px;
50+
}
51+
.user_info {
52+
float: right;
53+
@@ -65,3 +74,6 @@ p {
54+
font-size: small;
55+
text-align: center;
56+
}
57+
+.ui-widget {
58+
+ opacity: .9;
59+
+}
60+
diff --git a/static/images/cseismic2k10.png b/static/images/cseismic2k10.png
61+
index 5db8d6e..8689f9c 100644
62+
Binary files a/static/images/cseismic2k10.png and b/static/images/cseismic2k10.png differ
63+
diff --git a/static/images/menu/Contact.png b/static/images/menu/Contact.png
64+
index 42fbe0f..8be5d6c 100644
65+
Binary files a/static/images/menu/Contact.png and b/static/images/menu/Contact.png differ
66+
diff --git a/static/images/menu/Events.png b/static/images/menu/Events.png
67+
index b955979..0077f87 100644
68+
Binary files a/static/images/menu/Events.png and b/static/images/menu/Events.png differ
69+
diff --git a/static/images/menu/Gallery.png b/static/images/menu/Gallery.png
70+
index e7bc3fb..a7cc97a 100644
71+
Binary files a/static/images/menu/Gallery.png and b/static/images/menu/Gallery.png differ
72+
diff --git a/static/images/menu/Home.png b/static/images/menu/Home.png
73+
index c2aff5b..df4ee74 100644
74+
Binary files a/static/images/menu/Home.png and b/static/images/menu/Home.png differ
75+
diff --git a/static/images/menu/Register.png b/static/images/menu/Register.png
76+
index 468b566..eb8e156 100644
77+
Binary files a/static/images/menu/Register.png and b/static/images/menu/Register.png differ
78+
diff --git a/static/images/menu/Schedule.png b/static/images/menu/Schedule.png
79+
index d20e768..00cafd2 100644
80+
Binary files a/static/images/menu/Schedule.png and b/static/images/menu/Schedule.png differ
81+
diff --git a/static/js/main.js b/static/js/main.js
82+
index 4a099a6..18908dd 100644
83+
--- a/static/js/main.js
84+
+++ b/static/js/main.js
85+
@@ -11,6 +11,6 @@ $(document).ready( function() {
86+
runningclass: 'innerfade',
87+
});
88+
$('#news').css({ visibility: "visible"});
89+
- $('#menu').jqDock({labels: true, size: '75px'});
90+
+ $('#menu').jqDock({labels: true, size: "80px"});
91+
});
92+
93+
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
94+
index 7be86c5..13623ea 100644
95+
--- a/templates/authopenid/signin.html
96+
+++ b/templates/authopenid/signin.html
97+
@@ -45,8 +45,6 @@
98+
<div>&nbsp;&nbsp;<a href="/account/password/reset">{% trans "Lost your password ?" %}</a></div>
99+
</fieldset>
100+
</form>
101+
-<br/>
102+
-<p><a href="/">Back to Home</a></p>
103+
</div>
104+
{% endblock %}
105+
106+
diff --git a/templates/richbase.html b/templates/richbase.html
107+
index 9a42b36..b2926f3 100644
108+
--- a/templates/richbase.html
109+
+++ b/templates/richbase.html
110+
@@ -8,7 +8,7 @@
111+
<meta http-equiv="X-XRDS-Location" content="http://{{ request.get_host }}{% url oid_xrdf %}" />
112+
{% endif %}
113+
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/css/base.css" />
114+
- <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/css/custom-theme/jquery-ui-1.8.2.custom.css" />
115+
+ <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/css/custom-theme2/jquery-ui-1.8.2.custom.css" />
116+
<script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery-1.4.2.min.js"></script>
117+
<script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery-ui-1.8.2.custom.min.js"></script>
118+
<script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery.innerfade.js"></script>
119+
@@ -25,10 +25,10 @@
120+
<a href="{% url user_signin %}?next={{request.get_full_path}}">Log In</a> | <a href="{% url registration_register %}?next={{request.get_full_path}}">Register</a>
121+
{% endif %}
122+
</div>
123+
- <header width="100%" style="text-align: center;">
124+
- <img width="500px" src="{{ MEDIA_URL }}/images/cseismic2k10.png" alt="Cseismic-2K10"><br>
125+
- <div class="ui-state-error">&laquo;This website is under construction&raquo;</div>
126+
- </header>
127+
+ <h1 align="center">
128+
+ <img width="500px" src="{{ MEDIA_URL }}/images/cseismic2k10.png" alt="Cseismic-2K10">
129+
+ </h1>
130+
+ <div style="text-align: center;" class="ui-state-error">&laquo;This website is under construction&raquo;</div>
131+
<div id="menu" class="menu">
132+
<a href="/" ><img src="{{ MEDIA_URL }}/images/menu/Home.gif" alt="{{ MEDIA_URL }}/images/menu/Home.png"></a>
133+
<a href="{% url events %}"><img src="{{ MEDIA_URL }}/images/menu/Events.gif" alt="{{ MEDIA_URL }}/images/menu/Events.png"></a>
134+
@@ -37,6 +37,7 @@
135+
<a href="{% url gallery %}"><img src="{{ MEDIA_URL }}/images/menu/Gallery.gif" alt="{{ MEDIA_URL }}/images/menu/Gallery.png"></a>
136+
<a href="{% url contact_us %}"><img src="{{ MEDIA_URL }}/images/menu/Contact.gif" alt="{{ MEDIA_URL }}/images/menu/Contact.png"></a>
137+
</div>
138+
+<hr>
139+
<br>
140+
<div class="content">
141+
{% block content %}
142+
diff --git a/urls.py b/urls.py
143+
index a62f358..4a6cd9a 100644
144+
--- a/urls.py
145+
+++ b/urls.py
146+
@@ -22,6 +22,8 @@ urlpatterns = patterns('',
147+
url(r'^account/activate/(?P<activation_key>\w+)/$', 'registration.views.activate', { 'backend': 'registration.backends.default.DefaultBackend' }, name='registration_activate'),
148+
url(r'^account/activate/complete/$', direct_to_template, { 'template': 'registration/activation_complete.html' }, name='registration_activation_complete'),
149+
url(r'^account/signup/$', 'registration.views.register', {'backend':'registration.backends.default.DefaultBackend' }, name='registration_register'),
150+
+ url(r'^register/closed/$', direct_to_template, { 'template': 'registration/registration_closed.html' }, name='registration_disallowed'),
151+
+
152+
(r'^account/', include('django_authopenid.urls')),
153+
(r'^events/', include('events.urls')),
154+
url(r'^contact$', 'host.views.contact_us', name='contact_us'),

settings.py

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
LOGIN_URL = '/account/signin'
101101
LOGOUT_URL = '/account/signout'
102102
LOGIN_REDIRECT_URL = '/'
103+
REGISTRATION_OPEN = False
103104

104105
DEFAULT_FROM_EMAIL = '[email protected]'
105106

static/css/base.css

+18-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
1-
body {
2-
background-color:#100;
3-
margin-left: 50px;
4-
margin-right: 50px;
1+
body {
2+
3+
background-color: #020f22;
4+
background-image: url(/static/images/background1.jpg);
5+
background-position: center;
6+
background-attachment: fixed;
7+
width: 1010px;
8+
background-repeat: no-repeat;
9+
margin: 0 auto;
510
color:#fff;
611
}
712
a {
8-
color: #5ff;
13+
/* color: #5ff; */
14+
color: #0ff;
915
}
1016
a:hover {
1117
color: #0f0;
1218
}
1319
a:visited {
1420
color: #099;
1521
}
22+
a:visited:hover {
23+
color: #0f0;
24+
}
1625
.content {
17-
min-height: 600px;
26+
min-height: 400px;
1827
}
1928
.user_info {
2029
float: right;
@@ -65,3 +74,6 @@ p {
6574
font-size: small;
6675
text-align: center;
6776
}
77+
.ui-widget {
78+
opacity: .9;
79+
}
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)