From 2e55e477f93fc7e2e26e5d01395fd8d47c283c27 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Tue, 22 Feb 2011 23:09:09 +0000 Subject: Move install footer/header/sidebar into page/elements. Converted CSS to use more standard Elgg framework objects git-svn-id: http://code.elgg.org/elgg/trunk@8430 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/installation/install/footer.php | 10 -------- views/installation/install/header.php | 8 ------- views/installation/install/sidebar.php | 26 --------------------- views/installation/page/default.php | 35 +++++++++++++++------------- views/installation/page/elements/footer.php | 10 ++++++++ views/installation/page/elements/header.php | 8 +++++++ views/installation/page/elements/sidebar.php | 26 +++++++++++++++++++++ 7 files changed, 63 insertions(+), 60 deletions(-) delete mode 100644 views/installation/install/footer.php delete mode 100644 views/installation/install/header.php delete mode 100644 views/installation/install/sidebar.php create mode 100644 views/installation/page/elements/footer.php create mode 100644 views/installation/page/elements/header.php create mode 100644 views/installation/page/elements/sidebar.php (limited to 'views') diff --git a/views/installation/install/footer.php b/views/installation/install/footer.php deleted file mode 100644 index 69cd27f66..000000000 --- a/views/installation/install/footer.php +++ /dev/null @@ -1,10 +0,0 @@ - -

\ No newline at end of file diff --git a/views/installation/install/header.php b/views/installation/install/header.php deleted file mode 100644 index 8c18dbffd..000000000 --- a/views/installation/install/header.php +++ /dev/null @@ -1,8 +0,0 @@ - - Elgg

diff --git a/views/installation/install/sidebar.php b/views/installation/install/sidebar.php deleted file mode 100644 index 8136cd898..000000000 --- a/views/installation/install/sidebar.php +++ /dev/null @@ -1,26 +0,0 @@ -'; -foreach ($steps as $index => $step) { - if ($index < $current_step_index) { - $class = 'past'; - } elseif ($index == $current_step_index) { - $class = 'present'; - } else { - $class = 'future'; - } - $text = elgg_echo("install:$step"); - echo "

$text

"; -} -echo ''; diff --git a/views/installation/page/default.php b/views/installation/page/default.php index abee13dba..7618e7255 100644 --- a/views/installation/page/default.php +++ b/views/installation/page/default.php @@ -31,22 +31,25 @@ header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', TRUE); -

- +

+ +

+ $vars['sysmessages'])); ?> + +

- -

- $vars['sysmessages'])); ?> - -

- diff --git a/views/installation/page/elements/footer.php b/views/installation/page/elements/footer.php new file mode 100644 index 000000000..69cd27f66 --- /dev/null +++ b/views/installation/page/elements/footer.php @@ -0,0 +1,10 @@ + +

\ No newline at end of file diff --git a/views/installation/page/elements/header.php b/views/installation/page/elements/header.php new file mode 100644 index 000000000..8c18dbffd --- /dev/null +++ b/views/installation/page/elements/header.php @@ -0,0 +1,8 @@ + + Elgg

diff --git a/views/installation/page/elements/sidebar.php b/views/installation/page/elements/sidebar.php new file mode 100644 index 000000000..8136cd898 --- /dev/null +++ b/views/installation/page/elements/sidebar.php @@ -0,0 +1,26 @@ +'; +foreach ($steps as $index => $step) { + if ($index < $current_step_index) { + $class = 'past'; + } elseif ($index == $current_step_index) { + $class = 'present'; + } else { + $class = 'future'; + } + $text = elgg_echo("install:$step"); + echo "

$text

"; +} +echo ''; -- cgit v1.2.3