From 926a26061de0d9ac1c036edfd680721650e5b385 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 7 Dec 2017 15:03:32 +0000
Subject: Update pipelines empty state [ci skip]

---
 .../pipelines/components/empty_state.vue           | 44 ++++++++++++----------
 app/assets/stylesheets/framework/images.scss       |  7 ++++
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/pipelines/components/empty_state.vue b/app/assets/javascripts/pipelines/components/empty_state.vue
index 0eaac8dd64f..465e02cbafe 100644
--- a/app/assets/javascripts/pipelines/components/empty_state.vue
+++ b/app/assets/javascripts/pipelines/components/empty_state.vue
@@ -1,36 +1,42 @@
 <script>
-export default {
-  props: {
-    helpPagePath: {
-      type: String,
-      required: true,
+  export default {
+    props: {
+      helpPagePath: {
+        type: String,
+        required: true,
+      },
+      emptyStateSvgPath: {
+        type: String,
+        required: true,
+      },
     },
-    emptyStateSvgPath: {
-      type: String,
-      required: true,
-    },
-  },
-};
+  };
 </script>
-
 <template>
   <div class="row empty-state js-empty-state">
     <div class="col-xs-12">
-      <div class="svg-content">
-        <img :src="emptyStateSvgPath"/>
+      <div class="svg-content svg-250">
+        <img :src="emptyStateSvgPath" />
       </div>
     </div>
 
-    <div class="col-xs-12 text-center">
+    <div class="col-xs-12">
       <div class="text-content">
-        <h4>Build with confidence</h4>
+        <h4 class="text-center">
+          Build with confidence
+        </h4>
         <p>
           Continous Integration can help catch bugs by running your tests automatically,
           while Continuous Deployment can help you deliver code to your product environment.
         </p>
-        <a :href="helpPagePath" class="btn btn-info">
-          Get started with Pipelines
-        </a>
+        <div class="text-center">
+          <a
+            :href="helpPagePath"
+            class="btn btn-info"
+            >
+            Get started with Pipelines
+          </a>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/assets/stylesheets/framework/images.scss b/app/assets/stylesheets/framework/images.scss
index 78a8e57ddbb..aa2d30a3cef 100644
--- a/app/assets/stylesheets/framework/images.scss
+++ b/app/assets/stylesheets/framework/images.scss
@@ -19,6 +19,13 @@
     max-width: 425px;
     width: 100%;
   }
+
+  &.svg-250 {
+    img,
+    svg {
+      width: 250px;
+    }
+  }
 }
 
 @mixin svg-size($size) {
-- 
cgit v1.2.1


From 9d7b83b4872f67bdc3b4e54b3e3b3a9b2bc94f42 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 7 Dec 2017 15:36:26 +0000
Subject: Update issues empty state [ci skip]

---
 app/views/shared/empty_states/_issues.html.haml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/views/shared/empty_states/_issues.html.haml b/app/views/shared/empty_states/_issues.html.haml
index de26fa8bbf3..ee5637cf422 100644
--- a/app/views/shared/empty_states/_issues.html.haml
+++ b/app/views/shared/empty_states/_issues.html.haml
@@ -6,7 +6,7 @@
   .col-xs-12
     .svg-content
       = image_tag 'illustrations/issues.svg'
-  .col-xs-12.text-center
+  .col-xs-12
     .text-content
       - if has_button && current_user
         %h4
@@ -14,10 +14,11 @@
         %p
           Issues can be bugs, tasks or ideas to be discussed.
           Also, issues are searchable and filterable.
-        - if project_select_button
-          = render 'shared/new_project_item_select', path: 'issues/new', label: 'New issue', type: :issues
-        - else
-          = link_to 'New issue', button_path, class: 'btn btn-new', title: 'New issue', id: 'new_issue_link'
+        .text-center
+          - if project_select_button
+            = render 'shared/new_project_item_select', path: 'issues/new', label: 'New issue', type: :issues
+          - else
+            = link_to 'New issue', button_path, class: 'btn btn-new', title: 'New issue', id: 'new_issue_link'
       - else
         .text-center
-          %h4 There are no issues to show.
+          %h4 There are no issues to show
-- 
cgit v1.2.1


From 61edc8e51e181d2215e404e97eec620c6515647c Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 7 Dec 2017 15:43:09 +0000
Subject: Update labels empty state [ci skip] Update clusters empty state

---
 app/views/projects/clusters/_empty_state.html.haml | 4 ++--
 app/views/shared/empty_states/_labels.html.haml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/clusters/_empty_state.html.haml b/app/views/projects/clusters/_empty_state.html.haml
index e629cc58b06..29c753230cb 100644
--- a/app/views/projects/clusters/_empty_state.html.haml
+++ b/app/views/projects/clusters/_empty_state.html.haml
@@ -1,12 +1,12 @@
 .row.empty-state
   .col-xs-12
     .svg-content= image_tag 'illustrations/clusters_empty.svg'
-  .col-xs-12.text-center
+  .col-xs-12
     .text-content
       %h4= s_('ClusterIntegration|Integrate cluster automation')
       - link_to_help_page = link_to(s_('ClusterIntegration|Learn more about Clusters'), help_page_path('user/project/clusters/index'), target: '_blank', rel: 'noopener noreferrer')
       %p= s_('ClusterIntegration|Clusters allow you to use review apps, deploy your applications, run your pipelines, and much more in an easy way. %{link_to_help_page}').html_safe % { link_to_help_page: link_to_help_page}
 
-      %p
+      .text-center
         = link_to s_('ClusterIntegration|Add cluster'), new_project_cluster_path(@project), class: 'btn btn-success'
 
diff --git a/app/views/shared/empty_states/_labels.html.haml b/app/views/shared/empty_states/_labels.html.haml
index a65634dce53..852bb0e6ce8 100644
--- a/app/views/shared/empty_states/_labels.html.haml
+++ b/app/views/shared/empty_states/_labels.html.haml
@@ -2,7 +2,7 @@
   .col-xs-12
     .svg-content
       = image_tag 'illustrations/labels.svg'
-  .col-xs-12.text-center
+  .col-xs-12
     .text-content
       %h4 Labels can be applied to issues and merge requests to categorize them.
       %p You can also star a label to make it a priority label.
-- 
cgit v1.2.1


From 37450e5178ce35e35bef0bfa7ec564c18f626177 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 7 Dec 2017 17:22:35 +0000
Subject: Update merge request empty state

---
 app/views/shared/empty_states/_merge_requests.html.haml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/shared/empty_states/_merge_requests.html.haml b/app/views/shared/empty_states/_merge_requests.html.haml
index 67f906903e9..488ea7ed6c9 100644
--- a/app/views/shared/empty_states/_merge_requests.html.haml
+++ b/app/views/shared/empty_states/_merge_requests.html.haml
@@ -6,17 +6,18 @@
   .col-xs-12
     .svg-content
       = image_tag 'illustrations/merge_requests.svg'
-  .col-xs-12.text-center
+  .col-xs-12
     .text-content
       - if has_button
         %h4
-          Merge requests are a place to propose changes you've made to a project and discuss those changes with others.
+          Merge requests are a place to propose changes you've made to a project and discuss those changes with others
         %p
           Interested parties can even contribute by pushing commits if they want to.
-        - if project_select_button
-          = render 'shared/new_project_item_select', path: 'merge_requests/new', label: 'New merge request', type: :merge_requests
-        - else
-          = link_to 'New merge request', button_path, class: 'btn btn-new', title: 'New merge request', id: 'new_merge_request_link'
+        .text-center
+          - if project_select_button
+            = render 'shared/new_project_item_select', path: 'merge_requests/new', label: 'New merge request', type: :merge_requests
+          - else
+            = link_to 'New merge request', button_path, class: 'btn btn-new', title: 'New merge request', id: 'new_merge_request_link'
       - else
         %h4.text-center
-          There are no merge requests to show.
+          There are no merge requests to show
-- 
cgit v1.2.1


From c2d150049b0fc38332eb5f2f166c0b15ae43d731 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 11 Dec 2017 12:08:55 +0000
Subject: Improve empty states for TODOs and issues

---
 app/views/dashboard/todos/index.html.haml       | 6 +++---
 app/views/shared/empty_states/_issues.html.haml | 7 +++++--
 config/no_todos_messages.yml                    | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index a5686002328..20ca6ec969a 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -83,12 +83,12 @@
         You're all done!
   - elsif current_user.todos.any?
     .todos-all-done
-      .svg-content
+      .svg-content.svg-250
         = image_tag 'illustrations/todos_all_done.svg'
       - if todos_filter_empty?
         %h4.text-center
           = Gitlab.config.gitlab.no_todos_messages.sample
-        %p.text-center
+        %p
           Are you looking for things to do? Take a look at
           = succeed "," do
             = link_to "the opened issues", issues_dashboard_path
@@ -104,7 +104,7 @@
         = image_tag 'illustrations/todos_empty.svg'
       .todos-empty-content
         %h4
-          Todos let you see what you should do next.
+          Todos let you see what you should do next
         %p
           When an issue or merge request is assigned to you, or when you
           %strong
diff --git a/app/views/shared/empty_states/_issues.html.haml b/app/views/shared/empty_states/_issues.html.haml
index ee5637cf422..cabada4094c 100644
--- a/app/views/shared/empty_states/_issues.html.haml
+++ b/app/views/shared/empty_states/_issues.html.haml
@@ -18,7 +18,10 @@
           - if project_select_button
             = render 'shared/new_project_item_select', path: 'issues/new', label: 'New issue', type: :issues
           - else
-            = link_to 'New issue', button_path, class: 'btn btn-new', title: 'New issue', id: 'new_issue_link'
+            = link_to 'New issue', button_path, class: 'btn btn-success', title: 'New issue', id: 'new_issue_link'
       - else
+        %h4.text-center There are no issues to show
+        %p
+          The Issue Tracker is the place to add things that need to be improved or solved in a project. You can register or sign in to create issues for this project.
         .text-center
-          %h4 There are no issues to show
+          = link_to 'Register / Sign In', new_user_session_path, class: 'btn btn-success'
diff --git a/config/no_todos_messages.yml b/config/no_todos_messages.yml
index 264a975b614..da721a9b6e6 100644
--- a/config/no_todos_messages.yml
+++ b/config/no_todos_messages.yml
@@ -3,9 +3,9 @@
 #
 # If you come up with a fun one, please feel free to contribute it to GitLab!
 # https://about.gitlab.com/contributing/
---- 
-- Good job! Looks like you don't have any todos left.
+---
+- Good job! Looks like you don't have any todos left
 - Isn't an empty todo list beautiful?
 - Give yourself a pat on the back!
 - Nothing left to do, high five!
-- Henceforth you shall be known as "Todo Destroyer".
+- Henceforth you shall be known as "Todo Destroyer"
-- 
cgit v1.2.1


From a414f548d2c2dfede96b2d3bd43d1d55a0833391 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 11 Dec 2017 13:23:14 +0000
Subject: Fix broken test

---
 spec/features/dashboard/todos/todos_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/dashboard/todos/todos_spec.rb b/spec/features/dashboard/todos/todos_spec.rb
index 6f916078b1a..94133c62b5c 100644
--- a/spec/features/dashboard/todos/todos_spec.rb
+++ b/spec/features/dashboard/todos/todos_spec.rb
@@ -13,7 +13,7 @@ feature 'Dashboard Todos' do
     end
 
     it 'shows "All done" message' do
-      expect(page).to have_content 'Todos let you see what you should do next.'
+      expect(page).to have_content 'Todos let you see what you should do next'
     end
   end
 
-- 
cgit v1.2.1


From ae4a04ea11ec22e30ca3f93db1abbccaddf7cdb7 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 12 Dec 2017 11:47:40 +0000
Subject: Center cluster title

---
 app/views/projects/clusters/_empty_state.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/clusters/_empty_state.html.haml b/app/views/projects/clusters/_empty_state.html.haml
index 29c753230cb..b525f4efc83 100644
--- a/app/views/projects/clusters/_empty_state.html.haml
+++ b/app/views/projects/clusters/_empty_state.html.haml
@@ -3,7 +3,7 @@
     .svg-content= image_tag 'illustrations/clusters_empty.svg'
   .col-xs-12
     .text-content
-      %h4= s_('ClusterIntegration|Integrate cluster automation')
+      %h4.text-center= s_('ClusterIntegration|Integrate cluster automation')
       - link_to_help_page = link_to(s_('ClusterIntegration|Learn more about Clusters'), help_page_path('user/project/clusters/index'), target: '_blank', rel: 'noopener noreferrer')
       %p= s_('ClusterIntegration|Clusters allow you to use review apps, deploy your applications, run your pipelines, and much more in an easy way. %{link_to_help_page}').html_safe % { link_to_help_page: link_to_help_page}
 
-- 
cgit v1.2.1


From 40d6edac49404290f773e83952e61fde0912245f Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 12 Dec 2017 16:55:16 +0000
Subject: Adds i18n

---
 app/assets/javascripts/pipelines/components/empty_state.vue |  7 +++----
 app/assets/javascripts/pipelines/pipelines_bundle.js        |  3 +++
 app/views/shared/empty_states/_issues.html.haml             | 11 +++++------
 app/views/shared/empty_states/_labels.html.haml             |  8 ++++----
 app/views/shared/empty_states/_merge_requests.html.haml     | 10 +++++-----
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/pipelines/components/empty_state.vue b/app/assets/javascripts/pipelines/components/empty_state.vue
index 465e02cbafe..78322f30685 100644
--- a/app/assets/javascripts/pipelines/components/empty_state.vue
+++ b/app/assets/javascripts/pipelines/components/empty_state.vue
@@ -23,18 +23,17 @@
     <div class="col-xs-12">
       <div class="text-content">
         <h4 class="text-center">
-          Build with confidence
+          {{ s__("Pipelines|Build with confidence") }}
         </h4>
         <p>
-          Continous Integration can help catch bugs by running your tests automatically,
-          while Continuous Deployment can help you deliver code to your product environment.
+          {{ s__("Pipelines|Continous Integration can help catch bugs by running your tests automatically, while Continuous Deployment can help you deliver code to your product environment.") }}
         </p>
         <div class="text-center">
           <a
             :href="helpPagePath"
             class="btn btn-info"
             >
-            Get started with Pipelines
+            {{ s__("Pipelines|Get started with Pipelines") }}
           </a>
         </div>
       </div>
diff --git a/app/assets/javascripts/pipelines/pipelines_bundle.js b/app/assets/javascripts/pipelines/pipelines_bundle.js
index 923d9bfb248..3e4b6eeb5bf 100644
--- a/app/assets/javascripts/pipelines/pipelines_bundle.js
+++ b/app/assets/javascripts/pipelines/pipelines_bundle.js
@@ -1,6 +1,9 @@
 import Vue from 'vue';
 import PipelinesStore from './stores/pipelines_store';
 import pipelinesComponent from './components/pipelines.vue';
+import Translate from '../vue_shared/translate';
+
+Vue.use(Translate);
 
 document.addEventListener('DOMContentLoaded', () => new Vue({
   el: '#pipelines-list-vue',
diff --git a/app/views/shared/empty_states/_issues.html.haml b/app/views/shared/empty_states/_issues.html.haml
index cabada4094c..e039a73cd3b 100644
--- a/app/views/shared/empty_states/_issues.html.haml
+++ b/app/views/shared/empty_states/_issues.html.haml
@@ -10,18 +10,17 @@
     .text-content
       - if has_button && current_user
         %h4
-          The Issue Tracker is the place to add things that need to be improved or solved in a project
+          = _("The Issue Tracker is the place to add things that need to be improved or solved in a project")
         %p
-          Issues can be bugs, tasks or ideas to be discussed.
-          Also, issues are searchable and filterable.
+          = _("Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable.")
         .text-center
           - if project_select_button
             = render 'shared/new_project_item_select', path: 'issues/new', label: 'New issue', type: :issues
           - else
             = link_to 'New issue', button_path, class: 'btn btn-success', title: 'New issue', id: 'new_issue_link'
       - else
-        %h4.text-center There are no issues to show
+        %h4.text-center= _("There are no issues to show")
         %p
-          The Issue Tracker is the place to add things that need to be improved or solved in a project. You can register or sign in to create issues for this project.
+          = _("The Issue Tracker is the place to add things that need to be improved or solved in a project. You can register or sign in to create issues for this project.")
         .text-center
-          = link_to 'Register / Sign In', new_user_session_path, class: 'btn btn-success'
+          = link_to _('Register / Sign In'), new_user_session_path, class: 'btn btn-success'
diff --git a/app/views/shared/empty_states/_labels.html.haml b/app/views/shared/empty_states/_labels.html.haml
index 852bb0e6ce8..04db9de3606 100644
--- a/app/views/shared/empty_states/_labels.html.haml
+++ b/app/views/shared/empty_states/_labels.html.haml
@@ -4,8 +4,8 @@
       = image_tag 'illustrations/labels.svg'
   .col-xs-12
     .text-content
-      %h4 Labels can be applied to issues and merge requests to categorize them.
-      %p You can also star a label to make it a priority label.
+      %h4= _("Labels can be applied to issues and merge requests to categorize them.")
+      %p= _("You can also star a label to make it a priority label.")
       - if can?(current_user, :admin_label, @project)
-        = link_to 'New label', new_project_label_path(@project), class: 'btn btn-new', title: 'New label', id: 'new_label_link'
-        = link_to 'Generate a default set of labels', generate_project_labels_path(@project), method: :post, class: 'btn btn-success btn-inverted', title: 'Generate a default set of labels', id: 'generate_labels_link'
+        = link_to _('New label'), new_project_label_path(@project), class: 'btn btn-new', title: _('New label'), id: 'new_label_link'
+        = link_to _('Generate a default set of labels'), generate_project_labels_path(@project), method: :post, class: 'btn btn-success btn-inverted', title: _('Generate a default set of labels'), id: 'generate_labels_link'
diff --git a/app/views/shared/empty_states/_merge_requests.html.haml b/app/views/shared/empty_states/_merge_requests.html.haml
index 488ea7ed6c9..2edf3557df4 100644
--- a/app/views/shared/empty_states/_merge_requests.html.haml
+++ b/app/views/shared/empty_states/_merge_requests.html.haml
@@ -10,14 +10,14 @@
     .text-content
       - if has_button
         %h4
-          Merge requests are a place to propose changes you've made to a project and discuss those changes with others
+          = _("Merge requests are a place to propose changes you've made to a project and discuss those changes with others")
         %p
-          Interested parties can even contribute by pushing commits if they want to.
+          = _("Interested parties can even contribute by pushing commits if they want to.")
         .text-center
           - if project_select_button
-            = render 'shared/new_project_item_select', path: 'merge_requests/new', label: 'New merge request', type: :merge_requests
+            = render 'shared/new_project_item_select', path: 'merge_requests/new', label: _('New merge request'), type: :merge_requests
           - else
-            = link_to 'New merge request', button_path, class: 'btn btn-new', title: 'New merge request', id: 'new_merge_request_link'
+            = link_to _('New merge request'), button_path, class: 'btn btn-new', title: _('New merge request'), id: 'new_merge_request_link'
       - else
         %h4.text-center
-          There are no merge requests to show
+          = _("There are no merge requests to show")
-- 
cgit v1.2.1