Binary file web/hdalab/locale/de/LC_MESSAGES/djangojs.mo has changed

--- a/web/hdalab/locale/de/LC_MESSAGES/djangojs.po	Wed Sep 05 19:11:34 2012 +0200
+++ b/web/hdalab/locale/de/LC_MESSAGES/djangojs.po	Thu Sep 06 12:16:27 2012 +0200
@@ -111,3 +111,11 @@
 #: static/hdalab/js/gomina.js:920
 msgid "Nouvelle liste"
 msgstr "Neue Liste"
+
+#: static/hdalab/js/completion.js:73
+msgid "Source : Wikipédia"
+msgstr "Quelle: Wikipedia"
+
+#: static/hdalab/js/completion.js:20
+msgid "Localisation :"
+msgstr "Standort:"

Binary file web/hdalab/locale/en/LC_MESSAGES/djangojs.mo has changed

--- a/web/hdalab/locale/en/LC_MESSAGES/djangojs.po	Wed Sep 05 19:11:34 2012 +0200
+++ b/web/hdalab/locale/en/LC_MESSAGES/djangojs.po	Thu Sep 06 12:16:27 2012 +0200
@@ -109,3 +109,11 @@
 #: static/hdalab/js/gomina.js:920
 msgid "Nouvelle liste"
 msgstr "New list"
+
+#: static/hdalab/js/completion.js:73
+msgid "Source : Wikipédia"
+msgstr "Source: Wikipedia"
+
+#: static/hdalab/js/completion.js:20
+msgid "Localisation :"
+msgstr "Location:"

Binary file web/hdalab/locale/es/LC_MESSAGES/djangojs.mo has changed

--- a/web/hdalab/locale/es/LC_MESSAGES/djangojs.po	Wed Sep 05 19:11:34 2012 +0200
+++ b/web/hdalab/locale/es/LC_MESSAGES/djangojs.po	Thu Sep 06 12:16:27 2012 +0200
@@ -110,3 +110,11 @@
 #: static/hdalab/js/gomina.js:920
 msgid "Nouvelle liste"
 msgstr "Nueva lista"
+
+#: static/hdalab/js/completion.js:73
+msgid "Source : Wikipédia"
+msgstr "Fuente: Wikipedia"
+
+#: static/hdalab/js/completion.js:20
+msgid "Localisation :"
+msgstr "Localización:"

Binary file web/hdalab/locale/fr/LC_MESSAGES/djangojs.mo has changed

--- a/web/hdalab/locale/fr/LC_MESSAGES/djangojs.po	Wed Sep 05 19:11:34 2012 +0200
+++ b/web/hdalab/locale/fr/LC_MESSAGES/djangojs.po	Thu Sep 06 12:16:27 2012 +0200
@@ -110,3 +110,11 @@
 #: static/hdalab/js/gomina.js:920
 msgid "Nouvelle liste"
 msgstr "Nouvelle liste"
+
+#: static/hdalab/js/completion.js:73
+msgid "Source : Wikipédia"
+msgstr "Source : Wikipédia"
+
+#: static/hdalab/js/completion.js:20
+msgid "Localisation :"
+msgstr "Localisation :"

Binary file web/hdalab/locale/it/LC_MESSAGES/djangojs.mo has changed

--- a/web/hdalab/locale/it/LC_MESSAGES/djangojs.po	Wed Sep 05 19:11:34 2012 +0200
+++ b/web/hdalab/locale/it/LC_MESSAGES/djangojs.po	Thu Sep 06 12:16:27 2012 +0200
@@ -111,3 +111,11 @@
 #: static/hdalab/js/gomina.js:920
 msgid "Nouvelle liste"
 msgstr "Nuovo elenco"
+
+#: static/hdalab/js/completion.js:73
+msgid "Source : Wikipédia"
+msgstr "Fonte: Wikipedia"
+
+#: static/hdalab/js/completion.js:20
+msgid "Localisation :"
+msgstr "Localizzazione:"

Binary file web/hdalab/locale/ja/LC_MESSAGES/djangojs.mo has changed

--- a/web/hdalab/locale/ja/LC_MESSAGES/djangojs.po	Wed Sep 05 19:11:34 2012 +0200
+++ b/web/hdalab/locale/ja/LC_MESSAGES/djangojs.po	Thu Sep 06 12:16:27 2012 +0200
@@ -111,3 +111,11 @@
 #: static/hdalab/js/gomina.js:920
 msgid "Nouvelle liste"
 msgstr "名称未設定のリスト"
+
+#: static/hdalab/js/completion.js:73
+msgid "Source : Wikipédia"
+msgstr "ウィキペディア"
+
+#: static/hdalab/js/completion.js:20
+msgid "Localisation :"
+msgstr "Location:"

Binary file web/hdalab/locale/zh-tw/LC_MESSAGES/djangojs.mo has changed

--- a/web/hdalab/locale/zh-tw/LC_MESSAGES/djangojs.po	Wed Sep 05 19:11:34 2012 +0200
+++ b/web/hdalab/locale/zh-tw/LC_MESSAGES/djangojs.po	Thu Sep 06 12:16:27 2012 +0200
@@ -112,3 +112,7 @@
 #: static/hdalab/js/gomina.js:920
 msgid "Nouvelle liste"
 msgstr "Nouvelle liste"
+
+#: static/hdalab/js/completion.js:73
+msgid "Source : Wikipédia"
+msgstr "Source : Wikipédia"

--- a/web/hdalab/static/hdalab/css/completion.css	Wed Sep 05 19:11:34 2012 +0200
+++ b/web/hdalab/static/hdalab/css/completion.css	Thu Sep 06 12:16:27 2012 +0200
@@ -166,22 +166,30 @@
     float: right; font-size: 12px; margin: 2px 0 0 2px;
 }
 
-h4.actitle {
+.actitle {
+    font-size: 13px;
+}
+
+.wptitle {
     font-size: 13px; font-weight: bold;
 }
 
-img.acimg {
-    max-width: 80px; max-height: 60px; float: left; margin: 5px 2px 2px 0;
+.wpimg {
+    max-width: 80px; max-height: 60px; float: left; margin: 5px 2px 2px 0; border: none;
 }
 
-p.acabstract {
-    margin-left: 82px;
+.wpabstract {
+    font-size: 11px;
+}
+
+.wpsource {
+    font-size: 10px; font-style: bold;
 }
 
 .clear {
     clear: both;
 }
 
-.actitle strong {
+.actitle strong, .wptitle strong {
     color: #c000c0;
 }
\ No newline at end of file

--- a/web/hdalab/static/hdalab/js/completion.js	Wed Sep 05 19:11:34 2012 +0200
+++ b/web/hdalab/static/hdalab/js/completion.js	Thu Sep 06 12:16:27 2012 +0200
@@ -16,7 +16,9 @@
                         + _d.coords.latitude
                         + ','
                         + _d.coords.longitude
-                        + '&sensor=false" /><h4>Localisation&nbsp;: '
+                        + '&sensor=false" /><h4>'
+                        + gettext('Localisation&nbsp;:')
+                        + ' '
                         + _d.coords.city_name
                         + '</h4></div>'
                         : '')
@@ -58,6 +60,29 @@
     );
 }
 
+function ellipse(_text, _length) {
+    var _rgxp = new RegExp('(^.{0,' + _length + '})([\s]|$)(.*)')
+    return _text.replace(/(\n|\r|\r\n)/mg,' ').trim().replace(_rgxp,'$1…')
+}
+
+function highlightText(_text, _search) {
+    var _rgxp = new RegExp('(' + _search.replace(/(\W)/g, '\\$1') + ')','gi');
+    return _text.replace(_rgxp, '<strong>$1</strong>');
+}
+
+function wikipediaUrl(_text) {
+    return "http://" + gomNs.languageCode + ".wikipedia.org/wiki/" + encodeURI(_text.replace(/ /g,'_'))
+}
+
+wpTemplate = _.template(
+    '<h4 class="wptitle"><% print(highlightText(item.label, inputvalue)); %></h4><% if (item.thumbnail) { %><img class="wpimg" src="<%-item.thumbnail%>" /><% };'
+    + ' if (item.abstract) { %><p class="wpabstract"><% print(ellipse(item.abstract,250))%></p><p class="wpsource"><a href="<% print(wikipediaUrl(item.label)) %>" target="_blank"><% print(gettext("Source&nbsp;: Wikipédia")) %></a></p><% }; %><div class="clear"></div>'
+);
+
+acTemplate = _.template(
+    '<a><span class="acnb"><%- item.nb %></span><h4 class="actitle"><% print(highlightText(item.label, inputvalue)); %></h4></a>'
+)
+
 $(document).ready(function() {
     $(" #tagform ").submit(function() {
         return false;
@@ -81,54 +106,25 @@
                 }
             });
         },
-        minLength: 2,
+        minLength: ( gomNs.languageCode == 'ja' ? 1 : 2 ),
         focus: function( event, ui ) {
-            var _title = $('<h4>')
-                .addClass("actitle")
-                .html(
-                    ui.item.value.replace(
-                        new RegExp('('
-                            + $("#tagsearch").val().replace(/(\W)/g, '\\$1')
-                            + ')','gi') ,
-                        '<strong>$1</strong>')
-                );
-            $(".wpinfo").html(_title);
-            if (ui.item.thumbnail) {
-                var _img = $('<img>')
-                    .addClass("acimg")
-                    .attr("src",ui.item.thumbnail);
-                $(".wpinfo").append(_img);
-            }
-            if (ui.item.abstract) {
-                var _abstract = $('<p>')
-                    .addClass("acabstract")
-                    .text( ui.item.abstract.replace(/(^.{0,240})([\s]|$)(.*)/,'$1…') );
-                $(".wpinfo").append(_abstract);
-            }
-            $(".wpinfo").append('<div class="clear"></div>');
+            $(".wpinfo").html(wpTemplate({
+                item: ui.item,
+                inputvalue: $("#tagsearch").val()
+            }));
         },
         select: function( event, ui ) {
             getContents(ui.item.label);
         }
     })
     .data("autocomplete")._renderItem = function(ul, item) {
-        var _contents = $('<a>'),
-            _nb = $('<span>')
-                .addClass("acnb")
-                .text(item.nb),
-            _title = $('<h4>')
-                .addClass("actitle")
-                .html(
-                    item.value.replace(
-                        new RegExp('('
-                            + $("#tagsearch").val().replace(/(\W)/g, '\\$1')
-                            + ')','gi') ,
-                        '<strong>$1</strong>')
-                );
-        _contents.append(_nb).append(_title);
+        var _contents = acTemplate({
+            item: item,
+            inputvalue: $("#tagsearch").val()
+        });
         return $( "<li>" )
             .data( "item.autocomplete", item )
-            .append( _contents )
+            .html( _contents )
             .appendTo( ul );
     };
 });

--- a/web/hdalab/static/hdalab/js/gomina.js	Wed Sep 05 19:11:34 2012 +0200
+++ b/web/hdalab/static/hdalab/js/gomina.js	Thu Sep 06 12:16:27 2012 +0200
@@ -263,7 +263,9 @@
                         + _d.coords.latitude
                         + ','
                         + _d.coords.longitude
-                        + '&sensor=false" /><h4>Localisation&nbsp;: '
+                        + '&sensor=false" /><h4>'
+                        + gettext('Localisation&nbsp;:')
+                        + ' '
                         + _d.coords.city_name
                         + '</h4></div>'
                         : '')