- {{thumb.format(record.get_thumbnail, 100, 100, "", session, true)}}
+ {{thumb.format(record.get_thumbnail, 100, 100, "", session, true, false)}}
{% set name = "title_" ~ record.get_serialize_key() %}
diff --git a/templates/web/prod/actions/Bridge/index.html.twig b/templates/web/prod/actions/Bridge/index.html.twig
index c5b27367e7..c142fb5f21 100644
--- a/templates/web/prod/actions/Bridge/index.html.twig
+++ b/templates/web/prod/actions/Bridge/index.html.twig
@@ -7,7 +7,7 @@
{% for id, record in route.get_elements %}
{{ record.get_title() }}
- {{thumb.format(record.get_thumbnail, 80, 80, "", session, true)}}
+ {{thumb.format(record.get_thumbnail, 80, 80, "", session, true, false)}}
{% endfor %}
diff --git a/templates/web/prod/actions/Bridge/records_list.html.twig b/templates/web/prod/actions/Bridge/records_list.html.twig
index 63b721d560..b5a3f9c9c7 100644
--- a/templates/web/prod/actions/Bridge/records_list.html.twig
+++ b/templates/web/prod/actions/Bridge/records_list.html.twig
@@ -60,7 +60,7 @@
- {{thumb.format(element.get_record().get_thumbnail, 40, 40, "", session, true)}}
+ {{thumb.format(element.get_record().get_thumbnail, 40, 40, "", session, true, false)}}
diff --git a/templates/web/prod/actions/publish/publish.html.twig b/templates/web/prod/actions/publish/publish.html.twig
index b504249c3e..d67a5477b9 100644
--- a/templates/web/prod/actions/publish/publish.html.twig
+++ b/templates/web/prod/actions/publish/publish.html.twig
@@ -1,7 +1,7 @@
{% macro format_diapo(record, session) %}
{% import 'common/thumbnail.html.twig' as thumbnail %}
- {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}}
+ {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true, false)}}
{% endmacro %}
diff --git a/templates/web/prod/actions/publish/publish_edit.html.twig b/templates/web/prod/actions/publish/publish_edit.html.twig
index 2ff21da251..7ec3f77f97 100644
--- a/templates/web/prod/actions/publish/publish_edit.html.twig
+++ b/templates/web/prod/actions/publish/publish_edit.html.twig
@@ -2,7 +2,7 @@
{% macro format_diapo(record, session) %}
{% import 'common/thumbnail.html.twig' as thumbnail %}
- {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}}
+ {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true, false)}}
{% endmacro %}
diff --git a/templates/web/prod/orders/order_item.html.twig b/templates/web/prod/orders/order_item.html.twig
index d90e02d491..fedaf6dd1e 100644
--- a/templates/web/prod/orders/order_item.html.twig
+++ b/templates/web/prod/orders/order_item.html.twig
@@ -58,7 +58,7 @@
{% for order_element_id,element in order %}
- {{ thumbnail.format(element.get_thumbnail() ,80, 80, '', session, true) }}
+ {{ thumbnail.format(element.get_thumbnail() ,80, 80, '', session, true, false) }}
{% if element.get_order_master_id() %}
{% set name = element.get_order_master_name() %}
{% if element.get_deny() == 1 %}
diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig
index 3ff64f7a77..fa0ddd0c05 100644
--- a/templates/web/prod/results/record.html.twig
+++ b/templates/web/prod/results/record.html.twig
@@ -59,9 +59,9 @@
{% if rollover_gif %}
{% set extraclass = 'rollover-gif-out' %}
{% endif %}
- {{thumbnail.format(record.get_thumbnail(), th_size, th_size, extraclass, session, true)}}
+ {{thumbnail.format(record.get_thumbnail(), th_size, th_size, extraclass, session, true, true)}}
{% if rollover_gif %}
- {{thumbnail.format(rollover_gif, th_size, th_size, 'rollover-gif-hover', session, true )}}
+ {{thumbnail.format(rollover_gif, th_size, th_size, 'rollover-gif-hover', session, true, true )}}
{% endif %}
diff --git a/templates/web/prod/thesaurus.js b/templates/web/prod/thesaurus.js
index 3ccc7e7457..0b73fc30e8 100644
--- a/templates/web/prod/thesaurus.js
+++ b/templates/web/prod/thesaurus.js
@@ -1285,10 +1285,12 @@ function startThesaurus(){
{
C_MenuOption(menuItem, menu, "ACCEPT", {'lng':'{{lng_code}}'});
}
- },
+ }
+ ,
{% endfor %}
{
label:'{% trans 'prod::thesaurusTab:cmenu:Remplacer par...' %}',
+ disabled:true,
onclick:function(menuItem, menu)
{
C_MenuOption(menuItem, menu, 'REPLACE', null);
@@ -1296,6 +1298,7 @@ function startThesaurus(){
},
{
label:'{% trans 'boutton::supprimer' %}',
+ disabled:true,
onclick:function(menuItem, menu)
{
C_MenuOption(menuItem, menu, 'DELETE', null);
diff --git a/templates/web/prod/upload/lazaret.html.twig b/templates/web/prod/upload/lazaret.html.twig
index 741ce1973e..8f8ffb7c01 100644
--- a/templates/web/prod/upload/lazaret.html.twig
+++ b/templates/web/prod/upload/lazaret.html.twig
@@ -308,7 +308,7 @@
- {{ thumb.format(record.get_thumbnail(), 260, 180, "", session, false) }}
+ {{ thumb.format(record.get_thumbnail(), 260, 180, "", session, false, false) }}
diff --git a/www/include/jslibs/jquery.lazyload/jquery.lazyload.1.8.1.js b/www/include/jslibs/jquery.lazyload/jquery.lazyload.1.8.1.js
new file mode 100644
index 0000000000..9601a58614
--- /dev/null
+++ b/www/include/jslibs/jquery.lazyload/jquery.lazyload.1.8.1.js
@@ -0,0 +1,215 @@
+/*
+ * Lazy Load - jQuery plugin for lazy loading images
+ *
+ * Copyright (c) 2007-2012 Mika Tuupola
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * Project home:
+ * http://www.appelsiini.net/projects/lazyload
+ *
+ * Version: 1.8.1
+ *
+ */
+(function($, window) {
+ var $window = $(window);
+
+ $.fn.lazyload = function(options) {
+ var elements = this;
+ var $container;
+ var settings = {
+ threshold : 0,
+ failure_limit : 0,
+ event : "scroll",
+ effect : "show",
+ container : window,
+ data_attribute : "original",
+ skip_invisible : true,
+ appear : null,
+ load : null
+ };
+
+ function update() {
+ var counter = 0;
+
+ elements.each(function() {
+ var $this = $(this);
+ if (settings.skip_invisible && !$this.is(":visible")) {
+ return;
+ }
+ if ($.abovethetop(this, settings) ||
+ $.leftofbegin(this, settings)) {
+ /* Nothing. */
+ } else if (!$.belowthefold(this, settings) &&
+ !$.rightoffold(this, settings)) {
+ $this.trigger("appear");
+ /* if we found an image we'll load, reset the counter */
+ counter = 0;
+ } else {
+ if (++counter > settings.failure_limit) {
+ return false;
+ }
+ }
+ });
+
+ }
+
+ if(options) {
+ /* Maintain BC for a couple of versions. */
+ if (undefined !== options.failurelimit) {
+ options.failure_limit = options.failurelimit;
+ delete options.failurelimit;
+ }
+ if (undefined !== options.effectspeed) {
+ options.effect_speed = options.effectspeed;
+ delete options.effectspeed;
+ }
+
+ $.extend(settings, options);
+ }
+
+ /* Cache container as jQuery as object. */
+ $container = (settings.container === undefined ||
+ settings.container === window) ? $window : $(settings.container);
+
+ /* Fire one scroll event per scroll. Not one scroll event per image. */
+ if (0 === settings.event.indexOf("scroll")) {
+ $container.bind(settings.event, function(event) {
+ return update();
+ });
+ }
+
+ this.each(function() {
+ var self = this;
+ var $self = $(self);
+
+ self.loaded = false;
+
+ /* When appear is triggered load original image. */
+ $self.one("appear", function() {
+ if (!this.loaded) {
+ if (settings.appear) {
+ var elements_left = elements.length;
+ settings.appear.call(self, elements_left, settings);
+ }
+ $("
")
+ .bind("load", function() {
+ $self
+ .hide()
+ .attr("src", $self.data(settings.data_attribute))
+ [settings.effect](settings.effect_speed);
+ self.loaded = true;
+
+ /* Remove image from array so it is not looped next time. */
+ var temp = $.grep(elements, function(element) {
+ return !element.loaded;
+ });
+ elements = $(temp);
+
+ if (settings.load) {
+ var elements_left = elements.length;
+ settings.load.call(self, elements_left, settings);
+ }
+ })
+ .attr("src", $self.data(settings.data_attribute));
+ }
+ });
+
+ /* When wanted event is triggered load original image */
+ /* by triggering appear. */
+ if (0 !== settings.event.indexOf("scroll")) {
+ $self.bind(settings.event, function(event) {
+ if (!self.loaded) {
+ $self.trigger("appear");
+ }
+ });
+ }
+ });
+
+ /* Check if something appears when window is resized. */
+ $window.bind("resize", function(event) {
+ update();
+ });
+
+ /* Force initial check if images should appear. */
+ $(document).ready(function() {
+ update();
+ });
+
+ return this;
+ };
+
+ /* Convenience methods in jQuery namespace. */
+ /* Use as $.belowthefold(element, {threshold : 100, container : window}) */
+
+ $.belowthefold = function(element, settings) {
+ var fold;
+
+ if (settings.container === undefined || settings.container === window) {
+ fold = $window.height() + $window.scrollTop();
+ } else {
+ fold = $(settings.container).offset().top + $(settings.container).height();
+ }
+
+ return fold <= $(element).offset().top - settings.threshold;
+ };
+
+ $.rightoffold = function(element, settings) {
+ var fold;
+
+ if (settings.container === undefined || settings.container === window) {
+ fold = $window.width() + $window.scrollLeft();
+ } else {
+ fold = $(settings.container).offset().left + $(settings.container).width();
+ }
+
+ return fold <= $(element).offset().left - settings.threshold;
+ };
+
+ $.abovethetop = function(element, settings) {
+ var fold;
+
+ if (settings.container === undefined || settings.container === window) {
+ fold = $window.scrollTop();
+ } else {
+ fold = $(settings.container).offset().top;
+ }
+
+ return fold >= $(element).offset().top + settings.threshold + $(element).height();
+ };
+
+ $.leftofbegin = function(element, settings) {
+ var fold;
+
+ if (settings.container === undefined || settings.container === window) {
+ fold = $window.scrollLeft();
+ } else {
+ fold = $(settings.container).offset().left;
+ }
+
+ return fold >= $(element).offset().left + settings.threshold + $(element).width();
+ };
+
+ $.inviewport = function(element, settings) {
+ return !$.rightoffold(element, settings) && !$.leftofbegin(element, settings) &&
+ !$.belowthefold(element, settings) && !$.abovethetop(element, settings);
+ };
+
+ /* Custom selectors for your convenience. */
+ /* Use as $("img:below-the-fold").something() or */
+ /* $("img").filter(":below-the-fold").something() which is faster */
+
+ $.extend($.expr[':'], {
+ "below-the-fold" : function(a) { return $.belowthefold(a, {threshold : 0}); },
+ "above-the-top" : function(a) { return !$.belowthefold(a, {threshold : 0}); },
+ "right-of-screen": function(a) { return $.rightoffold(a, {threshold : 0}); },
+ "left-of-screen" : function(a) { return !$.rightoffold(a, {threshold : 0}); },
+ "in-viewport" : function(a) { return $.inviewport(a, {threshold : 0}); },
+ /* Maintain BC for couple of versions. */
+ "above-the-fold" : function(a) { return !$.belowthefold(a, {threshold : 0}); },
+ "right-of-fold" : function(a) { return $.rightoffold(a, {threshold : 0}); },
+ "left-of-fold" : function(a) { return !$.rightoffold(a, {threshold : 0}); }
+ });
+
+})(jQuery, window);
diff --git a/www/include/minify/groupsConfig.php b/www/include/minify/groupsConfig.php
index d2562b55e4..e86922327f 100644
--- a/www/include/minify/groupsConfig.php
+++ b/www/include/minify/groupsConfig.php
@@ -59,6 +59,7 @@ $groups = array(
, '//include/jslibs/json2.js'
, '//include/jslibs/colorpicker/js/colorpicker.js'
, '//include/jslibs/jquery.mousewheel.js'
+ , '//include/jslibs/jquery.lazyload/jquery.lazyload.1.8.1.js'
, '//include/jslibs/jquery-ui-1.8.17/jquery-ui-i18n.js'
, '//include/jslibs/jquery.cookie.js'
, '//include/jquery.common.js'
diff --git a/www/prod/page0.js b/www/prod/page0.js
index 0c8b70d84b..8d11de6051 100644
--- a/www/prod/page0.js
+++ b/www/prod/page0.js
@@ -57,8 +57,15 @@ function getHome(cas, page){
success: function(data){
answAjaxrunning = false;
var answers = $('#answers');
+
$('.next_publi_link', answers).remove();
+
answers.append(data);
+
+ answers.find("img.lazyload").lazyload({
+ container: answers
+ });
+
afterSearch();
if(page > 0)
{
@@ -478,6 +485,10 @@ function initAnswerForm(){
$('#answers').empty().append(datas.results).removeClass('loading');
+
+ $("#answers img.lazyload").lazyload({
+ container: $('#answers')
+ });
$('#tool_results').empty().append(datas.infos);
$('#tool_navigate').empty().append(datas.navigation);
@@ -950,6 +961,10 @@ $(document).ready(function(){
$('.see_more.loading', $answers).remove();
$answers.append(data);
+ $answers.find("img.lazyload").lazyload({
+ container: $answers
+ });
+
if(!no_scroll)
{
$answers.animate({
diff --git a/www/skins/grey.gif b/www/skins/grey.gif
new file mode 100644
index 0000000000..975959a010
Binary files /dev/null and b/www/skins/grey.gif differ
diff --git a/www/skins/icons/SHARE16.png b/www/skins/icons/SHARE16.png
index b22650cd60..4a4d768004 100644
Binary files a/www/skins/icons/SHARE16.png and b/www/skins/icons/SHARE16.png differ
diff --git a/www/skins/icons/deleted.png b/www/skins/icons/deleted.png
index 2ef45deb6e..4f5daa1159 100644
Binary files a/www/skins/icons/deleted.png and b/www/skins/icons/deleted.png differ
diff --git a/www/skins/icons/push16.png b/www/skins/icons/push16.png
index ef3f3442b9..35e3a3f963 100644
Binary files a/www/skins/icons/push16.png and b/www/skins/icons/push16.png differ
diff --git a/www/skins/icons/push64.png b/www/skins/icons/push64.png
index cb69a6eb3a..e7469cc913 100644
Binary files a/www/skins/icons/push64.png and b/www/skins/icons/push64.png differ
diff --git a/www/skins/icons/ressource16.png b/www/skins/icons/ressource16.png
index f51e781cb6..55c1d9cb2d 100644
Binary files a/www/skins/icons/ressource16.png and b/www/skins/icons/ressource16.png differ
diff --git a/www/skins/icons/substitution.png b/www/skins/icons/substitution.png
index 9e5a71449e..5fec99e0ed 100644
Binary files a/www/skins/icons/substitution.png and b/www/skins/icons/substitution.png differ