From da70450f78e14c5a5cffce2673be755584efeb54 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Mon, 9 Jan 2012 15:25:52 +0530 Subject: [PATCH] better static page --- pandora/item/views.py | 10 +++++----- pandora/padma.jsonc | 6 +++--- pandora/templates/item.html | 2 +- static/js/pandora/UI.js | 4 ++-- static/js/pandora/URL.js | 20 +++++++++++++------- static/js/pandora/clipList.js | 2 +- static/js/pandora/infoView.padma.js | 8 ++++---- static/js/pandora/item.js | 7 +++++++ static/js/pandora/utils.js | 27 +++++++++++++++++++++------ 9 files changed, 57 insertions(+), 29 deletions(-) diff --git a/pandora/item/views.py b/pandora/item/views.py index d9e7cef5..f35eb0a6 100644 --- a/pandora/item/views.py +++ b/pandora/item/views.py @@ -823,9 +823,8 @@ def item(request, id): keys = [ 'year', 'director', - 'country', - 'keywords', - 'summary' + 'topic', + 'description' ] data = [] for key in keys: @@ -848,12 +847,13 @@ def item(request, id): 'settings': settings, 'data': data, 'clips': clips, - 'icon': 'poster', + 'icon': settings.CONFIG['user']['ui']['icons'] == 'frames' and 'icon' or 'poster', } for key in ('title', 'description', 'keywords'): value = item.get({ - 'description': 'summary' in keys and 'summary' or 'description' + 'description': 'summary' in keys and 'summary' or 'description', + 'keywords': 'topic' in keys and 'topic' or 'keywords' }.get(key, key)) if isinstance(value, list): value = value = ', '.join(value) diff --git a/pandora/padma.jsonc b/pandora/padma.jsonc index be8ca61d..8325cf65 100644 --- a/pandora/padma.jsonc +++ b/pandora/padma.jsonc @@ -46,7 +46,7 @@ "filters": [ {"id": "source", "title": "Sources", "type": "string"}, {"id": "project", "title": "Projects", "type": "string"}, - {"id": "topics", "title": "Topics", "type": "string"}, + {"id": "topic", "title": "Topics", "type": "string"}, {"id": "name", "title": "People", "type": "string"}, {"id": "keywords", "title": "Keywords", "type": "string"}, {"id": "language", "title": "Languages", "type": "string"}, @@ -517,7 +517,7 @@ {"id": "source", "sort": [{"key": "name", "operator": "+"}]}, {"id": "project", "sort": [{"key": "name", "operator": "+"}]}, {"id": "topic", "sort": [{"key": "items", "operator": "-"}]}, - {"id": "people", "sort": [{"key": "items", "operator": "-"}]}, + {"id": "name", "sort": [{"key": "items", "operator": "-"}]}, {"id": "keywords", "sort": [{"key": "items", "operator": "-"}]}, {"id": "places", "sort": [{"key": "items", "operator": "-"}]} ], @@ -529,7 +529,7 @@ "itemFind": {"conditions": [], "operator": "&"}, "itemSort": [{"key": "position", "operator": "+"}], "itemView": "info", - "listColumns": ["title", "director", "location", "source", "language", "duration", "source"], + "listColumns": ["title", "director", "location", "source", "language", "duration"], "listColumnWidth": {}, "listSelection": [], "listSort": [{"key": "title", "operator": "+"}], diff --git a/pandora/templates/item.html b/pandora/templates/item.html index 9bb3118e..5548804c 100644 --- a/pandora/templates/item.html +++ b/pandora/templates/item.html @@ -29,7 +29,7 @@