From a827199fb168aa676e3fdbdcfdb04a021f44f3f7 Mon Sep 17 00:00:00 2001 From: Weitian LI Date: Wed, 14 May 2014 11:20:53 +0800 Subject: * upaded display format of model Notice 'notice/models.py' * updated 'archive/urls.py', shortened the url, added a redirect * updated poster image: 'skaschool-poster.jpg' * updated the lecturer information of 'page/introduction.html' --- archive/urls.py | 6 +++++- notice/models.py | 2 +- page/templates/page/introduction.html | 9 +++++---- static/images/skaschool-poster.jpg | Bin 723184 -> 800778 bytes static/images/skaschool-poster2.jpg | Bin 0 -> 723184 bytes 5 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 static/images/skaschool-poster2.jpg diff --git a/archive/urls.py b/archive/urls.py index 8657fed..c57b15c 100644 --- a/archive/urls.py +++ b/archive/urls.py @@ -4,13 +4,17 @@ # from django.conf.urls import patterns, include, url +from django.views.generic.base import RedirectView +from django.core.urlresolvers import reverse_lazy from archive.views import ArchiveView urlpatterns = patterns('', # notice list view - url(r'^archive/all$', ArchiveView.as_view(), + url(r'^all$', ArchiveView.as_view(), name='archive_all'), + url(r'^archive/all$', + RedirectView.as_view(url=reverse_lazy('archive_all'))), ) diff --git a/notice/models.py b/notice/models.py index 63b17b2..92b34e5 100644 --- a/notice/models.py +++ b/notice/models.py @@ -26,7 +26,7 @@ class Notice(models.Model): ordering = ['-pubtime', 'id'] def __unicode__(self): - return u'Notice at %s' % self.pubtime.isoformat() + return u'Notice %s: %s' % (self.category.category_name, self.title) def show_pubtime(self): # used in 'list_notice.html' template diff --git a/page/templates/page/introduction.html b/page/templates/page/introduction.html index 4e1761c..a804f0b 100644 --- a/page/templates/page/introduction.html +++ b/page/templates/page/introduction.html @@ -65,10 +65,11 @@
  • 洪晓瑜（上海天文台台长）
  • 沈志强（上海天文台副台长、杰出青年）
  • 徐海光（上海交通大学教授、杰出青年）
    • -
  • Lister Staveley-Smith（澳大利亚西澳大学）
    • -
  • Melanie Johnston-Hollitt（新西兰惠灵顿大学）
    • -
  • Miguel Morales（美国华盛顿大学）
    • -
  • Tzu-Ching Chang（台湾中央研究院天文所）
    • +
  • 李菂（国家天文台研究员、千人计划）
    • +
  • Lister STAVELEY-SMITH（澳大利亚西澳大学）
    • +
  • Melanie JOHNSTON-HOLLITT（新西兰惠灵顿大学）
    • +
  • Willem BAAN（荷兰射电天文研究所）
    • +
  • Tzu-Ching CHANG（台湾中央研究院天文所）

    • 顾问

    diff --git a/static/images/skaschool-poster.jpg b/static/images/skaschool-poster.jpg index 11aad70..4021788 100644 Binary files a/static/images/skaschool-poster.jpg and b/static/images/skaschool-poster.jpg differ diff --git a/static/images/skaschool-poster2.jpg b/static/images/skaschool-poster2.jpg new file mode 100644 index 0000000..11aad70 Binary files /dev/null and b/static/images/skaschool-poster2.jpg differ -- cgit v1.2.2