diff options
author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-16 01:56:18 +0000 |
---|---|---|
committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-16 01:56:18 +0000 |
commit | fc5ef85ec2fa45afb44795109899d93329f7b2c4 (patch) | |
tree | 8d8f958ca42012c2ea753136859f54eda7796ab7 /mod/search/views | |
parent | f29b327342068543b8a2a3f0f487953468f3c9a5 (diff) | |
download | elgg-fc5ef85ec2fa45afb44795109899d93329f7b2c4.tar.gz elgg-fc5ef85ec2fa45afb44795109899d93329f7b2c4.tar.bz2 |
Merged [5623]:head from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@5760 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/search/views')
-rw-r--r-- | mod/search/views/default/search/css.php | 7 | ||||
-rw-r--r-- | mod/search/views/default/search/entity.php | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/mod/search/views/default/search/css.php b/mod/search/views/default/search/css.php index 72b696059..d008dd3c0 100644 --- a/mod/search/views/default/search/css.php +++ b/mod/search/views/default/search/css.php @@ -78,12 +78,7 @@ } /* formatting for the search results */ -.search_listing .item_extra { - border: 1px solid #cccccc; - margin: 2px; - padding: 3px; -} .search_listing .item_timestamp { font-style: italic; -}
\ No newline at end of file +} diff --git a/mod/search/views/default/search/entity.php b/mod/search/views/default/search/entity.php index 538cc8a64..e5659d6ab 100644 --- a/mod/search/views/default/search/entity.php +++ b/mod/search/views/default/search/entity.php @@ -42,9 +42,11 @@ $title = $entity->getVolatileData('search_matched_title'); $description = $entity->getVolatileData('search_matched_description'); $extra_info = $entity->getVolatileData('search_matched_extra'); $url = $entity->getVolatileData('search_url'); + if (!$url) { $url = $entity->getURL(); } + $title = "<a href=\"$url\">$title</a>"; $time = $entity->getVolatileData('search_time'); if (!$time) { @@ -53,7 +55,7 @@ if (!$time) { $time = friendly_time(($tu > $tc) ? $tu : $tc); } ?> - <div class="search_listing clearfloat"> + <div class="search_listing"> <div class="search_listing_icon"><?php echo $icon; ?></div> <div class="search_listing_info"> <p class="entity_title"><?php echo $title; ?></p> |