From 6c63520ef5735e56749c77b495f8137a20942504 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 19 Sep 2017 17:53:57 +0100
Subject: [PATCH] Removes 2 column layout. Adds i18n support

---
 .../registry/repositories/index.html.haml     | 104 ++++++++----------
 1 file changed, 48 insertions(+), 56 deletions(-)

diff --git a/app/views/projects/registry/repositories/index.html.haml b/app/views/projects/registry/repositories/index.html.haml
index ab263091c1f..4a76431494c 100644
--- a/app/views/projects/registry/repositories/index.html.haml
+++ b/app/views/projects/registry/repositories/index.html.haml
@@ -1,66 +1,58 @@
 - page_title "Container Registry"
 
-.row.prepend-top-default.append-bottom-default
-  .col-lg-3
-    %h4.prepend-top-0
+%section
+  .settings-header
+    %h4
       = page_title
     %p
-      With the Docker Container Registry integrated into GitLab, every project
-      can have its own space to store its Docker images.
+      = _('With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images.')
     %p.append-bottom-0
       = succeed '.' do
         Learn more about
-        = link_to 'Container Registry', help_page_path('user/project/container_registry'), target: '_blank'
+        = link_to _('Container Registry'), help_page_path('user/project/container_registry'), target: '_blank'
+  .row
+    .col-lg-12
+      .panel.panel-default
+        .panel-heading
+          %h4.panel-title
+            = _('How to use the Container Registry')
+        .panel-body
+          %p
+            = _('First log in to GitLab&rsquo;s Container Registry using your GitLab username and password. If you have')
+            = link_to _('2FA enabled'), help_page_path('user/profile/account/two_factor_authentication'), target: '_blank'
+            you need to use a
+            = succeed ':' do
+              = link_to _('personal access token'), help_page_path('user/profile/account/two_factor_authentication', anchor: 'personal-access-tokens'), target: '_blank'
+          %pre
+            docker login #{Gitlab.config.registry.host_port}
+          %br
+          %p
+            = _("Once you log in, you&rsquo;re free to create and upload a container image using the common")
+            %code
+              = _('build')
+            = _('and')
+            %code push
+            = _('commands:')
+          %pre
+            :plain
+              docker build -t #{escape_once(@project.container_registry_url)} .
+              docker push #{escape_once(@project.container_registry_url)}
 
-  .col-lg-9
-    .panel.panel-default
-      .panel-heading
-        %h4.panel-title
-          How to use the Container Registry
-      .panel-body
-        %p
-          First log in to GitLab&rsquo;s Container Registry using your GitLab username
-          and password. If you have
-          = link_to '2FA enabled', help_page_path('user/profile/account/two_factor_authentication'), target: '_blank'
-          you need to use a
-          = succeed ':' do
-            = link_to 'personal access token', help_page_path('user/profile/account/two_factor_authentication', anchor: 'personal-access-tokens'), target: '_blank'
-        %pre
-          docker login #{Gitlab.config.registry.host_port}
-        %br
-        %p
-          Once you log in, you&rsquo;re free to create and upload a container image
-          using the common
-          %code build
-          and
-          %code push
-          commands:
-        %pre
-          :plain
-            docker build -t #{escape_once(@project.container_registry_url)} .
-            docker push #{escape_once(@project.container_registry_url)}
-
-        %hr
-        %h5.prepend-top-default
-          Use different image names
-        %p.light
-          GitLab supports up to 3 levels of image names. The following
-          examples of images are valid for your project:
-        %pre
-          :plain
-            #{escape_once(@project.container_registry_url)}:tag
-            #{escape_once(@project.container_registry_url)}/optional-image-name:tag
-            #{escape_once(@project.container_registry_url)}/optional-name/optional-image-name:tag
-
-    #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json)}}
-
-    = page_specific_javascript_bundle_tag('common_vue')
-    = page_specific_javascript_bundle_tag('registry_list')
+          %hr
+          %h5.prepend-top-default
+            = _('Use different image names')
+          %p.light
+            = _('GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:')
+          %pre
+            :plain
+              #{escape_once(@project.container_registry_url)}:tag
+              #{escape_once(@project.container_registry_url)}/optional-image-name:tag
+              #{escape_once(@project.container_registry_url)}/optional-name/optional-image-name:tag
 
 
-    -# - if @images.blank?
-    -#   %p.settings-message.text-center.append-bottom-default
-    -#     No container images stored for this project. Add one by following the
-    -#     instructions above.
-    -# - else
-    -#   = render partial: 'image', collection: @images
+  .row
+    .col-lg-12
+      #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json)}}
+
+      = page_specific_javascript_bundle_tag('common_vue')
+      = page_specific_javascript_bundle_tag('registry_list')