From 6a58a81b21b6b17add638b20367afc4295dc4b79 Mon Sep 17 00:00:00 2001 From: Thomas Severinsen Date: Thu, 28 Feb 2013 15:41:21 +0100 Subject: [PATCH 01/44] New theme, updated to HTML5 New style.css to reflect the update to html5 several changes in index.php as the html has been updated. Had to delete icons support in base.php as they where conflicting with the new theme. --- base.php | 21 +--- index.php | 100 +++++++-------- style.css | 368 ++++++++++++++++++++++++------------------------------ 3 files changed, 203 insertions(+), 286 deletions(-) diff --git a/base.php b/base.php index 56503c6..68aaa9a 100644 --- a/base.php +++ b/base.php @@ -165,16 +165,7 @@ class Entry public $localUpdated; private static $updated = NULL; - public static $icons = array( - Author::ALL_AUTHORS_ID => 'images/author.png', - Serie::ALL_SERIES_ID => 'images/serie.png', - Book::ALL_RECENT_BOOKS_ID => 'images/recent.png', - Tag::ALL_TAGS_ID => 'images/tag.png', - CustomColumn::ALL_CUSTOMS_ID => 'images/tag.png', - "calibre:books$" => 'images/allbook.png', - "calibre:books:letter" => 'images/allbook.png' - ); - + public function getUpdatedTime () { if (!is_null ($this->localUpdated)) { return date (DATE_ATOM, $this->localUpdated); @@ -193,16 +184,6 @@ class Entry $this->contentType = $pcontentType; $this->linkArray = $plinkArray; - if ($config['cops_show_icons'] == 1) - { - foreach (self::$icons as $reg => $image) - { - if (preg_match ("/" . $reg . "/", $pid)) { - array_push ($this->linkArray, new Link (getUrlWithVersion ($image), "image/png", Link::OPDS_THUMBNAIL_TYPE)); - break; - } - } - } } } diff --git a/index.php b/index.php index f6e2384..98aec5f 100644 --- a/index.php +++ b/index.php @@ -45,10 +45,9 @@ ?> - - + + - <?php echo htmlspecialchars ($currentPage->title) ?> @@ -59,6 +58,7 @@ " media="screen" /> + From 28afce612e4f840b6bc3866c26269958a66eb673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= Date: Thu, 16 May 2013 17:12:19 +0200 Subject: [PATCH 34/44] Typo --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 875b9ba..3fc48f9 100644 --- a/index.php +++ b/index.php @@ -51,7 +51,7 @@ - + <?php echo htmlspecialchars ($currentPage->title) ?> From 0486dfd03b97ae821663fe62e049b77502aba5c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= Date: Thu, 16 May 2013 17:22:21 +0200 Subject: [PATCH 35/44] Small fixes to UI again --- checkconfig.php | 2 +- index.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/checkconfig.php b/checkconfig.php index 681975d..4b81e4f 100644 --- a/checkconfig.php +++ b/checkconfig.php @@ -24,7 +24,7 @@ - + COPS Configuration Check " media="screen" /> diff --git a/index.php b/index.php index 3fc48f9..fc0ace3 100644 --- a/index.php +++ b/index.php @@ -50,7 +50,6 @@ - <?php echo htmlspecialchars ($currentPage->title) ?> From 3e7c6deefbd490eb7ea6f59c82ae7f6f2c88d5ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= Date: Thu, 16 May 2013 17:51:09 +0200 Subject: [PATCH 36/44] Fix book sorting --- index.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/index.php b/index.php index fc0ace3..ad55800 100644 --- a/index.php +++ b/index.php @@ -73,7 +73,7 @@ }); $("#sort").click(function(){ - $('.book').sortElements(function(a, b){ + $('.books').sortElements(function(a, b){ var test = 1; if ($("#sortorder").val() == "desc") { @@ -81,7 +81,6 @@ } return $(a).find ("." + $("#sortchoice").val()).text() > $(b).find ("." + $("#sortchoice").val()).text() ? test : -test; }); - $("#search").slideUp(); }); @@ -251,23 +250,23 @@
-

title) ?> +

title) ?> book->getPubDate() != "") { ?> - (book->getPubDate() ?>) + (book->getPubDate() ?>) - book->getRating () ?>

-

" . htmlspecialchars ($entry->book->getAuthorsName ()) ?>
+ book->getRating () ?>

+

book->getAuthorsName ()) ?>

" . htmlspecialchars ($entry->book->getTagsName ()) ?>
book->getSerie (); if (!is_null ($serie)) { ?> -

" . htmlspecialchars ($serie->name) . " (" . $entry->book->seriesIndex . ")" ?>
+

name) . " (" . $entry->book->seriesIndex . ")" ?>
 From 91a29209e7aa89636d6be5e6e9f0871e186d87e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= Date: Fri, 17 May 2013 06:36:38 +0200 Subject: [PATCH 37/44] Include a local version of normalize. --- index.php | 32 +-- resources/normalize/normalize.css | 396 ++++++++++++++++++++++++++++++ 2 files changed, 405 insertions(+), 23 deletions(-) create mode 100644 resources/normalize/normalize.css diff --git a/index.php b/index.php index ad55800..157f1d1 100644 --- a/index.php +++ b/index.php @@ -62,15 +62,11 @@ " media="screen" /> - + " /> + " media="screen" /> " /> -