Commit de59f556 authored by Jean Michel Rouly's avatar Jean Michel Rouly
Browse files

Merge branch 'dev'

Introduced filters as a feature.
parents 22cd9c20 720984e5
......@@ -6,5 +6,5 @@ emailsettings.py
/researchquestions/static/css/build
/researchquestions/static/admin
/researchquestions/media/feedback.txt
/researchquestions/website/migrations
/researchquestions/settings/secret.py
/researchquestions/researchquestions/secret.py
/researchquestions/config/config.py
## Define your install-specific configurations here.
DICTIONARY_ADJECTIVES = 'dicts/adjectives.en'
DICTIONARY_NOUNS = 'dicts/nouns.en'
BRANDING = ''
PAGE_TITLE_PREFIX = ''
ORGANIZATION = ''
ORGANIZATION_URL = ''
......@@ -3,7 +3,7 @@ import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "researchquestions.settings")
from django.core.management import execute_from_command_line
......
from django.conf import settings
def branding( request ):
return {
'page_title_prefix' : settings.PAGE_TITLE_PREFIX,
'organization' : settings.ORGANIZATION,
'organization_url' : settings.ORGANIZATION_URL,
'branding' : settings.BRANDING,
}
......@@ -22,9 +22,9 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__))
SECRET_KEY = secret.SECRET_KEY
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
DEBUG = True
TEMPLATE_DEBUG = True
TEMPLATE_DEBUG = False
ALLOWED_HOSTS = ['127.0.0.1']
......@@ -42,6 +42,8 @@ INSTALLED_APPS = (
'django.contrib.staticfiles',
'south',
'website',
'website.filters',
'config',
)
MIDDLEWARE_CLASSES = (
......@@ -53,9 +55,9 @@ MIDDLEWARE_CLASSES = (
'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
ROOT_URLCONF = 'settings.urls'
ROOT_URLCONF = 'researchquestions.urls'
WSGI_APPLICATION = 'settings.wsgi.application'
WSGI_APPLICATION = 'researchquestions.wsgi.application'
MEDIA_URL = '/media/'
MEDIA_ROOT = (os.path.join(BASE_DIR, 'media/'))
......@@ -74,7 +76,6 @@ STATICFILES_FINDERS = (
TEMPLATE_DIRS = (
(os.path.join(BASE_DIR, 'templates/')),
#'/www/http/research-questions/researchquestions/templates/',
'templates',
)
......@@ -83,14 +84,18 @@ TEMPLATE_LOADERS = (
'django.template.loaders.app_directories.Loader',
)
TEMPLATE_CONTEXT_PROCSSORS = (
'django.core.context_processors.request',
TEMPLATE_CONTEXT_PROCESSORS = (
'django.contrib.auth.context_processors.auth',
)
'django.core.context_processors.debug',
'django.core.context_processors.i18n',
'django.core.context_processors.media',
'django.core.context_processors.static',
'django.core.context_processors.tz',
'django.contrib.messages.context_processors.messages',
'django.core.context_processors.request',
LOGIN_URL = '/login'
LOGOUT_URL = '/logout'
LOGIN_REDIRECT_URL = '/'
'researchquestions.context_processors.branding',
)
# Database
# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
......@@ -122,11 +127,12 @@ USE_TZ = True
# Authentication
# http://pythonhosted.org/django-auth-ldap
LOGIN_URL = '/login'
LOGOUT_URL = '/logout'
LOGIN_REDIRECT_URL = '/'
import ldap
# Baseline configuration
# Keep ModelBackend around for per-user permissions and maybe a local
# superuser.
AUTHENTICATION_BACKENDS = (
'django_auth_ldap.backend.LDAPBackend',
'django.contrib.auth.backends.ModelBackend',
......@@ -145,39 +151,21 @@ AUTH_LDAP_GLOBAL_OPTIONS = { # ignore UAC cert.
ldap.OPT_X_TLS_REQUIRE_CERT : ldap.OPT_X_TLS_NEVER,
}
# Populate the Django user from the LDAP directory.
AUTH_LDAP_USER_ATTR_MAP = {
"first_name": "givenName",
"last_name": "sn",
"email": "mail"
}
#AUTH_LDAP_USER_FLAGS_BY_GROUP = {
# "is_active": "cn=active,ou=django,ou=groups,dc=example,dc=com",
# "is_staff": "cn=staff,ou=django,ou=groups,dc=example,dc=com",
# "is_superuser": "cn=superuser,ou=django,ou=groups,dc=example,dc=com"
#}
#AUTH_LDAP_PROFILE_FLAGS_BY_GROUP = {
# "is_awesome": "cn=awesome,ou=django,ou=groups,dc=example,dc=com",
#}
# This is the default, but I like to be explicit.
AUTH_LDAP_ALWAYS_UPDATE_USER = True
# Use LDAP group membership to calculate group permissions.
#AUTH_LDAP_FIND_GROUP_PERMS = True
AUTH_LDAP_ALWAYS_UPDATE_USER = True
# Cache group memberships for an hour to minimize LDAP traffic
#AUTH_LDAP_CACHE_GROUPS = True
#AUTH_LDAP_GROUP_CACHE_TIMEOUT = 3600
# Install-specific configurations.
from config import config
# Auth Logging (off by default)
#import logging, logging.handlers
#logfile = "/tmp/django-ldap-debug.log"
#my_logger = logging.getLogger('django_auth_ldap')
#my_logger.setLevel(logging.DEBUG)
#
#handler = logging.handlers.RotatingFileHandler(
#logfile, maxBytes=1024 * 500, backupCount=5)
#
#my_logger.addHandler(handler)
DICTIONARY_ADJECTIVES = (os.path.join(STATIC_ROOT, config.DICTIONARY_ADJECTIVES))
DICTIONARY_NOUNS = (os.path.join(STATIC_ROOT, config.DICTIONARY_NOUNS))
PAGE_TITLE_PREFIX = config.PAGE_TITLE_PREFIX
ORGANIZATION = config.ORGANIZATION
ORGANIZATION_URL = config.ORGANIZATION_URL
BRANDING = config.BRANDING
......@@ -7,19 +7,13 @@ admin.autodiscover()
handler404 = 'website.views.error_404'
handler500 = 'website.views.error_500'
urlpatterns = patterns('website.views',
#### STATIC PAGES ####
url(r'^help$', 'help', name='help'),
#### DYNAMIC PAGES ####
url(r'^submit$', 'submit_question', name='submit_question'),
url(r'^feedback$', 'feedback', name='feedback'),
url(r'^$', 'index', name='homepage'),
url(r'^question/(?P<slug>[^\.]+)$', 'view_question', name='view_question'),
url(r'^me$', 'my_questions', name='my_questions'),
urlpatterns = patterns('',
#### ADMIN PAGES ####
#### Dynamic website pages
url(r'^', include('website.urls')),
url(r'^filter/', include('website.filters.urls')),
#### Admin pages
url(r'^admin/', include(admin.site.urls)),
)
......
......@@ -8,7 +8,7 @@ https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/
"""
import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "researchquestions.settings")
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()
......
/*!
* Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.3');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.3333333333333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.2857142857142858em;text-align:center}.fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:.14285714285714285em;text-align:center}.fa-li.fa-lg{left:-1.8571428571428572em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)}100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0,mirror=1);-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2,mirror=1);-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-asc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-desc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-reply-all:before{content:"\f122"}.fa-mail-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}
\ No newline at end of file
This diff is collapsed.
{% extends 'layouts/base.html' %}
{% block title %}
HNRS 110 &bull; Instructions
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-10 col-lg-offset-1">
<h1>Help</h1>
<p class="lead">Use this document to guide your peer-review of
other students' research questions.</p>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-10 col-lg-offset-1">
<div class="well well-sm text-center">
<ul class="nav nav-pills text-left" style="display:inline-block;">
<li class="dropdown">
<a class="dropdown-toggle" href="#" data-toggle="dropdown">
Using the Website
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a href="#Submit">Submitting a Question</a></li>
<li><a href="#Comments">Comment System</a></li>
<li><a href="#Names">Usernames</a></li>
<li><a href="#Accountability">Accountability</a></li>
</ul>
</li>
<!--
<li>
<a href="#Instructions">Instructions</a>
</li>
-->
<li class="dropdown">
<a class="dropdown-toggle" href="#" data-toggle="dropdown">
Research Questions
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a href="#Good-Questions">Good Questions</a></li>
<li class="divider"></li>
<li><a href="#Originality">Originality</a></li>
<!--
<li><a href="#Building-Blocks">Building Blocks</a></li>
-->
<li><a href="#Specific-Details">Specific Details</a></li>
<li><a href="#Self-Check">Self Check</a></li>
<li><a href="#Material">Material</a></li>
<!--
<li><a href="#Uniqueness">Uniqueness</a></li>
<li><a href="#Framing">Framing</a></li>
<li><a href="#Focus">Focus</a></li>
<li><a href="#Completeness">Completeness</a></li>
<li><a href="#Researchability">Researchability</a></li>
-->
<li class="divider"></li>
<li><a href="#Improving-Questions">Improving Your Questions</a></li>
</ul>
</li>
<li class="dropdown">
<a class="dropdown-toggle" href="#" data-toggle="dropdown">
Feedback
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a href="#Constructive-Feedback">Constructive Feedback</a></li>
<li><a href="#Non-Constructive-Feedback">Non-Constructive Feedback</a></li>
<li><a href="#Feedback-Example">Feedback Example</a></li>
<li class="divider"></li>
<li><a href="#Pro-Tip">Tips</a></li>
</ul>
</li>
</ul>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-10 col-lg-offset-1" style="text-align: justify;">
<!--
<a name="Instructions"></a>
<h1>Instructions</h1>
<p>The objective of this exercise is to have you rate your peers'
research questions as either <strong>good</strong> or <strong>needs
work</strong>. You will also be asked to provide
<strong>comments</strong> explaining your thought process. This
document is meant to help you understand how best to do this.</p>
-->
<a name="Website"></a>
<h1>Using the Website</h1>
<p>In its most general sense, this website is intended to allow
students like yourself to get feedback from your peers on your Honors
110 research questions. If you need help revising, focusing, narrowing,
or in any way editing your question or topic, feel free to submit it
for review!</p>
<a name="Submit"></a>
<h2>Submitting a Question</h2>
<p>Submitting a question is simple. Click the "Submit Question" link in
the navigation bar at the top of the screen, then enter your research
question or topic in the provided box and hit submit. That's all!</p>
<a name="Comments"></a>
<h2>The Comment System</h2>
<p>The comment and reply system on each student's question allows for
pseudo-anonymous discussion. Please use comments and replies to discuss
a student's proposed idea, and provide them with constructive feedback
or ideas.</p>
<a name="Names"></a>
<h2>Usernames</h2>
<p>You will be paired with a randomly generated username when engaging
in discussion. The usernames are generated from a list of English
adjectives and nouns. If you find your username offensive, please
report it to an <a href="mailto:jrouly@gmu.edu">administrator</a>.</p>
<a name="Accountability"></a>
<h2>Student Accountability</h2>
<p>Despite having anonymized usernames for discussion, you are still
held accountable for content posted. Moderators (including your PRMs,
GTAs, and professors) have access to your secret identities. If you
post objectionable content, you <em>will</em> be held accountable. This
can include, but is not limited to: personal attacks, slurs,
"trolling," and general rudeness.</p>
<!---------------------------------------------------------------->
<a name="Research-Questions"></a>
<h1>Research Questions</h1>
<a name="Good-Questions"></a>
<h2>Good Questions</h2>
<p>The art of constructing a good research question is a difficult
skill to learn, but with persistence and dedication it can be mastered
in a short span of time. A good research question is not something that
can be written in a single sitting. This process requires careful
planning, critical analysis of your chosen topic, and revisions based
on the feedback you will receive.</p>
<p>Once you have chosen an acceptable research topic, it is time to
write your research question. When beginning to write the question,
keep in mind the following factors:</p>
<a name="Originality"></a>
<h3>Originality</h3>
<p>Your research question should be unique. This means that either no
one has previously asked this question or that your work presents a new
line of thought on an existing controversy.</p>
<!--
<a name="Building-Blocks"></a>
<h3>Using the Right Building Blocks</h3>
<p>The best research questions look at the <em>"hows"</em> and
<em>"whys"</em> rather than the <em>"whats"</em> and <em>"whos"</em>.
On occasion, a good research question can begin with <em>"what"</em>
(or even more rarely with <em>"who"</em>) if it meets all the other
necessary criteria.</p>
<p>You do not want to have a question that can be definitively
answered. The answer to your research question should be debatable. A
question asking <em>"who"</em> or <em>"what"</em> can almost always be
answered conclusively, and therefore is not a proper research
question.</p>
-->
<a name="Specific-Details"></a>
<h3>Focusing On Specific Details</h3>
<p>Your research question should be asking a specific question that is
narrow. For example, <em>"How did President Clinton's Foreign Policy
Towards Southern Europe in the Late 1990s Help America?"</em> is too
broad. What part(s) of America will you be discussing in the paper?
What exact time period does <em>"the late 1990s"</em> constitute? What
do you consider to be the boundaries of Southern Europe? You do not
need to provide all of these answers in your initial research question,
but you should consider them as you attempt to make your question more
specific. A better research question, using our example, would be,
<em>"How did President Clinton's foreign policy towards Southern France
and Northern Italy between 1995 and 1999 influence the economy in
America’s Northeast?"</em></p>
<a name="Self-Check"></a>
<h3>Perform a Self-Check on Your Question</h3>
<p>Remember that your research question should include the following
four components: who, what, where and when. In our example of a good
research question above, the who is <em>"President Clinton,"</em> the
where is both <em>"Southern France and Northern Italy"</em> and
<em>"America’s Northeast,"</em> the when is <em>"between 1995 and
1999"</em> and the what is <em>"President Clinton’s foreign
policy."</em> You do not need to necessarily include every component
specifically in the question; for example, you could have used
<em>"late 1990s"</em> in place of <em>"between 1995 and 1999."</em>
However, at some point in your paper you would need to clarify what you
consider to be <em>"late 1990s."</em></p>
<a name="Material"></a>
<h3>Is There Enough Material to Research Your Question?</h3>
<p>Make sure your research question has enough available scholarly
sources for you to write the paper (although this should have been
confirmed when choosing your research topic).</p>
<hr />
<a name="Improving-Questions"></a>
<h2>Improving Your Questions</h2>
<h3><em>"Who killed President John F. Kennedy?"</em></h3>
<p>Although the answer to this question is debatable, it is too broad
and uses <em>"who"</em> instead of <em>"why"</em> or <em>"how."</em> In
order to improve the question, the topic needs to focus more closely on
one aspect of JFK's assassin(s) and provide more details in the
question.</p>
<p><strong>Improved:</strong> <em>"Why do modern historians continue to
debate the ‘lone gunman theory’ of the JFK Assassination?"</em></p>
<p><strong>Improved:</strong> <em>"How did the secrecy of the Warren
Commission establish a foundation for theories of conspiracy concerning the
JFK Assassination?"</em>
<h3><em>"Will Hillary Clinton run for President in
2016?"</em></h3>
<p>This question is far too broad - there are many possibilities that can
be explored - and the scholarship on this subject is likely limited, as it
is a very recent topic. In order to improve this question, a student should
focus on a topic that is at least a few years old and is more specific.
Also, keep in mind that while looking toward the future may be fine as an
aspect for the paper, it can prove difficult to focus an entire paper
around predicting the future.</p>
<p><strong>Improved:</strong> <em>"How can the errors made in Hillary
Clinton's 2008 Presidential Campaign be analyzed in order to improve the
success of future candidacies?"</em></p>
<p><strong>Improved:</strong> <em>"How did Hillary Clinton's loss in the
2008 Democratic Iowa Caucus create a domino effect that led to the
Presidency of Barack Obama?"</em></p>
<h3><em>"How did Barack Obama become
President?"</em></h3>
<p>This question needs to be more specific, and as with the previous
example, the scholarship on this subject may be limited, as it is a
very recent topic. At this point in time, focusing on a previous
president would lead to better sources and academic research for your
paper. Also, keep in mind that while topics encompassing modern
politics are covered in a variety of sources, not all of these
materials may be considered scholarly or peer-reviewed (The New York
Times and The Washington Post are acceptable sources for this paper,
but the bulk of your research should come from peer-reviewed journal
articles or academic texts).</p>
<p><strong>Improved:</strong> <em>"How was Barack Obama able to use
his victory in the 2008 Iowa Caucus to win the Democratic Party
Nomination for President of the United States?"</em></p>
<p><strong>Improved:</strong> <em>"Why was the 2008 Democratic Party
Presidential Primary electorate so enthusiastic about the candidacy of
Barack Obama after his victory in the Iowa Caucus?"</em></p>
<hr /> <!-------------------------------------------------------->
<a name="Feedback"></a>
<h1>Feedback</h1>
<a name="Constructive-Feedback"></a>
<h2>Constructive Feedback</h2>
<p>So, you and your classmates have completed the colossal task of creating
your research questions. Unfortunately, a question that may make sense to
you may not make sense to everyone else. This is why peer reviewing each
other’s proposed questions is an absolute necessity. In order to arrive at
the perfect research question, it is imperative to heed the constructive
criticism of others and to adjust your question accordingly each time.
Allow suggestions from others as well as the information you gain from
scholarly articles guide your research process.</p>
<p>First of all, it is very important to note that <strong><em>positive
feedback isn't always good and negative feedback isn't always
bad</em></strong>. Remember that the purpose of providing feedback isn't
to make your classmate feel better about their research projects; it is to
help them do better with their research projects.</p>
<p>Good feedback encourages the researcher, but also pushes them to improve
their question by letting them know what may be unclear to others.</p>
<p>Look at the question critically and identify where improvements could be
made in order to make the question more specific and answerable. Offer
these suggestions in your feedback. It is always better to offer an
alternative phrase or word in order to make it clear to the researcher
exactly how they can improve the question.</p>
<a name="Non-Constructive-Feedback"></a>
<h2>Non-Constructive Feedback</h2>
<p>Just like a bad research question, bad feedback is vague and unhelpful.
Feedback is least useful when it is dishonest, biased, too critical, or
unspecific. Be as honest as possible to the researcher to allow them to
make changes wherever possible. Never hold back constructive criticism for
fear of hurting your classmate's feelings. Instead, do them a favor and