]> gitweb.fluxo.info Git - lorea/saravea_theme.git/commitdiff
projects / lorea / saravea_theme.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a744c53)
Modified layout.
authorSem <sembrestels@riseup.net>
Wed, 18 Apr 2012 11:09:27 +0000 (13:09 +0200)
committerSem <sembrestels@riseup.net>
Wed, 18 Apr 2012 11:09:27 +0000 (13:09 +0200)
manifest.xml patch | blob | history
start.php patch | blob | history
views/default/css/elements/layout.php patch | blob | history
views/default/page/default.php [new file with mode: 0644] patch | blob
views/default/page/elements/header.php [new file with mode: 0644] patch | blob
views/default/page/elements/topbar.php [new file with mode: 0644] patch | blob

diff --git a/manifest.xml b/manifest.xml
index daf419df52bcea987255bffe347ed142c09fbc11..745a75c16c30eb26cf80b7426efd0c739b9a2b1e 100644 (file)
--- 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>
diff --git a/start.php b/start.php
index 233b915a0b258c1b80e882c06ab872c65fbf2edc..dc7028e0d2d9dc8defd8a0493d40132f53d20f5b 100644 (file)
--- a/start.php
+++ b/start.php
@@ -7,7 +7,7 @@ function n1_theme_init() {
        elgg_register_menu_item('topbar', array(\r
                'name' => 'elgg_logo',\r
                'text' => elgg_get_site_entity()->name,\r
-               'href' => elgg_get_site_url,\r
+               'href' => elgg_get_site_url(),\r
                'priority' => 0,\r
        ));\r
        \r
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index 42d898439b9316ec65117756655e890780e785a4..bb8190cc8f4d49e5b0eda4ea15da9d8fecc3528c 100644 (file)
--- 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 (file)
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 (file)
index 0000000..e69de29
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
new file mode 100644 (file)
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;
+}
ELGG saravea_theme plugin