aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-08 23:31:38 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-08 23:31:38 +0100
commit9d32d7fe1932504a042fd8b146cdf560be11350b (patch)
treeb30f787d03c9134a8ed1478aea23faf8291a1967
parentd4f636f26ab8642e8c357e75f71868bd73751d23 (diff)
Déplace le fichier main.phtml
app/views/javascript/main.phtml est déplacé vers app/views/helpers/javascript_vars.phtml Il reste à déplacer le fichier actualize.phtml pour se débarrasser de javascriptController
-rwxr-xr-xapp/controllers/javascriptController.php2
-rw-r--r--app/layout/layout.phtml2
-rw-r--r--app/views/helpers/javascript_vars.phtml (renamed from app/views/javascript/main.phtml)0
3 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/javascriptController.php b/app/controllers/javascriptController.php
index 071cf65a4..291474130 100755
--- a/app/controllers/javascriptController.php
+++ b/app/controllers/javascriptController.php
@@ -6,8 +6,6 @@ class javascriptController extends ActionController {
header('Content-type: text/javascript');
}
- public function mainAction () {}
-
public function actualizeAction () {
$feedDAO = new FeedDAO ();
$this->view->feeds = $feedDAO->listFeeds ();
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 192a6d73f..3f427a501 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -12,7 +12,7 @@
<?php echo self::headStyle (); ?>
<?php echo self::headScript (); ?>
<script>//<![CDATA[
-<?php $this->renderHelper ('../javascript/main'); ?>
+<?php $this->renderHelper ('javascript_vars'); ?>
//]]></script>
<?php
$next = isset($this->entryPaginator) ? $this->entryPaginator->next() : '';
diff --git a/app/views/javascript/main.phtml b/app/views/helpers/javascript_vars.phtml
index df552527f..df552527f 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/helpers/javascript_vars.phtml