diff options
| author | Evan Winslow <evan@elgg.org> | 2011-03-18 21:58:04 -0700 |
|---|---|---|
| committer | Evan Winslow <evan@elgg.org> | 2011-03-18 21:58:04 -0700 |
| commit | 16f9b5bf702572f90a7ab96263b340a6b24eaed6 (patch) | |
| tree | 3f5ea760fda8de969173747e49373fb9cc369af8 | |
| parent | 48333eee0da7133f6b038252acabaf93bf94a9bd (diff) | |
| download | elgg-16f9b5bf702572f90a7ab96263b340a6b24eaed6.tar.gz elgg-16f9b5bf702572f90a7ab96263b340a6b24eaed6.tar.bz2 | |
Adds module which uses <section>, <header>, and <footer> tags
| -rw-r--r-- | views/default/page/components/module.php | 52 | ||||
| -rw-r--r-- | views/default/page_elements/header.php | 87 |
2 files changed, 52 insertions, 87 deletions
diff --git a/views/default/page/components/module.php b/views/default/page/components/module.php new file mode 100644 index 000000000..eb5789bdb --- /dev/null +++ b/views/default/page/components/module.php @@ -0,0 +1,52 @@ +<?php
+/**
+ * Elgg module element
+ *
+ * @uses $vars['title'] Title text
+ * @uses $vars['header'] HTML content of the header
+ * @uses $vars['body'] HTML content of the body
+ * @uses $vars['footer'] HTML content of the footer
+ * @uses $vars['class'] Optional additional class for module
+ * @uses $vars['id'] Optional id for module
+ * @uses $vars['show_inner'] Optional flag to leave out inner div (default: false)
+ */
+
+$title = elgg_extract('title', $vars, '');
+$header = elgg_extract('header', $vars, '');
+$body = elgg_extract('body', $vars, '');
+$footer = elgg_extract('footer', $vars, '');
+$show_inner = elgg_extract('show_inner', $vars, false);
+
+$class = 'elgg-module';
+$additional_class = elgg_extract('class', $vars, '');
+if ($additional_class) {
+ $class = "$class $additional_class";
+}
+
+$id = '';
+if (isset($vars['id'])) {
+ $id = "id=\"{$vars['id']}\"";
+}
+
+if (isset($vars['header'])) {
+ if ($vars['header']) {
+ $header = "<header class=\"elgg-head\">$header</header>";
+ }
+} else {
+ $header = "<header class=\"elgg-head\"><h3>$title</h3></header>";
+}
+
+$body = "<div class=\"elgg-body\">$body</div>";
+
+if (isset($vars['footer'])) {
+ if ($vars['footer']) {
+ $footer = "<footer class=\"elgg-foot\">$footer</footer>";
+ }
+}
+
+$contents = $header . $body . $footer;
+if ($show_inner) {
+ $contents = "<div class=\"elgg-inner\">$contents</div>";
+}
+
+echo "<section class=\"$class\" $id>$contents</section>";
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php deleted file mode 100644 index a69f79cba..000000000 --- a/views/default/page_elements/header.php +++ /dev/null @@ -1,87 +0,0 @@ -<?php
-/**
- * Elgg pageshell
- * The standard HTML header that displays across the site
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['config'] The site configuration settings, imported
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- */
-
-// Set title
-if (empty($vars['title'])) {
- $title = $vars['config']->sitename;
-} else if (empty($vars['config']->sitename)) {
- $title = $vars['title'];
-} else {
- $title = $vars['config']->sitename . ": " . $vars['title'];
-}
-
-global $autofeed;
-if (isset($autofeed) && $autofeed == true) {
- $url = $url2 = full_url();
- if (substr_count($url,'?')) {
- $url .= "&view=rss";
- } else {
- $url .= "?view=rss";
- }
- if (substr_count($url2,'?')) {
- $url2 .= "&view=odd";
- } else {
- $url2 .= "?view=opendd";
- }
- $feedref = <<<END
-
- <link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
- <link rel="alternate" type="application/odd+xml" title="OpenDD" href="{$url2}" />
-
-END;
-} else {
- $feedref = "";
-}
-
-// we won't trust server configuration but specify utf-8
-header('Content-type: text/html; charset=utf-8');
-
-$version = get_version();
-$release = get_version(true);
-?>
-<!doctype html>
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta name="ElggRelease" content="<?php echo $release; ?>" />
- <meta name="ElggVersion" content="<?php echo $version; ?>" />
- <title><?php echo $title; ?></title>
-
- <!-- include the default css file -->
- <link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&viewtype=<?php echo $vars['view']; ?>" type="text/css" />
-
- <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.3.2.min.js"></script>
- <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.custom.min.js"></script>
- <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.form.js"></script>
- <script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=initialise_elgg&viewtype=<?php echo $vars['view']; ?>"></script>
-
-<?php
- global $pickerinuse;
- if (isset($pickerinuse) && $pickerinuse == true) {
-?>
- <!-- only needed on pages where we have friends collections and/or the friends picker -->
- <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.easing.1.3.packed.js"></script>
- <script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=friendsPickerv1&viewtype=<?php echo $vars['view']; ?>"></script>
-<?php
- }
-?>
-
- <?php
- echo $feedref;
- echo elgg_view('metatags',$vars);
- ?>
-</head>
-
-<body>
|