cleaning up the page footer - still need to add css for footer menu

git-svn-id: http://code.elgg.org/elgg/trunk@7685 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/reportedcontent/views/default/reportedcontent/css.php b/mod/reportedcontent/views/default/reportedcontent/css.php
index c66cd20041fdfda4a635aa2769ced2ddc0dfc614..ed498f03aa81cf526e8ee008e0fa8573b0c806d2 100644 (file)
--- a/mod/reportedcontent/views/default/reportedcontent/css.php
+++ b/mod/reportedcontent/views/default/reportedcontent/css.php
@@ -9,12 +9,9 @@
 
 ?>
 /* Reported Content */
-#report_this {
-       text-align: left;
-       float:left;
-}
-#report_this a {
+.report-this {
        font-size: 90%;
-       padding:0 0 4px 20px;
+}
+.report-this-icon {
        background: url(<?php echo elgg_get_site_url(); ?>mod/reportedcontent/graphics/icon_reportthis.gif) no-repeat left top;
 }

diff --git a/mod/reportedcontent/views/default/reportedcontent/footer_link.php b/mod/reportedcontent/views/default/reportedcontent/footer_link.php
index 69e6f096708b6c6a7056cea8d1a003fc25859605..4e893522c383d4d29e92da15146a1d95b1996f98 100644 (file)
--- a/mod/reportedcontent/views/default/reportedcontent/footer_link.php
+++ b/mod/reportedcontent/views/default/reportedcontent/footer_link.php
@@ -9,6 +9,8 @@ $title = elgg_echo('reportedcontent:this:tooltip');
 $text  = elgg_echo('reportedcontent:this');
 ?>
 
-<div id="report_this">
-       <a href="javascript:location.href='<?php echo elgg_get_site_url(); ?>pg/reportedcontent/add/?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)" title="<?php echo $title; ?>"><?php echo $text; ?></a>
-</div>
+
+<a class="report-this" href="javascript:location.href='<?php echo elgg_get_site_url(); ?>pg/reportedcontent/add/?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)" title="<?php echo $title; ?>">
+       <span class="elgg-icon report-this-icon"></span>
+       <?php echo $text; ?>
+</a>

diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php
index 844187503cf1c144826fd0b61e2517ed78eb696e..08c01d6c717331b2bcfd9f0b7a991a100ba3b318 100644 (file)
--- a/mod/sitepages/start.php
+++ b/mod/sitepages/start.php
@@ -24,6 +24,8 @@ function sitepages_init() {
        // Extend CSS
        elgg_extend_view('css/screen', 'sitepages/css');
 
+       sitepages_setup_footer_menu();
+
        // register our subtype
        run_function_once('sitepages_runonce');
 
@@ -33,7 +35,6 @@ function sitepages_init() {
        // Register a URL handler for external pages
        register_entity_url_handler('sitepages_url', 'object', 'sitepages');
 
-       elgg_extend_view('footer/links', 'sitepages/footer_menu');
        elgg_extend_view('html_head/extend', 'sitepages/metatags');
 
        // Replace the default index page if user has requested and the site is not running walled garden
@@ -137,6 +138,17 @@ function sitepages_page_handler($page) {
        echo elgg_view_page($title, $content);
 }
 
+/**
+ * Setup the links to site pages
+ */
+function sitepages_setup_footer_menu() {
+       $pages = array('about', 'terms', 'privacy');
+       foreach ($pages as $page) {
+               $url = "pg/sitepages/read/$page";
+               $item = new ElggMenuItem($page, elgg_echo("sitepages:$page"), $url);
+               elgg_register_menu_item('footer', $item);
+       }
+}
 
 /**
  * Register some default keywords.

diff --git a/mod/sitepages/views/default/sitepages/footer_menu.php b/mod/sitepages/views/default/sitepages/footer_menu.php
deleted file mode 100644 (file)
index d3858cb..0000000
--- a/mod/sitepages/views/default/sitepages/footer_menu.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Footer view to add links to the semi-static pages.
- *
- * @package SitePages
- */
-?>
-
-<div class="footer_toolbar_links">|
-<a href="<?php echo elgg_get_site_url(); ?>pg/sitepages/read/About/"><?php echo elgg_echo('sitepages:about'); ?></a> |
-<a href="<?php echo elgg_get_site_url(); ?>pg/sitepages/read/Terms/"><?php echo elgg_echo('sitepages:terms'); ?></a> |
-<a href="<?php echo elgg_get_site_url(); ?>pg/sitepages/read/Privacy/"><?php echo elgg_echo('sitepages:privacy'); ?></a> |
-</div>
\ No newline at end of file

diff --git a/views/default/css/elements/skin.php b/views/default/css/elements/skin.php
index e6e238dc425b1d9eb5b72261839d736ccca2480d..e639182bc09cb58f3c48c7a2b23f5a16e2b30b0e 100644 (file)
--- a/views/default/css/elements/skin.php
+++ b/views/default/css/elements/skin.php
@@ -159,6 +159,16 @@ a.selected {
        padding: 5px 0;
        border-top: 1px solid #DEDEDE;
 }
+.elgg-page-footer a {
+       float: left;
+}
+.elgg-page-footer a.elgg-alt {
+       float: right;
+}
+.elgg-page-footer .elgg-menu {
+       float: left;
+       width: 100%;
+}
 .elgg-page-footer .elgg-inner,
 .elgg-page-footer .elgg-inner a,
 .elgg-page-footer .elgg-inner p {
@@ -167,9 +177,6 @@ a.selected {
 .elgg-page-footer .elgg-inner a:hover {
        color: #666666;
 }
-.elgg-page-footer .elgg-inner p {
-       margin: 0;
-}
 
 /* ***************************************
        ICONS
@@ -181,6 +188,7 @@ a.selected {
        height: 16px;
        display: block;
        float: left;
+       margin: 0 2px;
 }
 .elgg-icon-settings {
        background-position: -302px -44px;

diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
index 4a8220312c085026ac46e83de9f2e90f3a5f270c..68981cee6ee1b8e9fbba75d5d6f92920d9b54572 100644 (file)
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -11,8 +11,9 @@
 ?>
 <div class="elgg-page-footer">
        <div class="elgg-inner clearfix">
+               <?php echo elgg_view_menu('footer'); ?>
                <?php echo elgg_view('footer/links'); ?>
-               <a href="http://www.elgg.org" class="right">
+               <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>