Personal/cops
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'remotes/seblucas/master'

Browse source 
Conflicts:
	lang/Localization_nl.json
This commit is contained in:
Michael 2014-03-05 15:39:20 +01:00
parent 1ad15d410c 94072c440e
commit 790f9f6888
7 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -5,3 +5,4 @@ clover.xml
test/text.atom test/text.atom
cops.zip cops.zip
cops.sublime-* cops.sublime-*
config_local.php

3
checkconfig.php
View file

@ -25,6 +25,7 @@
?> ?>
<head> <head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>COPS Configuration Check</title> <title>COPS Configuration Check</title>
<link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss ()) ?>" media="screen" /> <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>
<article class="frontpage"> <article class="frontpage">
<h2>Check if Calibre database file exists and is readable</h2> <h2>Check if Calibre database file exists and is readable</h2>
<h4>
<?php <?php
if (is_readable (Base::getDbFileName ($i))) { if (is_readable (Base::getDbFileName ($i))) {
echo "{$name} OK"; echo "{$name} OK";
@ -128,6 +130,7 @@ Please check
</ul>"; </ul>";
} }
?> ?>
</h4>
</article> </article>
<?php if (is_readable (Base::getDbFileName ($i))) { ?> <?php if (is_readable (Base::getDbFileName ($i))) { ?>
<article class="frontpage"> <article class="frontpage">

5
index.php
View file

@ -3,7 +3,7 @@
* COPS (Calibre OPDS PHP Server) HTML main script * COPS (Calibre OPDS PHP Server) HTML main script
* *
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @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,7 +61,8 @@
<?php <?php
if (useServerSideRendering ()) { if (useServerSideRendering ()) {
// Get the data // Get the data
$data = getJson (true); require_once ("JSON_renderer.php");
$data = JSONRenderer::getJson (true);
echo serverSideRender ($data); echo serverSideRender ($data);
} }

1
login.html
View file

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>COPS</title> <title>COPS</title>
<script type="text/javascript" src="resources/jQuery/jquery-1.10.2.min.js"></script> <script type="text/javascript" src="resources/jQuery/jquery-1.10.2.min.js"></script>

1
templates/bootstrap/file.html
View file

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <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-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="default" /> <meta name="apple-mobile-web-app-status-bar-style" content="default" />

1
templates/default/file.html
View file

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <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-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="default" /> <meta name="apple-mobile-web-app-status-bar-style" content="default" />

20
test/prepareSauceTest.sh
View file

@ -1,11 +1,5 @@
#!/usr/bin/env bash #!/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+"` PHP_VERSION=`php -v|grep --only-matching --perl-regexp "PHP 5\.\\d+"`
echo $PHP_VERSION echo $PHP_VERSION
@ -18,14 +12,20 @@ fi
echo "Good PHP version" echo "Good PHP version"
# Install dependencies
wget http://getcomposer.org/composer.phar
php composer.phar install
# Handle scrutinizer # Handle scrutinizer
wget https://scrutinizer-ci.com/ocular.phar wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover clover.xml 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 # Handle Sauce
curl https://gist.githubusercontent.com/seblucas/7692094/raw/e2a090e6ea639a0d700e6d02cee048fa2f6c8617/sauce_connect_setup.sh | bash curl https://gist.githubusercontent.com/seblucas/7692094/raw/e2a090e6ea639a0d700e6d02cee048fa2f6c8617/sauce_connect_setup.sh | bash
cp -v test/config_local.php.sauce config_local.php cp -v test/config_local.php.sauce config_local.php