diff options
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/page_elements/elgg_topbar.php | 7 | ||||
| -rw-r--r-- | views/default/search/entity_list.php | 62 | ||||
| -rw-r--r-- | views/default/search/gallery.php | 49 | ||||
| -rw-r--r-- | views/default/search/gallery_listing.php | 35 | ||||
| -rw-r--r-- | views/default/search/listing.php | 45 | ||||
| -rw-r--r-- | views/default/search/startblurb.php | 8 |
6 files changed, 2 insertions, 204 deletions
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php index 46314f2ad..2908cbd95 100644 --- a/views/default/page_elements/elgg_topbar.php +++ b/views/default/page_elements/elgg_topbar.php @@ -68,10 +68,7 @@ </div> <div id="elgg_topbar_container_search"> -<form id="searchform" action="<?php echo $vars['url']; ?>pg/search/" method="get"> - <input type="text" size="21" name="tag" value="<?php echo elgg_echo('search'); ?>" onclick="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' }" class="search_input" /> - <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search_submit_button" /> -</form> +<?php echo elgg_view('page_elements/searchbox'); ?> </div> </div><!-- /#elgg_topbar --> @@ -80,4 +77,4 @@ <?php } -?>
\ No newline at end of file +?> diff --git a/views/default/search/entity_list.php b/views/default/search/entity_list.php deleted file mode 100644 index f0438fa11..000000000 --- a/views/default/search/entity_list.php +++ /dev/null @@ -1,62 +0,0 @@ -<?php
-
- $context = $vars['context'];
- $offset = $vars['offset'];
- $entities = $vars['entities'];
- $limit = $vars['limit'];
- $count = $vars['count'];
- $baseurl = $vars['baseurl'];
- $context = $vars['context'];
- $viewtype = $vars['viewtype'];
- $pagination = $vars['pagination'];
- $fullview = $vars['fullview'];
-
- $html = "";
- $nav = "";
-
- if (isset($vars['viewtypetoggle'])) {
- $viewtypetoggle = $vars['viewtypetoggle'];
- } else {
- $viewtypetoggle = true;
- }
-
- if ($context == "search" && $count > 0 && $viewtypetoggle) {
- $nav .= elgg_view("navigation/viewtype",array(
-
- 'baseurl' => $baseurl,
- 'offset' => $offset,
- 'count' => $count,
- 'viewtype' => $viewtype,
-
- ));
- }
-
- if ($pagination)
- $nav .= elgg_view('navigation/pagination',array(
-
- 'baseurl' => $baseurl,
- 'offset' => $offset,
- 'count' => $count,
- 'limit' => $limit,
-
- ));
-
- $html .= $nav;
-
- if ($viewtype == "list") {
- if (is_array($entities) && sizeof($entities) > 0) {
- foreach($entities as $entity) {
- $html .= elgg_view_entity($entity, $fullview);
- }
- }
- } else {
- if (is_array($entities) && sizeof($entities) > 0)
- $html .= elgg_view("search/gallery",array('entities' => $entities));
- }
-
- if ($count)
- $html .= $nav;
-
- echo $html;
-
-?>
diff --git a/views/default/search/gallery.php b/views/default/search/gallery.php deleted file mode 100644 index 366cd713b..000000000 --- a/views/default/search/gallery.php +++ /dev/null @@ -1,49 +0,0 @@ -<?php
-
- /**
- * Elgg gallery view
- *
- * @package Elgg
- * @subpackage Core
- - * @author Curverider Ltd
- - * @link http://elgg.org/
- */
-
- $entities = $vars['entities'];
- if (is_array($entities) && sizeof($entities) > 0) {
-
-?>
-
- <table class="search_gallery">
-
-<?php
-
- $col = 0;
- foreach($entities as $entity) {
- if ($col == 0) {
-
- echo "<tr>";
-
- }
- echo "<td class=\"search_gallery_item\">";
- echo elgg_view_entity($entity);
- echo "</td>";
- $col++;
- if ($col > 3) {
- echo "</tr>";
- $col = 0;
- }
- }
- if ($col > 0) echo "</tr>";
-
-?>
-
- </table>
-
-<?php
-
- }
-
-?>
\ No newline at end of file diff --git a/views/default/search/gallery_listing.php b/views/default/search/gallery_listing.php deleted file mode 100644 index 4c0f40643..000000000 --- a/views/default/search/gallery_listing.php +++ /dev/null @@ -1,35 +0,0 @@ -<?php
-
- /**
- * Elgg search listing: gallery view
- *
- * @package Elgg
- * @subpackage Core
- - * @author Curverider Ltd
- - * @link http://elgg.org/
- */
-
-?>
-
- <div class="search_listing">
-
- <div class="search_listing_header">
-
- <?php
-
- echo $vars['icon'];
-
- ?>
-
- </div>
- <div class="search_listing_info">
- <?php
-
- echo $vars['info'];
-
- ?>
- </div>
-
- </div>
\ No newline at end of file diff --git a/views/default/search/listing.php b/views/default/search/listing.php deleted file mode 100644 index 0a9d01fee..000000000 --- a/views/default/search/listing.php +++ /dev/null @@ -1,45 +0,0 @@ -<?php
-
- /**
- * Elgg search listing
- *
- * @package Elgg
- * @subpackage Core
- - * @author Curverider Ltd
- - * @link http://elgg.org/
- */
-
- if (isset($vars['search_viewtype']) && $vars['search_viewtype'] == "gallery") {
-
- echo elgg_view("search/gallery_listing",$vars);
-
- } else {
-
-?>
-
- <div class="search_listing">
-
- <div class="search_listing_icon">
- <?php
-
- echo $vars['icon'];
-
- ?>
- </div>
- <div class="search_listing_info">
- <?php
-
- echo $vars['info'];
-
- ?>
- </div>
-
- </div>
-
-<?php
-
- }
-
-?>
\ No newline at end of file diff --git a/views/default/search/startblurb.php b/views/default/search/startblurb.php deleted file mode 100644 index 82b4aef8c..000000000 --- a/views/default/search/startblurb.php +++ /dev/null @@ -1,8 +0,0 @@ -
-<div class="contentWrapper">
- <?php
-
- echo sprintf(elgg_echo("tag:search:startblurb"),$vars['tag']);
-
- ?>
-</div>
\ No newline at end of file |