# HG changeset patch # User ymh # Date 1283327405 -7200 # Node ID 509e30b9f5c972f340ae03070ca120400b7774f9 # Parent da2f0d5221d877e6dd0a463e8293355aeedb715f basic contents and projects display diff -r da2f0d5221d8 -r 509e30b9f5c9 web/franceculture/templates/base.html --- a/web/franceculture/templates/base.html Fri Aug 27 08:25:18 2010 +0200 +++ b/web/franceculture/templates/base.html Wed Sep 01 09:50:05 2010 +0200 @@ -6,8 +6,9 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + - + {% block title %}France Culture{% endblock %} {% block js_import %} @@ -51,10 +52,11 @@ {% if user.is_authenticated %} {% url franceculture.views.workspace as workspace_url %} {% url ldt.ldt_utils.views.list_ldt as space_url %} + {% url ldt.ldt_utils.views.list_content as content_url %} {% url ldt.user.views.profile as profile_url %}

{% trans "home" %}
{% trans "contents" %}
{% trans "contents" %}
{% trans "indexation projects" %}
{% trans "accounts" %}
{% trans "Profiles" %}

	{% trans "name" %}
+		{% trans "Create content" %}
		{{ content.title }}

	{% trans "name" %}
+				{% trans "Create project" %}
+ {% ifequal project.state 2 %} + + {% else %} + + {% endifequal %} + +				{{ project.title }}

{% trans "content list" %}

- - - - - - - - - - - - - - - {% for content in contents %} - - - - - - {% endfor %} - - -

	{% trans "name" %}
+		{% trans "Create media" %}
		{{ content.title }}

+ {% include "franceculture/partial/contentslist.html" %}

{% trans "project list" %}

- - - - - - - - - - - - - - {% for project in projects %} - - - {% url ldt.ldt_utils.views.project_json_id project.ldt_id as json_url_id %} - - - - - - - - {% endfor %} -

	{% trans "name" %}
+				{% trans "Create project" %}
- {% ifequal project.state 2 %} - - {% else %} - - {% endifequal %} - -				{{ project.title }}

+ {% include "franceculture/partial/projectslist.html" %}

{% trans "content list" %}

+ {% include "franceculture/partial/contentslist.html" %} +

{% trans "project list" %}

+ {% include "franceculture/partial/projectslist.html" %} +

\w*)/(?Ptrue|false)/$', "franceculture.views.projectsfilter", ), + url(r'^filtercontents/(?P\w*)/$', "franceculture.views.contentsfilter", ), (r'^embedpopup/?$', "franceculture.views.popup_embed"), ) diff -r da2f0d5221d8 -r 509e30b9f5c9 web/franceculture/views.py --- a/web/franceculture/views.py Fri Aug 27 08:25:18 2010 +0200 +++ b/web/franceculture/views.py Wed Sep 01 09:50:05 2010 +0200 @@ -3,7 +3,9 @@ from django.template import RequestContext from django.utils.html import escape from django.template.loader import render_to_string -from ldt.ldt_utils.models import Content, Project +from ldt.ldt_utils.models import Content, Project, Owner +from ldt.ldt_utils.utils import boolean_convert +from django.http import HttpResponseServerError @login_required @@ -19,6 +21,44 @@ return render_to_response("franceculture/workspace.html", {'contents': content_list, 'projects': project_list}, context_instance=RequestContext(request)) + +@login_required +def projectsfilter(request, filter, is_owner=False): + + project_list = None + is_owner = boolean_convert(is_owner) + + if is_owner: + owner = None + try: + owner = Owner.objects.get(user=request.user) + except: + return HttpResponseServerError("

User not found

") + + project_list = Project.objects.filter(owner=owner) + else: + project_list = Project.objects.filter(state=2) + + if filter: + project_list = project_list.filter(title__icontains=filter) + + return render_to_response("franceculture/partial/projectslist.html", + {'projects': project_list}, + context_instance=RequestContext(request)) + + +@login_required +def contentsfilter(request, filter): + if filter: + content_list = Content.objects.filter(title__icontains=filter) + else: + content_list = Content.objects.all() + + return render_to_response("franceculture/partial/contentslist.html", + {'contents': content_list}, + context_instance=RequestContext(request)) + + def popup_embed(request): diff -r da2f0d5221d8 -r 509e30b9f5c9 web/ldt/ldt_utils/templates/ldt/ldt_utils/content_list.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/ldt/ldt_utils/templates/ldt/ldt_utils/content_list.html Wed Sep 01 09:50:05 2010 +0200 @@ -0,0 +1,84 @@ +{% extends "ldt/user/user_base.html" %} +{% load i18n %} + +{% block js_declaration %} +{{block.super}} + + +{% endblock %} + +{% block css_import %} +{{block.super}} + +{% endblock %} + +{% block breadcrumb %} +

{% trans "Space" %}

{% trans "Ldt Project" %}

+{% endblock %} + +{% block content_title %}{% trans "Contents" %}{%endblock %} + +{% block iricontent %} +

{% trans 'Create new content'%} + + + + + + + + + + +{% for content in contents %} + + + + +{% endfor %} + +

{% trans "Content" %}
{% trans "title" %}	{% trans "create project" %}
{{ content.title }}	{% trans "create project" %}

+ +{% endblock %} diff -r da2f0d5221d8 -r 509e30b9f5c9 web/ldt/ldt_utils/templates/ldt/ldt_utils/ldt_list.html --- a/web/ldt/ldt_utils/templates/ldt/ldt_utils/ldt_list.html Fri Aug 27 08:25:18 2010 +0200 +++ b/web/ldt/ldt_utils/templates/ldt/ldt_utils/ldt_list.html Wed Sep 01 09:50:05 2010 +0200 @@ -66,7 +66,7 @@ - {% for ldt in ldtProjects %} + {% for ldt in projects %} {{ ldt.title }} diff -r da2f0d5221d8 -r 509e30b9f5c9 web/ldt/ldt_utils/urls.py --- a/web/ldt/ldt_utils/urls.py Fri Aug 27 08:25:18 2010 +0200 +++ b/web/ldt/ldt_utils/urls.py Wed Sep 01 09:50:05 2010 +0200 @@ -24,6 +24,7 @@ if test_ldt(): urlpatterns += patterns('ldt.ldt_utils', + url(r'^space/content/$', 'views.list_content'), url(r'^space/ldt/$', 'views.list_ldt'), url(r'^space/ldt/indexproject/(?P.*)$', 'views.indexProject'), url(r'^space/ldt/init/(?P.*)/(?P.+)$', 'views.init', name='space_ldt_init'), @@ -31,7 +32,7 @@ url(r'^space/ldt/create/$', 'views.create_ldt_view'), url(r'^space/ldt/created_done/$', 'views.created_ldt'), url(r'^space/ldt/save/$', 'views.save_ldtProject'), - url(r'^space/ldt/publish/(?P.*)$', 'views.publish'), - url(r'^space/ldt/unpublish/(?P.*)$', 'views.unpublish'), + url(r'^space/ldt/publish/(?P[\w-]*)(?:/(?Ptrue|false))?$', 'views.publish'), + url(r'^space/ldt/unpublish/(?P[\w-]*)(?:/(?Ptrue|false))?$', 'views.unpublish'), ) diff -r da2f0d5221d8 -r 509e30b9f5c9 web/ldt/ldt_utils/utils.py --- a/web/ldt/ldt_utils/utils.py Fri Aug 27 08:25:18 2010 +0200 +++ b/web/ldt/ldt_utils/utils.py Wed Sep 01 09:50:05 2010 +0200 @@ -14,6 +14,23 @@ import Ft import lxml.etree +__BOOLEAN_DICT = { + 'false':False, + 'true':True, + '0':False, + '1':True, + 't': True, + 'f':False +} + +def boolean_convert(bool): + if bool is None: + return False + if bool is True or bool is False: + return bool + key = str(bool).lower() + return __BOOLEAN_DICT.get(key, False) + class LdtSearch(object): def query(self, field, query): diff -r da2f0d5221d8 -r 509e30b9f5c9 web/ldt/ldt_utils/views.py --- a/web/ldt/ldt_utils/views.py Fri Aug 27 08:25:18 2010 +0200 +++ b/web/ldt/ldt_utils/views.py Wed Sep 01 09:50:05 2010 +0200 @@ -133,10 +133,19 @@ ldtProjects = Project.objects.filter(owner=owner) context={ 'contents': contents, - 'ldtProjects': ldtProjects.reverse(), + 'projects': ldtProjects.reverse(), } return render_to_response('ldt/ldt_utils/ldt_list.html', context, context_instance=RequestContext(request)) +@login_required +def list_content(request): + contents = Content.objects.all() + context={ + 'contents': contents, + } + return render_to_response('ldt/ldt_utils/content_list.html', context, context_instance=RequestContext(request)) + + def create_ldt_view(request): if request.method == "POST" : form = LdtAddForm(request.POST) @@ -276,18 +285,26 @@ return render_to_response('ldt/ldt_utils/save_done.html', {'ldt': ldt, 'id':id, 'title':title, 'contents': new_contents}, context_instance=RequestContext(request)) @login_required -def publish(request, id): +def publish(request, id, redirect=True): ldt = get_object_or_404(Project, ldt_id=id) ldt.state = 2 #published ldt.save() - return HttpResponseRedirect(reverse("ldt.ldt_utils.views.list_ldt")) + redirect = boolean_convert(redirect) + if redirect: + return HttpResponseRedirect(reverse("ldt.ldt_utils.views.list_ldt")) + else: + return HttpResponse(simplejson.dumps({'res':True, 'ldt': {'id': ldt.id, 'state':ldt.state,'ldt_id': ldt.ldt_id}}, ensure_ascii=False),mimetype='application/json') @login_required -def unpublish(request, id): +def unpublish(request, id, redirect=True): ldt = get_object_or_404(Project, ldt_id=id) ldt.state = 1 #edition ldt.save() - return HttpResponseRedirect(reverse("ldt.ldt_utils.views.list_ldt")) + redirect = boolean_convert(redirect) + if redirect: + return HttpResponseRedirect(reverse("ldt.ldt_utils.views.list_ldt")) + else: + return HttpResponse(simplejson.dumps({'res':True, 'ldt': {'id': ldt.id, 'state':ldt.state,'ldt_id': ldt.ldt_id}}, ensure_ascii=False),mimetype='application/json') def index(request, url): diff -r da2f0d5221d8 -r 509e30b9f5c9 web/ldt/media/css/dashboard.css --- a/web/ldt/media/css/dashboard.css Fri Aug 27 08:25:18 2010 +0200 +++ b/web/ldt/media/css/dashboard.css Wed Sep 01 09:50:05 2010 +0200 @@ -1,3 +1,4 @@ +@charset "UTF-8"; #content-main-app-ldt-utils { float: left; diff -r da2f0d5221d8 -r 509e30b9f5c9 web/ldt/media/css/ldt.css --- a/web/ldt/media/css/ldt.css Fri Aug 27 08:25:18 2010 +0200 +++ b/web/ldt/media/css/ldt.css Wed Sep 01 09:50:05 2010 +0200 @@ -1,3 +1,5 @@ +@charset "UTF-8"; + #addldtform { font-size: 16px; diff -r da2f0d5221d8 -r 509e30b9f5c9 web/ldt/media/css/style.css --- a/web/ldt/media/css/style.css Fri Aug 27 08:25:18 2010 +0200 +++ b/web/ldt/media/css/style.css Wed Sep 01 09:50:05 2010 +0200 @@ -1,3 +1,5 @@ +@charset "UTF-8"; + #loginstate a, #loginstate a:hover, #loginstate a:visited, #loginstate a:link, #loginstate a:active { color:#0063DC; margin-right:4px; diff -r da2f0d5221d8 -r 509e30b9f5c9 web/ldt/media/css/style_base.css --- a/web/ldt/media/css/style_base.css Fri Aug 27 08:25:18 2010 +0200 +++ b/web/ldt/media/css/style_base.css Wed Sep 01 09:50:05 2010 +0200 @@ -1,3 +1,5 @@ +@charset "UTF-8"; + body { font-family: Arial, Helvetica, sans serif; padding: 0px; diff -r da2f0d5221d8 -r 509e30b9f5c9 web/static/css/LdtPlayer.css --- a/web/static/css/LdtPlayer.css Fri Aug 27 08:25:18 2010 +0200 +++ b/web/static/css/LdtPlayer.css Wed Sep 01 09:50:05 2010 +0200 @@ -1,105 +1,105 @@ - #demo-frame > div.demo { padding: 5px !important; }; - - button.ui-button-icon-only { - height:1.5em; - width:1.5em; - } - - #Ldt-controler { - font-size: 62.5%; - font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif"; - } +@charset "UTF-8"; - .Ldt-iri-chapter{ - padding-top:10px; - padding-bottom:5px; - border-left:solid 1px #000; - border-right:solid 1px #000; - } - - .tooltip { - display:none; - background:transparent url(../css/jq-css/imgs/white_arrow_mini.png); - font-size:12px; - height:55px; - width:180px; - padding:10px; - padding-left:15px; - padding-top:15px; - padding-right:15px; - color:#000; - font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif"; - } +#demo-frame > div.demo { padding: 5px !important; }; - #Ldt-Annotations{ - padding-left:5px; - width:470px; - float:left; - font-size: 62.5%; - } - #Ldt-SaTitle{ - padding-top:2px; - padding-bottom:5px; - font-size:18px; - color:#FFF; - height:22p; - } - #Ldt-SaDescription{ - font-size:12px; - color:#FFF; - } - #Ldt-ShowAnnotation{ - position:absolute; - z-index: 999; - padding:5px; - background:url(../css/jq-css/imgs/transBlack.png); - font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif"; - } - - #Ldt-PlaceHolder{ - position:absolue; - float:none; - } - .Ldt-Control1{ - width:70px; - float:left; - } - .Ldt-Control2{ - padding-left:10px; - width:70px; - float:left; - } - .Ldt-cleaner { - clear:both; - } - .share { - background:url('../css/jq-css/imgs/widget20.png') no-repeat scroll 0 0 transparent ; - display:block; - height:16px; - line-height:16px !important; - overflow:hidden; - width:16px; - float:left; - cursor:pointer; - margin:2px; - } - .shareFacebook{ - background-position:0 -704px; - } - .shareMySpace{ - background-position:0 -736px; - } - .shareTwitter{ - background-position:0 -1072px; - } - .shareGoogle{ - background-position:0 -752px; - } - .shareDelicious{ - background-position:0 -672px; - } - .shareJamesPot{ - background-position:0 -1808px; - } - - \ No newline at end of file +button.ui-button-icon-only { + height:1.5em; + width:1.5em; +} + +#Ldt-controler { + font-size: 62.5%; + font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif"; +} + +.Ldt-iri-chapter{ + padding-top:10px; + padding-bottom:5px; + border-left:solid 1px #000; + border-right:solid 1px #000; +} + +.tooltip { + display:none; + background:transparent url(../css/jq-css/imgs/white_arrow_mini.png); + font-size:12px; + height:55px; + width:180px; + padding:10px; + padding-left:15px; + padding-top:15px; + padding-right:15px; + color:#000; + font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif"; +} + +#Ldt-Annotations{ + padding-left:5px; + width:470px; + float:left; + font-size: 62.5%; +} +#Ldt-SaTitle{ + padding-top:2px; + padding-bottom:5px; + font-size:18px; + color:#FFF; + height:22p; +} +#Ldt-SaDescription{ + font-size:12px; + color:#FFF; +} +#Ldt-ShowAnnotation{ + position:absolute; + z-index: 999; + padding:5px; + background:url(../css/jq-css/imgs/transBlack.png); + font-family: "Trebuchet MS", "Helvetica", "Arial", "Verdana", "sans-serif"; +} + +#Ldt-PlaceHolder{ + position:absolue; + float:none; +} +.Ldt-Control1{ + width:70px; + float:left; +} +.Ldt-Control2{ + padding-left:10px; + width:70px; + float:left; +} +.Ldt-cleaner { + clear:both; +} +.share { + background:url('../css/jq-css/imgs/widget20.png') no-repeat scroll 0 0 transparent ; + display:block; + height:16px; + line-height:16px !important; + overflow:hidden; + width:16px; + float:left; + cursor:pointer; + margin:2px; +} +.shareFacebook{ + background-position:0 -704px; +} +.shareMySpace{ + background-position:0 -736px; +} +.shareTwitter{ + background-position:0 -1072px; +} +.shareGoogle{ + background-position:0 -752px; +} +.shareDelicious{ + background-position:0 -672px; +} +.shareJamesPot{ + background-position:0 -1808px; +} diff -r da2f0d5221d8 -r 509e30b9f5c9 web/static/css/custom_player.css --- a/web/static/css/custom_player.css Fri Aug 27 08:25:18 2010 +0200 +++ b/web/static/css/custom_player.css Wed Sep 01 09:50:05 2010 +0200 @@ -1,3 +1,5 @@ +@charset "UTF-8"; + #demo-frame > div.demo { padding: 5px !important; }; .iri-chapter{ padding-top:10px; diff -r da2f0d5221d8 -r 509e30b9f5c9 web/static/css/nyroModal.css --- a/web/static/css/nyroModal.css Fri Aug 27 08:25:18 2010 +0200 +++ b/web/static/css/nyroModal.css Wed Sep 01 09:50:05 2010 +0200 @@ -1,3 +1,5 @@ +@charset "UTF-8"; + div#nyroModalFull { font-size: 12px; color: #777; diff -r da2f0d5221d8 -r 509e30b9f5c9 web/static/css/style.css --- a/web/static/css/style.css Fri Aug 27 08:25:18 2010 +0200 +++ b/web/static/css/style.css Wed Sep 01 09:50:05 2010 +0200 @@ -1,3 +1,5 @@ +@charset "UTF-8"; + body { font-family: Arial, Helvetica, sans serif; diff -r da2f0d5221d8 -r 509e30b9f5c9 web/static/css/tabs.css --- a/web/static/css/tabs.css Fri Aug 27 08:25:18 2010 +0200 +++ b/web/static/css/tabs.css Wed Sep 01 09:50:05 2010 +0200 @@ -9,7 +9,7 @@ * For credits and origins, see AUTHORS. ----------------------------------------------------------------------- */ - +@charset "UTF-8"; .tabs { height:auto; diff -r da2f0d5221d8 -r 509e30b9f5c9 web/static/css/workspace.css --- a/web/static/css/workspace.css Fri Aug 27 08:25:18 2010 +0200 +++ b/web/static/css/workspace.css Wed Sep 01 09:50:05 2010 +0200 @@ -1,3 +1,4 @@ +@charset "UTF-8"; .titlediv { margin: 0px 0px 25px 0px; @@ -47,9 +48,9 @@ .searchfieldinputbase { background: #ffffff url("../img/search.gif") no-repeat left center; border: none; - width: 110px; + width: 99px; height: 14px; - margin: 0px; + margin: 0px 2px 0px 0px; vertical-align: top; padding-left: 20px; } @@ -63,11 +64,13 @@ html>body div.projectscontentsdiv { overflow: hidden; width: 470px; + height: 570px; + } div.projectscontentsdiv table { float: left; width: 470px; - height: 570px; + height: 100%; } div.projectscontentsdiv td, div.projectscontentsdiv th { @@ -82,16 +85,13 @@ background: white; } -html>body div.projectscontentsdiv table { - width: 470px -} thead.projectscontentsheader tr { - position: relative + position: relative; } tfoot.projectscontentsfooter tr { - position: relative + position: relative; } /* make the TH elements pretty */ @@ -101,7 +101,7 @@ text-transform:capitalize; color: white; padding: 1px 2px; - text-align: left + text-align: left; } #contentsheader th { @@ -139,7 +139,7 @@ color: #FFF; display: block; text-decoration: none; - width: 100% + width: 100%; } /* make the A elements pretty. makes for nice clickable headers */ @@ -148,7 +148,7 @@ color: #FFF; display: block; text-decoration: underline; - width: 100% + width: 100%; } html>body thead.projectscontentsheader tr { @@ -173,6 +173,9 @@ border-bottom: 2px solid #b5b5b5 ; } +.projectscontentsbody tr { + height: 26px; +} .titlediv { vertical-align: middle; @@ -183,10 +186,14 @@ width: 18px; text-align: center; padding: 4px 2px 4px 2px; + cursor: pointer; cursor: hand; } .cellimgdiv { visibility: hidden; } +.searchajaxloader { + display: none; +} diff -r da2f0d5221d8 -r 509e30b9f5c9 web/static/img/ajax-loader-16x16.gif Binary file web/static/img/ajax-loader-16x16.gif has changed diff -r da2f0d5221d8 -r 509e30b9f5c9 web/static/img/ajax-loader-43x43.gif Binary file web/static/img/ajax-loader-43x43.gif has changed diff -r da2f0d5221d8 -r 509e30b9f5c9 web/static/img/ajaxLoader.gif Binary file web/static/img/ajaxLoader.gif has changed