fixed HTML: <fieldset> + <legend> (#6202)

* legend tags cleaned

* formgroup -> fieldset tag

* add bookmarklet class

* Update logs.phtml

* Update logs.phtml

* fixed log table text alignment

1 files changed, 109 insertions, 105 deletions

diff --git a/app/views/helpers/configure/query.phtml b/app/views/helpers/configure/query.phtml
index 49ffbad87..cce398542 100644
--- a/app/views/helpers/configure/query.phtml
+++ b/app/views/helpers/configure/query.phtml
@@ -22,120 +22,124 @@
 			</div>
 		</div>
 
-		<legend><?= _t('conf.query.share') ?></legend>
-		<div class="form-group">
-			<div class="group-controls">
-				<label class="checkbox" for="shareRss">
-					<input type="checkbox" name="query[shareRss]" id="shareRss" value="1" <?= $this->query->shareRss() ? 'checked="checked"' : ''?> />
-					<?= _t('conf.query.filter.shareRss') ?>
-				</label>
-				<?php if ($this->query->sharedUrlRss() !== ''): ?>
-				<ul>
-					<li><a href="<?= $this->query->sharedUrlHtml() ?>"><?= _i('link') ?> <?= _t('conf.query.share.html') ?></a></li>
-					<li><a href="<?= $this->query->sharedUrlRss() ?>"><?= _i('link') ?> <?= _t('conf.query.share.rss') ?></a></li>
-				</ul>
-				<?php endif; ?>
-			</div>
-			<div class="group-controls">
-				<label class="checkbox" for="shareOpml">
-					<input type="checkbox" name="query[shareOpml]" id="shareOpml" value="1" <?= $this->query->shareOpml() && $this->query->safeForOpml() ? 'checked="checked"' : '' ?>
-						<?= $this->query->safeForOpml() ? '' : 'disabled="disabled"' ?> />
-					<?= _t('conf.query.filter.shareOpml') ?>
-				</label>
-				<?php if ($this->query->sharedUrlOpml() !== ''): ?>
-				<ul>
-					<li><a href="<?= $this->query->sharedUrlOpml() ?>"><?= _i('link') ?> <?= _t('conf.query.share.opml') ?></a></li>
-				</ul>
-				<?php endif; ?>
+		<fieldset>
+			<legend><?= _t('conf.query.share') ?></legend>
+			<div class="form-group">
+				<div class="group-controls">
+					<label class="checkbox" for="shareRss">
+						<input type="checkbox" name="query[shareRss]" id="shareRss" value="1" <?= $this->query->shareRss() ? 'checked="checked"' : ''?> />
+						<?= _t('conf.query.filter.shareRss') ?>
+					</label>
+					<?php if ($this->query->sharedUrlRss() !== ''): ?>
+					<ul>
+						<li><a href="<?= $this->query->sharedUrlHtml() ?>"><?= _i('link') ?> <?= _t('conf.query.share.html') ?></a></li>
+						<li><a href="<?= $this->query->sharedUrlRss() ?>"><?= _i('link') ?> <?= _t('conf.query.share.rss') ?></a></li>
+					</ul>
+					<?php endif; ?>
+				</div>
+				<div class="group-controls">
+					<label class="checkbox" for="shareOpml">
+						<input type="checkbox" name="query[shareOpml]" id="shareOpml" value="1" <?= $this->query->shareOpml() && $this->query->safeForOpml() ? 'checked="checked"' : '' ?>
+							<?= $this->query->safeForOpml() ? '' : 'disabled="disabled"' ?> />
+						<?= _t('conf.query.filter.shareOpml') ?>
+					</label>
+					<?php if ($this->query->sharedUrlOpml() !== ''): ?>
+					<ul>
+						<li><a href="<?= $this->query->sharedUrlOpml() ?>"><?= _i('link') ?> <?= _t('conf.query.share.opml') ?></a></li>
+					</ul>
+					<?php endif; ?>
+				</div>
+				<p class="help"><?= _i('help') ?> <?= _t('conf.query.share.help') ?></a></p>
+				<p class="help"><?= _i('help') ?> <?= _t('conf.query.help') ?></a></p>
 			</div>
-			<p class="help"><?= _i('help') ?> <?= _t('conf.query.share.help') ?></a></p>
-			<p class="help"><?= _i('help') ?> <?= _t('conf.query.help') ?></a></p>
-		</div>
 
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?= _t('gen.action.submit') ?></button>
+			<div class="form-group form-actions">
+				<div class="group-controls">
+					<button type="submit" class="btn btn-important"><?= _t('gen.action.submit') ?></button>
+				</div>
 			</div>
-		</div>
+		</fieldset>
 
-		<legend><?= _t('conf.query.filter') ?></legend>
-		<div class="form-group">
-			<label class="group-name" for=""><?= _t('conf.query.filter.search') ?></label>
-			<div class="group-controls">
-				<input type="text" id="query_search" name="query[search]" value="<?= htmlspecialchars($this->query->getSearch()->getRawInput(), ENT_COMPAT, 'UTF-8') ?>"/>
-				<p class="help"><?= _i('help') ?> <?= _t('gen.menu.search_help') ?></a></p>
+		<fieldset>
+			<legend><?= _t('conf.query.filter') ?></legend>
+			<div class="form-group">
+				<label class="group-name" for=""><?= _t('conf.query.filter.search') ?></label>
+				<div class="group-controls">
+					<input type="text" id="query_search" name="query[search]" value="<?= htmlspecialchars($this->query->getSearch()->getRawInput(), ENT_COMPAT, 'UTF-8') ?>"/>
+					<p class="help"><?= _i('help') ?> <?= _t('gen.menu.search_help') ?></a></p>
+				</div>
 			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for=""><?= _t('conf.query.filter.state') ?></label>
-			<div class="group-controls">
-				<label class="checkbox" for="show_read">
-					<input type="checkbox" name="query[state][]" id="show_read"
-						value="<?= FreshRSS_Entry::STATE_READ ?>" <?= FreshRSS_Entry::STATE_READ & $this->query->getState() ? 'checked="checked"' : ''?> />
-					<?= _t('index.menu.read') ?>
-				</label>
-				<label class="checkbox" for="show_not_read">
-					<input type="checkbox" name="query[state][]" id="show_not_read"
-						value="<?= FreshRSS_Entry::STATE_NOT_READ ?>" <?= FreshRSS_Entry::STATE_NOT_READ & $this->query->getState() ? 'checked="checked"' : ''?> />
-					<?= _t('index.menu.unread') ?>
-				</label>
-				<label class="checkbox" for="show_favorite">
-					<input type="checkbox" name="query[state][]" id="show_favorite"
-						value="<?= FreshRSS_Entry::STATE_FAVORITE ?>" <?= FreshRSS_Entry::STATE_FAVORITE & $this->query->getState() ? 'checked="checked"' : ''?> />
-					<?= _t('index.menu.starred') ?>
-				</label>
-				<label class="checkbox" for="show_not_favorite">
-					<input type="checkbox" name="query[state][]" id="show_not_favorite"
-						value="<?= FreshRSS_Entry::STATE_NOT_FAVORITE ?>" <?= FreshRSS_Entry::STATE_NOT_FAVORITE & $this->query->getState() ? 'checked="checked"' : ''?> />
-					<?= _t('index.menu.non-starred') ?>
-				</label>
+			<div class="form-group">
+				<label class="group-name" for=""><?= _t('conf.query.filter.state') ?></label>
+				<div class="group-controls">
+					<label class="checkbox" for="show_read">
+						<input type="checkbox" name="query[state][]" id="show_read"
+							value="<?= FreshRSS_Entry::STATE_READ ?>" <?= FreshRSS_Entry::STATE_READ & $this->query->getState() ? 'checked="checked"' : ''?> />
+						<?= _t('index.menu.read') ?>
+					</label>
+					<label class="checkbox" for="show_not_read">
+						<input type="checkbox" name="query[state][]" id="show_not_read"
+							value="<?= FreshRSS_Entry::STATE_NOT_READ ?>" <?= FreshRSS_Entry::STATE_NOT_READ & $this->query->getState() ? 'checked="checked"' : ''?> />
+						<?= _t('index.menu.unread') ?>
+					</label>
+					<label class="checkbox" for="show_favorite">
+						<input type="checkbox" name="query[state][]" id="show_favorite"
+							value="<?= FreshRSS_Entry::STATE_FAVORITE ?>" <?= FreshRSS_Entry::STATE_FAVORITE & $this->query->getState() ? 'checked="checked"' : ''?> />
+						<?= _t('index.menu.starred') ?>
+					</label>
+					<label class="checkbox" for="show_not_favorite">
+						<input type="checkbox" name="query[state][]" id="show_not_favorite"
+							value="<?= FreshRSS_Entry::STATE_NOT_FAVORITE ?>" <?= FreshRSS_Entry::STATE_NOT_FAVORITE & $this->query->getState() ? 'checked="checked"' : ''?> />
+						<?= _t('index.menu.non-starred') ?>
+					</label>
+				</div>
 			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for="query_get"><?= _t('conf.query.filter.type') ?></label>
-			<div class="group-controls">
-				<select name="query[get]" id="query_get" size="10">
-					<option value="a" <?= in_array($this->query->getGet(), ['', 'a'], true) ? 'selected="selected"' : '' ?>><?= _t('index.feed.title') ?></option>
-					<option value="i" <?= 'i' === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= _t('index.menu.important') ?></option>
-					<option value="s" <?= 's' === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= _t('index.feed.title_fav') ?></option>
-					<option value="T" <?= 'T' === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= _t('index.menu.tags') ?></option>
-					<optgroup label="<?= _t('conf.query.filter.tags') ?>">
-						<?php foreach ($this->tags as $tag): ?>
-							<option value="t_<?= $tag->id() ?>" <?= "t_{$tag->id()}" === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= $tag->name() ?></option>
-						<?php endforeach?>
-					</optgroup>
-					<optgroup label="<?= _t('conf.query.filter.categories') ?>">
-						<?php foreach ($this->categories as $category): ?>
-							<option value="c_<?= $category->id() ?>" <?= "c_{$category->id()}" === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= $category->name() ?></option>
-						<?php endforeach?>
-					</optgroup>
-					<optgroup label="<?= _t('conf.query.filter.feeds') ?>">
-						<?php foreach ($this->feeds as $feed): ?>
-							<option value="f_<?= $feed->id() ?>" <?= "f_{$feed->id()}" === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= $feed->name() ?></option>
-						<?php endforeach?>
-					</optgroup>
-				</select>
+			<div class="form-group">
+				<label class="group-name" for="query_get"><?= _t('conf.query.filter.type') ?></label>
+				<div class="group-controls">
+					<select name="query[get]" id="query_get" size="10">
+						<option value="a" <?= in_array($this->query->getGet(), ['', 'a'], true) ? 'selected="selected"' : '' ?>><?= _t('index.feed.title') ?></option>
+						<option value="i" <?= 'i' === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= _t('index.menu.important') ?></option>
+						<option value="s" <?= 's' === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= _t('index.feed.title_fav') ?></option>
+						<option value="T" <?= 'T' === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= _t('index.menu.tags') ?></option>
+						<optgroup label="<?= _t('conf.query.filter.tags') ?>">
+							<?php foreach ($this->tags as $tag): ?>
+								<option value="t_<?= $tag->id() ?>" <?= "t_{$tag->id()}" === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= $tag->name() ?></option>
+							<?php endforeach?>
+						</optgroup>
+						<optgroup label="<?= _t('conf.query.filter.categories') ?>">
+							<?php foreach ($this->categories as $category): ?>
+								<option value="c_<?= $category->id() ?>" <?= "c_{$category->id()}" === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= $category->name() ?></option>
+							<?php endforeach?>
+						</optgroup>
+						<optgroup label="<?= _t('conf.query.filter.feeds') ?>">
+							<?php foreach ($this->feeds as $feed): ?>
+								<option value="f_<?= $feed->id() ?>" <?= "f_{$feed->id()}" === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= $feed->name() ?></option>
+							<?php endforeach?>
+						</optgroup>
+					</select>
+				</div>
 			</div>
-		</div>
-		<div class="form-group">
-			<label class="group-name" for=""><?= _t('conf.query.filter.order') ?></label>
-			<div class="group-controls">
-				<select name="query[order]" id="query_order">
-					<option value=""></option>
-					<option value="DESC" <?= 'DESC' === $this->query->getOrder() ? 'selected="selected"' : '' ?>><?= _t('conf.query.order_desc') ?></option>
-					<option value="ASC" <?= 'ASC' === $this->query->getOrder() ? 'selected="selected"' : '' ?>><?= _t('conf.query.order_asc') ?></option>
-				</select>
+			<div class="form-group">
+				<label class="group-name" for=""><?= _t('conf.query.filter.order') ?></label>
+				<div class="group-controls">
+					<select name="query[order]" id="query_order">
+						<option value=""></option>
+						<option value="DESC" <?= 'DESC' === $this->query->getOrder() ? 'selected="selected"' : '' ?>><?= _t('conf.query.order_desc') ?></option>
+						<option value="ASC" <?= 'ASC' === $this->query->getOrder() ? 'selected="selected"' : '' ?>><?= _t('conf.query.order_asc') ?></option>
+					</select>
+				</div>
 			</div>
-		</div>
 
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?= _t('gen.action.submit') ?></button>
-				<button type="submit" class="btn btn-attention confirm"
-					data-str-confirm="<?= _t('gen.js.confirm_action_feed_cat') ?>"
-					formaction="<?= _url('configure', 'deleteQuery', 'id', $this->queryId) ?>"
-					formmethod="post"><?= _t('gen.action.remove') ?></button>
+			<div class="form-group form-actions">
+				<div class="group-controls">
+					<button type="submit" class="btn btn-important"><?= _t('gen.action.submit') ?></button>
+					<button type="submit" class="btn btn-attention confirm"
+						data-str-confirm="<?= _t('gen.js.confirm_action_feed_cat') ?>"
+						formaction="<?= _url('configure', 'deleteQuery', 'id', $this->queryId) ?>"
+						formmethod="post"><?= _t('gen.action.remove') ?></button>
+				</div>
 			</div>
-		</div>
+		</fieldset>
 	</form>
 </div>