mirror of
https://github.com/evennia/evennia.git
synced 2026-03-31 04:57:16 +02:00
Some more work towards having a working news module. This isn't anywhere near ready yet!
This commit is contained in:
parent
115a420cee
commit
ebb145654f
4 changed files with 27 additions and 47 deletions
|
|
@ -1,6 +1,6 @@
|
|||
from django.conf.urls.defaults import *
|
||||
|
||||
urlpatterns = patterns('apps.news.views',
|
||||
# (r'^news/show/(?P<entry_id>\d+)/$', 'show_news'),
|
||||
(r'^show/(?P<entry_id>\d+)/$', 'show_news'),
|
||||
# (r'^news/categories/list/$', 'recent_kills'),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,34 +2,21 @@
|
|||
# News display.
|
||||
#
|
||||
from django.shortcuts import render_to_response, get_object_or_404
|
||||
from django.db import connection
|
||||
from django.template import RequestContext
|
||||
from django import newforms as forms
|
||||
from django.newforms.util import ValidationError
|
||||
import django.views.generic.list_detail as list_detail
|
||||
from django.contrib.auth.models import User
|
||||
from django.utils import simplejson
|
||||
|
||||
import frontier.settings as settings
|
||||
from frontier.apps.player.models import UserProfile
|
||||
from frontier.apps.news.models import NewsTopic, NewsEntry
|
||||
from apps.news.models import NewsTopic, NewsEntry
|
||||
|
||||
nav_block = """
|
||||
<div>
|
||||
</div>
|
||||
"""
|
||||
|
||||
def index(request):
|
||||
def show_news(request, entry_id):
|
||||
"""
|
||||
News index.
|
||||
Show an individual news entry.
|
||||
"""
|
||||
news_entries = NewsEntry.objects.all().order_by('-date_posted')[:10]
|
||||
#news_entries = NewsEntry.objects.all().order_by('-date_posted')[:10]
|
||||
|
||||
pagevars = {
|
||||
"page_title": "Front Page",
|
||||
"nav_block": nav_block,
|
||||
"news_entries": news_entries,
|
||||
}
|
||||
|
||||
context_instance = RequestContext(request)
|
||||
return render_to_response('news/index.html', pagevars, context_instance)
|
||||
return render_to_response('base.html', pagevars, context_instance)
|
||||
|
|
|
|||
3
urls.py
3
urls.py
|
|
@ -15,6 +15,9 @@ urlpatterns = patterns('',
|
|||
|
||||
# Front page
|
||||
(r'^', include('apps.website.urls')),
|
||||
|
||||
# News stuff
|
||||
(r'^news/', include('apps.news.urls')),
|
||||
)
|
||||
|
||||
# If you'd like to serve media files via Django (strongly not recommended!),
|
||||
|
|
|
|||
|
|
@ -7,21 +7,11 @@
|
|||
<meta name="author" content="haran" />
|
||||
<meta name="generator" content="haran" />
|
||||
|
||||
<!-- Navigational metadata for large websites (an accessibility feature): -->
|
||||
<link rel="top" href="./index.html" title="Homepage" />
|
||||
<link rel="up" href="./index.html" title="Up" />
|
||||
<link rel="first" href="./index.html" title="First page" />
|
||||
<link rel="previous" href="./index.html" title="Previous page" />
|
||||
<link rel="next" href="./index2.html" title="Next page" />
|
||||
<link rel="last" href="./index2.html" title="Last page" />
|
||||
<link rel="toc" href="./index.html" title="Table of contents" />
|
||||
<link rel="index" href="./index.html" title="Site map" />
|
||||
<link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-screen-alt.css" media="screen" title="Prosimii (alternative)" />
|
||||
<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="./prosimii-screen-alt.css" media="screen" title="Prosimii (alternative)" />
|
||||
<link rel="stylesheet alternative" type="text/css" href="./prosimii-print.css" media="screen" title="Print Preview" />
|
||||
<link rel="stylesheet" type="text/css" href="./prosimii-print.css" media="print" />
|
||||
|
||||
<title>Prosimii Page Two</title>
|
||||
<title>{{game_name}}</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -33,31 +23,34 @@
|
|||
<div id="header">
|
||||
<div class="superHeader">
|
||||
<span>Related Sites:</span>
|
||||
<a href="http://www.oswd.org" title="The host of this design">OSWD</a> |
|
||||
<a href="http://evennia.com" title="The Python-based MUD server">Evennia</a> |
|
||||
<a href="http://www.oswd.org/userinfo.phtml?user=haran" title="Other designs by haran">haran’s Designs</a>
|
||||
</div>
|
||||
|
||||
<div class="midHeader">
|
||||
<h1 class="headerTitle" lang="la">Prosimii</h1>
|
||||
<div class="headerSubTitle">No more monkey business…</div>
|
||||
<h1 class="headerTitle" lang="la">{{game_name}}</h1>
|
||||
<div class="headerSubTitle" title="Slogan">
|
||||
<!-- Insert a slogan here if you want -->
|
||||
|
||||
</div>
|
||||
|
||||
<br class="doNotDisplay doNotPrint" />
|
||||
|
||||
<div class="headerLinks">
|
||||
<span class="doNotDisplay">Tools:</span>
|
||||
<a href="./index.html">view the previous layout «</a>
|
||||
<a href="/login">Log In «</a>
|
||||
<span class="doNotDisplay">|</span>
|
||||
<a style="cursor: help;" title="Thanks to CSS, this page is already printer friendly!" href="#stylesheets">printer-friendly version «</a>
|
||||
<a href="/register">Register «</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="subHeader">
|
||||
<span class="doNotDisplay">Navigation:</span>
|
||||
<a href="./index.html">Home</a> |
|
||||
<a href="./index2.html">Products</a> |
|
||||
<a href="./index2.html">Services</a> |
|
||||
<a href="./index2.html">Contact Us</a> |
|
||||
<a href="./index2.html">About Us</a>
|
||||
<a href="./index.html">About</a> |
|
||||
<a href="./index.html">Documentation</a> |
|
||||
<a href="./index.html">Staff List</a> |
|
||||
<a href="/admin/">Admin Interface</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -129,12 +122,9 @@
|
|||
|
||||
<div id="footer">
|
||||
<span class="doNotPrint">
|
||||
For comments or questions about this website, please
|
||||
<a href="mailto:email.address@is.invalid" title="NB: Invalid email address">email the Webmaster</a><br />
|
||||
Powered by
|
||||
<a href="http://evennia.com">Evennia</a><br />
|
||||
</span>
|
||||
|
||||
<strong>URI »</strong> http://domain.is.invalid/prosimii/index2.html
|
||||
• <strong>Updated »</strong> 2004-Oct-24 10:32 +1000
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue