diff options
Diffstat (limited to 'src/view')
-rw-r--r-- | src/view/HeadBuilder.php | 9 | ||||
-rw-r--r-- | src/view/HeaderBuilder.php | 6 | ||||
-rw-r--r-- | src/view/MainBuilder.php | 2 | ||||
-rw-r--r-- | src/view/NewBuilder.php | 6 | ||||
-rw-r--r-- | src/view/PostBuilder.php | 6 | ||||
-rw-r--r-- | src/view/templates/modify_block.php | 6 |
6 files changed, 7 insertions, 28 deletions
diff --git a/src/view/HeadBuilder.php b/src/view/HeadBuilder.php index 4fe86ef..b1dfacb 100644 --- a/src/view/HeadBuilder.php +++ b/src/view/HeadBuilder.php | |||
@@ -14,19 +14,16 @@ class HeadBuilder extends AbstractBuilder | |||
14 | if(file_exists($viewFile)) | 14 | if(file_exists($viewFile)) |
15 | { | 15 | { |
16 | // css et js | 16 | // css et js |
17 | if(!empty($node->getAttributes())) | 17 | $page = Model::$page_path->getLast(); |
18 | { | ||
19 | extract($node->getAttributes()); | ||
20 | } | ||
21 | 18 | ||
22 | $css = ''; | 19 | $css = ''; |
23 | foreach($css_array as $name) | 20 | foreach($page->getCSS() as $name) |
24 | { | 21 | { |
25 | $css .= '<link rel="stylesheet" href="' . self::versionedFileURL('css', $name) . '">' . "\n"; | 22 | $css .= '<link rel="stylesheet" href="' . self::versionedFileURL('css', $name) . '">' . "\n"; |
26 | } | 23 | } |
27 | 24 | ||
28 | $js = ''; | 25 | $js = ''; |
29 | foreach($js_array as $name) | 26 | foreach($page->getJS() as $name) |
30 | { | 27 | { |
31 | $js .= '<script src="' . self::versionedFileURL('js', $name) . '"></script>' . "\n"; | 28 | $js .= '<script src="' . self::versionedFileURL('js', $name) . '"></script>' . "\n"; |
32 | } | 29 | } |
diff --git a/src/view/HeaderBuilder.php b/src/view/HeaderBuilder.php index 1b60bc9..dc4aec4 100644 --- a/src/view/HeaderBuilder.php +++ b/src/view/HeaderBuilder.php | |||
@@ -41,12 +41,6 @@ class HeaderBuilder extends AbstractBuilder | |||
41 | extract($node->getNodeData()->getData()); | 41 | extract($node->getNodeData()->getData()); |
42 | } | 42 | } |
43 | 43 | ||
44 | // attributs, aucun pour l'instant | ||
45 | if(!empty($node->getAttributes())) | ||
46 | { | ||
47 | extract($node->getAttributes()); | ||
48 | } | ||
49 | |||
50 | // réseaux sociaux + logo dans l'entête | 44 | // réseaux sociaux + logo dans l'entête |
51 | $keys = array_keys($social); | 45 | $keys = array_keys($social); |
52 | $social_networks = ''; | 46 | $social_networks = ''; |
diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php index a920eb4..332efa5 100644 --- a/src/view/MainBuilder.php +++ b/src/view/MainBuilder.php | |||
@@ -27,7 +27,7 @@ class MainBuilder extends AbstractBuilder | |||
27 | if($node->getAdoptedChild() == null){ | 27 | if($node->getAdoptedChild() == null){ |
28 | $date = new \DateTime; | 28 | $date = new \DateTime; |
29 | $article = new Article('', $date); | 29 | $article = new Article('', $date); |
30 | $new = new Node('new', [], 0, null, null, $article); | 30 | $new = new Node('new', 0, null, null, $article); |
31 | } | 31 | } |
32 | // modification | 32 | // modification |
33 | else{ | 33 | else{ |
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php index ec48541..a31a1c4 100644 --- a/src/view/NewBuilder.php +++ b/src/view/NewBuilder.php | |||
@@ -33,12 +33,6 @@ class NewBuilder extends AbstractBuilder | |||
33 | else{ | 33 | else{ |
34 | $id = (string)$node->getId(); | 34 | $id = (string)$node->getId(); |
35 | 35 | ||
36 | // id (timestamp) | ||
37 | if(!empty($node->getAttributes())) | ||
38 | { | ||
39 | extract($node->getAttributes()); | ||
40 | } | ||
41 | |||
42 | // html, date | 36 | // html, date |
43 | $title = $node->getArticle()->getTitle(); | 37 | $title = $node->getArticle()->getTitle(); |
44 | $preview = $node->getArticle()->getPreview(); | 38 | $preview = $node->getArticle()->getPreview(); |
diff --git a/src/view/PostBuilder.php b/src/view/PostBuilder.php index 70a2d77..de7a818 100644 --- a/src/view/PostBuilder.php +++ b/src/view/PostBuilder.php | |||
@@ -13,12 +13,6 @@ class PostBuilder extends AbstractBuilder | |||
13 | 13 | ||
14 | if(file_exists($viewFile)) | 14 | if(file_exists($viewFile)) |
15 | { | 15 | { |
16 | // id (timestamp) | ||
17 | if(!empty($node->getAttributes())) | ||
18 | { | ||
19 | extract($node->getAttributes()); | ||
20 | } | ||
21 | |||
22 | // html | 16 | // html |
23 | $title = $node->getArticle()->getTitle(); | 17 | $title = $node->getArticle()->getTitle(); |
24 | $html = $node->getArticle()->getContent(); | 18 | $html = $node->getArticle()->getContent(); |
diff --git a/src/view/templates/modify_block.php b/src/view/templates/modify_block.php index 75cb218..6b7ceb0 100644 --- a/src/view/templates/modify_block.php +++ b/src/view/templates/modify_block.php | |||
@@ -44,9 +44,6 @@ if(Blocks::hasPresentation($child_node->getName())){ | |||
44 | <input type="number" id="cols_min_width_select_<?= $child_node->getId() ?>" onchange="changeColsMinWidth(<?= $child_node->getId() ?>)" min="150" max="400" value="<?= $child_node->getNodeData()->getColsMinWidth() ?>"> pixels | 44 | <input type="number" id="cols_min_width_select_<?= $child_node->getId() ?>" onchange="changeColsMinWidth(<?= $child_node->getId() ?>)" min="150" max="400" value="<?= $child_node->getNodeData()->getColsMinWidth() ?>"> pixels |
45 | </div> | 45 | </div> |
46 | </div> | 46 | </div> |
47 | <?php | ||
48 | } | ||
49 | ?> | ||
50 | <div class="pagination_limit"> | 47 | <div class="pagination_limit"> |
51 | <label for="pagination_limit_<?= $child_node->getId() ?>"> | 48 | <label for="pagination_limit_<?= $child_node->getId() ?>"> |
52 | Nombre max d'articles affichés | 49 | Nombre max d'articles affichés |
@@ -54,4 +51,7 @@ if(Blocks::hasPresentation($child_node->getName())){ | |||
54 | <i>(mettre 0 désactive la pagination)</i> | 51 | <i>(mettre 0 désactive la pagination)</i> |
55 | </label> | 52 | </label> |
56 | </div> | 53 | </div> |
54 | <?php | ||
55 | } | ||
56 | ?> | ||
57 | </div> \ No newline at end of file | 57 | </div> \ No newline at end of file |