diff options
| -rw-r--r-- | archive/urls.py | 6 | ||||
| -rw-r--r-- | notice/models.py | 2 | ||||
| -rw-r--r-- | page/templates/page/introduction.html | 9 | ||||
| -rw-r--r-- | static/images/skaschool-poster.jpg | bin | 723184 -> 800778 bytes | |||
| -rw-r--r-- | static/images/skaschool-poster2.jpg | bin | 0 -> 723184 bytes |
5 files changed, 11 insertions, 6 deletions
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 @@ <li>洪晓瑜（上海天文台台长）</li> <li>沈志强（上海天文台副台长、杰出青年）</li> <li>徐海光（上海交通大学教授、杰出青年）</li> - <li>Lister Staveley-Smith（澳大利亚西澳大学）</li> - <li>Melanie Johnston-Hollitt（新西兰惠灵顿大学）</li> - <li>Miguel Morales（美国华盛顿大学）</li> - <li>Tzu-Ching Chang（台湾中央研究院天文所）</li> + <li>李菂（国家天文台研究员、千人计划）</li> + <li>Lister STAVELEY-SMITH（澳大利亚西澳大学）</li> + <li>Melanie JOHNSTON-HOLLITT（新西兰惠灵顿大学）</li> + <li>Willem BAAN（荷兰射电天文研究所）</li> + <li>Tzu-Ching CHANG（台湾中央研究院天文所）</li> </ul> <h3 id="consultant">顾问</h3> diff --git a/static/images/skaschool-poster.jpg b/static/images/skaschool-poster.jpg Binary files differindex 11aad70..4021788 100644 --- a/static/images/skaschool-poster.jpg +++ b/static/images/skaschool-poster.jpg diff --git a/static/images/skaschool-poster2.jpg b/static/images/skaschool-poster2.jpg Binary files differnew file mode 100644 index 0000000..11aad70 --- /dev/null +++ b/static/images/skaschool-poster2.jpg |
