Merge pull request #735 from anaggh/master
Fix install script, allow navbar for md
This commit is contained in:
commit
9c448b9d10
|
@ -1,4 +1,4 @@
|
||||||
<nav class="navbar navbar-light bg-light d-block d-sm-none">
|
<nav class="navbar navbar-light bg-light d-block d-lg-none">
|
||||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
<span class="navbar-toggler-icon"></span>
|
<span class="navbar-toggler-icon"></span>
|
||||||
</button>
|
</button>
|
||||||
|
@ -31,4 +31,4 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
|
@ -128,7 +128,7 @@ include(PATH_HELPERS.'valid.class.php');
|
||||||
include(PATH_HELPERS.'text.class.php');
|
include(PATH_HELPERS.'text.class.php');
|
||||||
include(PATH_HELPERS.'log.class.php');
|
include(PATH_HELPERS.'log.class.php');
|
||||||
include(PATH_HELPERS.'date.class.php');
|
include(PATH_HELPERS.'date.class.php');
|
||||||
include(PATH_KERNEL.'dblanguage.class.php');
|
include(PATH_KERNEL.'language.class.php');
|
||||||
|
|
||||||
// --- LANGUAGE and LOCALE ---
|
// --- LANGUAGE and LOCALE ---
|
||||||
// Try to detect the language from browser or headers
|
// Try to detect the language from browser or headers
|
||||||
|
@ -155,7 +155,7 @@ foreach ($languageFiles as $fname=>$native) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$Language = new Language($finalLanguage);
|
$language = new Language($finalLanguage);
|
||||||
|
|
||||||
// Set locale
|
// Set locale
|
||||||
setlocale(LC_ALL, $localeFromHTTP);
|
setlocale(LC_ALL, $localeFromHTTP);
|
||||||
|
|
Loading…
Reference in New Issue