diff options
| author | Sem <sembrestels@riseup.net> | 2012-04-18 13:09:27 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-04-18 13:09:27 +0200 |
| commit | 5727d85ced9ae87d010b47ac99aab8adcd686a2e (patch) | |
| tree | db052fa0c9f38b11ab63a4a4aa44a26623823f39 | |
| parent | a744c532b0acb7c49487f22f6e2d051e610c6bbb (diff) | |
| download | saravea_theme-5727d85ced9ae87d010b47ac99aab8adcd686a2e.tar.gz saravea_theme-5727d85ced9ae87d010b47ac99aab8adcd686a2e.tar.bz2 | |
Modified layout.
| -rw-r--r-- | manifest.xml | 10 | ||||
| -rw-r--r-- | start.php | 2 | ||||
| -rw-r--r-- | views/default/css/elements/layout.php | 7 | ||||
| -rw-r--r-- | views/default/page/default.php | 63 | ||||
| -rw-r--r-- | views/default/page/elements/header.php | 0 | ||||
| -rw-r--r-- | views/default/page/elements/topbar.php | 15 |
6 files changed, 88 insertions, 9 deletions
diff --git a/manifest.xml b/manifest.xml index daf419d..745a75c 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>N-1 Theme</name> - <author>Lorea</author> + <author>Lorea developers</author> <version>1.0</version> <category>theme</category> <description> - Modifies your Elgg site to look and behave very much like Facebook. + Modifies your Elgg site to look and behave very much like GNOME 3. </description> - <website>https://github.com/lorea/n1_theme</website> - <copyright>(C) 2011 Lorea</copyright> - <license>GNU Public License version 2</license> + <website>https://gitorious.org/lorea/n1_theme</website> + <copyright>(C) 2011-2012 Lorea</copyright> + <license>GNU Affero General Public License, version 3</license> <requires> <type>elgg_release</type> @@ -7,7 +7,7 @@ function n1_theme_init() { elgg_register_menu_item('topbar', array(
'name' => 'elgg_logo',
'text' => elgg_get_site_entity()->name,
- 'href' => elgg_get_site_url,
+ 'href' => elgg_get_site_url(),
'priority' => 0,
));
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php index 42d8984..bb8190c 100644 --- a/views/default/css/elements/layout.php +++ b/views/default/css/elements/layout.php @@ -25,11 +25,12 @@ height: 90px; } .elgg-page-default .elgg-page-body > .elgg-inner { - width: 990px; + width: 94%; margin: 0 auto; + padding-top: 25px; } .elgg-page-default .elgg-page-footer > .elgg-inner { - width: 990px; + width: 94; margin: 0 auto; padding: 5px 0; border-top: 1px solid #DEDEDE; @@ -115,4 +116,4 @@ } .elgg-page-footer a:hover { color: #666; -}
\ 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 0000000..b18b65d --- /dev/null +++ b/views/default/page/default.php @@ -0,0 +1,63 @@ +<?php +/** + * Elgg pageshell + * The standard HTML page shell that everything else fits into + * + * @package Elgg + * @subpackage Core + * + * @uses $vars['title'] The page title + * @uses $vars['body'] The main content of the page + * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages() + */ + +// backward compatability support for plugins that are not using the new approach +// of routing through admin. See reportedcontent plugin for a simple example. +if (elgg_get_context() == 'admin') { + elgg_deprecated_notice("admin plugins should route through 'admin'.", 1.8); + elgg_admin_add_plugin_settings_menu(); + elgg_unregister_css('elgg'); + echo elgg_view('page/admin', $vars); + return true; +} + +// render content before head so that JavaScript and CSS can be loaded. See #4032 +$topbar = elgg_view('page/elements/topbar', $vars); +$messages = elgg_view('page/elements/messages', array('object' => $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"); + +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<?php echo elgg_view('page/elements/head', $vars); ?> +</head> +<body> +<div class="elgg-page elgg-page-default"> + <div class="elgg-page-messages"> + <?php echo $messages; ?> + </div> + <div class="elgg-page-topbar"> + <div class="elgg-inner"> + <?php echo $topbar; ?> + </div> + </div> + <div class="elgg-page-body"> + <div class="elgg-inner"> + <?php echo $body; ?> + </div> + </div> + <div class="elgg-page-footer"> + <div class="elgg-inner"> + <?php echo $footer; ?> + </div> + </div> +</div> +<?php echo elgg_view('page/elements/foot'); ?> +</body> +</html> diff --git a/views/default/page/elements/header.php b/views/default/page/elements/header.php new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/views/default/page/elements/header.php diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php new file mode 100644 index 0000000..d217c2d --- /dev/null +++ b/views/default/page/elements/topbar.php @@ -0,0 +1,15 @@ +<?php +/** + * N-1 topbar + * The N-1 top toolbar + */ + +echo elgg_view_menu('topbar', array('sort_by' => 'priority', array('elgg-menu-hz'))); + +// elgg tools menu +// need to echo this empty view for backward compatibility. +$content = elgg_view("navigation/topbar_tools"); +if ($content) { + elgg_deprecated_notice('navigation/topbar_tools was deprecated. Extend the topbar menus or the page/elements/topbar view directly', 1.8); + echo $content; +} |