From f1d0bed331aa20d00648f34799f08478a0fbedd4 Mon Sep 17 00:00:00 2001
From: Johannes Nickel <jn@znuny.com>
Date: Fri, 11 Aug 2017 17:34:14 +0200
Subject: [PATCH] Added requirement text for jQuery for the forms area. This
 resolves #1338

---
 app/assets/javascripts/app/controllers/_channel/chat.coffee | 3 +--
 app/assets/javascripts/app/controllers/_channel/form.coffee | 4 ++--
 app/assets/javascripts/app/views/channel/chat.jst.eco       | 4 ++--
 app/assets/javascripts/app/views/channel/form.jst.eco       | 3 +++
 4 files changed, 8 insertions(+), 6 deletions(-)

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 @@
   <h3><%- @T('Automatically show chat') %> (<%- @T('default') %>)</h3>
   <p><%- @T('The chat will show up once the connection to the server got established and if there is someone online to chat with.') %></p>
 
-  <pre><code class="language-html js-paramsBlock">&lt;script src="<%= @baseurl %>/assets/chat/chat.min.js"&gt;&lt;/script&gt;
+  <pre><code class="language-html js-code">&lt;script src="<%= @baseurl %>/assets/chat/chat.min.js"&gt;&lt;/script&gt;
 &lt;script&gt;
 $(function() {
   new ZammadChat({
@@ -153,7 +153,7 @@ $(function() {
 
   <h3><%- @T('Manually open chat') %></h3>
   <p><%- @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.') %></p>
-  <pre><code class="language-html js-paramsBlock">&lt;button class="open-zammad-chat"&gt;Chat with us&lt;/button&gt;
+  <pre><code class="language-html js-code">&lt;button class="open-zammad-chat"&gt;Chat with us&lt;/button&gt;
 
 &lt;script src="<%= @baseurl %>/assets/chat/chat.min.js"&gt;&lt;/script&gt;
 &lt;script&gt;
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 @@
       </div>
     </div>
   </div>
+  <h3><%- @T('Requirements') %></h3>
+  <p><%- @T("Zammad Forms requires jQuery. If you don't already use it on your website include it like this:") %></p>
+  <pre><code class="language-html js-code">&lt;script src="https://code.jquery.com/jquery-2.1.4.min.js"&gt;&lt;/script&gt;</code></pre>
 
   <p><%- @T('You need to add the following Javascript code snippet to your web page') %>:</p>