aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.editorconfig3
-rw-r--r--src/Wallabag/CoreBundle/Helper/EntriesExport.php6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig2
3 files changed, 7 insertions, 4 deletions
diff --git a/.editorconfig b/.editorconfig
index 92c9a4c3..6553d30f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,3 +12,6 @@ insert_final_newline = true
12[*.{js,css}] 12[*.{js,css}]
13indent_style = space 13indent_style = space
14indent_size = 2 14indent_size = 2
15
16[Makefile]
17indent_style = tab
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index 830798b8..136f66f5 100644
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -174,8 +174,6 @@ class EntriesExport
174 $book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png'); 174 $book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png');
175 } 175 }
176 176
177 $book->buildTOC();
178
179 /* 177 /*
180 * Adding actual entries 178 * Adding actual entries
181 */ 179 */
@@ -190,11 +188,13 @@ class EntriesExport
190 // in filenames, we limit to A-z/0-9 188 // in filenames, we limit to A-z/0-9
191 $filename = preg_replace('/[^A-Za-z0-9\-]/', '', $entry->getTitle()); 189 $filename = preg_replace('/[^A-Za-z0-9\-]/', '', $entry->getTitle());
192 190
191 $titlepage = $content_start . '<h1>' . $entry->getTitle() . '</h1>' . $this->getExportInformation('PHPePub') . $bookEnd;
192 $book->addChapter('Title', 'Title.html', $titlepage, true, EPub::EXTERNAL_REF_ADD);
193 $chapter = $content_start . $entry->getContent() . $bookEnd; 193 $chapter = $content_start . $entry->getContent() . $bookEnd;
194 $book->addChapter($entry->getTitle(), htmlspecialchars($filename) . '.html', $chapter, true, EPub::EXTERNAL_REF_ADD); 194 $book->addChapter($entry->getTitle(), htmlspecialchars($filename) . '.html', $chapter, true, EPub::EXTERNAL_REF_ADD);
195 } 195 }
196 196
197 $book->addChapter('Notices', 'Cover2.html', $content_start . $this->getExportInformation('PHPePub') . $bookEnd); 197 $book->buildTOC();
198 198
199 return Response::create( 199 return Response::create(
200 $book->getBook(), 200 $book->getBook(),
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index a8143315..f896fe2d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -68,9 +68,9 @@
68 68
69 <div class="row"> 69 <div class="row">
70 <div class="input-field col s12"> 70 <div class="input-field col s12">
71 {{ form_label(form.config.action_mark_as_read) }}
72 {{ form_errors(form.config.action_mark_as_read) }} 71 {{ form_errors(form.config.action_mark_as_read) }}
73 {{ form_widget(form.config.action_mark_as_read) }} 72 {{ form_widget(form.config.action_mark_as_read) }}
73 {{ form_label(form.config.action_mark_as_read) }}
74 </div> 74 </div>
75 </div> 75 </div>
76 76