Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
3196985a
Commit
3196985a
authored
Jan 29, 2008
by
Clare Lenihan
Committed by
Clare Lenihan
Jan 30, 2008
Browse files
changing the top right search to redirect to user/find.php
deleting search.php and its template
parent
9b72eaa5
Changes
3
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/web.php
View file @
3196985a
...
...
@@ -1772,7 +1772,7 @@ function searchform() {
require_once
(
'pieforms/pieform.php'
);
return
pieform
(
array
(
'name'
=>
'searchform'
,
'action'
=>
get_config
(
'wwwroot'
)
.
'se
arch
.php'
,
'action'
=>
get_config
(
'wwwroot'
)
.
'
u
se
r/find
.php'
,
'renderer'
=>
'oneline'
,
'autofocus'
=>
false
,
'validate'
=>
false
,
...
...
htdocs/search.php
deleted
100644 → 0
View file @
9b72eaa5
<?php
/**
* Mahara: Electronic portfolio, weblog, resume builder and social networking
* Copyright (C) 2006-2007 Catalyst IT Ltd (http://www.catalyst.net.nz)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package mahara
* @subpackage core
* @author Richard Mansfield <richard.mansfield@catalyst.net.nz>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL
* @copyright (C) 2006,2007 Catalyst IT Ltd http://catalyst.net.nz
*
*/
define
(
'INTERNAL'
,
1
);
require
(
'init.php'
);
define
(
'SECTION_PLUGINTYPE'
,
'core'
);
define
(
'SECTION_PLUGINNAME'
,
'search'
);
define
(
'SECTION_PAGE'
,
'search'
);
define
(
'TITLE'
,
get_string
(
'search'
));
// If there is no query posted, the 'results' section of the page will
// stay invisible until a query is submitted.
$query
=
param_variable
(
'query'
,
''
);
$noresults
=
get_string
(
'noresultsfound'
);
$wwwroot
=
get_config
(
'wwwroot'
);
safe_require
(
'artefact'
,
'internal'
);
$userfields
=
ArtefactTypeProfile
::
get_public_fields
();
$userfieldstrings
=
array
(
get_string
(
'name'
));
foreach
(
$userfields
as
$k
=>
$v
)
{
$userfieldstrings
[]
=
get_string
(
$k
,
'artefact.internal'
);
}
$userfields
=
json_encode
(
array_keys
(
$userfields
));
$ncols
=
count
(
$userfieldstrings
);
$userfieldstrings
=
json_encode
(
$userfieldstrings
);
$javascript
=
<<<EOF
var userfields = {$userfields};
var userfieldstrings = {$userfieldstrings};
var results = new TableRenderer(
'searchresults',
'{$wwwroot}json/search.php',
[]
);
results.statevars.push('query');
results.statevars.push('type');
results.emptycontent = '{$noresults}';
results.updatecallback = function (d) {
if (d.type == 'user') {
results.linkspan = {$ncols};
if (!$('userfields')) {
appendChildNodes(results.thead, TR({'id':'userfields'},
map(partial(TH, null), userfieldstrings)));
}
}
else {
results.linkspan = 1;
removeElement('userfields');
if ($('userfields')) {
removeElement('userfields');
}
}
}
results.rowfunction = function(r,n,d) {
if ( d.type == 'group' ) {
return TR({'class':'r'+(n%2)},
TD(null,A({'href':'group/view.php?id=' + r.id},r.name)));
}
var row = TR({'class':'r'+(n%2)},TD(null,A({'href':'user/view.php?id=' + r.id},r.name)));
for (var i = 0; i < userfields.length; i++) {
if (r[userfields[i]]) {
if (userfields[i] == 'introduction') {
var td = TD();
td.innerHTML = r[userfields[i]];
appendChildNodes(row, td);
}
else {
appendChildNodes(row, TD(null, r[userfields[i]]));
}
}
else {
appendChildNodes(row, TD(null));
}
}
return row;
}
function doSearch() {
results.query = $('search_query').value;
results.type = $('search_type').options[$('search_type').selectedIndex].value;
results.offset = 0;
results.doupdate();
}
EOF;
$smarty
=
smarty
(
array
(
'tablerenderer'
));
if
(
isset
(
$_REQUEST
[
'query'
]))
{
$javascript
.
=
' results.query = '
.
json_encode
(
$query
)
.
";
\n
"
;
$javascript
.
=
" results.updateOnLoad();
\n
"
;
$smarty
->
assign
(
'search_query_value'
,
$query
);
}
$smarty
->
assign
(
'INLINEJAVASCRIPT'
,
$javascript
);
$smarty
->
display
(
'search.tpl'
);
?>
htdocs/theme/default/templates/search.tpl
deleted
100644 → 0
View file @
9b72eaa5
{
include
file
=
"header.tpl"
}
{
include
file
=
"columnfullstart.tpl"
}
<div
class=
"searchform"
>
<h2>
{
str
tag
=
"search"
}
</h2>
<form
action=
""
method=
"get"
onsubmit=
"doSearch(); return false;"
>
<label>
{
str
tag
=
Query
}
:
<input
type=
"text"
name=
"search_query"
id=
"search_query"
value=
"
{
$search_query_value
|
escape
}
"
>
</label>
<select
id=
"search_type"
>
<option
value=
"user"
>
{
str
tag
=
users
}
</option>
<option
value=
"group"
>
{
str
tag
=
groups
}
</option>
</select>
<input
type=
"submit"
class=
"submit"
value=
"
{
str
tag
=
'go'
}
"
>
</form>
</div>
<div
id=
"seachresults"
>
<h3>
{
str
tag
=
"Results"
}
</h3>
<table
id=
"searchresults"
class=
"hidden tablerenderer"
>
<tbody>
</tbody>
</table>
</div>
{
include
file
=
"columnfullend.tpl"
}
{
include
file
=
"footer.tpl"
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment