This repository has been archived by the owner on Jan 13, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 34
Past Events page #59
Open
XiayangFan
wants to merge
4
commits into
upenu:master
Choose a base branch
from
XiayangFan:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Past Events page #59
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
taeklklej | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
""" | ||
Django settings for upe project. | ||
|
||
For more information on this file, see | ||
https://docs.djangoproject.com/en/1.6/topics/settings/ | ||
|
||
For the full list of settings and their values, see | ||
https://docs.djangoproject.com/en/1.6/ref/settings/ | ||
""" | ||
|
||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) | ||
import os | ||
BASE_DIR = os.path.dirname(os.path.dirname(__file__)) | ||
|
||
# Address for Docker setups | ||
MYSQL_IP = os.getenv('MYSQL_PORT_3306_TCP_ADDR', '127.0.0.1') | ||
|
||
# Quick-start development settings - unsuitable for production | ||
# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/ | ||
|
||
# SECURITY WARNING: keep the secret key used in production secret! | ||
SECRET_KEY = '9+!w(w9&qra8zp)k(^xq%i!3flgnipy4m_84&o8bf7#&&4nvl!' | ||
|
||
# SECURITY WARNING: don't run with debug turned on in production! | ||
DEBUG = True | ||
TEMPLATE_DEBUG = False | ||
|
||
|
||
|
||
LOGIN_URL = '/login/' | ||
|
||
# Application definition | ||
|
||
INSTALLED_APPS = ( | ||
'django.contrib.admin', | ||
'django.contrib.auth', | ||
'django.contrib.contenttypes', | ||
'django.contrib.sessions', | ||
'django.contrib.messages', | ||
'django.contrib.staticfiles', | ||
'website', | ||
'upe_calendar', | ||
'users' | ||
) | ||
|
||
MIDDLEWARE_CLASSES = ( | ||
'django.contrib.sessions.middleware.SessionMiddleware', | ||
'django.middleware.common.CommonMiddleware', | ||
'django.middleware.csrf.CsrfViewMiddleware', | ||
'django.contrib.auth.middleware.AuthenticationMiddleware', | ||
'django.contrib.messages.middleware.MessageMiddleware', | ||
'django.middleware.clickjacking.XFrameOptionsMiddleware', | ||
) | ||
|
||
ROOT_URLCONF = 'upe.urls' | ||
|
||
WSGI_APPLICATION = 'upe.wsgi.application' | ||
|
||
|
||
# Database | ||
# https://docs.djangoproject.com/en/1.6/ref/settings/#databases | ||
|
||
DATABASES = { | ||
'default': { | ||
'ENGINE': 'django.db.backends.mysql', | ||
'NAME': 'upe', | ||
'USER': 'admin', | ||
'PASSWORD': 'littlewhale', | ||
'HOST': MYSQL_IP, | ||
'PORT': '3306', | ||
} | ||
} | ||
|
||
# Static files (CSS, JavaScript) | ||
# https://docs.djangoproject.com/en/1.6/howto/static-files/ | ||
STATIC_ROOT = os.path.join(BASE_DIR, 'static') | ||
STATIC_URL = '/static/' | ||
|
||
# Media files (Images, Downloads, Files) | ||
MEDIA_ROOT = os.path.join(BASE_DIR, 'media') | ||
MEDIA_URL = '/media/' | ||
|
||
# Internationalization | ||
# https://docs.djangoproject.com/en/1.6/topics/i18n/ | ||
|
||
LANGUAGE_CODE = 'en-us' | ||
|
||
TIME_ZONE = 'America/Los_Angeles' | ||
|
||
USE_I18N = True | ||
|
||
USE_L10N = True | ||
|
||
USE_TZ = True | ||
|
||
AUTHENTICATION_BACKENDS = ('users.backends.CustomBackend',) | ||
|
||
from django.conf import global_settings | ||
TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ("website.processor.populate_footer",) | ||
|
||
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' | ||
EMAIL_HOST = 'localhost' | ||
EMAIL_HOST_PASSWORD = '' | ||
EMAIL_HOST_USER = '' | ||
EMAIL_PORT = 25 | ||
EMAIL_USE_TLS = False | ||
DEFAULT_FROM_EMAIL = 'Do-Not-Reply <[email protected]>' | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,152 @@ | ||
h1 { | ||
font-size: 20px; | ||
font-weight: bold; | ||
} | ||
|
||
/*img { | ||
display: block; | ||
max-width:400px; | ||
max-height:200px; | ||
width: auto; | ||
height: auto; | ||
}*/ | ||
#event-element-container { | ||
margin: 0 auto; | ||
min-height: 300px; | ||
float: left; | ||
width:800px; | ||
} | ||
|
||
#main-content-wrapper .event-element { | ||
vertical-align:top; | ||
width: 350px; | ||
height: 550px; | ||
background-color: white; | ||
position: relative; | ||
display: inline-block; | ||
margin-right: 10px; | ||
margin-bottom: 20px; | ||
-moz-box-shadow: 0 0 5px #bfbeba !important; | ||
-webkit-box-shadow: 0 0 5px #bfbeba !important; | ||
-o-box-shadow: 0 0 5px #bfbeba !important; | ||
-ktml-box-shadow: 0 0 5px #bfbeba !important; | ||
-ms-box-shadow: 0 0 5px #bfbeba !important; | ||
} | ||
|
||
#main-content-wrapper .event-picture { | ||
width: 350px; | ||
height: 180px; | ||
margin-bottom: 5px; | ||
} | ||
|
||
#main-content-wrapper .event-element span { | ||
display: block; | ||
} | ||
|
||
#main-content-wrapper .social { | ||
position: absolute; | ||
bottom: 0px; | ||
display: block; | ||
padding: 5px; | ||
font-size: 20px; | ||
} | ||
|
||
#main-content-wrapper .social li { | ||
display: inline-block; | ||
margin-right: 5px; | ||
} | ||
|
||
#main-content-wrapper .social i { | ||
color: #3eacc7 !important; | ||
} | ||
|
||
#main-content-wrapper .social i:hover { | ||
color: #78c5d8 !important; | ||
} | ||
|
||
#main-content-wrapper .officer-member-info { | ||
padding: 5px; | ||
font-size: 13px; | ||
line-height: 1.2; | ||
font-weight: 800; | ||
} | ||
|
||
#main-content-wrapper .content-container { | ||
width: 980px; | ||
margin: 72px auto 20px auto; | ||
padding: 35px 20px; | ||
overflow: auto; | ||
} | ||
|
||
#main-content-wrapper .content-container { | ||
font-family: 'PT Sans', sans-serif; | ||
background-color: white; | ||
box-shadow: 0 0 10px #bfbeba; | ||
-moz-box-shadow: 0 0 10px #bfbeba; | ||
-webkit-box-shadow: 0 0 10px #bfbeba; | ||
-o-box-shadow: 0 0 10px #bfbeba; | ||
-ktml-box-shadow: 0 0 10px #bfbeba; | ||
-ms-box-shadow: 0 0 10px #bfbeba; | ||
} | ||
|
||
.officer-sidebar { | ||
margin-bottom: 32px; | ||
margin-right: 16px; | ||
width: 160px; | ||
float: left; | ||
} | ||
|
||
#main-content-wrapper .content-sidebar h1 { | ||
font-size: 25px; | ||
font-weight: 700; | ||
color: #555; | ||
border-bottom: 2px solid #3eacc7; | ||
width: 115px; | ||
line-height: 45px; | ||
position: relative; | ||
top: -15px; | ||
} | ||
|
||
#main-content-wrapper .email { | ||
font-weight: 400; | ||
} | ||
|
||
#main-content-wrapper #archive li { | ||
margin-bottom: 7px; | ||
} | ||
|
||
#main-content-wrapper #archive li a { | ||
color: #555; | ||
font-weight: 400; | ||
} | ||
|
||
#main-content-wrapper .officer-position { | ||
padding: 10px; | ||
} | ||
|
||
#main-content-wrapper .position-label { | ||
border-bottom: 2px solid #3eacc7; | ||
} | ||
|
||
/* See https://css-tricks.com/hash-tag-links-padding/ */ | ||
#main-content-wrapper .position-container:before { | ||
display: block; | ||
content: " "; | ||
margin-top: -50px; | ||
height: 50px; | ||
visibility: hidden; | ||
} | ||
|
||
.link { | ||
border-bottom: 1px solid #0088cc; | ||
color: #0088cc; | ||
font-weight: 600; | ||
text-decoration: none; | ||
transition: 100ms; | ||
position: relative; | ||
} | ||
|
||
.link:hover { | ||
border-bottom-color: #0088cc; | ||
border-bottom-width: medium; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wat