admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tache #2342: Version de NOALYSS : donné quand on tag une version

Browse source
This commit is contained in:
sparkyx 2024-02-25 17:32:49 +01:00
parent a124cf0a0e
commit 245ed74748
5 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
html/index.php
View file

@ -305,7 +305,7 @@ if (isset($_REQUEST['reconnect'])&&isset($_REQUEST['backurl']))
<?php endif; ?>
<span id="info_noalyss">
version NOALYSS_VERSION - <?php echo $my_domain; ?>
version <?=NOALYSS_VERSION?> - <?php echo $my_domain; ?>
</SPAN>
</div>

5
include/class/mobile.class.php
View file

@ -73,6 +73,7 @@ class Mobile
*/
function page_start()
{
global $version_noalyss;
// check not called twiced
static $already_call=0;
if ($already_call==1)
@ -96,8 +97,8 @@ class Mobile
<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">
<LINK id=\"bootstrap\" REL=\"stylesheet\" type=\"text/css\" href=\"css/bootstrap.min.css\" media=\"screen\"/>
<LINK id=\"fontello\" REL=\"stylesheet\" type=\"text/css\" href=\"css/font/fontello/css/fontello.css\" media=\"screen\"/>
<LINK id=\"pagestyle\" REL=\"stylesheet\" type=\"text/css\" href=\"css/".$style."?version=".SVNINFO."\" media=\"screen\"/>
<link rel=\"stylesheet\" type=\"text/css\" href=\"css/style-print.css?version=".SVNINFO."\" media=\"print\"/>";
<LINK id=\"pagestyle\" REL=\"stylesheet\" type=\"text/css\" href=\"css/".$style."?version=".$version_noalyss."\" media=\"screen\"/>
<link rel=\"stylesheet\" type=\"text/css\" href=\"css/style-print.css?version=".$version_noalyss."\" media=\"print\"/>";
// preload font
echo '<link rel="preload" href="./css/font/OpenSansRegular.woff" as="font" crossorigin="anonymous" />';

8
include/constant.php
View file

@ -93,11 +93,7 @@ define('BUTTONADD', "&#10010;");
// If noalyss_version is not defined it is likely directly taken from
// git and so this variable is not set, this cause some issue
if (! defined ("NOALYSS_VERSION"))
{
define("NOALYSS_VERSION",9999);
}
define('SVNINFO', NOALYSS_VERSION);
define('NOALYSS_VERSION', 9114 );
if (!defined('DEBUGNOALYSS')) {
define("DEBUGNOALYSS", 0);
}
@ -109,7 +105,7 @@ if (!defined('LOGINPUT')) {
if (!defined('DEBUGNOALYSS')) {
define('DEBUGNOALYSS', 0);
}
$version_noalyss = SVNINFO;
$version_noalyss = NOALYSS_VERSION;
// If you don't want to be notified of the update
if (!defined("SITE_UPDATE"))

19
include/lib/ac_common.php
View file

@ -336,16 +336,17 @@ function html_page_start($p_theme="", $p_script="", $p_script2="")
{
echo ' <meta http-equiv="x-ua-compatible" content="IE=edge"/>';
}
echo "
global $version_noalyss;
echo <<<EOF
<TITLE>$title</TITLE>
<link rel=\"icon\" type=\"image/ico\" href=\"favicon.ico\" />
<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">
<LINK id=\"bootstrap\" REL=\"stylesheet\" type=\"text/css\" href=\"css/bootstrap.min.css\" media=\"screen\"/>
<LINK id=\"fontello\" REL=\"stylesheet\" type=\"text/css\" href=\"css/font/fontello/css/fontello.css\" media=\"screen\"/>
<LINK id=\"pagestyle\" REL=\"stylesheet\" type=\"text/css\" href=\"css/".$style."?version=".SVNINFO."\" media=\"screen\"/>
<link rel=\"stylesheet\" type=\"text/css\" href=\"css/style-print.css?version=".SVNINFO."\" media=\"print\"/>" .
$p_script2 . "
";
<link rel="icon" type="image/ico" href="favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<LINK id="bootstrap" REL="stylesheet" type="text/css" href="css/bootstrap.min.css" media="screen"/>
<LINK id="fontello" REL="stylesheet" type="text/css" href="css/font/fontello/css/fontello.css" media="screen"/>
<LINK id="pagestyle" REL="stylesheet" type="text/css" href="css/$style?version=$version_noalyss" media="screen"/>
<link rel="stylesheet" type="text/css" href="css/style-print.css?version=$version_noalyss" media="print"/>
$p_script2
EOF;
// preload font
echo '<link rel="preload" href="css/font/OpenSansRegular.woff" as="font" crossorigin="anonymous" />';
echo '<link rel="preload" href="css/font/SansationLight/SansationLight.woff" as="font" crossorigin="anonymous" />';

3
include/lib/function_javascript.php
View file

@ -16,6 +16,7 @@ License: GPL
*/
function js_include($p_string)
{
global $version_noalyss;
static $ajs=array(); /* avoid to add twice the same script */
static $seq=0;
if ( in_array($p_string,$ajs)) return '';
@ -24,7 +25,7 @@ function js_include($p_string)
if ( ! file_exists('js/'.$p_string))
alert("Erreur js/$p_string n existe pas");
$script='<script type="text/javascript" charset="utf-8" language="javascript" src="js/'.$p_string.'?version='.SVNINFO.'"></script>';
$script='<script type="text/javascript" charset="utf-8" language="javascript" src="js/'.$p_string.'?version='.$version_noalyss.'"></script>';
// debug
return $script;