diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-10-09 20:43:39 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-10-09 20:43:39 +0000 |
| commit | 34e28b1ccb73cb488f36cec692c854f9502cdd18 (patch) | |
| tree | e8117952cca46ef10c6543d388e92bd6e232fb34 /views/default | |
| parent | f9aa70c258578d907cdeb1e9d5b26fffca5bede6 (diff) | |
| download | elgg-34e28b1ccb73cb488f36cec692c854f9502cdd18.tar.gz elgg-34e28b1ccb73cb488f36cec692c854f9502cdd18.tar.bz2 | |
Reverted back to previous copy removing Justin's search because of views problems in plugins.
git-svn-id: http://code.elgg.org/elgg/trunk@3521 36083f99-b078-4883-b0ff-0f9b5a30f544
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, 204 insertions, 2 deletions
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php index 2908cbd95..46314f2ad 100644 --- a/views/default/page_elements/elgg_topbar.php +++ b/views/default/page_elements/elgg_topbar.php @@ -68,7 +68,10 @@ </div> <div id="elgg_topbar_container_search"> -<?php echo elgg_view('page_elements/searchbox'); ?> +<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> </div> </div><!-- /#elgg_topbar --> @@ -77,4 +80,4 @@ <?php } -?> +?>
\ No newline at end of file diff --git a/views/default/search/entity_list.php b/views/default/search/entity_list.php new file mode 100644 index 000000000..f0438fa11 --- /dev/null +++ b/views/default/search/entity_list.php @@ -0,0 +1,62 @@ +<?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 new file mode 100644 index 000000000..366cd713b --- /dev/null +++ b/views/default/search/gallery.php @@ -0,0 +1,49 @@ +<?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 new file mode 100644 index 000000000..4c0f40643 --- /dev/null +++ b/views/default/search/gallery_listing.php @@ -0,0 +1,35 @@ +<?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 new file mode 100644 index 000000000..0a9d01fee --- /dev/null +++ b/views/default/search/listing.php @@ -0,0 +1,45 @@ +<?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 new file mode 100644 index 000000000..82b4aef8c --- /dev/null +++ b/views/default/search/startblurb.php @@ -0,0 +1,8 @@ +
+<div class="contentWrapper">
+ <?php
+
+ echo sprintf(elgg_echo("tag:search:startblurb"),$vars['tag']);
+
+ ?>
+</div>
\ No newline at end of file |