diff --git a/app/assets/javascripts/app/controllers/_channel/chat.coffee b/app/assets/javascripts/app/controllers/_channel/chat.coffee index a33ee73d7..a1cb273cb 100644 --- a/app/assets/javascripts/app/controllers/_channel/chat.coffee +++ b/app/assets/javascripts/app/controllers/_channel/chat.coffee @@ -21,7 +21,6 @@ class App.ChannelChat extends App.ControllerSubContent '.js-chat-welcome': 'chatWelcome' '.js-testurl-input': 'urlInput' '.js-backgroundColor': 'chatBackground' - '.js-paramsBlock': 'paramsBlock' '.js-code': 'code' '.js-palette': 'palette' '.js-color': 'colorField' @@ -361,7 +360,7 @@ class App.ChannelChat extends App.ControllerSubContent @$('.js-modal-params').html(paramString) # highlight - @paramsBlock.each (i, block) -> + @code.each (i, block) -> hljs.highlightBlock block App.Config.set('Chat', { prio: 4000, name: 'Chat', parent: '#channels', target: '#channels/chat', controller: App.ChannelChat, permission: ['admin.chat'] }, 'NavBarAdmin') diff --git a/app/assets/javascripts/app/controllers/_channel/form.coffee b/app/assets/javascripts/app/controllers/_channel/form.coffee index 6955b3b60..7efd8168b 100644 --- a/app/assets/javascripts/app/controllers/_channel/form.coffee +++ b/app/assets/javascripts/app/controllers/_channel/form.coffee @@ -9,7 +9,7 @@ class App.ChannelForm extends App.ControllerSubContent 'change .js-paramsSetting select': 'updateGroup' elements: - '.js-paramsBlock': 'paramsBlock' + '.js-code': 'code' '.js-paramsSetting': 'paramsSetting' '.js-formSetting input': 'formSetting' @@ -43,7 +43,7 @@ class App.ChannelForm extends App.ControllerSubContent @html element - @paramsBlock.each (i, block) -> + @code.each (i, block) -> hljs.highlightBlock block @updateParamsDesigner() diff --git a/app/assets/javascripts/app/views/channel/chat.jst.eco b/app/assets/javascripts/app/views/channel/chat.jst.eco index cfdd447af..310183074 100644 --- a/app/assets/javascripts/app/views/channel/chat.jst.eco +++ b/app/assets/javascripts/app/views/channel/chat.jst.eco @@ -142,7 +142,7 @@
<%- @T('The chat will show up once the connection to the server got established and if there is someone online to chat with.') %>
-<script src="<%= @baseurl %>/assets/chat/chat.min.js"></script>
+ <script src="<%= @baseurl %>/assets/chat/chat.min.js"></script>
<script>
$(function() {
new ZammadChat({
@@ -153,7 +153,7 @@ $(function() {
<%- @T('Manually open chat') %>
<%- @T('If you want to open the chat by the press of a button set the option §show§ to §false§ and add the class §open-zammad-chat§ to the button.') %>
- <button class="open-zammad-chat">Chat with us</button>
+ <button class="open-zammad-chat">Chat with us</button>
<script src="<%= @baseurl %>/assets/chat/chat.min.js"></script>
<script>
diff --git a/app/assets/javascripts/app/views/channel/form.jst.eco b/app/assets/javascripts/app/views/channel/form.jst.eco
index f0e412a8f..011c10a8c 100644
--- a/app/assets/javascripts/app/views/channel/form.jst.eco
+++ b/app/assets/javascripts/app/views/channel/form.jst.eco
@@ -126,6 +126,9 @@
+ <%- @T('Requirements') %>
+ <%- @T("Zammad Forms requires jQuery. If you don't already use it on your website include it like this:") %>
+ <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
<%- @T('You need to add the following Javascript code snippet to your web page') %>: