]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b75d27a)
Cleaned up views/default/page/ directory
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Mon, 14 Feb 2011 20:35:00 +0000 (20:35 +0000)
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Mon, 14 Feb 2011 20:35:00 +0000 (20:35 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8231 36083f99-b078-4883-b0ff-0f9b5a30f544

views/default/page/elements/body.php patch | blob | history
views/default/page/elements/footer.php patch | blob | history
views/default/page/elements/header.php patch | blob | history
views/default/page/elements/messages.php patch | blob | history
views/default/page/elements/topbar.php patch | blob | history
views/default/page/shells/admin.php patch | blob | history
views/default/page/shells/default.php patch | blob | history

diff --git a/views/default/page/elements/body.php b/views/default/page/elements/body.php
index 6f76916936bc1f548ff49a8fb191e47aa03b9a5b..31fe24ab4893f2963e0fb77b87d3efd41f13c61e 100644 (file)
--- a/views/default/page/elements/body.php
+++ b/views/default/page/elements/body.php
@@ -5,10 +5,4 @@
  * @uses $vars['body'] The HTML of the page body
  */
 
-$body = elgg_get_array_value('body', $vars, '');
-
-echo <<<HTML
-<div class="elgg-page-body">
-       $body
-</div>
-HTML;
+echo elgg_get_array_value('body', $vars, '');
\ No newline at end of file
diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
index 0c32e54297dffae2826aa650246869552e22cdcf..001d856b16fe9bbdc76b9bc5dd324dd9a9a86230 100644 (file)
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -8,15 +8,11 @@
  *
  */
 
+echo elgg_view_menu('footer', array('class' => 'elgg-menu-footer'));
+echo elgg_view('footer/links');
+
 ?>
-<div class="elgg-page-footer">
-       <div class="elgg-inner clearfix">
-               <?php echo elgg_view_menu('footer', array('class' => 'elgg-menu-footer')); ?>
-               <?php echo elgg_view('footer/links'); ?>
-               <a href="http://www.elgg.org" class="elgg-alt">
-                       <img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
-               </a>
-       </div>
-</div>
 
-<?php echo elgg_view('footer/analytics'); ?>
+<a href="http://www.elgg.org" class="elgg-alt">
+       <img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
+</a>
diff --git a/views/default/page/elements/header.php b/views/default/page/elements/header.php
index 125d80bfa894dea3790451daa7dab662cf78ab21..972c90272c671d950a65a9ca9a50e0951931b52f 100644 (file)
--- a/views/default/page/elements/header.php
+++ b/views/default/page/elements/header.php
@@ -4,21 +4,14 @@
  * This file holds the header output that a user will see
  **/
 
-?>
-<div class="elgg-page-header">
-       <div class="elgg-inner">
-               <?php
-                       // link back to main site.
-                       echo elgg_view('page/elements/header_logo', $vars);
-                       
-                       // drop-down login
-                       echo elgg_view('core/account/login_dropdown');
-               
-                       // insert site-wide navigation
-                       echo elgg_view_menu('site');
+// link back to main site.
+echo elgg_view('page/elements/header_logo', $vars);
 
-                       // insert a view which can be extended
-                       echo elgg_view('header/extend');
-               ?>
-       </div>
-</div>
+// drop-down login
+echo elgg_view('core/account/login_dropdown');
+
+// insert site-wide navigation
+echo elgg_view_menu('site');
+
+// insert a view which can be extended
+echo elgg_view('header/extend');
diff --git a/views/default/page/elements/messages.php b/views/default/page/elements/messages.php
index 3663bb7968f60022c816ef8ee59de3829d8358c5..e4e6030f197207835e8eec2ab7a9c77858616c07 100644 (file)
--- a/views/default/page/elements/messages.php
+++ b/views/default/page/elements/messages.php
@@ -9,10 +9,9 @@
  * @uses $vars['object'] The array of message registers
  */
 
-if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
-
-       echo '<ul class="elgg-system-messages">';
+echo '<ul class="elgg-system-messages">';
 
+if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
        foreach ($vars['object'] as $type => $list ) {
                foreach ($list as $message) {
                        echo "<li class=\"elgg-message elgg-state-$type\">";
@@ -23,6 +22,6 @@ if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object'
                        echo '</li>';
                }
        }
-
-       echo '</ul>';
 }
+
+echo '</ul>';
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
index 7ca8a58e269e6815f72bcb320fb008dd08116ceb..98732611910abe36a5a8894ddff709d0935184aa 100644 (file)
--- a/views/default/page/elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -5,10 +5,8 @@
  */
 
 $user = elgg_get_logged_in_user_entity();
-if (!elgg_instanceof($user, 'user')) {
-       // do not show tobpar to logged out users
-       return true;
-}
+
+//@todo echo elgg_view_menu('topbar', array('class' => 'elgg-menu-topbar'));
 
 // Elgg logo
 $image = '<img src="' . elgg_get_site_url() . '_graphics/elgg_toolbar_logo.gif" alt="Elgg logo" />';
@@ -43,11 +41,14 @@ echo elgg_view('output/url', array(
 
 // elgg tools menu
 // need to echo this empty view for backward compatibility.
+// @todo -- do we really?  So much else is broken, and the new menu system is so much nicer...
 echo elgg_view("navigation/topbar_tools");
 
 // enable elgg topbar extending
 echo elgg_view('elgg_topbar/extend', $vars);
 
+//@todo echo elgg_view_menu('topbar2', array('class' => 'elgg-menu-topbar elgg-alt'));
+
 // user settings
 echo elgg_view('output/url', array(
        'href' => elgg_get_site_url() . "pg/settings/user/{$user->username}",
diff --git a/views/default/page/shells/admin.php b/views/default/page/shells/admin.php
index f401f3416c1939541a46a7f8e3e43857cc05224e..211bd40370170b306b2d90c773e5e97bcbb76a3f 100644 (file)
--- a/views/default/page/shells/admin.php
+++ b/views/default/page/shells/admin.php
@@ -22,6 +22,7 @@ header("Content-type: text/html; charset=UTF-8");
        <div class="elgg-page elgg-page-admin">
                <?php echo $vars['body']; ?>
        </div>
+       <?php echo elgg_view('footer/analytics'); ?>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/views/default/page/shells/default.php b/views/default/page/shells/default.php
index e089d11b610f8be95268a5ea222da3c536d0551c..775eb4acc7e096dde5362c082ff1036f925041f6 100644 (file)
--- a/views/default/page/shells/default.php
+++ b/views/default/page/shells/default.php
@@ -35,11 +35,15 @@ header("Content-type: text/html; charset=UTF-8");
        <div class="elgg-page-messages">
                <?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?>
        </div>
+       
+       <?php if (elgg_is_logged_in()): ?>
        <div class="elgg-page-topbar">
                <div class="elgg-inner">
                        <?php echo elgg_view('page/elements/topbar', $vars); ?>
                </div>
        </div>
+       <?php endif; ?>
+       
        <div class="elgg-page-header">
                <div class="elgg-inner">
                        <?php echo elgg_view('page/elements/header', $vars); ?>
@@ -56,5 +60,6 @@ header("Content-type: text/html; charset=UTF-8");
                </div>
        </div>
 </div>
+<?php echo elgg_view('footer/analytics'); ?>
 </body>
 </html>
\ No newline at end of file
Social Networking Engine