Merge pull request #2479 from annando/1604-vier-login
Vier: No visible login border/no search and events without login
This commit is contained in:
commit
714eb1a296
|
@ -118,15 +118,17 @@ function nav_info(&$a) {
|
|||
if(count($a->apps)>0)
|
||||
$nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
|
||||
|
||||
$nav['search'] = array('search', t('Search'), "", t('Search site content'));
|
||||
if (local_user() OR !get_config('system','local_search')) {
|
||||
$nav['search'] = array('search', t('Search'), "", t('Search site content'));
|
||||
|
||||
$nav['searchoption'] = array(
|
||||
t("Full Text"),
|
||||
t("Tags"),
|
||||
t("Contacts"));
|
||||
$nav['searchoption'] = array(
|
||||
t("Full Text"),
|
||||
t("Tags"),
|
||||
t("Contacts"));
|
||||
|
||||
if (get_config('system','poco_local_search'))
|
||||
$nav['searchoption'][] = t("Forums");
|
||||
if (get_config('system','poco_local_search'))
|
||||
$nav['searchoption'][] = t("Forums");
|
||||
}
|
||||
|
||||
$gdirpath = 'directory';
|
||||
|
||||
|
@ -140,7 +142,8 @@ function nav_info(&$a) {
|
|||
elseif(get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
|
||||
$nav['community'] = array('community', t('Community'), "", t('Conversations on the network'));
|
||||
|
||||
$nav['events'] = Array('events', t('Events'), "", t('Events and Calendar'));
|
||||
if(local_user())
|
||||
$nav['events'] = Array('events', t('Events'), "", t('Events and Calendar'));
|
||||
|
||||
$nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
|
||||
|
||||
|
|
|
@ -2378,6 +2378,11 @@ ul.tabs li .active, span.pager_current a {
|
|||
aside form {
|
||||
overflow-x: hidden;
|
||||
}
|
||||
aside form fieldset {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
border: 0px none;
|
||||
}
|
||||
aside form .field label {
|
||||
float: left;
|
||||
width: 170px;
|
||||
|
|
Loading…
Reference in a new issue