aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mod/search/views/default/search/comments/entity.php8
-rw-r--r--mod/search/views/default/search/css.php110
-rw-r--r--mod/search/views/default/search/entity.php17
-rw-r--r--mod/search/views/default/search/listing.php2
-rw-r--r--views/default/css.php2
-rw-r--r--views/default/entities/gallery_listing.php6
6 files changed, 72 insertions, 73 deletions
diff --git a/mod/search/views/default/search/comments/entity.php b/mod/search/views/default/search/comments/entity.php
index 8b4d286c9..3bfd01033 100644
--- a/mod/search/views/default/search/comments/entity.php
+++ b/mod/search/views/default/search/comments/entity.php
@@ -12,7 +12,7 @@ $entity = $vars['entity'];
$owner = get_entity($entity->getVolatileData('search_matched_comment_owner_guid'));
if ($owner instanceof ElggUser) {
- $icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'small'));
+ $icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'tiny'));
} else {
$icon = '';
}
@@ -47,11 +47,11 @@ $tc = $entity->getVolatileData('search_matched_comment_time_created');;
$time = friendly_time($tc);
echo <<<___END
- <div class="search_listing">
+ <div class="search_listing clearfloat">
<div class="search_listing_icon">$icon</div>
<div class="search_listing_info">
- <p class="ItemTitle">$title</p>$description
- <p class="ItemTimestamp">$time</p>
+ <p class="entity_title">$title</p>$description
+ <p class="entity_subtext">$time</p>
</div>
</div>
___END;
diff --git a/mod/search/views/default/search/css.php b/mod/search/views/default/search/css.php
index fdc402199..85c7a44d8 100644
--- a/mod/search/views/default/search/css.php
+++ b/mod/search/views/default/search/css.php
@@ -1,3 +1,45 @@
+<?php
+/**
+ * Elgg Search css
+ *
+ * @package search
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+?>
+
+.search_listing {
+ background:none;
+ border-bottom:1px dotted #CCCCCC;
+ clear:both;
+ display:block;
+ margin:0;
+ padding:5px 0 7px;
+ position:relative;
+}
+.search_listing_icon {
+ float:left;
+ margin-left:3px;
+ margin-top:3px;
+}
+.search_listing_icon .avatar_menu_button img {
+ width: 15px;
+ margin:0;
+}
+.search_listing_info {
+ float:left;
+ margin-left:7px;
+ min-height:28px;
+ width:693px;
+}
+.search_listing_info p {
+ margin:0;
+}
+
+
+/* search matches */
.searchtype {
background: #FFFACD;
color: black;
@@ -12,79 +54,29 @@
margin-bottom: 2em;
}
.searchMatch {
- background-color: #FFFF66;
+ background-color: #bbdaf7;
}
.searchMatchColor1 {
- background-color: #FFFF66;
+ background-color: #bbdaf7;
}
.searchMatchColor2 {
background-color: #A0FFFF;
}
.searchMatchColor3 {
- background-color: #FF9999;
+ background-color: #FDFFC3;
}
.searchMatchColor4 {
- background-color: #FF66FF;
+ background-color: #cccccc;
}
.searchMatchColor5 {
- background-color: #99FF99;
+ background-color: #4690d6;
}
.searchTitle {
text-decoration: underline;
}
-#searchform input.search_input {
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- background-color:#FFFFFF;
- border:1px solid #BBBBBB;
- color:#999999;
- font-size:12px;
- font-weight:bold;
- margin:0pt;
- padding:2px;
- width:180px;
- height:12px;
-}
-#searchform input.search_submit_button {
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- color:#333333;
- background: #cccccc;
- border:none;
- font-size:12px;
- font-weight:bold;
- margin:0px;
- padding:2px;
- width:auto;
- height:18px;
- cursor:pointer;
-}
-#searchform input.search_submit_button:hover {
- color:#ffffff;
- background: #4690d6;
-}
-/*
-.search_listing {
- display: block;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- background:white;
- margin:0 10px 5px 10px;
- padding:5px;
+.search_listing_category_title {
+ margin-top:20px;
}
-
-.entity_gallery_item .search_listing {
- background: none;
- text-align: center;
+.search_listing.more {
+ display: block;
}
-*/
-
-/* override the entity container piece
-.search_listing .search_listing {
- -webkit-border-radius: 0px;
- -moz-border-radius: 0px;
- background: transparent;
- margin: 0;
- padding: 0;
-}
-*/
diff --git a/mod/search/views/default/search/entity.php b/mod/search/views/default/search/entity.php
index 92f6aa41d..2b08384d5 100644
--- a/mod/search/views/default/search/entity.php
+++ b/mod/search/views/default/search/entity.php
@@ -14,16 +14,16 @@ $entity = $vars['entity'];
// @todo allow an option to switch to displaying the entity's icon instead.
$type = $entity->getType();
if ($type == 'user' || $type == 'group') {
- $icon = elgg_view('profile/icon', array('entity' => $entity, 'size' => 'small'));
+ $icon = elgg_view('profile/icon', array('entity' => $entity, 'size' => 'tiny'));
} elseif ($owner = $entity->getOwnerEntity()) {
- $icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'small'));
+ $icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'tiny'));
} else {
// display a generic icon if no owner, though there will probably be
// other problems if the owner can't be found.
$icon = elgg_view(
'graphics/icon', array(
'entity' => $entity,
- 'size' => 'small',
+ 'size' => 'tiny',
));
}
@@ -31,17 +31,22 @@ $title = $entity->getVolatileData('search_matched_title');
$description = $entity->getVolatileData('search_matched_description');
$extra_info = $entity->getVolatileData('search_matched_extra');
$url = $entity->getURL();
+
+if (!$title) {
+ $title = elgg_echo('untitled');
+}
+
$title = "<a href=\"$url\">$title</a>";
$tc = $entity->time_created;
$tu = $entity->time_updated;
$time = friendly_time(($tu > $tc) ? $tu : $tc);
echo <<<___END
- <div class="search_listing">
+ <div class="search_listing clearfloat">
<div class="search_listing_icon">$icon</div>
<div class="search_listing_info">
- <p class="ItemTitle">$title</p>$description
- <p class="ItemTimestamp">$time $extra_info</p>
+ <p class="entity_title">$title</p>$description
+ <p class="entity_subtext">$time $extra_info</p>
</div>
</div>
___END;
diff --git a/mod/search/views/default/search/listing.php b/mod/search/views/default/search/listing.php
index 8825b7e8d..28a40f62f 100644
--- a/mod/search/views/default/search/listing.php
+++ b/mod/search/views/default/search/listing.php
@@ -92,7 +92,7 @@ if ($more) {
$more_link = '';
}
-$body = elgg_view_title($type_str);
+$body = "<div class='search_listing_category_title'>".elgg_view_title($type_str)."</div>";
foreach ($entities as $entity) {
if ($view = search_get_search_view($vars['params'], 'entity')) {
diff --git a/views/default/css.php b/views/default/css.php
index e1b9e4902..f2a3bfc08 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1498,6 +1498,7 @@ a.action_button:focus {
.admin_settings.users_online p.owner_timestamp {
padding-left:3px;
}
+/*
.admin_users_online .search_listing {
margin:0 0 5px 0;
padding:5px;
@@ -1505,6 +1506,7 @@ a.action_button:focus {
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
+*/
.admin_plugin_reorder {
float:right;
width:200px;
diff --git a/views/default/entities/gallery_listing.php b/views/default/entities/gallery_listing.php
index 66f88f2be..fbc6a1a3c 100644
--- a/views/default/entities/gallery_listing.php
+++ b/views/default/entities/gallery_listing.php
@@ -10,9 +10,9 @@
?>
-<div class="search_listing">
+<div class="search_listing todo">
- <div class="search_listing_header">
+ <div class="search_listing_header todo">
<?php
@@ -21,7 +21,7 @@
?>
</div>
- <div class="search_listing_info">
+ <div class="search_listing_info todo">
<?php
echo $vars['info'];