Yay, the news system is looking good now. We'll re-visit it later to add searching/sorting by news categories and stuff.
This commit is contained in:
parent
762e0f83bc
commit
613edc774f
3 changed files with 13 additions and 11 deletions
|
|
@ -28,7 +28,6 @@ def page_index(request):
|
||||||
|
|
||||||
pagevars = {
|
pagevars = {
|
||||||
"page_title": "Front Page",
|
"page_title": "Front Page",
|
||||||
"no_sidebar": True,
|
|
||||||
"news_entries": news_entries,
|
"news_entries": news_entries,
|
||||||
"players_connected_recent": recent_players,
|
"players_connected_recent": recent_players,
|
||||||
"num_players_connected": functions_db.get_connected_players().count(),
|
"num_players_connected": functions_db.get_connected_players().count(),
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,10 @@ USE_I18N = False
|
||||||
# lighttpd).
|
# lighttpd).
|
||||||
SERVE_MEDIA = False
|
SERVE_MEDIA = False
|
||||||
|
|
||||||
|
# The master urlconf file that contains all of the sub-branches to the
|
||||||
|
# applications.
|
||||||
|
ROOT_URLCONF = 'urls'
|
||||||
|
|
||||||
# Where users are redirected after logging in via contribu.auth.login.
|
# Where users are redirected after logging in via contribu.auth.login.
|
||||||
LOGIN_REDIRECT_URL = '/'
|
LOGIN_REDIRECT_URL = '/'
|
||||||
|
|
||||||
|
|
@ -123,12 +127,9 @@ MIDDLEWARE_CLASSES = (
|
||||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
'django.middleware.doc.XViewMiddleware',
|
'django.middleware.doc.XViewMiddleware',
|
||||||
|
'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
|
||||||
)
|
)
|
||||||
|
|
||||||
# The master urlconf file that contains all of the sub-branches to the
|
|
||||||
# applications.
|
|
||||||
ROOT_URLCONF = 'urls'
|
|
||||||
|
|
||||||
# Context processors define context variables, generally for the template
|
# Context processors define context variables, generally for the template
|
||||||
# system to use.
|
# system to use.
|
||||||
TEMPLATE_CONTEXT_PROCESSORS = (
|
TEMPLATE_CONTEXT_PROCESSORS = (
|
||||||
|
|
@ -154,9 +155,11 @@ TEMPLATE_DIRS = (
|
||||||
# refer to app models and perform DB syncs.
|
# refer to app models and perform DB syncs.
|
||||||
INSTALLED_APPS = (
|
INSTALLED_APPS = (
|
||||||
'django.contrib.auth',
|
'django.contrib.auth',
|
||||||
|
'django.contrib.sites,
|
||||||
'django.contrib.contenttypes',
|
'django.contrib.contenttypes',
|
||||||
'django.contrib.sessions',
|
'django.contrib.sessions',
|
||||||
'django.contrib.admin',
|
'django.contrib.admin',
|
||||||
|
'django.contrib.flatpages',
|
||||||
'apps.config',
|
'apps.config',
|
||||||
'apps.objects',
|
'apps.objects',
|
||||||
'apps.helpsys',
|
'apps.helpsys',
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,10 @@
|
||||||
<meta name="author" content="haran" />
|
<meta name="author" content="haran" />
|
||||||
<meta name="generator" content="haran" />
|
<meta name="generator" content="haran" />
|
||||||
|
|
||||||
{% if no_sidebar %}
|
{% if sidebar %}
|
||||||
<link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-screen.css" media="screen" title="Prosimii" />
|
|
||||||
{% else %}
|
|
||||||
<link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-screen-alt.css" media="screen" title="Prosimii (Sidebar)" />
|
<link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-screen-alt.css" media="screen" title="Prosimii (Sidebar)" />
|
||||||
|
{% else %}
|
||||||
|
<link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-screen.css" media="screen" title="Prosimii" />
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<link rel="stylesheet alternative" type="text/css" href="{{media_url}}css/prosimii-print.css" media="screen" title="Print Preview" />
|
<link rel="stylesheet alternative" type="text/css" href="{{media_url}}css/prosimii-print.css" media="screen" title="Print Preview" />
|
||||||
<link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-print.css" media="print" />
|
<link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-print.css" media="print" />
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
{% block header_ext %}
|
{% block header_ext %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
<title>{{game_name}} - {{page_title}}</title>
|
<title>{{game_name}} - {% if flatpage %}{{flatpage.title}}{% else %}{{page_title}}{% endif %}</title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|
@ -54,7 +54,7 @@
|
||||||
<div class="subHeader">
|
<div class="subHeader">
|
||||||
<span class="doNotDisplay">Navigation:</span>
|
<span class="doNotDisplay">Navigation:</span>
|
||||||
<a href="/">Home</a> |
|
<a href="/">Home</a> |
|
||||||
<a href="/tbi">About</a> |
|
<a href="/about/">About</a> |
|
||||||
<a href="/tbi">Documentation</a> |
|
<a href="/tbi">Documentation</a> |
|
||||||
<a href="/tbi">Staff List</a> |
|
<a href="/tbi">Staff List</a> |
|
||||||
<a href="/admin/">Admin Interface</a>
|
<a href="/admin/">Admin Interface</a>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue