Merge branch 'access_dropdown-tpl' into 'dev'

move html from accesslist module to tpl

See merge request hubzilla/core!2257
This commit is contained in:
Mario
2026-01-21 13:24:35 +00:00
2 changed files with 29 additions and 17 deletions

View File

@@ -232,25 +232,17 @@ class Lockview extends Controller {
}
}
$access_list_header = '<div class="dropdown-header text-uppercase h6">' . t('Access') . '</div>';
$guest_access_list_header = '<div class="dropdown-header text-uppercase h6">' . t('Guest access') . '</div>';
$ocap_access_list_header = '<div class="dropdown-header text-uppercase h6">' . t('OCAP access') . '</div>';
$divider = '<div class="dropdown-divider"></div>';
$str = '';
$tpl = get_markup_template('access_dropdown.tpl');
if ($access_list) {
$str .= $access_list_header . implode($access_list);
}
echo replace_macros($tpl, [
'$access_header' => t('Access'),
'$guest_access_header' => t('Guest access'),
'$ocap_access_header' => t('OCAP access'),
if ($guest_access_list) {
$str .= $divider . $guest_access_list_header . implode($guest_access_list);
}
if ($ocap_access_list) {
$str .= $divider . $ocap_access_list_header . implode($ocap_access_list);
}
echo $str;
'$access_list' => $access_list ? implode($access_list) : '',
'$guest_access_list' => $guest_access_list ? implode($guest_access_list) : '',
'$ocap_access_list' => $ocap_access_list ? implode($ocap_access_list) : '',
]);
killme();
}

View File

@@ -0,0 +1,20 @@
{{if $access_list}}
<div class="dropdown-header text-uppercase h6">{{$access_header}}</div>
{{$access_list}}
{{/if}}
{{if $guest_access_list}}
{{if $access_list}}
<div class="dropdown-divider"></div>
{{/if}}
<div class="dropdown-header text-uppercase h6">{{$guest_access_header}}</div>
{{$guest_access_list}}
{{/if}}
{{if $ocap_access_list}}
{{if $access_list || $guest_access_list}}
<div class="dropdown-divider"></div>
{{/if}}
<div class="dropdown-header text-uppercase h6">{{$ocap_access_header}}</div>
{{$ocap_access_list}}
{{/if}}