]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Adds module which uses <section>, <header>, and <footer> tags
authorEvan Winslow <evan@elgg.org>
Sat, 19 Mar 2011 04:58:04 +0000 (21:58 -0700)
committerEvan Winslow <evan@elgg.org>
Sat, 19 Mar 2011 04:58:04 +0000 (21:58 -0700)
views/default/page/components/module.php [new file with mode: 0644]
views/default/page_elements/header.php [deleted file]

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