created a new layout element - page links - holds stuff like the rss link

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

diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index 6f4e46f6602d8108e2ced56676060a2c5b25f3ca..87942758391f5008009cad26daf2be251e20e43b 100644 (file)
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -116,20 +116,6 @@ h2 {
 .margin-top {
        margin-top:10px;
 }
-.rss-link {
-       margin-top:-10px;
-       margin-bottom:10px;
-}
-.rss-link a {
-       display:block;
-       width:14px;
-       height:14px;
-       float:right;
-       background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
-       background-repeat: no-repeat;
-       background-position: -250px top;
-       text-indent: -1000em;
-}
 .elgg-tags {
        background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
        background-repeat: no-repeat;

diff --git a/views/default/css/elements/skin.php b/views/default/css/elements/skin.php
index 91a61dacb4b2448d0af2f582e764c9363cc8dc97..d02797cfd580ccfa91156f4c5e0317927624b7bb 100644 (file)
--- a/views/default/css/elements/skin.php
+++ b/views/default/css/elements/skin.php
@@ -154,6 +154,10 @@ a.selected {
        padding-bottom: 5px;
 }
 
+.elgg-rss {
+       float: right;
+}
+
 /***** PAGE FOOTER ******/
 
 .elgg-page-footer {
@@ -240,6 +244,9 @@ a.selected {
        width: 22px;
        height: 20px;
 }
+.elgg-icon-rss {
+       background-position: -249px 1px;
+}
 
 .ajax-loader {
        background-color: white;

diff --git a/views/default/layout/elements/page_links.php b/views/default/layout/elements/page_links.php
new file mode 100644 (file)
index 0000000..56eab0b
--- /dev/null
+++ b/views/default/layout/elements/page_links.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Page links: RSS link, reported content link, etc.
+ */
+
+// Are there feeds to display?
+global $autofeed;
+$rss_link = '';
+if (isset($autofeed) && $autofeed == true) {
+       $url = full_url();
+       if (substr_count($url,'?')) {
+               $url .= "&view=rss";
+       } else {
+               $url .= "?view=rss";
+       }
+       $url = elgg_format_url($url);
+       $label = elgg_echo('feed:rss');
+       
+       $rss_link = elgg_view('output/url', array(
+               'text' => '<span class="elgg-icon elgg-icon-rss"></span>',
+               'href' => $url,
+               'title' => $label,
+               'rel' => 'nofollow',
+               'encode_text' => false,
+               'class' => 'elgg-rss',
+       ));
+}
+
+// view to extend by plugins
+$links = elgg_view('page/links', $vars);
+
+if ($links || $rss_link) {
+       echo '<div class="elgg-page-links clearfix mbm">';
+       echo $rss_link;
+       echo $links;
+       echo '</div>';
+}

diff --git a/views/default/layout/elements/sidebar.php b/views/default/layout/elements/sidebar.php
index f2071adb5d63d201f1e6468d19c32fdeb08e3dcb..93dd659f537377588365c4e3cbbad90b67ce9b88 100644 (file)
--- a/views/default/layout/elements/sidebar.php
+++ b/views/default/layout/elements/sidebar.php
@@ -5,23 +5,9 @@
  * @uses $vars['sidebar'] Optional content that is displayed at the bottom of sidebar
  */
 
-// Are there feeds to display?
-global $autofeed;
-if (isset($autofeed) && $autofeed == true) {
-       $url = full_url();
-       if (substr_count($url,'?')) {
-               $url .= "&view=rss";
-       } else {
-               $url .= "?view=rss";
-       }
-       $url = elgg_format_url($url);
-       $label = elgg_echo('feed:rss');
-       echo <<<END
-       <div class="rss-link clearfix"><a href="{$url}" rel="nofollow" title="{$label}">{$label}</a></div>
-END;
-}
+echo elgg_view('layout/elements/page_links', $vars);
 
-echo elgg_view('layout/elements/owner_block');
+echo elgg_view('layout/elements/owner_block', $vars);
 
 echo elgg_view('navigation/sidebar_menu');
 echo elgg_view_menu('page', array('sort_by' => 'name'));