Subversion Repositories Applications.referentiel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 390 → Rev 391

/trunk/interfaces/index.php
19,16 → 19,16
<meta name="robots" content="noindex,nofollow" />
<meta name="author" content="Tela Botanica" />
 
<link rel="shortcut icon" type="image/x-icon" href="http://resources.tela-botanica.org/tb/img/16x16/favicon.ico" />
<link rel="icon" type="image/png" href="http://resources.tela-botanica.org/tb/img/16x16/favicon.png" />
<link rel="shortcut icon" type="image/x-icon" href="https://resources.tela-botanica.org/tb/img/16x16/favicon.ico" />
<link rel="icon" type="image/png" href="https://resources.tela-botanica.org/tb/img/16x16/favicon.png" />
 
<link rel="stylesheet" type="text/css" media="screen" href="interfaces/squelettes/css/humanity/jquery-ui-1.8.7.custom.css" />
<link rel="stylesheet" type="text/css" media="screen" href="interfaces/squelettes/css/referentiel/referentiel.css" />
<link rel="stylesheet" type="text/css" media="screen" href="interfaces/squelettes/css/referentiel/debogage.css" />
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/1.4.4/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/cookie/1.0/jquery.cookie.min.js"></script>
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/chromatable/1.3.0/jquery.chromatable.js"></script>
<script type="text/javascript" src="https://www.tela-botanica.org/commun/jquery/1.4.4/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="https://www.tela-botanica.org/commun/jquery/cookie/1.0/jquery.cookie.min.js"></script>
<script type="text/javascript" src="https://www.tela-botanica.org/commun/jquery/chromatable/1.3.0/jquery.chromatable.js"></script>
<script type="text/javascript" src="interfaces/squelettes/js/jquery-ui-1.8.7.custom.min.js"></script>
<script type="text/javascript" src="interfaces/squelettes/js/referentiels.js"></script>
 
47,7 → 47,7
 
<div id="zone-logo">
<a href="<?php echo Config::get('url_base'); ?>" title="Retour à l'accueil du site">
<img src="http://resources.tela-botanica.org/tb/img/128x128/logo_carre_officiel.png" alt="le logo de Tela Botanica"/>
<img src="https://resources.tela-botanica.org/tb/img/128x128/logo_carre_officiel.png" alt="le logo de Tela Botanica"/>
</a>
</div>
88,4 → 88,4
</div>
</div>
</body>
</html>
</html>
/trunk/interfaces/bibliotheque/pear/Pager/Sliding.php
143,7 → 143,7
* @return array back/pages/next/first/last/all links
* @access public
*/
function getLinks($pageID = null)
function getLinks($pageID = null, $next_html = '')
{
if ($pageID != null) {
$_sav = $this->_currentPage;
286,4 → 286,4
 
// }}}
}
?>
?>
/trunk/.
Property changes:
Modified: svn:mergeinfo
Merged /branches/v2.0-betulales:r387,390