From ed72c7a497f3bbd2e548075048ae14af9af90478 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 17 Sep 2012 18:22:06 +0200 Subject: [PATCH] add static again --- .../telemeta}/swf/mp3player.swf | Bin .../telemeta}/swf/xspf_player.swf | Bin .../telemeta}/swf/xspf_player_slim.swf | Bin telemeta/templates/telemeta/base.html | 2 +- .../templates/telemeta/collection_detail.html | 24 ++++++------- .../telemeta/inc/mediaitem_list.html | 2 +- .../templates/telemeta/mediaitem_detail.html | 4 +-- telemeta/urls.py | 34 +++++++++--------- 8 files changed, 33 insertions(+), 33 deletions(-) rename telemeta/{htdocs => static/telemeta}/swf/mp3player.swf (100%) rename telemeta/{htdocs => static/telemeta}/swf/xspf_player.swf (100%) rename telemeta/{htdocs => static/telemeta}/swf/xspf_player_slim.swf (100%) diff --git a/telemeta/htdocs/swf/mp3player.swf b/telemeta/static/telemeta/swf/mp3player.swf similarity index 100% rename from telemeta/htdocs/swf/mp3player.swf rename to telemeta/static/telemeta/swf/mp3player.swf diff --git a/telemeta/htdocs/swf/xspf_player.swf b/telemeta/static/telemeta/swf/xspf_player.swf similarity index 100% rename from telemeta/htdocs/swf/xspf_player.swf rename to telemeta/static/telemeta/swf/xspf_player.swf diff --git a/telemeta/htdocs/swf/xspf_player_slim.swf b/telemeta/static/telemeta/swf/xspf_player_slim.swf similarity index 100% rename from telemeta/htdocs/swf/xspf_player_slim.swf rename to telemeta/static/telemeta/swf/xspf_player_slim.swf diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html index 6db05cc1..b9283c6c 100644 --- a/telemeta/templates/telemeta/base.html +++ b/telemeta/templates/telemeta/base.html @@ -51,7 +51,7 @@
{% if user.is_authenticated %} -user +user {% trans "Welcome" %}, {% if user.first_name and user.last_name %} {{ user.first_name }} {{ user.last_name }} | diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html index b33f21a2..37624683 100644 --- a/telemeta/templates/telemeta/collection_detail.html +++ b/telemeta/templates/telemeta/collection_detail.html @@ -5,14 +5,14 @@ {% block head_title %}{% trans "Collection" %}{{collection|prepend:' : '}} - {{ block.super }}{% endblock %} {% block extra_javascript %} - - - + + + +
{% endif %} {% endif %} {% block infos %}
- {% if collection.items.count %}{{ collection.items.count }} {% ifequal collection.items.count 1 %}item{% else %}items{% endifequal %}{% else %}No item{% endif %} + {% if collection.items.count %}{{ collection.items.count }} {% ifequal collection.items.count 1 %}item{% else %}items{% endifequal %}{% else %}No item{% endif %}
{% block general_info %} @@ -199,9 +199,9 @@ {% endblock related %}
{% endif %} - +
-

Items

+

Items

{% with "1" as location_name %} {% include "telemeta/inc/mediaitem_list.html" %} {% endwith %} diff --git a/telemeta/templates/telemeta/inc/mediaitem_list.html b/telemeta/templates/telemeta/inc/mediaitem_list.html index cc09245c..bad287c3 100644 --- a/telemeta/templates/telemeta/inc/mediaitem_list.html +++ b/telemeta/templates/telemeta/inc/mediaitem_list.html @@ -47,7 +47,7 @@ {% if item.file %} - yes + yes {% endif %} diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index db1fc7c2..95ee73f1 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -80,8 +80,8 @@ {% if "video" in mime_type %} - - + + {% endif %} {% endif %} diff --git a/telemeta/urls.py b/telemeta/urls.py index 8b762f8f..8dab15e3 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -48,7 +48,7 @@ import telemeta.config telemeta.config.check() # initialization -general_view = HomeView() +home_view = HomeView() admin_view = AdminView() collection_view = CollectionView() item_view = ItemView() @@ -71,10 +71,10 @@ all_fonds = { 'queryset': MediaFonds.objects.all().order_by('title') } # ID's regular expressions export_extensions = "|".join(item_view.list_export_extensions()) -htdocs = os.path.dirname(__file__) + '/htdocs' +htdocs = os.path.dirname(__file__) + '/static/telemeta' urlpatterns = patterns('', - url(r'^$', general_view.home, name="telemeta-home"), + url(r'^$', home_view.home, name="telemeta-home"), # items url(r'^archives/items/$', 'django.views.generic.list_detail.object_list', @@ -194,21 +194,21 @@ urlpatterns = patterns('', url(r'^archives/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/dc/xml/$', resource_view.detail, {'format': 'dublin_core_xml'}, name="telemeta-resource-dublincore-xml"), - url(r'^archives/$', general_view.search, name="telemeta-archives"), + url(r'^archives/$', home_view.search, name="telemeta-archives"), # search - url(r'^search/$', general_view.search, name="telemeta-search"), - url(r'^search/collections/$', general_view.search, {'type': 'collections'}, + url(r'^search/$', home_view.search, name="telemeta-search"), + url(r'^search/collections/$', home_view.search, {'type': 'collections'}, name="telemeta-search-collections"), - url(r'^search/items/$', general_view.search, {'type': 'items'}, + url(r'^search/items/$', home_view.search, {'type': 'items'}, name="telemeta-search-items"), - url(r'^search/corpus/$', general_view.search, {'type': 'corpus'}, + url(r'^search/corpus/$', home_view.search, {'type': 'corpus'}, name="telemeta-search-corpus"), - url(r'^search/fonds/$', general_view.search, {'type': 'fonds'}, + url(r'^search/fonds/$', home_view.search, {'type': 'fonds'}, name="telemeta-search-fonds"), - url(r'^search/criteria/$', general_view.edit_search, name="telemeta-search-criteria"), - url(r'^complete_location/$', general_view.complete_location, name="telemeta-complete-location"), + url(r'^search/criteria/$', home_view.edit_search, name="telemeta-search-criteria"), + url(r'^complete_location/$', home_view.complete_location, name="telemeta-complete-location"), # administration url(r'^admin/$', admin_view.admin_index, name="telemeta-admin"), @@ -291,10 +291,10 @@ urlpatterns = patterns('', name="telemeta-video-js"), # Flat pages - url(r'^pages/(?P.*)$', general_view.render_flatpage, name="telemeta-flatpage"), + url(r'^pages/(?P.*)$', home_view.render_flatpage, name="telemeta-flatpage"), # OAI-PMH Data Provider - url(r'^oai/.*$', general_view.handle_oai_request, name="telemeta-oai"), + url(r'^oai/.*$', home_view.handle_oai_request, name="telemeta-oai"), # Authentication url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'}, @@ -303,15 +303,15 @@ urlpatterns = patterns('', name="telemeta-login"), #url(r'^login/$', 'ipauth.views.login', {'template_name': 'telemeta/login.html'}, # name="telemeta-login"), - url(r'^logout/$', general_view.logout, name="telemeta-logout"), + url(r'^logout/$', home_view.logout, name="telemeta-logout"), # Users - url(r'^accounts/$', general_view.users, name="telemeta-users"), + url(r'^accounts/$', home_view.users, name="telemeta-users"), # Desk - url(r'^desk/lists/$', general_view.lists, name="telemeta-desk-lists"), + url(r'^desk/lists/$', home_view.lists, name="telemeta-desk-lists"), url(r'^desk/profile/(?P[A-Za-z0-9._-]+)/$', profile_view.profile_detail, name="telemeta-desk-profile"), - url(r'^desk/home/$', general_view.home, name="telemeta-desk-home"), + url(r'^desk/home/$', home_view.home, name="telemeta-desk-home"), # Profiles url(r'^accounts/(?P[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"), -- 2.39.5