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

Get rid of fancybox completely if not enabled. fixes #50 

About.xml is still utf8 but looses it's BOM
This commit is contained in:
Sébastien Lucas 2013-04-21 15:00:21 +02:00
parent 73433a1c20
commit 6272cd1b01
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
about.xml
View File

@ -1,4 +1,5 @@
<div class="entryTitle">Authors</div>
<div class="bookdetail">
<div class="entryTitle">Authors</div>
<div class="content" style="max-width:700px;">
<p>COPS is developped and maintained by Sébastien Lucas.</p>
@ -17,4 +18,5 @@
<p>For more info please visit <a href="http://blog.slucas.fr/en/oss/calibre-opds-php-server">COPS Home Page</a></p>
<p>You can also check <a href="http://www.mobileread.com/forums/showthread.php?t=170903">COPS's topic on MobileRead forum</a>.</p>
</div>
</div>

12
base.php
View File

@ -339,6 +339,8 @@ class Page
return new PageQueryResult ($id, $query, $n);
case Base::PAGE_BOOK_DETAIL :
return new PageBookDetail ($id, $query, $n);
case Base::PAGE_ABOUT :
return new PageAbout ($id, $query, $n);
default:
$page = new Page ($id, $query, $n);
$page->idPage = "cops:catalog";
@ -596,6 +598,15 @@ class PageBookDetail extends Page
}
}
class PageAbout extends Page
{
public function InitializeContent ()
{
$this->title = "About";
}
}
abstract class Base
{
const PAGE_INDEX = "index";
@ -614,6 +625,7 @@ abstract class Base
const PAGE_BOOK_DETAIL = "13";
const PAGE_ALL_CUSTOMS = "14";
const PAGE_CUSTOM_DETAIL = "15";
const PAGE_ABOUT = "16";
const COMPATIBILITY_XML_ALDIKO = "aldiko";

17
index.php
View File

@ -59,12 +59,16 @@
<?php } else { ?>
<script type="text/javascript" src="<?php echo getUrlWithVersion("js/jquery-1.9.1.min.js") ?>"></script>
<?php } ?>
<?php if ($config['cops_use_fancyapps'] == 1) { ?>
<script type="text/javascript" src="fancybox/jquery.fancybox.pack.js?v=2.1.4"></script>
<?php } ?>
<script type="text/javascript" src="<?php echo getUrlWithVersion("js/jquery.sortElements.js") ?>"></script>
<script type="text/javascript" src="<?php echo getUrlWithVersion("js/jquery.cookies.js") ?>"></script>
<link rel="related" href="<?php echo $config['cops_full_url'] ?>feed.php" type="application/atom+xml;profile=opds-catalog" title="<?php echo $config['cops_title_default']; ?>" />
<link rel="icon" type="image/vnd.microsoft.icon" href="<?php echo $currentPage->favicon ?>" />
<?php if ($config['cops_use_fancyapps'] == 1) { ?>
<link rel="stylesheet" type="text/css" href="fancybox/jquery.fancybox.css?v=2.1.4" media="screen" />
<?php } ?>
<link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion("style.css") ?>" media="screen" />
<script type="text/javascript">
$(document).ready(function() {
@ -93,7 +97,6 @@
nextEffect : 'none'
<?php if ($isEink) echo ", openEffect : 'none', closeEffect : 'none', helpers : {overlay : null}"; ?>
});
<?php } ?>
$(".fancyabout").fancybox({
'type' : 'ajax',
@ -102,6 +105,7 @@
nextEffect : 'none'
<?php if ($isEink) echo ", openEffect : 'none', closeEffect : 'none', helpers : {overlay : null}"; ?>
});
<?php } ?>
$("#settingsImage").click(function(){
if ($("#tool").is(":hidden")) {
@ -211,14 +215,15 @@
<div class="clearer" />
<div id="content" style="display: none;"></div>
<div class="entries">
<?php
if ($page == Base::PAGE_BOOK_DETAIL)
{
<?php
if ($page == Base::PAGE_BOOK_DETAIL) {
include ("bookdetail.php");
} else if ($page == Base::PAGE_ABOUT) {
readfile ("about.xml");
}
foreach ($currentPage->entryArray as $entry) {
if (get_class ($entry) != "EntryBook") {
?>
?>
<div class="entry">
<div class="entryTitle"><?php echo htmlspecialchars ($entry->title) ?></div>
<div class="entryContent"><?php echo htmlspecialchars ($entry->content) ?></div>
@ -295,7 +300,7 @@
</div>
<div class="foot">
<div class="footright">
<a class="fancyabout" href="about.xml"><img src="<?php echo getUrlWithVersion("images/info.png") ?>" alt="Home" /></a>
<a class="fancyabout" href="<?php if ($config['cops_use_fancyapps'] == 1) { echo "about.xml"; } else { echo $_SERVER["SCRIPT_NAME"] . str_replace ("&", "&amp;", addURLParameter ("?page=16", DB, $database)); } ?>"><img src="<?php echo getUrlWithVersion("images/info.png") ?>" alt="Home" /></a>
</div>
<?php
if ($currentPage->isPaginated ()) {