From 23267e37fa65bb2edd8485653e8125e09e2fcbc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= <sebastien@slucas.fr>
Date: Mon, 17 Jun 2013 21:41:59 +0200
Subject: [PATCH] Simplify book detail. re #73

---
 book.php       |   6 +--
 bookdetail.php | 103 -------------------------------------------------
 util.js        |  13 ++++---
 3 files changed, 8 insertions(+), 114 deletions(-)
 delete mode 100644 bookdetail.php

diff --git a/book.php b/book.php
index 38d4413..55d19f9 100644
--- a/book.php
+++ b/book.php
@@ -169,11 +169,7 @@ class Book extends Base {
         $urlParam = $this->getUri ();
         if (!is_null (GetUrlParam (DB))) $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
         $urlParam = str_replace ("&", "&amp;", $urlParam);
-        if ($permalink || getCurrentOption ('use_fancyapps') == 0) { 
-            return 'index.php' . $urlParam; 
-        } else { 
-            return 'bookdetail.php' . $urlParam;
-        }
+        return 'index.php' . $urlParam; 
     }
     
     public function getTitle () {
diff --git a/bookdetail.php b/bookdetail.php
deleted file mode 100644
index 51d8f8a..0000000
--- a/bookdetail.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * COPS (Calibre OPDS PHP Server) book detail script
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     Sébastien Lucas <sebastien@slucas.fr>
- *
- */
-
-require_once ("config.php");
-require_once ("book.php");
-
-$book = Book::getBookById($_GET["id"]);
-$authors = $book->getAuthors ();
-$tags = $book->getTags ();
-$serie = $book->getSerie ();
-$book->getLinkArray ();
- 
-?>
-<article class="bookpopup">
-            <span class="cover">
-            <?php
-                if ($book->hasCover) {
-            ?>
-            <a href="<?php echo Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL)->hrefXhtml () ?>">
-              <img src="<?php echo Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL, NULL, 150)->hrefXhtml () ?>" alt="<?php echo localize("i18n.coversection") ?>" />
-            </a>
-            <?php
-                }
-            ?>
-            </span>
-<?php
-            foreach ($book->getDatas() as $data)
-            {
-?>    
-                <h2 class="download"><a href="<?php echo $data->getHtmlLink () ?>"><?php echo $data->format ?></a></h2>
-<?php
-            }
-?>
-        <h1><a rel="bookmark" href="<?php echo $book->getDetailUrl (true) ?>"><img src="<?php echo getUrlWithVersion("images/Link.png") ?>" alt="<?php echo localize ("permalink.alternate") ?>" /></a><?php echo htmlspecialchars ($book->title) ?></h1>
-            <p class="popupless">
-            <h3><?php echo localize("authors.title") ?>: </h3>
-            
-<?php
-            $i = 0;
-            foreach ($authors as $author) {
-                if ($i > 0) echo ", ";
-?>
-                <a href="<?php $link = new LinkNavigation ($author->getUri ()); echo $link->hrefXhtml () ?>"><?php echo htmlspecialchars ($author->name) ?></a>
-<?php
-            }
-?>
-</p>
-<?php
-        if (count ($tags) > 0) {
-?>
-            <p class="popupless">
-            <h3><?php echo localize("tags.title") ?>: </h3>
-
-<?php
-            $i = 0;
-            foreach ($tags as $tag) {
-                if ($i > 0) echo ", ";
-?>
-                <a href="<?php $link = new LinkNavigation ($tag->getUri ()); echo $link->hrefXhtml () ?>"><?php echo htmlspecialchars ($tag->name) ?></a>
-<?php
-            }
-?>
-</p>
-<?php
-        }
-        if (!is_null ($serie))
-        {
-?>
-            <p class="popupless">
-                <h3><a href="index.php<?php $link = new LinkNavigation ($serie->getUri ()); echo $link->hrefXhtml () ?>"><?php echo localize("series.title") ?></a>: </h3>
-            <?php echo str_format (localize ("content.series.data"), $book->seriesIndex, htmlspecialchars ($serie->name)) ?>
-</p>
-<?php
-        }
-        if ($book->getPubDate() != "")
-        {
-?>
-            <p class="popupless">
-<h3><?php echo localize("pubdate.title") ?>: </h3>
-            <?php echo $book->getPubDate() ?>
-</p>
-<?php
-        }
-        if ($book->getLanguages () != "")
-        {
-?>
-            <p class="popupless">
-<h3><?php echo localize("language.title") ?>: </h3>
-            <?php echo $book->getLanguages () ?>
-</p>
- <?php
-        }
-?>
-<br />
-<h4><?php echo localize("content.summary") ?></h4>
-<div <?php if (!isset ($page)) echo 'style="max-width:700px;"' ?> ><?php echo $book->getComment (false) ?></div>
-</article>
\ No newline at end of file
diff --git a/util.js b/util.js
index 33757b6..5ab7e71 100644
--- a/util.js
+++ b/util.js
@@ -71,14 +71,13 @@ function updatePage (data) {
         $(".fancydetail").click(function(event){
             event.preventDefault(); 
             var url = $(this).attr("href");
-            var jsonurl = url.replace ("bookdetail", "getJSON");
+            var jsonurl = url.replace ("index", "getJSON");
             $.getJSON(jsonurl, function(data) {
                 data ["const"] = currentData ["const"];
                 var detail = templateBookDetail (data);
-                $.fancybox( {
-                    content: detail,
-                    autoSize: true
-                });
+                var fancyparams = fancyBoxObject (data.title, null);
+                fancyparams ["content"] = detail;
+                $.fancybox(fancyparams);
             });
         });
         
@@ -91,7 +90,9 @@ function updatePage (data) {
 
 function ajaxifyLinks () {
     if (history.pushState) {
-        $("a[href^='index']").click (function (event) {
+        var links = $("a[href^='index']");
+        if (getCurrentOption ("use_fancyapps") == 1) links = links.not (".fancydetail");
+        links.click (function (event) {
             event.preventDefault(); 
 
             var url = $(this).attr('href');