diff options
author | Andrew Dolgov <[email protected]> | 2021-03-05 15:16:41 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2021-03-05 15:16:41 +0300 |
commit | 5c1f9f31bdb6418469c3434047c163b4dae8f139 (patch) | |
tree | 7418b3eaa48984195a42667a15c61c5545cb3a29 /js | |
parent | fe06416f1787d27e90ad75f7c33eadd412574346 (diff) |
add a bunch of button icons
Diffstat (limited to 'js')
-rw-r--r-- | js/CommonDialogs.js | 12 | ||||
-rw-r--r-- | js/CommonFilters.js | 14 | ||||
-rw-r--r-- | js/PrefLabelTree.js | 7 | ||||
-rw-r--r-- | js/PrefUsers.js | 1 |
4 files changed, 18 insertions, 16 deletions
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index a7e793b9c..ea26ee515 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -474,7 +474,7 @@ const CommonDialogs = { <fieldset> <input dojoType='dijit.form.ValidationTextBox' required='1' placeHolder="${__("Feed title")}" - style='font-size : 16px; width: 500px' name='title' value="${App.escapeHtml(feed.title)}"> + style='font-size : 16px; width: 530px' name='title' value="${App.escapeHtml(feed.title)}"> </fieldset> <fieldset> @@ -565,19 +565,21 @@ const CommonDialogs = { <div dojoType="dijit.layout.ContentPane" title="${__('Icon')}"> <div><img class='feedIcon' style="${feed.icon ? "" : "display : none"}" src="${feed.icon ? App.escapeHtml(feed.icon) : ""}"></div> - <label class="dijitButton">${__("Upload new icon...")} + <label class="dijitButton"> + ${App.FormFields.icon("file_upload")} + ${__("Upload new icon...")} <input style="display: none" type="file" onchange="App.dialogOf(this).uploadIcon(this)"> </label> - ${App.FormFields.submit_tag(__("Remove"), {class: "alt-danger", onclick: "App.dialogOf(this).removeIcon("+feed_id+")"})} + ${App.FormFields.submit_tag(App.FormFields.icon("delete") + " " + __("Remove"), {class: "alt-danger", onclick: "App.dialogOf(this).removeIcon("+feed_id+")"})} </div> <div dojoType="dijit.layout.ContentPane" title="${__('Plugins')}"> ${reply.plugin_data} </div> </div> <footer> - ${App.FormFields.button_tag(__("Unsubscribe"), "", {class: "pull-left alt-danger", onclick: "App.dialogOf(this).unsubscribe()"})} - ${App.FormFields.submit_tag(__("Save"), {onclick: "App.dialogOf(this).execute()"})} + ${App.FormFields.button_tag(App.FormFields.icon("delete") + " " + __("Unsubscribe"), "", {class: "pull-left alt-danger", onclick: "App.dialogOf(this).unsubscribe()"})} + ${App.FormFields.submit_tag(App.FormFields.icon("save") + " " + __("Save"), {onclick: "App.dialogOf(this).execute()"})} ${App.FormFields.cancel_dialog_tag(__("Cancel"))} </footer> </form> diff --git a/js/CommonFilters.js b/js/CommonFilters.js index 606cf2076..1450458f8 100644 --- a/js/CommonFilters.js +++ b/js/CommonFilters.js @@ -229,7 +229,7 @@ const Filters = { <footer> ${App.FormFields.button_tag(App.FormFields.icon("help") + " " + __("More info"), "", {class: 'pull-left alt-info', onclick: "window.open('https://tt-rss.org/wiki/ContentFilters')"})} - ${App.FormFields.submit_tag(__("Save rule"), {onclick: "App.dialogOf(this).execute()"})} + ${App.FormFields.submit_tag(App.FormFields.icon("save") + " " + __("Save"), {onclick: "App.dialogOf(this).execute()"})} ${App.FormFields.cancel_dialog_tag(__("Cancel"))} </footer> @@ -313,7 +313,7 @@ const Filters = { "filterDlg_actionParamPlugin")} </section> <footer> - ${App.FormFields.submit_tag(__("Save action"), {onclick: "App.dialogOf(this).execute()"})} + ${App.FormFields.submit_tag(App.FormFields.icon("save") + " " + __("Save"), {onclick: "App.dialogOf(this).execute()"})} ${App.FormFields.cancel_dialog_tag(__("Cancel"))} </footer> </form> @@ -511,13 +511,13 @@ const Filters = { <footer> ${filter_id ? ` - ${App.FormFields.button_tag(__("Remove"), "", {class: "pull-left alt-danger", onclick: "App.dialogOf(this).removeFilter()"})} - ${App.FormFields.button_tag(__("Test"), "", {class: "alt-info", onclick: "App.dialogOf(this).test()"})} - ${App.FormFields.submit_tag(__("Save"), {onclick: "App.dialogOf(this).execute()"})} + ${App.FormFields.button_tag(App.FormFields.icon("delete") + " " + __("Remove"), "", {class: "pull-left alt-danger", onclick: "App.dialogOf(this).removeFilter()"})} + ${App.FormFields.button_tag(App.FormFields.icon("check_circle") + " " + __("Test"), "", {class: "alt-info", onclick: "App.dialogOf(this).test()"})} + ${App.FormFields.submit_tag(App.FormFields.icon("save") + " " + __("Save"), {onclick: "App.dialogOf(this).execute()"})} ${App.FormFields.cancel_dialog_tag(__("Cancel"))} ` : ` - ${App.FormFields.button_tag(__("Test"), "", {class: "alt-info", onclick: "App.dialogOf(this).test()"})} - ${App.FormFields.submit_tag(__("Create"), {onclick: "App.dialogOf(this).execute()"})} + ${App.FormFields.button_tag(App.FormFields.icon("check_circle") + " " + __("Test"), "", {class: "alt-info", onclick: "App.dialogOf(this).test()"})} + ${App.FormFields.submit_tag(App.FormFields.icon("add") + " " + __("Create"), {onclick: "App.dialogOf(this).execute()"})} ${App.FormFields.cancel_dialog_tag(__("Cancel"))} `} </footer> diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js index 6792413b1..39e3f8315 100644 --- a/js/PrefLabelTree.js +++ b/js/PrefLabelTree.js @@ -69,7 +69,6 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f const dialog = new fox.SingleUseDialog({ id: "labelEditDlg", title: __("Edit label"), - style: "width: 650px", setLabelColor: function (id, fg, bg) { let kind = ''; @@ -121,10 +120,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f content: ` <form onsubmit='return false'> - <header>${__("Caption")}</header> <section> - <input style='font-size : 16px; color : ${fg_color}; background : ${bg_color}; transition : background 0.1s linear' + <input style='font-size : 16px; width : 550px; color : ${fg_color}; background : ${bg_color}; transition : background 0.1s linear' id='labelEdit_caption' + placeholder="${__("Caption")}" name='caption' dojoType='dijit.form.ValidationTextBox' required='true' @@ -138,7 +137,6 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f ${App.FormFields.hidden_tag('fg_color', fg_color, {}, 'labelEdit_fgColor')} ${App.FormFields.hidden_tag('bg_color', bg_color, {}, 'labelEdit_bgColor')} - <header>${__("Colors")}</header> <section> <table width='100%'> <tr> @@ -168,6 +166,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f <footer> <button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick='App.dialogOf(this).execute()'> + ${App.FormFields.icon("save")} ${__('Save')} </button> <button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'> diff --git a/js/PrefUsers.js b/js/PrefUsers.js index 7fde19851..7ce3cae94 100644 --- a/js/PrefUsers.js +++ b/js/PrefUsers.js @@ -115,6 +115,7 @@ const Users = { <footer> <button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick='App.dialogOf(this).execute()'> + ${App.FormFields.icon("save")} ${__('Save')} </button> <button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'> |