diff options
author | Andrew Dolgov <[email protected]> | 2021-02-16 22:07:37 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2021-02-16 22:07:37 +0300 |
commit | 0fc783e2b350b8ac6ff275fd9b201674cbcf2c16 (patch) | |
tree | e3b88e90f25d40791acb01e178acded2d0d994a7 | |
parent | 89e8176c6912f757f400dd47d3495502db0b7322 (diff) |
cleanup markup in some plugins, make nsfw generate dijit widgets
-rwxr-xr-x | include/controls.php | 4 | ||||
-rw-r--r-- | plugins/note/init.php | 21 | ||||
-rw-r--r-- | plugins/nsfw/init.js | 13 | ||||
-rw-r--r-- | plugins/nsfw/init.php | 84 | ||||
-rw-r--r-- | plugins/share/init.php | 52 |
5 files changed, 83 insertions, 91 deletions
diff --git a/include/controls.php b/include/controls.php index 78ff75572..4c60d94f3 100755 --- a/include/controls.php +++ b/include/controls.php @@ -19,6 +19,10 @@ return button_tag($value, "submit", array_merge(["class" => "alt-primary"], $attributes)); } + function cancel_dialog_tag(string $value, array $attributes = []) { + return button_tag($value, "", array_merge(["onclick" => "App.dialogOf(this).hide()"], $attributes)); + } + function select_tag(string $name, $value, array $values, array $attributes = [], string $id = "") { $attributes_str = attributes_to_string($attributes); $dojo_type = strpos($attributes_str, "dojoType") === false ? "dojoType='fox.form.Select'" : ""; diff --git a/plugins/note/init.php b/plugins/note/init.php index 0634d4c57..12c56f7ad 100644 --- a/plugins/note/init.php +++ b/plugins/note/init.php @@ -42,19 +42,18 @@ class Note extends Plugin { print \Controls\hidden_tag("method", "setNote"); print \Controls\hidden_tag("plugin", "note"); - print "<textarea dojoType='dijit.form.SimpleTextarea' + ?> + <textarea dojoType='dijit.form.SimpleTextarea' style='font-size : 12px; width : 98%; height: 100px;' - name='note'>$note</textarea>"; - + name='note'><?= $note ?></textarea> + <?php } - - print "<footer class='text-center'>"; - print "<button dojoType=\"dijit.form.Button\" - onclick=\"dijit.byId('editNoteDlg').execute()\">".__('Save')."</button> "; - print "<button dojoType=\"dijit.form.Button\" - onclick=\"dijit.byId('editNoteDlg').hide()\">".__('Cancel')."</button>"; - print "</footer>"; - + ?> + <footer class='text-center'> + <?= \Controls\submit_tag(__('Save')) ?> + <?= \Controls\cancel_dialog_tag(__('Cancel')) ?> + </footer> + <?php } function setNote() { diff --git a/plugins/nsfw/init.js b/plugins/nsfw/init.js index adb6d43c0..4bc2443e8 100644 --- a/plugins/nsfw/init.js +++ b/plugins/nsfw/init.js @@ -1,7 +1,12 @@ -function nsfwShow(elem) { - let content = elem.parentNode.getElementsBySelector("div.nswf.content")[0]; +/* global Plugins */ - if (content) { - Element.toggle(content); +Plugins.NSFW = { + toggle: function(elem) { + const content = elem.domNode.parentNode.querySelector(".nswf.content"); + + if (content) { + Element.toggle(content); + } } } + diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php index 1b27cc017..fecbc62af 100644 --- a/plugins/nsfw/init.php +++ b/plugins/nsfw/init.php @@ -27,74 +27,64 @@ class NSFW extends Plugin { $a_tags = array_map("trim", explode(",", $article["tag_cache"])); if (count(array_intersect($tags, $a_tags)) > 0) { - $article["content"] = "<div class='nswf wrapper'><button onclick=\"nsfwShow(this)\">".__("Not work safe (click to toggle)")."</button> - <div class='nswf content' style='display : none'>".$article["content"]."</div></div>"; + $article["content"] = "<div class='nswf wrapper'>". + \Controls\button_tag(__("Not work safe (click to toggle)"), '', ['onclick' => 'Plugins.NSFW.toggle(this)']). + "<div class='nswf content' style='display : none'>".$article["content"]."</div> + </div>"; } return $article; } function hook_render_article_cdm($article) { - $tags = array_map("trim", explode(",", $this->host->get($this, "tags"))); - $a_tags = array_map("trim", explode(",", $article["tag_cache"])); - - if (count(array_intersect($tags, $a_tags)) > 0) { - $article["content"] = "<div class='nswf wrapper'><button onclick=\"nsfwShow(this)\">".__("Not work safe (click to toggle)")."</button> - <div class='nswf content' style='display : none'>".$article["content"]."</div></div>"; - } - - return $article; + return $this->hook_render_article($article); } function hook_prefs_tab($args) { if ($args != "prefPrefs") return; - print "<div dojoType=\"dijit.layout.AccordionPane\" - title=\"<i class='material-icons'>extension</i> ".__("NSFW Plugin")."\">"; - - print "<br/>"; - $tags = $this->host->get($this, "tags"); - print "<form dojoType=\"dijit.form.Form\">"; - - print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\"> - evt.preventDefault(); - if (this.validate()) { - new Ajax.Request('backend.php', { - parameters: dojo.objectToQuery(this.getValues()), - onComplete: function(transport) { - Notify.info(transport.responseText); + ?> + <div dojoType="dijit.layout.AccordionPane" + title="<i class='material-icons'>extension</i> <?= __("NSFW Plugin") ?>"> + <form dojoType="dijit.form.Form"> + + <?= \Controls\hidden_tag("op", "pluginhandler") ?> + <?= \Controls\hidden_tag("method", "save") ?> + <?= \Controls\hidden_tag("plugin", "nsfw") ?> + + <script type="dojo/method" event="onSubmit" args="evt"> + evt.preventDefault(); + if (this.validate()) { + new Ajax.Request('backend.php', { + parameters: dojo.objectToQuery(this.getValues()), + onComplete: function(transport) { + Notify.info(transport.responseText); + } + }); } - }); - //this.reset(); - } - </script>"; - - print \Controls\hidden_tag("op", "pluginhandler"); - print \Controls\hidden_tag("method", "save"); - print \Controls\hidden_tag("plugin", "nsfw"); - - print "<table width=\"100%\" class=\"prefPrefsList\">"; - - print "<tr><td width=\"40%\">".__("Tags to consider NSFW (comma-separated)")."</td>"; - print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"tags\" value=\"$tags\"></td></tr>"; + </script> - print "</table>"; + <header><?= __("Tags to consider NSFW (comma-separated):") ?></header> - print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">". - __("Save")."</button>"; + <fieldset> + <textarea dojoType='dijit.form.SimpleTextarea' rows='4' + style='width: 500px; font-size : 12px;' + name='tags'><?= $tags ?></textarea> + </fieldset> - print "</form>"; + <hr/> - print "</div>"; #pane + <?= \Controls\submit_tag(__("Save")) ?> + </form> + </div> + <?php } function save() { - $tags = explode(",", $_POST["tags"]); - $tags = array_map("trim", $tags); - $tags = array_map("mb_strtolower", $tags); - $tags = join(", ", $tags); + $tags = implode(", ", + FeedItem_Common::normalize_categories(explode(",", $_POST["tags"] ?? ""))); $this->host->set($this, "tags", $tags); diff --git a/plugins/share/init.php b/plugins/share/init.php index 42923ed8a..846e1f39c 100644 --- a/plugins/share/init.php +++ b/plugins/share/init.php @@ -41,14 +41,14 @@ class Share extends Plugin { function hook_prefs_tab_section($id) { if ($id == "prefFeedsPublishedGenerated") { + ?> + <hr/> - print "<hr/>"; - - print "<h2>" . __("You can disable all articles shared by unique URLs here.") . "</h2>"; - - print "<button class='alt-danger' dojoType='dijit.form.Button' onclick=\"return Plugins.Share.clearKeys()\">". - __('Unshare all articles')."</button> "; + <h2><?= __("You can disable all articles shared by unique URLs here.") ?></h2> + <button class='alt-danger' dojoType='dijit.form.Button' onclick="return Plugins.Share.clearKeys()"> + <?= __('Unshare all articles') ?></button> + <?php } } @@ -100,39 +100,33 @@ class Share extends Plugin { $sth->execute([$uuid, $param, $_SESSION['uid']]); } - print "<header>" . __("You can share this article by the following unique URL:") . "</header>"; + $url_path = htmlspecialchars(get_self_url_prefix() . "/public.php?op=share&key=$uuid"); - $url_path = get_self_url_prefix(); - $url_path .= "/public.php?op=share&key=$uuid"; + ?> - print "<section> - <div class='panel text-center'> - <a id='gen_article_url' href='$url_path' target='_blank' rel='noopener noreferrer'>$url_path</a> - </div> - </section>"; + <header><?= __("You can share this article by the following unique URL:") ?></header> - /* if (!label_find_id(__('Shared'), $_SESSION["uid"])) - label_create(__('Shared'), $_SESSION["uid"]); - label_add_article($ref_id, __('Shared'), $_SESSION['uid']); */ + <section> + <div class='panel text-center'> + <a id='gen_article_url' href="<?= $url_path ?>" + target='_blank' rel='noopener noreferrer'><?= $url_path ?></a> + </div> + </section> + <?php } else { print "Article not found."; } - print "<footer class='text-center'>"; - - print "<button dojoType='dijit.form.Button' onclick=\"return App.dialogOf(this).unshare()\">". - __('Unshare article')."</button>"; - - print "<button dojoType='dijit.form.Button' onclick=\"return App.dialogOf(this).newurl()\">". - __('Generate new URL')."</button>"; - - print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>". - __('Close this window')."</button>"; - - print "</footer>"; + ?> + <footer class='text-center'> + <?= \Controls\button_tag(__('Unshare article'), '', ['class' => 'alt-danger', 'onclick' => "App.dialogOf(this).unshare()"]) ?> + <?= \Controls\button_tag(__('Generate new URL'), '', ['onclick' => "App.dialogOf(this).newurl()"]) ?> + <?= \Controls\submit_tag(__("Close this window")) ?> + </footer> + <?php } function api_version() { |