From aa376d63b26e42728df309cb7cefc4a9f337d910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= <sebastien@slucas.fr>
Date: Mon, 17 Jun 2013 22:30:09 +0200
Subject: [PATCH] simplify again. re #73

---
 book.php                          | 1 -
 templates/default/bookdetail.html | 2 +-
 util.js                           | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/book.php b/book.php
index 65c0a53..06fe5d0 100644
--- a/book.php
+++ b/book.php
@@ -142,7 +142,6 @@ class Book extends Base {
     public function getFullContentArray () {
         $out = $this->getContentArray ();
         
-        $out ["detailurl"] = $this->getDetailUrl (true);
         $out ["coverurl"] = Data::getLink ($this, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL)->hrefXhtml ();
         $out ["thumbnailurl"] = Data::getLink ($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL, NULL, 150)->hrefXhtml ();
         $out ["content"] = $this->getComment (false);
diff --git a/templates/default/bookdetail.html b/templates/default/bookdetail.html
index 8cba571..9d58fa6 100644
--- a/templates/default/bookdetail.html
+++ b/templates/default/bookdetail.html
@@ -11,7 +11,7 @@
         <a href="{{=data.url}}">{{=data.format}}</a><br />
         {{~}}
     </h2>
-    <h1><a rel="bookmark" href="{{=it.book.detailurl}}"><img src="images/Link.png?v={{=it.const.version}}" alt="{{=it.const.i18n.permalinkAlt}}" /></a>{{=htmlEscape (it.title)}}</h1>
+    <h1><a rel="bookmark" href="{{=strformat (it.const.url.detailUrl, it.book.id, it.databaseId)}}"><img src="images/Link.png?v={{=it.const.version}}" alt="{{=it.const.i18n.permalinkAlt}}" /></a>{{=htmlEscape (it.title)}}</h1>
     <p class="popupless">
         <h3>{{=it.const.i18n.authorsTitle}}: </h3>
         {{~it.book.authors:author:j}}
diff --git a/util.js b/util.js
index f2a8fdb..262da8b 100644
--- a/util.js
+++ b/util.js
@@ -16,8 +16,8 @@ function fancyBoxObject (title, type) {
 
 function strformat () {
     var s = arguments[0];
-    for (var i = 0; i < arguments.length - 1; i++) {       
-        var reg = new RegExp("\\{" + i + "\\}", "gm");             
+    for (var i = 0; i < arguments.length - 1; i++) {
+        var reg = new RegExp("\\{" + i + "\\}", "gm");
         s = s.replace(reg, arguments[i + 1]);
     }
     return s;