diff --git a/app/assets/javascripts/app/controllers/_manage/knowledge_base.coffee b/app/assets/javascripts/app/controllers/_manage/knowledge_base.coffee index 086b5ca35..632ddfc33 100644 --- a/app/assets/javascripts/app/controllers/_manage/knowledge_base.coffee +++ b/app/assets/javascripts/app/controllers/_manage/knowledge_base.coffee @@ -32,7 +32,7 @@ class App.ManageKnowledgeBase extends App.ControllerTabs @ajax( id: 'knowledge_bases_init_admin' type: 'GET' - url: @apiPath + '/knowledge_bases/manage/init' + url: "#{@apiPath}/knowledge_bases/manage/init" processData: true success: (data, status, xhr) => App.Collection.loadAssets(data) @@ -93,7 +93,7 @@ class App.ManageKnowledgeBase extends App.ControllerTabs @tabs = [ { - name: 'Style' + name: 'Theme' target: 'style' controller: App.KnowledgeBaseForm params: _.extend({}, params, { screen: 'style', split: true }) @@ -117,7 +117,7 @@ class App.ManageKnowledgeBase extends App.ControllerTabs if !App.Config.get('system_online_service') @tabs.splice(-1, 0, { - name: 'Custom Address' + name: 'Custom URL' target: 'custom_address' controller: App.KnowledgeBaseCustomAddressForm, params: _.extend({}, params, { screen: 'custom_address' }) diff --git a/app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_form.coffee b/app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_form.coffee index ac20e4d11..4d223ed63 100644 --- a/app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_form.coffee +++ b/app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_form.coffee @@ -93,7 +93,7 @@ class App.KnowledgeBaseContentCanBePublishedForm extends App.ControllerForm model: configure_attributes: [ name: 'visibility' - display: 'Visibility' + display: 'Permissions' tag: 'radio' default: false options: [ @@ -103,7 +103,7 @@ class App.KnowledgeBaseContentCanBePublishedForm extends App.ControllerForm , value: 'internal' name: 'Internal' - note: 'Only visible to agents & editors' + note: 'Visible to agents & editors' , value: 'published' name: 'Public' @@ -119,7 +119,7 @@ class App.KnowledgeBaseContentCanBePublishedForm extends App.ControllerForm default: 'now' options: [ value: 'now' - name: 'Now' + name: 'now' , value: 'scheduled' name: 'Schedule for' diff --git a/app/assets/javascripts/app/controllers/knowledge_base/delete_action.coffee b/app/assets/javascripts/app/controllers/knowledge_base/delete_action.coffee index 417bc6211..207d2e2f4 100644 --- a/app/assets/javascripts/app/controllers/knowledge_base/delete_action.coffee +++ b/app/assets/javascripts/app/controllers/knowledge_base/delete_action.coffee @@ -6,7 +6,7 @@ class App.KnowledgeBaseDeleteAction if @object instanceof App.KnowledgeBaseCategory and !@object.isEmpty() @showCannotDelete( 'Cannot delete category', - 'Please delete all children categories and answers first.' + 'Delete all child categories and answers, then try again.' ) return @@ -19,7 +19,7 @@ class App.KnowledgeBaseDeleteAction @dialog = new App.ControllerConfirm( head: 'Delete' - message: "Are you sure to delete \"#{translation?.title}\"?" + message: "Are you sure you want to delete \"#{translation?.title}\"?" callback: @doDelete container: @parentController.el onSubmit: -> diff --git a/app/assets/javascripts/app/controllers/widget/http_log.coffee b/app/assets/javascripts/app/controllers/widget/http_log.coffee index 43ab07baf..add61b35b 100644 --- a/app/assets/javascripts/app/controllers/widget/http_log.coffee +++ b/app/assets/javascripts/app/controllers/widget/http_log.coffee @@ -51,7 +51,6 @@ class Show extends App.ControllerModal super content: -> - console.log('cont') App.view('widget/http_log_show')( record: @record ) diff --git a/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee b/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee index 17231cc48..843bf89d5 100644 --- a/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee +++ b/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee @@ -161,7 +161,6 @@ class App.TicketStatsList extends App.Controller ticket_ids_show = @ticket_ids tickets = (App.Ticket.fullLocal(id) for id in ticket_ids_show) - console.log tickets @html App.view('widget/ticket_stats_list')( user: @user diff --git a/app/assets/javascripts/app/lib/app_post/multi_locales_row.coffee b/app/assets/javascripts/app/lib/app_post/multi_locales_row.coffee index 0191aefda..03d5e968c 100644 --- a/app/assets/javascripts/app/lib/app_post/multi_locales_row.coffee +++ b/app/assets/javascripts/app/lib/app_post/multi_locales_row.coffee @@ -34,7 +34,7 @@ class App.MultiLocalesRow extends App.Controller name: name value: value null: false - placeholder: 'Select locale:' + placeholder: 'Select locale...' options: [] #formattedLocales class: 'form-control--small' ) diff --git a/app/assets/javascripts/app/models/knowledge_base.coffee b/app/assets/javascripts/app/models/knowledge_base.coffee index b86db83c4..a48f55bef 100644 --- a/app/assets/javascripts/app/models/knowledge_base.coffee +++ b/app/assets/javascripts/app/models/knowledge_base.coffee @@ -128,11 +128,10 @@ class App.KnowledgeBase extends App.Model shown: true }, { name: 'color_highlight' - display: 'Highlight Color' + display: 'Icon & Link Color' tag: 'color' style: 'block' null: false - help: 'The highlight color is used to make elements of the interface stand out. For example the links and icons.' screen: admin_style_color_highlight: display: false @@ -199,7 +198,7 @@ class App.KnowledgeBase extends App.Model display: 'Icon Set' tag: 'iconset_picker' style: 'block' - help: "Pick an iconset that fits your style. The icons from this set can be assigned to categories. Choose wisely because the icon sets don't match with each other. If you change it later on you'll have to reset every icon." + help: 'Every category in your knowledge base should be given a unique icon for maximum visual clarity. Each set below provides a wide range of icons to choose from, but beware-you can\'t mix and match different icons from different sets. Choose carefully!' null: false screen: admin_style_iconset: @@ -210,7 +209,7 @@ class App.KnowledgeBase extends App.Model tag: 'multi_locales' style: 'block' null: false - help: 'Set up the languages for the Knowledge Base. Zammad detects the prefered language of the visitor. When its not available it will fall back to the primary language.' + help: 'You can provide different versions of your knowledge base for different locales. Add a language below, then select it in the Knowledge Base Editor to add your translations.' screen: admin_languages: shown: true @@ -218,11 +217,11 @@ class App.KnowledgeBase extends App.Model shown: true }, { name: 'custom_address' - display: 'Custom Address' + display: 'Custom URL' tag: 'input' style: 'block' null: true - help: 'Fill in full domain (e.g. example.com or example.com/help) or path (e.g. /support) to use custom address. See Apache or Nginx for further instructions' + help: 'The default URL for your knowledge base is e.g. example.com or example.com/help. To serve it from a custom URL instead, enter the destination below (e.g., "/support", "example.com", or "example.com/support"). Then, follow the directions under "Web Server Configuration" to complete the process.' screen: admin_custom_address: shown: true diff --git a/app/assets/javascripts/app/views/generic/error/placeholder.jst.eco b/app/assets/javascripts/app/views/generic/error/placeholder.jst.eco index 2627163d7..1bfe52466 100644 --- a/app/assets/javascripts/app/views/generic/error/placeholder.jst.eco +++ b/app/assets/javascripts/app/views/generic/error/placeholder.jst.eco @@ -2,6 +2,6 @@ <%- @icon %>