From 33f92cc3382080f8fdd36033a55b890edd2590cc Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sat, 15 Oct 2016 01:04:09 +0200
Subject: [PATCH] Improved welcome text.

---
 .../javascripts/app/controllers/_channel/facebook.coffee      | 2 +-
 .../javascripts/app/controllers/_channel/twitter.coffee       | 2 +-
 app/assets/javascripts/app/views/facebook/app_config.jst.eco  | 2 +-
 app/assets/javascripts/app/views/facebook/index.jst.eco       | 4 +---
 app/assets/javascripts/app/views/twitter/app_config.jst.eco   | 2 +-
 app/assets/javascripts/app/views/twitter/index.jst.eco        | 4 +---
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_channel/facebook.coffee b/app/assets/javascripts/app/controllers/_channel/facebook.coffee
index af76b9415..3e6ef6281 100644
--- a/app/assets/javascripts/app/controllers/_channel/facebook.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/facebook.coffee
@@ -30,7 +30,7 @@ class Index extends App.ControllerSubContent
   render: (data) =>
 
     # if no facebook app is registered, show intro
-    if !App.ExternalCredential.findByAttribute(name: 'facebook')
+    if !App.ExternalCredential.findByAttribute('name', 'facebook')
       @html App.view('facebook/index')()
       return
 
diff --git a/app/assets/javascripts/app/controllers/_channel/twitter.coffee b/app/assets/javascripts/app/controllers/_channel/twitter.coffee
index 9a0b8b6eb..a8ae0fbd0 100644
--- a/app/assets/javascripts/app/controllers/_channel/twitter.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/twitter.coffee
@@ -29,7 +29,7 @@ class Index extends App.ControllerSubContent
   render: (data) =>
 
     # if no twitter app is registered, show intro
-    if !App.ExternalCredential.findByAttribute(name: 'twitter')
+    if !App.ExternalCredential.findByAttribute('name', 'twitter')
       @html App.view('twitter/index')()
       return
 
diff --git a/app/assets/javascripts/app/views/facebook/app_config.jst.eco b/app/assets/javascripts/app/views/facebook/app_config.jst.eco
index 1bbb27c70..d9098f3e0 100644
--- a/app/assets/javascripts/app/views/facebook/app_config.jst.eco
+++ b/app/assets/javascripts/app/views/facebook/app_config.jst.eco
@@ -1,6 +1,6 @@
 <div class="alert alert--danger hidden" role="alert"></div>
 <p>
-  The tutorial on how to create a Facebook App is hosted on <a href="http://zammad.org/twitter-app-tutorial" target="_blank">zammad.org/facebook-app-tutorial</a>
+  <%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](http://zammad.org/documentation/channel/facebook).', 'Facebook App') %>
 </p>
 <fieldset>
   <h2><%- @T('Enter your %s App Keys', 'Facebook') %></h2>
diff --git a/app/assets/javascripts/app/views/facebook/index.jst.eco b/app/assets/javascripts/app/views/facebook/index.jst.eco
index 9ca4976b3..e43590204 100644
--- a/app/assets/javascripts/app/views/facebook/index.jst.eco
+++ b/app/assets/javascripts/app/views/facebook/index.jst.eco
@@ -6,9 +6,7 @@
 
 <div class="page-content">
   <div class="page-description">
-    <p>
-      Lorem ipsum Consequat ex dolore ullamco dolor ut eu eiusmod voluptate. Lorem ipsum Non aliquip Ut veniam cupidatat velit deserunt. Lorem ipsum Id reprehenderit deserunt esse eiusmod exercitation. Lorem ipsum Voluptate mollit sed Ut nulla consequat enim. Lorem ipsum Adipisicing ullamco dolor elit officia pariatur ex ea laboris Ut exercitation proident sed. Lorem ipsum In officia reprehenderit sed nulla incididunt aute incididunt ad quis tempor. Lorem ipsum Dolore est id minim dolore et labore incididunt commodo. Lorem ipsum Excepteur non consectetur anim ut nostrud amet et. Lorem ipsum Sunt nostrud nulla officia aute laborum enim in pariatur sit enim et.
-    </p>
+    <p><%- @T('You can connect %s with Zammad. You need to connect your Zammad with %s first.', 'Facebook Accounts', 'Facebook') %></p>
     <div class="btn btn--success js-configApp"><%- @T('Connect Facebook App') %></div>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/twitter/app_config.jst.eco b/app/assets/javascripts/app/views/twitter/app_config.jst.eco
index a7f20c735..2e243eb6b 100644
--- a/app/assets/javascripts/app/views/twitter/app_config.jst.eco
+++ b/app/assets/javascripts/app/views/twitter/app_config.jst.eco
@@ -1,6 +1,6 @@
 <div class="alert alert--danger hidden" role="alert"></div>
 <p>
-  The tutorial on how to create a Twitter App is hosted on <a href="http://zammad.org/twitter-app-tutorial" target="_blank">zammad.org/twitter-app-tutorial</a>
+  <%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](http://zammad.org/documentation/channel/twitter).', 'Twitter App') %>
 </p>
 <fieldset>
   <h2><%- @T('Enter your %s App Keys', 'Twitter') %></h2>
diff --git a/app/assets/javascripts/app/views/twitter/index.jst.eco b/app/assets/javascripts/app/views/twitter/index.jst.eco
index 064f0d906..5a03b4189 100644
--- a/app/assets/javascripts/app/views/twitter/index.jst.eco
+++ b/app/assets/javascripts/app/views/twitter/index.jst.eco
@@ -6,9 +6,7 @@
 
 <div class="page-content">
   <div class="page-description">
-    <p>
-      Lorem ipsum Consequat ex dolore ullamco dolor ut eu eiusmod voluptate. Lorem ipsum Non aliquip Ut veniam cupidatat velit deserunt. Lorem ipsum Id reprehenderit deserunt esse eiusmod exercitation. Lorem ipsum Voluptate mollit sed Ut nulla consequat enim. Lorem ipsum Adipisicing ullamco dolor elit officia pariatur ex ea laboris Ut exercitation proident sed. Lorem ipsum In officia reprehenderit sed nulla incididunt aute incididunt ad quis tempor. Lorem ipsum Dolore est id minim dolore et labore incididunt commodo. Lorem ipsum Excepteur non consectetur anim ut nostrud amet et. Lorem ipsum Sunt nostrud nulla officia aute laborum enim in pariatur sit enim et.
-    </p>
+    <p><%- @T('You can connect %s with Zammad. You need to connect your Zammad with %s first.', 'Twitter Accounts', 'Twitter') %></p>
     <div class="btn btn--success js-configApp"><%- @T('Connect Twitter App') %></div>
   </div>
 </div>
\ No newline at end of file