diff options
| -rw-r--r-- | _graphics/icon_rss.png | bin | 0 -> 3341 bytes | |||
| -rw-r--r-- | languages/en.php | 6 | ||||
| -rw-r--r-- | mod/bookmarks/views/default/bookmarks/form.php | 2 | ||||
| -rw-r--r-- | views/default/css.php | 15 | ||||
| -rw-r--r-- | views/default/page_elements/owner_block.php | 32 |
5 files changed, 31 insertions, 24 deletions
diff --git a/_graphics/icon_rss.png b/_graphics/icon_rss.png Binary files differnew file mode 100644 index 000000000..6e7b676b3 --- /dev/null +++ b/_graphics/icon_rss.png diff --git a/languages/en.php b/languages/en.php index 9a41de024..7a00852ac 100644 --- a/languages/en.php +++ b/languages/en.php @@ -295,7 +295,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", 'friends:nocollections' => "You do not yet have any collections.", 'friends:collectiondeleted' => "Your collection has been deleted.", 'friends:collectiondeletefailed' => "We were unable to delete the collection. Either you don't have permission, or some other problem has occurred.", - 'friends:collectionadded' => "Your collection was successfuly created", + 'friends:collectionadded' => "Your collection was successfully created", 'friends:nocollectionname' => "You need to give your collection a name before it can be created.", 'friends:collections:members' => "Collection members", 'friends:collections:edit' => "Edit collection", @@ -310,9 +310,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", /** * Feeds */ - 'feed:rss' => 'Subscribe to feed', - 'feed:odd' => 'Syndicate OpenDD', - + 'feed:rss' => 'RSS feed for this page', /** * links **/ diff --git a/mod/bookmarks/views/default/bookmarks/form.php b/mod/bookmarks/views/default/bookmarks/form.php index 0052cccf9..9372dc7cb 100644 --- a/mod/bookmarks/views/default/bookmarks/form.php +++ b/mod/bookmarks/views/default/bookmarks/form.php @@ -37,7 +37,7 @@ if(isset($vars['entity'])){ $url = "action/bookmarks/add"; } ?> -<form class="action" action="<?php echo $vars['url'] . $url; ?>" method="post"> +<form class="margin_top" action="<?php echo $vars['url'] . $url; ?>" method="post"> <?php echo elgg_view('input/securitytoken'); ?> <p> <label> diff --git a/views/default/css.php b/views/default/css.php index 8b5c7cab7..3fe37b959 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -207,8 +207,19 @@ h2 { .margin_top { margin-top:10px; } -form.action { - 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 $vars['url']; ?>_graphics/icon_rss.png); + background-repeat: no-repeat; + background-position: left top; + text-indent: -1000em; } .tags { background-image:url(<?php echo $vars['url']; ?>_graphics/icon_tag.png); diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php index 04b70663a..4689b5a54 100644 --- a/views/default/page_elements/owner_block.php +++ b/views/default/page_elements/owner_block.php @@ -12,6 +12,21 @@ $contents = ""; +// Are there feeds to display? +global $autofeed; +if (isset($autofeed) && $autofeed == true) { + $url = $url2 = full_url(); + if (substr_count($url,'?')) { + $url .= "&view=rss"; + } else { + $url .= "?view=rss"; + } + $label = elgg_echo('feed:rss'); + $contents .= <<<END + <div class="rss_link clearfloat"><a href="{$url}" rel="nofollow" title="{$label}">{$label}</a></div> +END; +} + if(is_plugin_enabled('profile')) { // Is there a page owner? $owner = page_owner_entity(); @@ -34,23 +49,6 @@ if(is_plugin_enabled('profile')) { $contents .= "<div id='owner_block' class='radius8'>".$display."</div>"; } } -// Are there feeds to display? -global $autofeed; - -if (isset($autofeed) && $autofeed == true) { - $url = $url2 = full_url(); - if (substr_count($url,'?')) { - $url .= "&view=rss"; - } else { - $url .= "?view=rss"; - } - $label = elgg_echo('feed:rss'); - $contents .= <<<END - -<div id="rss_link"><a href="{$url}" rel="nofollow">{$label}</a></div> - -END; -} $contents .= elgg_view('owner_block/extend'); |
