Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/edge' into edge
Browse files Browse the repository at this point in the history
  • Loading branch information
@math-GH
math-GH committed Mar 21, 2024
2 parents 19a1f47 + 1c0b8a7 commit 3accfac
Show file tree
Hide file tree
Showing 37 changed files with 994 additions and 951 deletions.
6 changes: 3 additions & 3 deletions Docker/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,8 @@ services:
# So if changes are made (or in .env file), first delete the service and volumes.
# ℹ️ All the --db-* parameters can be omitted if using built-in SQLite database.
FRESHRSS_INSTALL: |-
--api_enabled
--base_url ${BASE_URL}
--api-enabled
--base-url ${BASE_URL}
--db-base ${DB_BASE}
--db-host ${DB_HOST}
--db-password ${DB_PASSWORD}
Expand All @@ -362,7 +362,7 @@ services:
--default_user admin
--language en
FRESHRSS_USER: |-
--api_password ${ADMIN_API_PASSWORD}
--api-password ${ADMIN_API_PASSWORD}
--email ${ADMIN_EMAIL}
--language en
--password ${ADMIN_PASSWORD}
Expand Down
7 changes: 3 additions & 4 deletions app/install.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ function printStep0(): void {
</div>
</div>

<h2><?= _t('install.language.choose') ?></h2>
<form action="index.php?step=0" method="post">
<legend><?= _t('install.language.choose') ?></legend>
<div class="form-group">
<label class="group-name" for="language"><?= _t('install.language') ?></label>
<div class="group-controls">
Expand Down Expand Up @@ -522,8 +522,8 @@ function printStep2(): void {
(empty($_SESSION['bd_error']) ? '' : ' : ' . $_SESSION['bd_error']) ?></p>
<?php } ?>

<h2><?= _t('install.bdd.conf') ?></h2>
<form action="index.php?step=2" method="post" autocomplete="off">
<legend><?= _t('install.bdd.conf') ?></legend>
<div class="form-group">
<label class="group-name" for="type"><?= _t('install.bdd.type') ?></label>
<div class="group-controls">
Expand Down Expand Up @@ -622,9 +622,8 @@ function printStep3(): void {
<p class="alert alert-error"><?= _t('install.fix_errors_before') ?></p>
<?php } ?>

<h2><?= _t('install.conf') ?></h2>
<form action="index.php?step=3" method="post">
<legend><?= _t('install.conf') ?></legend>

<div class="form-group">
<label class="group-name" for="default_user"><?= _t('install.default_user') ?></label>
<div class="group-controls">
Expand Down
5 changes: 3 additions & 2 deletions app/layout/layout.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
/** @var FreshRSS_View $this */
FreshRSS::preLayout();
$class = '';
$dir = '';
if (_t('gen.dir') === 'rtl') {
echo ' dir="rtl"';
$dir = ' dir="rtl"';
$class = 'rtl ';
}
if (FreshRSS_Context::userConf()->darkMode !== 'no') {
$class .= 'darkMode_' . FreshRSS_Context::userConf()->darkMode;
}
?>
<!DOCTYPE html>
<html lang="<?= FreshRSS_Context::userConf()->language ?>" xml:lang="<?= FreshRSS_Context::userConf()->language ?>" class="<?= $class ?>">
<html lang="<?= FreshRSS_Context::userConf()->language ?>"<?= $dir ?> xml:lang="<?= FreshRSS_Context::userConf()->language ?>" class="<?= $class ?>">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
Expand Down
5 changes: 3 additions & 2 deletions app/layout/simple.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
/** @var FreshRSS_View $this */
FreshRSS::preLayout();
$class = '';
$dir = '';
if (_t('gen.dir') === 'rtl') {
echo ' dir="rtl"';
$dir = ' dir="rtl"';
$class = 'rtl ';
}
if (FreshRSS_Context::userConf()->darkMode !== 'no') {
$class .= 'darkMode_' . FreshRSS_Context::userConf()->darkMode;
}
?>
<!DOCTYPE html>
<html lang="<?= FreshRSS_Context::userConf()->language ?>" xml:lang="<?= FreshRSS_Context::userConf()->language ?>" class="<?= $class ?>">
<html lang="<?= FreshRSS_Context::userConf()->language ?>"<?= $dir ?> xml:lang="<?= FreshRSS_Context::userConf()->language ?>" class="<?= $class ?>">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
Expand Down
20 changes: 9 additions & 11 deletions app/views/configure/integration.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<form method="post" action="<?= _url('configure', 'integration') ?>" class="draggableList">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<template id="simple-share">
<formgroup class="group-share dragbox">
<fieldset class="group-share dragbox">
<legend draggable="true">##label##</legend>
<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" data-leave-validation="" />
<div class="form-group" id="group-share-##key##">
Expand All @@ -27,10 +27,10 @@
<button type="button" class="remove btn btn-attention" title="<?= _t('conf.sharing.remove') ?>"><?= _t('gen.action.remove') ?></button>
</div>
</div>
</formgroup>
</fieldset>
</template>
<template id="advanced-share">
<formgroup class="group-share dragbox">
<fieldset class="group-share dragbox">
<legend draggable="true">##label##</legend>
<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" data-leave-validation="" />
<input type="hidden" id="share_##key##_method" name="share[##key##][method]" value="##method##" />
Expand All @@ -53,7 +53,7 @@
<button type="button" class="remove btn btn-attention" title="<?= _t('conf.sharing.remove') ?>"><?= _t('gen.action.remove') ?></button>
</div>
</div>
</formgroup>
</fieldset>
</template>

<?php
Expand All @@ -64,7 +64,7 @@
}
$share->update($share_options);
?>
<formgroup class="group-share dragbox" id="group-share-<?= $key ?>">
<fieldset class="group-share dragbox" id="group-share-<?= $key ?>">
<legend draggable="true"><?= $share->name(true) ?></legend>
<input type="hidden" id="share_<?= $key ?>_type" name="share[<?= $key ?>][type]" value="<?= $share->type() ?>" />
<input type="hidden" id="share_<?= $key ?>_method" name="share[<?= $key ?>][method]" value="<?= $share->method() ?>" />
Expand Down Expand Up @@ -110,13 +110,11 @@
</div>


</formgroup>
</fieldset>
<?php } ?>

<formgroup>
<legend>
<?= _t('conf.sharing.add') ?>
</legend>
<fieldset>
<legend><?= _t('conf.sharing.add') ?></legend>
<div class="form-group">
<div class="group-controls">
<div class="stick">
Expand All @@ -132,7 +130,7 @@
</div>
</div>
</div>
</formgroup>
</fieldset>

<div class="form-group form-actions">
<div class="group-controls">
Expand Down
2 changes: 1 addition & 1 deletion app/views/configure/system.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</div>
</div>

<legend><?= _t('admin.system.registration.title') ?></legend>
<h2><?= _t('admin.system.registration.title') ?></h2>

<div class="form-group">
<label class="group-name" for="max-registrations-select"><?= _t('admin.system.registration.select.label') ?></label>
Expand Down
118 changes: 62 additions & 56 deletions app/views/feed/add.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/** @var FreshRSS_View $this */
if ($this->feed !== null) {
?>
<main class="post">
<main class="post bookmarklet">
<h1><?= _t('sub.feed.add') ?></h1>

<?php if (!$this->load_ok) { ?>
Expand All @@ -12,76 +12,82 @@

<form method="post" action="<?= _url('feed', 'add') ?>" autocomplete="off">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<legend><?= _t('sub.feed.information') ?></legend>
<?php if ($this->load_ok) { ?>
<div class="form-group">
<label class="group-name"><?= _t('sub.feed.title') ?></label>
<div class="group-controls">
<label><?= $this->feed->name() ?></label>
<fieldset>
<legend><?= _t('sub.feed.information') ?></legend>
<?php if ($this->load_ok) { ?>
<div class="form-group">
<label class="group-name"><?= _t('sub.feed.title') ?></label>
<div class="group-controls">
<label><?= $this->feed->name() ?></label>
</div>
</div>
</div>

<?php $desc = $this->feed->description(); if ($desc != '') { ?>
<div class="form-group">
<label class="group-name"><?= _t('sub.feed.description') ?></label>
<div class="group-controls">
<label><?= htmlspecialchars($desc, ENT_NOQUOTES, 'UTF-8') ?></label>
<?php $desc = $this->feed->description(); if ($desc != '') { ?>
<div class="form-group">
<label class="group-name"><?= _t('sub.feed.description') ?></label>
<div class="group-controls">
<label><?= htmlspecialchars($desc, ENT_NOQUOTES, 'UTF-8') ?></label>
</div>
</div>
</div>
<?php } ?>
<?php } ?>

<div class="form-group">
<label class="group-name"><?= _t('sub.feed.website') ?></label>
<div class="group-controls">
<div class="stick">
<input type="text" value="<?= $this->feed->website() ?>" disabled="disabled" />
<a class="btn" target="_blank" rel="noreferrer" href="<?= $this->feed->website() ?>"><?= _i('link') ?></a>
<div class="form-group">
<label class="group-name"><?= _t('sub.feed.website') ?></label>
<div class="group-controls">
<div class="stick">
<input type="text" value="<?= $this->feed->website() ?>" disabled="disabled" />
<a class="btn" target="_blank" rel="noreferrer" href="<?= $this->feed->website() ?>"><?= _i('link') ?></a>
</div>
</div>
</div>
</div>
<?php } ?>
<?php } ?>

<div class="form-group">
<label class="group-name" for="url"><?= _t('sub.feed.url') ?></label>
<div class="group-controls">
<div class="stick">
<input type="text" name="url_rss" id="url" value="<?= $this->feed->url() ?>" />
<a class="btn open-url" target="_blank" rel="noreferrer" href="<?= $this->feed->url() ?>" data-input="url" title="<?= _t('gen.action.open_url') ?>"><?= _i('link') ?></a>
<div class="form-group">
<label class="group-name" for="url"><?= _t('sub.feed.url') ?></label>
<div class="group-controls">
<div class="stick">
<input type="text" name="url_rss" id="url" value="<?= $this->feed->url() ?>" />
<a class="btn open-url" target="_blank" rel="noreferrer" href="<?= $this->feed->url() ?>" data-input="url" title="<?= _t('gen.action.open_url') ?>"><?= _i('link') ?></a>
</div>
<br />
<a class="btn" target="_blank" rel="noreferrer" href="https://validator.w3.org/feed/check.cgi?url=<?= $this->feed->url() ?>"><?= _t('sub.feed.validator') ?></a>
</div>
<br />
<a class="btn" target="_blank" rel="noreferrer" href="https://validator.w3.org/feed/check.cgi?url=<?= $this->feed->url() ?>"><?= _t('sub.feed.validator') ?></a>
</div>
</div>
<div class="form-group">
<label class="group-name" for="category"><?= _t('sub.category') ?></label>
<div class="group-controls">
<select name="category" id="category">
<?php foreach ($this->categories as $cat) { ?>
<option value="<?= $cat->id() ?>"<?= $cat->id() == 1 ? ' selected="selected"' : '' ?>>
<?= $cat->name() ?>
</option>
<?php } ?>
</select>
<div class="form-group">
<label class="group-name" for="category"><?= _t('sub.category') ?></label>
<div class="group-controls">
<select name="category" id="category">
<?php foreach ($this->categories as $cat) { ?>
<option value="<?= $cat->id() ?>"<?= $cat->id() == 1 ? ' selected="selected"' : '' ?>>
<?= $cat->name() ?>
</option>
<?php } ?>
</select>
</div>
</div>
</div>
</fieldset>

<legend><?= _t('sub.feed.auth.http') ?></legend>
<?php $auth = $this->feed->httpAuth(false); ?>
<div class="form-group">
<label class="group-name" for="http_user"><?= _t('sub.feed.auth.username') ?></label>
<div class="group-controls">
<input type="text" name="http_user" id="http_user" value="<?= $auth['username'] ?>" autocomplete="off" />
<p class="help"><?= _i('help') ?> <?= _t('sub.feed.auth.help') ?></p>
<fieldset>
<legend><?= _t('sub.feed.auth.http') ?></legend>
<?php $auth = $this->feed->httpAuth(false); ?>
<div class="form-group">
<label class="group-name" for="http_user"><?= _t('sub.feed.auth.username') ?></label>
<div class="group-controls">
<input type="text" name="http_user" id="http_user" value="<?= $auth['username'] ?>" autocomplete="off" />
<p class="help"><?= _i('help') ?> <?= _t('sub.feed.auth.help') ?></p>
</div>
</div>

<label class="group-name" for="http_pass"><?= _t('sub.feed.auth.password') ?></label>
<div class="group-controls">
<div class="stick">
<input type="password" name="http_pass" id="http_pass" value="<?= $auth['password'] ?>" autocomplete="new-password" />
<button type="button" class="btn toggle-password" data-toggle="http_pass"><?= _i('key') ?></button>
<div class="form-group">
<label class="group-name" for="http_pass"><?= _t('sub.feed.auth.password') ?></label>
<div class="group-controls">
<div class="stick">
<input type="password" name="http_pass" id="http_pass" value="<?= $auth['password'] ?>" autocomplete="new-password" />
<button type="button" class="btn toggle-password" data-toggle="http_pass"><?= _i('key') ?></button>
</div>
</div>
</div>
</div>
</fieldset>

<div class="form-group form-actions">
<div class="group-controls">
Expand Down
11 changes: 10 additions & 1 deletion app/views/feed/contentSelectorPreview.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@
declare(strict_types=1);
/** @var FreshRSS_View $this */
FreshRSS::preLayout();
$class = '';
$dir = '';
if (_t('gen.dir') === 'rtl') {
$dir = ' dir="rtl"';
$class = 'rtl ';
}
if (FreshRSS_Context::userConf()->darkMode !== 'no') {
$class .= 'darkMode_' . FreshRSS_Context::userConf()->darkMode;
}
?>
<!DOCTYPE html>
<html class="preview_background" lang="<?= FreshRSS_Context::userConf()->language ?>" xml:lang="<?= FreshRSS_Context::userConf()->language ?>">
<html class="preview_background" lang="<?= FreshRSS_Context::userConf()->language ?>"<?= $dir ?> xml:lang="<?= FreshRSS_Context::userConf()->language ?>" class="<?= $class ?>">
<head>
<?= FreshRSS_View::headStyle() ?>
<script src="<?= Minz_Url::display('/scripts/preview.js?' . @filemtime(PUBLIC_PATH . '/scripts/preview.js')) ?>"></script>
Expand Down
Loading

0 comments on commit 3accfac

Please sign in to comment.