Fixes #3329: Added page/elements/foot and refactored page shells to use it

git-svn-id: http://code.elgg.org/elgg/trunk@8996 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index d0e7915ccd5b126801e85f01604332e7a536e80f..2b2ec9e4a6ae7df61fd8c37d5729d41b62a79741 100644 (file)
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -55,16 +55,7 @@ if ($notices) {
                        </div>
                </div>
        </div>
-<?php
-
-echo elgg_view('footer/analytics');
-$js = elgg_get_loaded_js('footer');
-foreach ($js as $script) { ?>
-       <script type="text/javascript" src="<?php echo $script; ?>"></script>
-<?php
-}
-
-?>
+       <?php echo elgg_view('page/elements/foot'); ?>
 </body>
 
 </html>
\ No newline at end of file

diff --git a/views/default/page/default.php b/views/default/page/default.php
index 77f79157b82a0d1ec04eb63f3f31e1e679e21dcc..9effce1ece127da2beb3e88cc86aa56e1a990803 100644 (file)
--- a/views/default/page/default.php
+++ b/views/default/page/default.php
@@ -60,15 +60,6 @@ header("Content-type: text/html; charset=UTF-8");
                </div>
        </div>
 </div>
-<?php
-
-echo elgg_view('footer/analytics');
-$js = elgg_get_loaded_js('footer');
-foreach ($js as $script) { ?>
-       <script type="text/javascript" src="<?php echo $script; ?>"></script>
-<?php
-}
-
-?>
+<?php echo elgg_view('page/elements/foot'); ?>
 </body>
 </html>
\ No newline at end of file

diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php
new file mode 100644 (file)
index 0000000..a56b373
--- /dev/null
+++ b/views/default/page/elements/foot.php
@@ -0,0 +1,11 @@
+<?php
+
+echo elgg_view('footer/analytics');
+
+$js = elgg_get_loaded_js('footer');
+foreach ($js as $script) { ?>
+       <script type="text/javascript" src="<?php echo $script; ?>"></script>
+<?php
+}
+
+?>
\ No newline at end of file

diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index 662e90f45c3c2524ad88e420ea51f193cfaa9ef2..95d17fcff3d6f1d5e7192eb3f2c3b4134b876701 100644 (file)
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -39,6 +39,6 @@ $title = $site->name;
                <div id="elgg-walledgarden-bottom"></div>
        </div>
 </div>
-<?php echo elgg_view('footer/analytics'); ?>
+<?php echo elgg_view('page/elements/foot'); ?>
 </body>
 </html>
\ No newline at end of file