# HG changeset patch # User cavaliet # Date 1414177397 -7200 # Node ID 511bff609c3d68443ca5d73fb72abc4cc792e70b # Parent 138b898e0f7e5e4494bf7da2ac84e5c2143d98a2 add iframe and correct url in eventsession admi diff -r 138b898e0f7e -r 511bff609c3d annot-server/webapp/admin.py --- a/annot-server/webapp/admin.py Fri Oct 24 18:31:47 2014 +0200 +++ b/annot-server/webapp/admin.py Fri Oct 24 21:03:17 2014 +0200 @@ -41,18 +41,26 @@ output = [] for c in model.categories_json.get("categories",[]): - if "subcategories" in c and len(c["subcategories"])>0: - for sc in c["subcategories"]: - output.append({"name": sc["code"],"keywords": [ sc["label"] ], "color" : sc["color"] }) - else: - output.append({"name": c["code"],"keywords": [ c["label"] ], "color" : c["color"] }) + #if "subcategories" in c and len(c["subcategories"])>0: + # for sc in c["subcategories"]: + # output.append({"name": sc["code"],"keywords": [ sc["label"] ], "color" : sc["color"] }) + #else: + output.append({"name": c["code"] if "code" in c else "","keywords": [ c["label"] ], "color" : c["color"] }) base_url = getattr(config,'LDT_PLATFORM_BASE_URL','') + "/ldt/embediframe/?" - url_query_params = {'project_id': model.project_id, 'polemic': 'all', 'polemics_list': json.dumps(output, separators=(',',':'))} + url_query_params = {'project_id': model.project_id, + 'polemic': 'all', + 'polemic__max_elements': 200, + 'createannotation': True, + 'createannotation_polemics': False, + 'tag_titles': "" + 'polemics_list': json.dumps(output, separators=(',',':'))} url = base_url + urllib.urlencode(url_query_params) - return Markup("%s" % (url,url[:80]+"...")) + embed = "" % url + + return Markup("Lien :

Code embed :" % (url, url, embed)) class EventView(ModelView): diff -r 138b898e0f7e -r 511bff609c3d annot-server/webapp/templates/liens.html --- a/annot-server/webapp/templates/liens.html Fri Oct 24 18:31:47 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ - - - - - Liens Mons - - - - -
-

Liens vers les vidéos des évènements Mons :

-
-

Jeudi matin

-

Jeudi après-midi 1

-

Jeudi après-midi 2

-

Vendredi matin 1

-

Vendredi matin 2

-
-
- diff -r 138b898e0f7e -r 511bff609c3d annot-server/webapp/views.py --- a/annot-server/webapp/views.py Fri Oct 24 18:31:47 2014 +0200 +++ b/annot-server/webapp/views.py Fri Oct 24 21:03:17 2014 +0200 @@ -61,10 +61,6 @@ return render_template('pianoroll.html', logging=True) -@app.route('/liens') -def page_liens(): - return render_template('liens.html') - @app.route('/api/test', methods=['PUT', 'POST']) def new(): diff -r 138b898e0f7e -r 511bff609c3d utils/create_url_polemics_param.py --- a/utils/create_url_polemics_param.py Fri Oct 24 18:31:47 2014 +0200 +++ b/utils/create_url_polemics_param.py Fri Oct 24 21:03:17 2014 +0200 @@ -35,7 +35,7 @@ # for sc in c["subcategories"]: # output.append({"name": sc["code"],"keywords": [ sc["label"] ], "color" : sc["color"] }) #else: - output.append({"name": c["code"],"keywords": [ c["label"] ], "color" : c["color"] }) + output.append({"name": c["code"] if "code" in c else "","keywords": [ c["label"] ], "color" : c["color"] }) base_url = "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/embediframe/?project_id=" + options.project_id + "&polemic=all&polemic__max_elements=200&polemics_list=" output_str = json.dumps(output, separators=(',',':'))