valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add search to plugin installer

This commit is contained in:
Andrew Dolgov 2021-03-04 15:52:37 +03:00
parent 2f6ea8b387
commit 04128c7870
9 changed files with 116 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes/pref/prefs.php
View File

@ -802,7 +802,7 @@ class Pref_Prefs extends Handler_Protected {
if ($about[3] ?? false) {
$is_checked = in_array($name, $system_enabled) ? "checked" : "";
?>
<fieldset class='prefs plugin'>
<fieldset class='prefs plugin' data-plugin-name='<?= htmlspecialchars($name) ?>'>
<label><?= $name ?>:</label>
<label class='checkbox description text-muted' id="PLABEL-<?= htmlspecialchars($name) ?>">
<input disabled='1' dojoType='dijit.form.CheckBox' <?= $is_checked ?> type='checkbox'><?= htmlspecialchars($about[1]) ?>
@ -867,7 +867,7 @@ class Pref_Prefs extends Handler_Protected {
}
?>
<fieldset class='prefs plugin'>
<fieldset class='prefs plugin' data-plugin-name='<?= htmlspecialchars($name) ?>'>
<label><?= $name ?>:</label>
<label class='checkbox description text-muted' id="PLABEL-<?= htmlspecialchars($name) ?>">
<input name='plugins[]' value="<?= htmlspecialchars($name) ?>"
@ -1353,14 +1353,20 @@ class Pref_Prefs extends Handler_Protected {
}
}
private function _get_available_plugins() {
private function _get_available_plugins(array $installed = []) {
if ($_SESSION["access_level"] >= 10 && Config::get(Config::ENABLE_PLUGIN_INSTALLER)) {
return json_decode(UrlHelper::fetch(['url' => 'https://tt-rss.org/plugins.json']), true);
$obj = json_decode(UrlHelper::fetch(['url' => 'https://tt-rss.org/plugins.json']));
// TODO: filter installed, we'll need class names in the plugins.json
return $obj;
}
}
function getAvailablePlugins() {
$installed = $_REQUEST['installed'];
if ($_SESSION["access_level"] >= 10) {
print json_encode($this->_get_available_plugins());
print json_encode($this->_get_available_plugins($installed));
}
}

52
js/PrefHelpers.js
View File

@ -370,8 +370,10 @@ const Helpers = {
PI_ERR_NO_TEMPDIR: "PI_ERR_NO_TEMPDIR",
PI_ERR_PLUGIN_NOT_FOUND: "PI_ERR_PLUGIN_NOT_FOUND",
PI_ERR_NO_WORKDIR: "PI_ERR_NO_WORKDIR",
title: __("List of plugins"),
title: __("Available plugins"),
need_refresh: false,
entries: false,
search_query: "",
onHide: function() {
if (this.need_refresh) {
Helpers.Prefs.refresh();
@ -428,18 +430,26 @@ const Helpers = {
install_dialog.show();
},
refresh: function() {
search: function() {
this.search_query = this.attr('value').search.toLowerCase();
this.render_contents();
},
render_contents: function() {
const container = dialog.domNode.querySelector(".contents");
container.innerHTML = `<li class='text-center'>${__("Looking for plugins...")}</li>`;
xhr.json("backend.php", {op: "pref-prefs", method: "getAvailablePlugins"}, (reply) => {
if (!reply) {
if (!dialog.entries) {
container.innerHTML = `<li class='text-center text-error'>${__("Operation failed: check event log.")}</li>`;
} else {
container.innerHTML = "";
reply.forEach((plugin) => {
let results_rendered = 0;
dialog.entries.forEach((plugin) => {
if (!dialog.search_query ||
(plugin.name.toLowerCase().indexOf(dialog.search_query) != -1 || plugin.description.toLowerCase().indexOf(dialog.search_query) != -1)) {
++results_rendered;
container.innerHTML += `
<li data-row-value="${App.escapeHtml(plugin.name)}">
<h3 style="margin-top: 0">${plugin.name}
@ -456,17 +466,39 @@ const Helpers = {
<hr/>
</li>
`
}
});
if (results_rendered == 0) {
container.innerHTML = `<li class='text-center text-info'>${__("Could not find any plugins for this search query.")}</li>`;
}
dojo.parser.parse(container);
}
},
reload: function() {
const container = dialog.domNode.querySelector(".contents");
container.innerHTML = `<li class='text-center'>${__("Looking for plugins...")}</li>`;
const installed = [...document.querySelectorAll('*[data-plugin-name]')].map((p) => p.getAttribute('data-plugin-name'));
xhr.json("backend.php", {op: "pref-prefs", method: "getAvailablePlugins", 'installed[]': installed}, (reply) => {
dialog.entries = reply;
dialog.render_contents();
});
},
content: `
<ul class="panel panel-scrollable contents"> </ul>
<div dojoType='fox.Toolbar'>
<div class='pull-right'>
<input name="search" placeholder="${__("Search...")}" type="search" dojoType="dijit.form.TextBox" onkeyup="App.dialogOf(this).search()">
</div>
<div style='height : 16px'>&nbsp;</div> <!-- disgusting -->
</div>
<ul style='clear : both' class="panel panel-scrollable-400px contents"> </ul>
<footer>
${App.FormFields.button_tag(__("Refresh"), "", {class: 'alt-primary', onclick: 'App.dialogOf(this).refresh()'})}
${App.FormFields.button_tag(__("Refresh"), "", {class: 'alt-primary', onclick: 'App.dialogOf(this).reload()'})}
${App.FormFields.cancel_dialog_tag(__("Close"))}
</footer>
`,
@ -474,7 +506,7 @@ const Helpers = {
const tmph = dojo.connect(dialog, 'onShow', function () {
dojo.disconnect(tmph);
dialog.refresh();
dialog.reload();
});
dialog.show();

10
themes/compact.css
View File

@ -988,6 +988,10 @@ body.ttrss_main .panel-scrollable {
overflow: auto;
height: 200px;
}
body.ttrss_main .panel-scrollable-400px {
overflow: auto;
height: 400px;
}
body.ttrss_main ul.list li {
padding: 2px;
}
@ -1715,9 +1719,13 @@ body.ttrss_utility.share_popup .content {
font-size: 13px;
padding: 0px;
}
.flat .dijitToolbar .dijitTextBox .dijitInputInner {
.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner {
line-height: 10px;
}
.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitPlaceHolder {
line-height: 15px;
margin-left: 0;
}
.flat .dijitToolbar label {
position: relative;
top: 2px;

10
themes/compact_night.css
View File

@ -988,6 +988,10 @@ body.ttrss_main .panel-scrollable {
overflow: auto;
height: 200px;
}
body.ttrss_main .panel-scrollable-400px {
overflow: auto;
height: 400px;
}
body.ttrss_main ul.list li {
padding: 2px;
}
@ -1617,9 +1621,13 @@ body.ttrss_utility fieldset > label.checkbox {
font-size: 13px;
padding: 0px;
}
.flat .dijitToolbar .dijitTextBox .dijitInputInner {
.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner {
line-height: 10px;
}
.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitPlaceHolder {
line-height: 15px;
margin-left: 0;
}
.flat .dijitToolbar label {
position: relative;
top: 2px;

10
themes/light.css
View File

@ -988,6 +988,10 @@ body.ttrss_main .panel-scrollable {
overflow: auto;
height: 200px;
}
body.ttrss_main .panel-scrollable-400px {
overflow: auto;
height: 400px;
}
body.ttrss_main ul.list li {
padding: 2px;
}
@ -1715,9 +1719,13 @@ body.ttrss_utility.share_popup .content {
font-size: 13px;
padding: 0px;
}
.flat .dijitToolbar .dijitTextBox .dijitInputInner {
.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner {
line-height: 10px;
}
.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitPlaceHolder {
line-height: 15px;
margin-left: 0;
}
.flat .dijitToolbar label {
position: relative;
top: 2px;

9
themes/light/dijit_basic.less
View File

@ -41,10 +41,17 @@
font-size: 13px;
padding: 0px;
.dijitTextBox .dijitInputInner {
.dijitTextBox .dijitInputContainer {
.dijitInputInner {
line-height : 10px;
}
.dijitPlaceHolder {
line-height : 15px;
margin-left : 0;
}
}
label {
position : relative;
top : 2px;

5
themes/light/tt-rss.less
View File

@ -1171,6 +1171,11 @@ body.ttrss_main {
height : 200px;
}
.panel-scrollable-400px {
overflow : auto;
height : 400px;
}
ul.list li {
padding : 2px;
}

10
themes/night.css
View File

@ -989,6 +989,10 @@ body.ttrss_main .panel-scrollable {
overflow: auto;
height: 200px;
}
body.ttrss_main .panel-scrollable-400px {
overflow: auto;
height: 400px;
}
body.ttrss_main ul.list li {
padding: 2px;
}
@ -1618,9 +1622,13 @@ body.ttrss_utility fieldset > label.checkbox {
font-size: 13px;
padding: 0px;
}
.flat .dijitToolbar .dijitTextBox .dijitInputInner {
.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner {
line-height: 10px;
}
.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitPlaceHolder {
line-height: 15px;
margin-left: 0;
}
.flat .dijitToolbar label {
position: relative;
top: 2px;

10
themes/night_blue.css
View File

@ -989,6 +989,10 @@ body.ttrss_main .panel-scrollable {
overflow: auto;
height: 200px;
}
body.ttrss_main .panel-scrollable-400px {
overflow: auto;
height: 400px;
}
body.ttrss_main ul.list li {
padding: 2px;
}
@ -1618,9 +1622,13 @@ body.ttrss_utility fieldset > label.checkbox {
font-size: 13px;
padding: 0px;
}
.flat .dijitToolbar .dijitTextBox .dijitInputInner {
.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitInputInner {
line-height: 10px;
}
.flat .dijitToolbar .dijitTextBox .dijitInputContainer .dijitPlaceHolder {
line-height: 15px;
margin-left: 0;
}
.flat .dijitToolbar label {
position: relative;
top: 2px;