Skip to content

refactor(responsive): use ResponsiveChromeRenderer, consolidate CSS #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ralflang merged 3 commits into from
May 25, 2026
Merged

refactor(responsive): use ResponsiveChromeRenderer, consolidate CSS #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff7ce3e
fix(themes): add screen.css stub for theme discovery
ralflang May 24, 2026
b37ce62
refactor(responsive): use ResponsiveChromeRenderer, consolidate CSS
ralflang May 24, 2026
baeaa82
docs: add Lucide Icons license notice
ralflang May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions doc/LUCIDE-LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
The application icon in themes/default/graphics/ is derived from Lucide Icons,
converted to PNG format.

Source: https://github.com/lucide-icons/lucide
License: ISC (with some icons under MIT via Feather Icons)

The full license text follows below.

========================================================================

ISC License

Copyright (c) 2020 Lucide Icons and Contributors

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

========================================================================

Some Lucide icons are derived from Feather Icons by Cole Bemis:

The MIT License (MIT)

Copyright (c) 2013-present Cole Bemis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
65 changes: 17 additions & 48 deletions src/ResponsivePasswordController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace Horde\Passwd;

use Horde\Core\Assets\ResponsiveAssets;
use Horde\Core\Config\RegistryState;
use Horde\Core\PageOutput\PageContent;
use Horde\Core\PageOutput\ResponsiveChromeRenderer;
use Horde\Core\View\ResponsiveTemplateView;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
Expand All @@ -28,31 +28,15 @@
*/
class ResponsivePasswordController implements RequestHandlerInterface
{
/**
* Handle password change request
*
* @param ServerRequestInterface $request The request object
*
* @return ResponseInterface The response
*/
public function handle(ServerRequestInterface $request): ResponseInterface
{
global $registry, $session, $injector, $conf;

// Get form variables
$vars = $injector->getInstance('Horde_Variables');

// Use existing Passwd_Basic for business logic
$basic = new \Passwd_Basic($vars);

// Build responsive assets
$responsiveAssets = new ResponsiveAssets(new RegistryState($registry->applications));

// Get backend info
$backends = $injector->getInstance('Passwd_Factory_Driver')->backends;
$backend_key = $vars->backend;
if (!isset($backends[$backend_key])) {
// Choose first available backend
foreach ($backends as $k => $v) {
if (substr($k, 0, 1) != '_') {
$backend_key = $k;
Expand All @@ -61,10 +45,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface
}
}

// Determine if we should show backend selector
$showlist = ($conf['backend']['backend_list'] == 'shown');

// Build header text
if ($showlist) {
$header = _("Change your password");
} else {
Expand All @@ -74,24 +56,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
);
}

// Prepare view data
$viewData = [
// Topbar data
'topbar' => [
'appName' => _("Change Password"),
'portalUrl' => (string) $registry->getServiceLink('portal')->setRaw(true),
'logoutUrl' => (string) $registry->getServiceLink('logout')->setRaw(true),
'userName' => $registry->getAuth(),
],

// Asset URIs
'hordeThemesUri' => $registry->get('themesuri', 'horde'),
'hordeJsUri' => $registry->get('jsuri', 'horde'),
'passwdThemesUri' => $registry->get('themesuri', 'passwd'),
'passwdJsUri' => $registry->get('jsuri', 'passwd'),
'registry' => $registry,

// Form data
'formInput' => \Horde_Util::formInput(),
'url' => $vars->return_to ?: '',
'userid' => $registry->getAuth() ?: '',
Expand All @@ -101,34 +66,38 @@ public function handle(ServerRequestInterface $request): ResponseInterface
'backend' => $backend_key,
'token' => $session->getToken(),
'header' => $header,

// Status messages (use responsive listener for proper CSS classes)
'status' => $this->getStatusMessages(),
];

// Render responsive template
$templatePath = PASSWD_TEMPLATES . '/responsive.html.php';
$templatePath = PASSWD_TEMPLATES . '/responsive-body.html.php';
$view = new ResponsiveTemplateView($templatePath, $viewData);
$bodyHtml = $view->render();

$chromeRenderer = $injector->get(ResponsiveChromeRenderer::class);
$pageContent = new PageContent(
title: _("Change Password") . ' - Horde',
bodyHtml: $bodyHtml,
app: 'passwd',
jsFiles: ['passwd-responsive.js'],
);

$pageHtml = $chromeRenderer->renderPage($pageContent, $request);

$streamFactory = $injector->getInstance('Psr\Http\Message\StreamFactoryInterface');
$responseFactory = $injector->getInstance('Psr\Http\Message\ResponseFactoryInterface');

return $responseFactory->createResponse(200)
->withBody($streamFactory->createStream($view->render()));
->withHeader('Content-Type', 'text/html; charset=UTF-8')
->withBody($streamFactory->createStream($pageHtml));
}

/**
* Get status messages using responsive listener
*
* @return string HTML status messages
*/
private function getStatusMessages(): string
{
$notification = $GLOBALS['notification'] ?? null;
if (!$notification) {
return '';
}

// Register our responsive listener if not already registered
if (!$notification->getListener('responsive_status')) {
$notification->attach(
'responsive_status',
Expand Down
113 changes: 113 additions & 0 deletions templates/responsive-body.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<main class="container passwd-container">
<div class="card passwd-card">
<div class="card-header">
<h2 class="card-title"><?= htmlspecialchars($header) ?></h2>
</div>

<?php if ($status): ?>
<?= $status ?>
<?php endif; ?>

<form method="post" action="" id="passwd-form">
<?= $formInput ?>
<input type="hidden" name="token" value="<?= htmlspecialchars($token) ?>">
<?php if (!empty($url)): ?>
<input type="hidden" name="return_to" value="<?= htmlspecialchars($url) ?>">
<?php endif; ?>
<?php if (!$showlist): ?>
<input type="hidden" name="backend" value="<?= htmlspecialchars($backend) ?>">

<div class="info-message">
<span class="info-icon">ℹ️</span>
<span class="info-text">
<?php
if ($backend === 'hordeauth') {
echo _("You are changing your Horde login password.");
} else {
echo sprintf(
_("You are changing the password for: %s"),
'<strong>' . htmlspecialchars($backends[$backend]['name']) . '</strong>'
);
}
?>
</span>
</div>
<?php endif; ?>

<?php if ($userChange): ?>
<div class="form-group">
<label for="passwd-userid" class="form-label">
<?= _("Username") ?>
</label>
<input type="text"
id="passwd-userid"
name="userid"
class="form-input"
value="<?= htmlspecialchars($userid) ?>"
required>
</div>
<?php endif; ?>

<?php if ($showlist): ?>
<div class="form-group">
<label for="passwd-backend" class="form-label">
<?= _("Change password for") ?>
</label>
<select id="passwd-backend"
name="backend"
class="form-input"
required>
<?php foreach ($backends as $key => $val): ?>
<?php if (substr($key, 0, 1) != '_'): ?>
<option value="<?= htmlspecialchars($key) ?>"
<?= $key == $backend ? 'selected' : '' ?>>
<?= htmlspecialchars($val['name']) ?>
</option>
<?php endif; ?>
<?php endforeach; ?>
</select>
</div>
<?php endif; ?>

<div class="form-group">
<label for="passwd-oldpassword" class="form-label">
<?= _("Old password") ?>
</label>
<input type="password"
id="passwd-oldpassword"
name="oldpassword"
class="form-input"
autocomplete="current-password"
required>
</div>

<div class="form-group">
<label for="passwd-newpassword0" class="form-label">
<?= _("New password") ?>
</label>
<input type="password"
id="passwd-newpassword0"
name="newpassword0"
class="form-input"
autocomplete="new-password"
required>
</div>

<div class="form-group">
<label for="passwd-newpassword1" class="form-label">
<?= _("Confirm new password") ?>
</label>
<input type="password"
id="passwd-newpassword1"
name="newpassword1"
class="form-input"
autocomplete="new-password"
required>
</div>

<button type="submit" name="submit" value="1" class="btn btn-primary btn-block">
<?= _("Change Password") ?>
</button>
</form>
</div>
</main>
Loading
Loading