Merge branch 'hotline#44903_bokeh_cache_des_images' into 'stable'

Hotline#44903 bokeh cache des images

See merge request !1798

VERSIONS_HOTLINE/44903

+ - ticket #44903 : constitution du cache des images: reprise automatique si erreur
\ No newline at end of file

application/modules/admin/views/scripts/footer.phtml

 <div class="copyright" style="text-align:center">
   <div ><?php echo $this->Admin_SkinSelector()?></div>
   <span>
-      &copy; 2006-<?php print(date("Y")); ?>
-      <?php echo $this->traduire('- Tous droits réservés - Hébergement &amp; Conception graphique');?>&nbsp;
-      <a href="http://www.afi-sa.net" target="_blank">AFI</a>
+    <?php echo $this->tagCredits() ?>
   </span>
 </div>
 

application/modules/opac/views/scripts/footer.phtml

@@ -31,9 +31,7 @@
         ?>
         <td style="text-align:right;padding-right:10px">
           <div class="credit">
-            &copy; 2006-<?php print(date("Y")); ?>
-            <?php echo $this->_('- Propulsé par ');?>
-            <a href="http://www.bokeh-library-portal.org" target="_blank" title="<?php echo $this->_('Site communautaire du projet Bokeh');?>">Bokeh</a>
+            <?php echo $this->tagCredits() ?>
           </div>
         </td>
       </tr>

index.php

@@ -18,11 +18,12 @@
  * along with BOKEH; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
-//vérification du paramétrage Bokeh
-if ((!file_exists('local.php') || !file_exists('config.ini') || !file_exists('cosmogramme/config.php')) //test existence fichiers de paramétrage
-	&& file_exists('scripts/install-bokeh.php')) { //contrôle présence script de paramétrage
+
+// Run Bokeh installer if not configured
+if ((!file_exists('local.php') || !file_exists('config.ini') || !file_exists('cosmogramme/config.php')) 	&& file_exists('scripts/install-bokeh.php')) {
 		include('scripts/install-bokeh.php');
 }
+
 require('includes.php');
 
 try {

library/ZendAfi/View/Helper/TagCredits.php

+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ */
+
+class ZendAfi_View_Helper_TagCredits extends Zend_View_Helper_HtmlElement {
+  public function tagCredits() {
+    return sprintf('&copy; 2006-%d - %s <a href="%s" target="_blank" title="%s">Bokeh</a>',
+                   date("Y"),
+                   $this->view->_('Propulsé par'),
+                   'http://www.bokeh-library-portal.org',
+                   $this->view->_('Site communautaire du projet Bokeh'));
+  }
+}
+?>
\ No newline at end of file

public/admin/js/cacheimages.js

-////////////////////////////////////////////////////////////////////////////////////
-// Constitution du cache des images
-///////////////////////////////////////////////////////////////////////////////////
-function makeCacheImages(sUrl)
-{
-	if(!sUrl) sUrl=baseUrl+'/admin/systeme/makecacheimages';
-	else sUrl=baseUrl+sUrl;
-	$('#bloc_restantes').show();
-	$('#restantes').load(sUrl);
-}
\ No newline at end of file
+// See module/admin/controllers/SystemeController.php makecacheimagesAction()
+function makeCacheImages(sUrl) {
+        if (!sUrl) 
+          sUrl = baseUrl+'/admin/systeme/makecacheimages';
+        else 
+          sUrl = baseUrl+sUrl;
+
+        $('#bloc_restantes').show();
+        $('#restantes').load(sUrl, 
+                             function(response, status, xhr) {
+                               if (status == "error") {
+                                 $('#restantes').append('.');
+                                 setTimeout(function() { makeCacheImages(); },
+                                            1);
+                                            
+                               }
+                             });
+}