harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/git-marijus/red

Browse Source 
Conflicts:
	view/theme/redbasic/css/style.css
This commit is contained in:
friendica 2013-12-09 15:45:52 -08:00
commit 70a81d6ad5
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/text.php
View File

@ -734,7 +734,7 @@ function search($s,$id='search-box',$url='/search',$save = false) {
$o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >';
$o .= '<input type="text" class="icon-search" name="search" id="search-text" placeholder="&#xf002;" value="' . $s .'" onclick="this.submit();" />';
$o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />';
if($save)
if(feature_enabled(local_user(),'savedsearch'))
$o .= '<input type="submit" name="save" id="search-save" value="' . t('Save') . '" />';
$o .= '</form></div>';
return $o;

2
mod/search.php
View File

@ -17,7 +17,7 @@ function search_saved_searches() {
$o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n";
$o .= '<ul id="saved-search-ul">' . "\r\n";
foreach($r as $rr) {
$o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="search/?f=&search=' . $rr['term'] . '" class="savedsearchterm" >' . htmlspecialchars($rr['term']) . '</a></li>' . "\r\n";
$o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . rawurlencode($rr['term']) . '" title="' . t('Remove term') . '" onclick="return confirmDelete();"><i class="icon-remove drop-icons"></i></a> <a href="search/?f=&search=' . $rr['term'] . '" class="savedsearchterm" >' . htmlspecialchars($rr['term']) . '</a></li>' . "\r\n";
}
$o .= '</ul><div class="clear"></div></div>' . "\r\n";
}

18
view/theme/redbasic/css/style.css
View File

@ -1232,13 +1232,26 @@ a.mail-list-link {
.groupsideedit {
margin-right: 10px;
}
#saved-search-ul {
list-style-type: none;
}
.saved-search-li i {
opacity: 0;
}
.saved-search-li:hover i {
opacity: 1;
}
/*
.savedsearchdrop, .savedsearchterm {
float: left;
margin-top: 10px;
}
*/
.savedsearchterm {
margin-left: 10px;
}
@ -2987,9 +3000,12 @@ img.mail-list-sender-photo {
}
.suggest-widget-more { margin-top: 10px; }
#note-text {
width: 190px;
max-width: 190px;
height: 150px;
}
#note-save { margin-top: 10px; }
#note-save { margin-top: 10px; }