Mercurial Mercurial > platform / 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.
Fixed minor bugs
authorverrierj
Fri, 30 Sep 2011 16:52:45 +0200
changeset 193 1fc885d6e120
parent 192 fbfb4f18d666
child 194 be01ce6ba490
Fixed minor bugs
src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html file | annotate | diff | comparison | revisions
src/ldt/ldt/ldt_utils/views.py file | annotate | diff | comparison | revisions
src/ldt/ldt/locale/en/LC_MESSAGES/django.mo file | annotate | diff | comparison | revisions
src/ldt/ldt/locale/en/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo file | annotate | diff | comparison | revisions
src/ldt/ldt/locale/fr/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/ldt/ldt/static/ldt/js/projectscontents.js file | annotate | diff | comparison | revisions 
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html	Fri Sep 30 12:27:54 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html	Fri Sep 30 16:52:45 2011 +0200
@@ -73,7 +73,14 @@
 			{% endifnotequal %}		
 			<ul class="listsegments">
 			{% for segment in res.list %}
-				<li class="segmentinfos" ><span  class="" title="{% trans 'open ldt' %}"><a class="ldt_link_open_ldt" href="{% url ldt.ldt_utils.views.display_highlighted_seg segment.project_id segment.iri_id segment.ensemble_id segment.decoupage_id segment.element_id %}">{{ segment.title }}</a></span><br />
+				<li class="segmentinfos" ><span  class="" title="{% trans 'open ldt' %}"><a class="ldt_link_open_ldt" href="{% url ldt.ldt_utils.views.display_highlighted_seg segment.project_id segment.iri_id segment.ensemble_id segment.decoupage_id segment.element_id %}">
+				{% if segment.title %}
+					{{ segment.title }}
+				{% else %}
+					{% trans "No title" %}
+				{% endif %}
+				
+				</a></span><br />
 				{{ segment.context }}<br />
 				{% if segment.tags %}
 				<b>{% trans "Tags"%}</b> : {{ segment.tags }}
--- a/src/ldt/ldt/ldt_utils/views.py	Fri Sep 30 12:27:54 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/views.py	Fri Sep 30 16:52:45 2011 +0200
@@ -234,7 +234,7 @@
     return render_to_response('ldt/ldt_utils/search_form.html', {'form': form} , context_instance=RequestContext(request))
 
 
-
+@login_required
 def search_index(request):
         
     sform = SearchForm(request.POST)
@@ -253,7 +253,10 @@
             
             results.sort(key=lambda k: k['iri_id'])
             for iri_id, item in groupby(results, itemgetter('iri_id')):
-                content = Content.objects.get(iri_id=iri_id)
+                try:
+                    content = Content.objects.get(iri_id=iri_id)
+                except Content.DoesNotExist:
+                    continue
                 segments = list(item)
                 score = sum([seg['score'] for seg in segments])
                 if content.description == None:
Binary file src/ldt/ldt/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/ldt/ldt/locale/en/LC_MESSAGES/django.po	Fri Sep 30 12:27:54 2011 +0200
+++ b/src/ldt/ldt/locale/en/LC_MESSAGES/django.po	Fri Sep 30 16:52:45 2011 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-28 17:04+0200\n"
+"POT-Creation-Date: 2011-09-30 15:55+0200\n"
 "PO-Revision-Date: 2010-02-17 03:53+0100\n"
 "Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -290,7 +290,7 @@
 msgstr "Copy your project"
 
 #: .\ldt_utils\templates\ldt\ldt_utils\copy_ldt.html.py:16
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:74
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:79
 msgid "Title"
 msgstr "Title"
 
@@ -341,7 +341,7 @@
 msgstr "media file is being processed please wait."
 
 #: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:124
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:109
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:114
 #: .\ldt_utils\templates\ldt\ldt_utils\error_confirm.html.py:52
 msgid "close_cancel"
 msgstr "Close"
@@ -354,47 +354,47 @@
 msgid "write"
 msgstr "Write"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:38
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:37
 msgid "check all"
 msgstr "check all"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:39
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:38
 msgid "uncheck all"
 msgstr "uncheck all"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:75
 msgid "Update your project"
 msgstr "Create your project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:75
 msgid "Create your project"
 msgstr "Create your project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:76
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:81
 #, fuzzy
 msgid "Description :"
 msgstr "description"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:78
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:83
 msgid "List of contents"
 msgstr "List of contents"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:91
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:96
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:3
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:3
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:3
 msgid "name"
 msgstr "name"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:111
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:116
 msgid "delete_project"
 msgstr "delete project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:112
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:117
 msgid "update_project"
 msgstr "update project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:114
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:119
 msgid "create_project"
 msgstr "Create new project"
 
@@ -516,24 +516,29 @@
 
 #: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:76
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:12
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:14
 msgid "open ldt"
 msgstr "open ldt"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:79
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:80
+msgid "No title"
+msgstr "No title"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:86
 #, fuzzy
 msgid "Tags"
 msgstr "Pages"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:93
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:100
 msgid "previous"
 msgstr "Previous"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:98
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:105
 #, python-format
 msgid "Page %(number)s of  %(num_pages)s"
 msgstr "Page %(number)s of  %(num_pages)s"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:103
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:110
 msgid "next"
 msgstr "Next"
 
@@ -549,20 +554,20 @@
 msgid "preview media"
 msgstr "preview media"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:13
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:17
 msgid "copy project"
 msgstr "Copy your project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:14
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:18
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:12
 msgid "link json by id"
 msgstr "link json by id"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:17
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:21
 msgid "Project published, click to unpublish"
 msgstr "Project published, click to unpublish"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:19
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:23
 msgid "Project not published, click to publish"
 msgstr "Project not published, click to publish"
 
Binary file src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po	Fri Sep 30 12:27:54 2011 +0200
+++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po	Fri Sep 30 16:52:45 2011 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-28 17:03+0200\n"
+"POT-Creation-Date: 2011-09-30 15:55+0200\n"
 "PO-Revision-Date: 2010-03-09 15:52+0100\n"
 "Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -290,7 +290,7 @@
 msgstr "Copier votre projet"
 
 #: .\ldt_utils\templates\ldt\ldt_utils\copy_ldt.html.py:16
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:74
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:79
 msgid "Title"
 msgstr "Titre"
 
@@ -340,7 +340,7 @@
 msgstr "Le fichier média est en cours de traitement. Veuillez patienter."
 
 #: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:124
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:109
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:114
 #: .\ldt_utils\templates\ldt\ldt_utils\error_confirm.html.py:52
 msgid "close_cancel"
 msgstr "Fermer"
@@ -353,47 +353,47 @@
 msgid "write"
 msgstr "Enregistrer"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:38
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:37
 msgid "check all"
 msgstr "Tout cocher"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:39
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:38
 msgid "uncheck all"
 msgstr "Tout décocher"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:75
 msgid "Update your project"
 msgstr "Mettre à jour votre projet Lignes de Temps"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:75
 msgid "Create your project"
 msgstr "Créer votre projet Lignes de Temps"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:76
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:81
 #, fuzzy
 msgid "Description :"
 msgstr "description"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:78
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:83
 msgid "List of contents"
 msgstr "Liste de contenus"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:91
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:96
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:3
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:3
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:3
 msgid "name"
 msgstr "Nom"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:111
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:116
 msgid "delete_project"
 msgstr "Effacer"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:112
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:117
 msgid "update_project"
 msgstr "Mettre à jour"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:114
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:119
 msgid "create_project"
 msgstr "Créer un nouveau projet Ligne de Temps"
 
@@ -512,24 +512,29 @@
 
 #: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:76
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:12
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:14
 msgid "open ldt"
 msgstr "Ouvrir sous Lignes de Temps"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:79
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:80
+msgid "No title"
+msgstr "Sans titre"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:86
 #, fuzzy
 msgid "Tags"
 msgstr "tags"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:93
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:100
 msgid "previous"
 msgstr "Précedent"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:98
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:105
 #, python-format
 msgid "Page %(number)s of  %(num_pages)s"
 msgstr "Page %(number)s de  %(num_pages)s"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:103
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:110
 msgid "next"
 msgstr "Suivant"
 
@@ -545,20 +550,20 @@
 msgid "preview media"
 msgstr "Aperçu"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:13
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:17
 msgid "copy project"
 msgstr "Copier votre projet"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:14
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:18
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:12
 msgid "link json by id"
 msgstr "Ouvrir le lecteur de métadata"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:17
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:21
 msgid "Project published, click to unpublish"
 msgstr "Projet publié, cliquer pour de-publier"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:19
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:23
 msgid "Project not published, click to publish"
 msgstr "Projet non publié, cliquer pour publier"
 
@@ -799,7 +804,7 @@
 
 #: .\templates\ldt\ldt_base.html.py:89
 msgid "Link to admin"
-msgstr "Lien vers admin"
+msgstr "Administration"
 
 #: .\templates\ldt\ldt_base.html.py:89
 msgid "Staff"
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js	Fri Sep 30 12:27:54 2011 +0200
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js	Fri Sep 30 16:52:45 2011 +0200
@@ -178,6 +178,7 @@
             minW: 730,
             minH: 480
         },
+        closeOnClick:false,
         callbacks: {
             afterClose: function(nm) {
                 searchCallback($('#searchprojectsinput'), "#contentslistcontainer", content_filter_url);
@@ -211,6 +212,7 @@
             minW: 730,
             minH: 480
         },
+        closeOnClick:false,
         callbacks: {
             afterClose: function(nm) {
                 searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0);    
@@ -333,6 +335,7 @@
             minW: '510',
             minH: '700'
         },
+        closeOnClick:false,
         callbacks: {
             afterClose: function(nm) {
                 searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
platform