simplify again. re #73

This commit is contained in:
Sébastien Lucas 2013-06-17 22:30:09 +02:00
parent 2029ab7d01
commit aa376d63b2
3 changed files with 3 additions and 4 deletions

View file

@ -142,7 +142,6 @@ class Book extends Base {
public function getFullContentArray () { public function getFullContentArray () {
$out = $this->getContentArray (); $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 ["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 ["thumbnailurl"] = Data::getLink ($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL, NULL, 150)->hrefXhtml ();
$out ["content"] = $this->getComment (false); $out ["content"] = $this->getComment (false);

View file

@ -11,7 +11,7 @@
<a href="{{=data.url}}">{{=data.format}}</a><br /> <a href="{{=data.url}}">{{=data.format}}</a><br />
{{~}} {{~}}
</h2> </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"> <p class="popupless">
<h3>{{=it.const.i18n.authorsTitle}}: </h3> <h3>{{=it.const.i18n.authorsTitle}}: </h3>
{{~it.book.authors:author:j}} {{~it.book.authors:author:j}}

View file

@ -16,8 +16,8 @@ function fancyBoxObject (title, type) {
function strformat () { function strformat () {
var s = arguments[0]; var s = arguments[0];
for (var i = 0; i < arguments.length - 1; i++) { for (var i = 0; i < arguments.length - 1; i++) {
var reg = new RegExp("\\{" + i + "\\}", "gm"); var reg = new RegExp("\\{" + i + "\\}", "gm");
s = s.replace(reg, arguments[i + 1]); s = s.replace(reg, arguments[i + 1]);
} }
return s; return s;