From eedfbb15b8d1e81e2e11b34f02b68df6700b288d Mon Sep 17 00:00:00 2001 From: Sem Date: Tue, 31 Jul 2012 22:09:18 +0200 Subject: Added doctype, header, footer and aside tags. Fixed time tag. --- views/default/output/friendlytime.php | 3 +- views/default/page/admin.php | 66 ++++++++++++++++++++++++ views/default/page/default.php | 74 +++++++++++++++++++++++++++ views/default/page/elements/doctype.php | 1 - views/default/page/elements/foot.php | 11 ++++ views/default/page/elements/footer.php | 22 ++++++++ views/default/page/elements/head.php | 79 +++++++++++++++++++++++++++++ views/default/page/elements/owner_block.php | 31 +++++++++++ views/default/page/layouts/admin.php | 40 +++++++++++++++ views/default/page/layouts/one_sidebar.php | 48 ++++++++++++++++++ views/default/page/layouts/two_sidebar.php | 43 ++++++++++++++++ views/default/page/walled_garden.php | 27 ++++++++++ 12 files changed, 443 insertions(+), 2 deletions(-) create mode 100644 views/default/page/admin.php create mode 100644 views/default/page/default.php delete mode 100644 views/default/page/elements/doctype.php create mode 100644 views/default/page/elements/foot.php create mode 100644 views/default/page/elements/footer.php create mode 100644 views/default/page/elements/head.php create mode 100644 views/default/page/elements/owner_block.php create mode 100644 views/default/page/layouts/admin.php create mode 100644 views/default/page/layouts/one_sidebar.php create mode 100644 views/default/page/layouts/two_sidebar.php create mode 100644 views/default/page/walled_garden.php (limited to 'views/default') diff --git a/views/default/output/friendlytime.php b/views/default/output/friendlytime.php index 3618e7f56..c9c74e880 100644 --- a/views/default/output/friendlytime.php +++ b/views/default/output/friendlytime.php @@ -8,5 +8,6 @@ $friendly_time = elgg_get_friendly_time($vars['time']); $timestamp = htmlentities(date(elgg_echo('friendlytime:date_format'), $vars['time'])); +$datetime = htmlentities(date("Y-m-d h:m", $vars['time'])); -echo ""; +echo ""; diff --git a/views/default/page/admin.php b/views/default/page/admin.php new file mode 100644 index 000000000..7d0449096 --- /dev/null +++ b/views/default/page/admin.php @@ -0,0 +1,66 @@ +$notices_html"; +} + +// render content before head so that JavaScript and CSS can be loaded. See #4032 +$messages = elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); +$header = elgg_view('admin/header', $vars); +$body = $vars['body']; +$footer = elgg_view('admin/footer', $vars); + + +// Set the content type +header("Content-type: text/html; charset=UTF-8"); + +?> + + + + + + +
+
+
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/views/default/page/default.php b/views/default/page/default.php new file mode 100644 index 000000000..f75fa1908 --- /dev/null +++ b/views/default/page/default.php @@ -0,0 +1,74 @@ + $vars['sysmessages'])); +$header = elgg_view('page/elements/header', $vars); +$body = elgg_view('page/elements/body', $vars); +$footer = elgg_view('page/elements/footer', $vars); + +// Set the content type +header("Content-type: text/html; charset=UTF-8"); + +?> + + + + + + +
+
+ +
+ + +
+
+ +
+
+ + +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/views/default/page/elements/doctype.php b/views/default/page/elements/doctype.php deleted file mode 100644 index 763b0739b..000000000 --- a/views/default/page/elements/doctype.php +++ /dev/null @@ -1 +0,0 @@ - \ 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 index 000000000..a56b373b4 --- /dev/null +++ b/views/default/page/elements/foot.php @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php new file mode 100644 index 000000000..ded2cea9a --- /dev/null +++ b/views/default/page/elements/footer.php @@ -0,0 +1,22 @@ + 'priority', 'class' => 'elgg-menu-hz')); + +$powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif"; + +echo '
'; +echo elgg_view('output/url', array( + 'href' => 'http://elgg.org', + 'text' => "\"Powered", + 'class' => '', + 'is_trusted' => true, +)); +echo '
'; diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php new file mode 100644 index 000000000..b1556b547 --- /dev/null +++ b/views/default/page/elements/head.php @@ -0,0 +1,79 @@ + + +END; +} else { + $feedref = ""; +} + +$js = elgg_get_loaded_js('head'); +$css = elgg_get_loaded_css(); + +$version = get_version(); +$release = get_version(true); +?> + + + + <?php echo $title; ?> + + + + + + + + + + + + + + + + + +getGUID() != elgg_get_logged_in_user_guid())) { + + $header = elgg_view_entity($owner, array('full_view' => false)); + + $body = elgg_view_menu('owner_block', array('entity' => $owner)); + + $body .= elgg_view('page/elements/owner_block/extend', $vars); + + echo elgg_view('page/components/module', array( + 'header' => $header, + 'body' => $body, + 'class' => 'elgg-owner-block', + )); +} + +elgg_pop_context(); \ No newline at end of file diff --git a/views/default/page/layouts/admin.php b/views/default/page/layouts/admin.php new file mode 100644 index 000000000..f9975d3e4 --- /dev/null +++ b/views/default/page/layouts/admin.php @@ -0,0 +1,40 @@ + + +
+ +
+
+ 'priority', + 'class' => 'elgg-menu-hz', + )); + + if (isset($vars['title'])) { + echo elgg_view_title($vars['title']); + } + ?> +
+ +
+
\ No newline at end of file diff --git a/views/default/page/layouts/one_sidebar.php b/views/default/page/layouts/one_sidebar.php new file mode 100644 index 000000000..61d6fed0e --- /dev/null +++ b/views/default/page/layouts/one_sidebar.php @@ -0,0 +1,48 @@ + + +
+ + +
+ +
+
diff --git a/views/default/page/layouts/two_sidebar.php b/views/default/page/layouts/two_sidebar.php new file mode 100644 index 000000000..b2660a155 --- /dev/null +++ b/views/default/page/layouts/two_sidebar.php @@ -0,0 +1,43 @@ + + +
+ + + +
+ +
+
diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php new file mode 100644 index 000000000..e1d57dac8 --- /dev/null +++ b/views/default/page/walled_garden.php @@ -0,0 +1,27 @@ + + + + + + + +
+
+ $vars['sysmessages'])); ?> +
+
+ +
+
+ + + \ No newline at end of file -- cgit v1.2.3