Merge remote-tracking branch 'remotes/seblucas/master'
Conflicts: lang/Localization_nl.json
This commit is contained in:
commit
790f9f6888
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -5,3 +5,4 @@ clover.xml
|
|||
test/text.atom
|
||||
cops.zip
|
||||
cops.sublime-*
|
||||
config_local.php
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
|
||||
?>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>COPS Configuration Check</title>
|
||||
<link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss ()) ?>" media="screen" />
|
||||
|
@ -114,6 +115,7 @@ foreach (Base::getDbList () as $name => $database) {
|
|||
</article>
|
||||
<article class="frontpage">
|
||||
<h2>Check if Calibre database file exists and is readable</h2>
|
||||
<h4>
|
||||
<?php
|
||||
if (is_readable (Base::getDbFileName ($i))) {
|
||||
echo "{$name} OK";
|
||||
|
@ -128,6 +130,7 @@ Please check
|
|||
</ul>";
|
||||
}
|
||||
?>
|
||||
</h4>
|
||||
</article>
|
||||
<?php if (is_readable (Base::getDbFileName ($i))) { ?>
|
||||
<article class="frontpage">
|
||||
|
@ -189,4 +192,4 @@ Please check
|
|||
<footer></footer>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* COPS (Calibre OPDS PHP Server) HTML main script
|
||||
*
|
||||
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
|
||||
* @author Sébastien Lucas <sebastien@slucas.fr>
|
||||
* @author Sébastien Lucas <sebastien@slucas.fr>
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -61,10 +61,11 @@
|
|||
<?php
|
||||
if (useServerSideRendering ()) {
|
||||
// Get the data
|
||||
$data = getJson (true);
|
||||
require_once ("JSON_renderer.php");
|
||||
$data = JSONRenderer::getJson (true);
|
||||
|
||||
echo serverSideRender ($data);
|
||||
}
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>COPS</title>
|
||||
<script type="text/javascript" src="resources/jQuery/jquery-1.10.2.min.js"></script>
|
||||
|
@ -94,4 +95,4 @@
|
|||
</div>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
|
||||
|
@ -56,4 +57,4 @@
|
|||
});
|
||||
</script>
|
||||
{{?}}
|
||||
</head>
|
||||
</head>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
|
||||
|
|
|
@ -1,11 +1,5 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
if [[ -z $SAUCE_ACCESS_KEY ]]
|
||||
then
|
||||
echo "No Sauce Api Key (Pull request)"
|
||||
exit
|
||||
fi
|
||||
|
||||
PHP_VERSION=`php -v|grep --only-matching --perl-regexp "PHP 5\.\\d+"`
|
||||
echo $PHP_VERSION
|
||||
|
||||
|
@ -18,14 +12,20 @@ fi
|
|||
|
||||
echo "Good PHP version"
|
||||
|
||||
# Install dependencies
|
||||
wget http://getcomposer.org/composer.phar
|
||||
php composer.phar install
|
||||
|
||||
# Handle scrutinizer
|
||||
wget https://scrutinizer-ci.com/ocular.phar
|
||||
php ocular.phar code-coverage:upload --format=php-clover clover.xml
|
||||
|
||||
if [[ -z $SAUCE_ACCESS_KEY ]]
|
||||
then
|
||||
echo "No Sauce Api Key (Pull request)"
|
||||
exit
|
||||
fi
|
||||
|
||||
# Install dependencies
|
||||
wget http://getcomposer.org/composer.phar
|
||||
php composer.phar install
|
||||
|
||||
# Handle Sauce
|
||||
curl https://gist.githubusercontent.com/seblucas/7692094/raw/e2a090e6ea639a0d700e6d02cee048fa2f6c8617/sauce_connect_setup.sh | bash
|
||||
cp -v test/config_local.php.sauce config_local.php
|
||||
|
|
Loading…
Reference in a new issue