Mercurial Mercurial > mons / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add iframe and correct url in eventsession admi
authorcavaliet
Fri, 24 Oct 2014 21:03:17 +0200
changeset 61 511bff609c3d
parent 60 138b898e0f7e
child 62 b1f7ab026ddb
add iframe and correct url in eventsession admi
annot-server/webapp/admin.py file | annotate | diff | comparison | revisions
annot-server/webapp/templates/liens.html file | annotate | diff | comparison | revisions
annot-server/webapp/views.py file | annotate | diff | comparison | revisions
utils/create_url_polemics_param.py file | annotate | diff | comparison | revisions 
--- 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("<a href=\"%s\" target=\"_blank\">%s</a>" % (url,url[:80]+"..."))
+    embed = "<iframe src=&quot;%s&quot; width=&quot;570&quot; height=&quot;711&quot; seamless=&quot;seamless&quot;></iframe>" % url
+
+    return Markup("<a href=\"%s\" target=\"_blank\">Lien</a> :<br/><input value=\"%s\"/><br/>Code embed :<input value=\"%s\"/>" % (url, url, embed))
 
 
 class EventView(ModelView):
--- 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 @@
-<!doctype html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Liens Mons</title>
-  <link rel="stylesheet" href="{{ config['STATIC_URL'] }}/css/lib.css">
-  <link rel="stylesheet" href="{{ config['STATIC_URL'] }}/css/base.css">
-</head>
-<body>
-  <div class="container" id="index-container">
-      <h1 class="row">Liens vers les vidéos des évènements Mons&nbsp;:</h1>
-      <div class="row">
-          <p><a href="http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/embediframe/?project_id=f62da61a-5aa3-11e4-bb79-00145ea4a2be&polemic=all&polemics_list=%5B%7B%22keywords%22%3A%5B%22M%5Cu00e9lodie%22%5D%2C%22color%22%3A%22rgb%28205%2C200%2C63%29%22%2C%22name%22%3A%22melodie%22%7D%2C%7B%22keywords%22%3A%5B%22Rythme%22%5D%2C%22color%22%3A%22rgb%2878%2C144%2C204%29%22%2C%22name%22%3A%22rythme%22%7D%2C%7B%22keywords%22%3A%5B%22Narration%22%5D%2C%22color%22%3A%22rgb%28211%2C94%2C60%29%22%2C%22name%22%3A%22narration%22%7D%2C%7B%22keywords%22%3A%5B%22Interaction+entre+musiciens%22%5D%2C%22color%22%3A%22rgb%28197%2C163%2C202%29%22%2C%22name%22%3A%22interaction%22%7D%2C%7B%22keywords%22%3A%5B%22Gestuelle%22%5D%2C%22color%22%3A%22rgb%28121%2C187%2C146%29%22%2C%22name%22%3A%22gestuelle%22%7D%2C%7B%22keywords%22%3A%5B%22%5Cu00c0+Rejouer%22%5D%2C%22color%22%3A%22rgb%28137%2C199%2C214%29%22%2C%22name%22%3A%22a-rejouer%22%7D%5D">Jeudi matin</a></p>
-          <p><a href="http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/embediframe/?project_id=588ba5e6-5ac7-11e4-9773-00145ea4a2be&polemic=all&polemic__max_elements=200&polemics_list=%5B%7B%22keywords%22%3A%5B%22M%5Cu00e9lodie%22%5D%2C%22color%22%3A%22rgb%28205%2C200%2C63%29%22%2C%22name%22%3A%22melodie%22%7D%2C%7B%22keywords%22%3A%5B%22Rythme%22%5D%2C%22color%22%3A%22rgb%2878%2C144%2C204%29%22%2C%22name%22%3A%22rythme%22%7D%2C%7B%22keywords%22%3A%5B%22Narration%22%5D%2C%22color%22%3A%22rgb%28211%2C94%2C60%29%22%2C%22name%22%3A%22narration%22%7D%2C%7B%22keywords%22%3A%5B%22Interaction+entre+musiciens%22%5D%2C%22color%22%3A%22rgb%28197%2C163%2C202%29%22%2C%22name%22%3A%22interaction%22%7D%2C%7B%22keywords%22%3A%5B%22Gestuelle%22%5D%2C%22color%22%3A%22rgb%28121%2C187%2C146%29%22%2C%22name%22%3A%22gestuelle%22%7D%2C%7B%22keywords%22%3A%5B%22Instruments%22%5D%2C%22color%22%3A%22rgb%28137%2C199%2C214%29%22%2C%22name%22%3A%22a-rejouer%22%7D%2C%7B%22keywords%22%3A%5B%22%5Cu00c0+Rejouer%22%5D%2C%22color%22%3A%22rgb%28222%2C139%2C83%29%22%2C%22name%22%3A%22a-rejouer%22%7D%5D">Jeudi après-midi 1</a></p>
-          <p><a href="http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/embediframe/?project_id=3b4e5544-5add-11e4-bcbc-00145ea4a2be&polemic=all&polemic__max_elements=200&polemics_list=%5B%7B%22keywords%22%3A%5B%22M%5Cu00e9lodie%22%5D%2C%22color%22%3A%22rgb%28205%2C200%2C63%29%22%2C%22name%22%3A%22melodie%22%7D%2C%7B%22keywords%22%3A%5B%22Rythme%22%5D%2C%22color%22%3A%22rgb%2878%2C144%2C204%29%22%2C%22name%22%3A%22rythme%22%7D%2C%7B%22keywords%22%3A%5B%22Narration%22%5D%2C%22color%22%3A%22rgb%28211%2C94%2C60%29%22%2C%22name%22%3A%22narration%22%7D%2C%7B%22keywords%22%3A%5B%22Interaction+entre+musiciens%22%5D%2C%22color%22%3A%22rgb%28197%2C163%2C202%29%22%2C%22name%22%3A%22interaction%22%7D%2C%7B%22keywords%22%3A%5B%22Gestuelle%22%5D%2C%22color%22%3A%22rgb%28121%2C187%2C146%29%22%2C%22name%22%3A%22gestuelle%22%7D%2C%7B%22keywords%22%3A%5B%22Instruments%22%5D%2C%22color%22%3A%22rgb%28137%2C199%2C214%29%22%2C%22name%22%3A%22a-rejouer%22%7D%2C%7B%22keywords%22%3A%5B%22%5Cu00c0+Rejouer%22%5D%2C%22color%22%3A%22rgb%28222%2C139%2C83%29%22%2C%22name%22%3A%22a-rejouer%22%7D%5D">Jeudi après-midi 2</a></p>
-          <p><a href="http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/embediframe/?project_id=fad36844-5b6b-11e4-bcbc-00145ea4a2be&polemic=all&polemic__max_elements=200&polemics_list=%5B%7B%22keywords%22%3A%5B%22M%5Cu00e9lodie%22%5D%2C%22color%22%3A%22rgb%28205%2C200%2C63%29%22%2C%22name%22%3A%22melodie%22%7D%2C%7B%22keywords%22%3A%5B%22Rythme%22%5D%2C%22color%22%3A%22rgb%2878%2C144%2C204%29%22%2C%22name%22%3A%22rythme%22%7D%2C%7B%22keywords%22%3A%5B%22Narration%22%5D%2C%22color%22%3A%22rgb%28211%2C94%2C60%29%22%2C%22name%22%3A%22narration%22%7D%2C%7B%22keywords%22%3A%5B%22Interaction+entre+musiciens%22%5D%2C%22color%22%3A%22rgb%28197%2C163%2C202%29%22%2C%22name%22%3A%22interaction%22%7D%2C%7B%22keywords%22%3A%5B%22Gestuelle%22%5D%2C%22color%22%3A%22rgb%28121%2C187%2C146%29%22%2C%22name%22%3A%22gestuelle%22%7D%2C%7B%22keywords%22%3A%5B%22Instruments%22%5D%2C%22color%22%3A%22rgb%28137%2C199%2C214%29%22%2C%22name%22%3A%22a-rejouer%22%7D%2C%7B%22keywords%22%3A%5B%22%5Cu00c0+Rejouer%22%5D%2C%22color%22%3A%22rgb%28222%2C139%2C83%29%22%2C%22name%22%3A%22a-rejouer%22%7D%5D">Vendredi matin 1</a></p>
-          <p><a href="http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/embediframe/?project_id=f35703a4-5b6c-11e4-bcbc-00145ea4a2be&polemic=all&polemic__max_elements=200&polemics_list=%5B%7B%22keywords%22%3A%5B%22M%5Cu00e9lodie%22%5D%2C%22color%22%3A%22rgb%28205%2C200%2C63%29%22%2C%22name%22%3A%22melodie%22%7D%2C%7B%22keywords%22%3A%5B%22Rythme%22%5D%2C%22color%22%3A%22rgb%2878%2C144%2C204%29%22%2C%22name%22%3A%22rythme%22%7D%2C%7B%22keywords%22%3A%5B%22Narration%22%5D%2C%22color%22%3A%22rgb%28211%2C94%2C60%29%22%2C%22name%22%3A%22narration%22%7D%2C%7B%22keywords%22%3A%5B%22Interaction+entre+musiciens%22%5D%2C%22color%22%3A%22rgb%28197%2C163%2C202%29%22%2C%22name%22%3A%22interaction%22%7D%2C%7B%22keywords%22%3A%5B%22Gestuelle%22%5D%2C%22color%22%3A%22rgb%28121%2C187%2C146%29%22%2C%22name%22%3A%22gestuelle%22%7D%2C%7B%22keywords%22%3A%5B%22Instruments%22%5D%2C%22color%22%3A%22rgb%28137%2C199%2C214%29%22%2C%22name%22%3A%22a-rejouer%22%7D%2C%7B%22keywords%22%3A%5B%22%5Cu00c0+Rejouer%22%5D%2C%22color%22%3A%22rgb%28222%2C139%2C83%29%22%2C%22name%22%3A%22a-rejouer%22%7D%5D">Vendredi matin 2</a></p>
-      </div>
-  </div>
- </body>
--- 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():
--- 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=(',',':'))
mons