[cig-commits] r13962 - in cs/portal/trunk/magportal: . MagWebPortal MagWebPortal/site MagWebPortal/static MagWebPortal/static/images MagWebPortal/templates/MagWebPortal MagWebPortal/templates/registration
leif at geodynamics.org
leif at geodynamics.org
Tue Jan 27 14:36:07 PST 2009
Author: leif
Date: 2009-01-27 14:36:06 -0800 (Tue, 27 Jan 2009)
New Revision: 13962
Added:
cs/portal/trunk/magportal/MagWebPortal/static/images/favicon.ico
Removed:
cs/portal/trunk/magportal/MagWebPortal/static/cig-logo_small-initials.ico
cs/portal/trunk/magportal/MagWebPortal/static/images/cig-logo_small-initials.ico
Modified:
cs/portal/trunk/magportal/MANIFEST.in
cs/portal/trunk/magportal/MagWebPortal/notifications.py
cs/portal/trunk/magportal/MagWebPortal/site/settings.py
cs/portal/trunk/magportal/MagWebPortal/site/urls.py
cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/root.html
cs/portal/trunk/magportal/MagWebPortal/templates/registration/pwreset_email.txt
cs/portal/trunk/magportal/setup.py
Log:
Updated e-mail addresses & URLs for move to Crust. Fixed shortcut
icon.
Modified: cs/portal/trunk/magportal/MANIFEST.in
===================================================================
--- cs/portal/trunk/magportal/MANIFEST.in 2009-01-27 15:54:59 UTC (rev 13961)
+++ cs/portal/trunk/magportal/MANIFEST.in 2009-01-27 22:36:06 UTC (rev 13962)
@@ -3,7 +3,6 @@
include runserver.sh
include daemon.py
include MagWebPortal/static/*.pdf
-include MagWebPortal/static/*.ico
include MagWebPortal/static/*.txt
include MagWebPortal/static/css/*.css
include MagWebPortal/static/doc/*.pdf
Modified: cs/portal/trunk/magportal/MagWebPortal/notifications.py
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/notifications.py 2009-01-27 15:54:59 UTC (rev 13961)
+++ cs/portal/trunk/magportal/MagWebPortal/notifications.py 2009-01-27 22:36:06 UTC (rev 13962)
@@ -12,7 +12,7 @@
"",
"To download the output, visit the following web page:",
"",
- "http://dynamo.geodynamics.org%s/simulations/%d/" % (URL_ROOT, sim.id),
+ "https://crust.geodynamics.org%s/simulations/%d/" % (URL_ROOT, sim.id),
"",
"Sincerely,",
"The CIG MAG Web Portal",
@@ -32,7 +32,7 @@
"",
"To download the output, visit the following web page:",
"",
- "http://dynamo.geodynamics.org%s/simulations/%d/" % (URL_ROOT, sim.id),
+ "https://crust.geodynamics.org%s/simulations/%d/" % (URL_ROOT, sim.id),
"",
"Sincerely,",
"The CIG MAG Web Portal",
@@ -68,7 +68,7 @@
message.extend([
"""NOTE: Before this new user can run simulations, you must approve them by selecting the "approved" checkbox on the following page:""",
"",
- "http://dynamo.geodynamics.org/admin/%s/userinfo/%d/" % (APP_LABEL, userInfo._get_pk_val()),
+ "https://crust.geodynamics.org/magadmin/%s/userinfo/%d/" % (APP_LABEL, userInfo._get_pk_val()),
"",
])
message.extend([
Modified: cs/portal/trunk/magportal/MagWebPortal/site/settings.py
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/site/settings.py 2009-01-27 15:54:59 UTC (rev 13961)
+++ cs/portal/trunk/magportal/MagWebPortal/site/settings.py 2009-01-27 22:36:06 UTC (rev 13962)
@@ -7,15 +7,20 @@
if DEBUG:
ADMINS = (
- ('Wei', 'wei at geodynamics.org'),
- )
+ ("Leif", "leif at geodynamics.org"),
+ )
+ MANAGERS = ADMINS
else:
ADMINS = (
- ('Wei', 'wei at geodynamics.org'),
- )
+ ("CIG Portal", "portal at geodynamics.org"),
+ ("Leif", "leif at geodynamics.org"),
+ )
+ MANAGERS = (
+ ("Ariel", "ariel at geodynamics.org"),
+ ("Sue", "sue at geodynamics.org"),
+ ("CIG Portal", "portal at geodynamics.org"),
+ )
-MANAGERS = ADMINS
-
DATABASE_ENGINE = 'sqlite3' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
DATABASE_NAME = os.environ.get("WEBPORTAL_DATABASE_NAME") # Or path to database file if using sqlite3.
DATABASE_USER = '' # Not used with sqlite3.
Modified: cs/portal/trunk/magportal/MagWebPortal/site/urls.py
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/site/urls.py 2009-01-27 15:54:59 UTC (rev 13961)
+++ cs/portal/trunk/magportal/MagWebPortal/site/urls.py 2009-01-27 22:36:06 UTC (rev 13962)
@@ -5,5 +5,5 @@
(r'^magwebportal/', include('MagWebPortal.urls')),
# Uncomment this for admin:
- (r'^admin/', include('django.contrib.admin.urls')),
+ (r'^magadmin/', include('django.contrib.admin.urls')),
)
Deleted: cs/portal/trunk/magportal/MagWebPortal/static/cig-logo_small-initials.ico
===================================================================
(Binary files differ)
Deleted: cs/portal/trunk/magportal/MagWebPortal/static/images/cig-logo_small-initials.ico
===================================================================
(Binary files differ)
Added: cs/portal/trunk/magportal/MagWebPortal/static/images/favicon.ico
===================================================================
(Binary files differ)
Property changes on: cs/portal/trunk/magportal/MagWebPortal/static/images/favicon.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/root.html
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/root.html 2009-01-27 15:54:59 UTC (rev 13961)
+++ cs/portal/trunk/magportal/MagWebPortal/templates/MagWebPortal/root.html 2009-01-27 22:36:06 UTC (rev 13962)
@@ -2,8 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <LINK REL="SHORTCUT ICON"
- HREF="https://dyanmo.geodynamics.org/magwebportal/ciglogo.ico">
+ <link rel="shortcut icon" type="image/x-icon" href="/magwebportal/images/favicon.ico">
<link href="/magwebportal/static/css/style.css" type="text/css" rel="stylesheet" media="all" />
<script type="text/javascript" language="javascript" src="/magwebportal/static/jss/main.js"></script>
<title>{% block title %}MAG PORTAL{% endblock %}</title>
Modified: cs/portal/trunk/magportal/MagWebPortal/templates/registration/pwreset_email.txt
===================================================================
--- cs/portal/trunk/magportal/MagWebPortal/templates/registration/pwreset_email.txt 2009-01-27 15:54:59 UTC (rev 13961)
+++ cs/portal/trunk/magportal/MagWebPortal/templates/registration/pwreset_email.txt 2009-01-27 22:36:06 UTC (rev 13962)
@@ -1,13 +1,13 @@
You're receiving this e-mail because you requested a password reset
for your user account at the MAG Web Portal:
-http://dyanmo.geodynamics.org/magwebportal/
+https://crust.geodynamics.org/magwebportal/
Your new password is: {{ new_password }}
Feel free to change this password by going to this page:
-https://dynamo.geodynamics.org/magwebportal/registration/password/
+https://crust.geodynamics.org/magwebportal/registration/password/
Your username, in case you've forgotten: {{ user.username }}
Modified: cs/portal/trunk/magportal/setup.py
===================================================================
--- cs/portal/trunk/magportal/setup.py 2009-01-27 15:54:59 UTC (rev 13961)
+++ cs/portal/trunk/magportal/setup.py 2009-01-27 22:36:06 UTC (rev 13962)
@@ -9,7 +9,6 @@
author_email = 'leif at geodynamics.org',
packages = ['MagWebPortal', 'MagWebPortal.site'],
package_data = {'MagWebPortal': ['static/*.pdf',
- 'static/*.ico',
'static/*.txt',
'static/css/*.css',
'static/doc/*.pdf',
More information about the CIG-COMMITS
mailing list