[various] Convert addon_settings hook functions to the new data array format

- Add separate template files to several addons
- Remove superfluous addon settings CSS files
This commit is contained in:
Hypolite Petovan 2021-11-20 04:56:55 -05:00
parent f0522a998b
commit 779b38ec09
68 changed files with 444 additions and 953 deletions

View file

@ -25,9 +25,9 @@ define("CATAVATAR_SIZE", 256);
*/
function catavatar_install()
{
Hook::register('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
Hook::register('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
Hook::register('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
Hook::register('avatar_lookup', __FILE__, 'catavatar_lookup');
Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings');
Hook::register('addon_settings_post', __FILE__, 'catavatar_addon_settings_post');
Logger::notice('registered catavatar');
}
@ -35,24 +35,29 @@ function catavatar_install()
/**
* Cat avatar user settings page
*/
function catavatar_addon_settings(App $a, &$s)
function catavatar_addon_settings(App $a, array &$data)
{
if (!local_user()) {
return;
}
$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/');
$s .= Renderer::replaceMacros($t, [
'$postpost' => !empty($_POST['catavatar-morecat']) || !empty($_POST['catavatar-emailcat']),
'$uncache' => time(),
'$uid' => local_user(),
'$usecat' => DI::l10n()->t('Use Cat as Avatar'),
'$morecat' => DI::l10n()->t('More Random Cat!'),
'$emailcat' => DI::l10n()->t('Reset to email Cat'),
'$seed' => DI::pConfig()->get(local_user(), 'catavatar', 'seed', false),
'$header' => DI::l10n()->t('Cat Avatar Settings'),
$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/');
$html = Renderer::replaceMacros($t, [
'$uncache' => time(),
'$uid' => local_user(),
'$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the cat.'),
]);
$data = [
'addon' => 'catavar',
'title' => DI::l10n()->t('Cat Avatar Settings'),
'html' => $html,
'submit' => [
'catavatar-usecat' => DI::l10n()->t('Use Cat as Avatar'),
'catavatar-morecat' => DI::l10n()->t('Another random Cat!'),
'catavatar-emailcat' => DI::pConfig()->get(local_user(), 'catavatar', 'seed', false) ? DI::l10n()->t('Reset to email Cat') : null,
],
];
}
/**

View file

@ -1,24 +1,2 @@
<span id="settings_catavatar_inflated" class="settings-block fakelink"
style="{{if $postpost}}display: none;{{else}}display: block;{{/if}}"
onclick="openClose('settings_catavatar_expanded'); openClose('settings_catavatar_inflated');">
<h3>{{$header}}</h3>
</span>
<div id="settings_catavatar_expanded" class="settings-block"
style="{{if $postpost}}display: block;{{else}}display: none;{{/if}}">
<span class="fakelink" onclick="openClose('settings_catavatar_expanded'); openClose('settings_catavatar_inflated');">
<h3>{{$header}}</h3>
</span>
<img src="{{$basepath}}/catavatar/{{$uid}}?{{$uncache}}">
<p>{{$setrandomize}}</p>
<div class="settings-submit-wrapper" >
<button type="submit" name="catavatar-usecat"
class="btn btn-primary settings-submit" value="{{$usecat}}">{{$usecat}}</button>
<div class="btn-group" role="group" aria-label="...">
<button type="submit" name="catavatar-morecat"
class="btn btn-default settings-submit" value="{{$morecat}}">{{$morecat}}</button>
<button type="submit" name="catavatar-emailcat" {{if !$seed}}disabled{{/if}}
class="btn btn-default settings-submit" value="{{$emailcat}}">{{$emailcat}}</button>
</div>
</div>
</div>
<p>{{$setrandomize}}</p>
<p><img src="{{$basepath}}/catavatar/{{$uid}}?{{$uncache}}"></p>