Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-09-15 16:31:33 +0300
committerStan Hu <stanhu@gmail.com>2015-09-15 23:07:32 +0300
commit0a8ef29b3d2504ba66cd0a98992c1f5f70b11daa (patch)
treed3970f22b07ab88ebc3569e6825e6a5ca096fc5f /app/views
parente14aa19e39baf67bbc5bb4099627ae28844a4f5b (diff)
Improve wording for header and placeholders
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/blob/_replace.html.haml4
-rw-r--r--app/views/projects/blob/_upload.html.haml5
-rw-r--r--app/views/projects/blob/new.html.haml5
3 files changed, 7 insertions, 7 deletions
diff --git a/app/views/projects/blob/_replace.html.haml b/app/views/projects/blob/_replace.html.haml
index 1d11fb0ae72..ed584d19ed7 100644
--- a/app/views/projects/blob/_replace.html.haml
+++ b/app/views/projects/blob/_replace.html.haml
@@ -12,12 +12,12 @@
.dropzone
.dropzone-previews.blob-upload-dropzone-previews
%p.dz-message.light
- Attach files by dragging &amp; dropping or
+ Attach a file by drag &amp; drop or
= link_to 'click to upload', '#', class: "markdown-selector"
%br
.dropzone-alerts{class: "alert alert-danger data", "data-dismiss" => "alert", style: "display:none"}
= render 'shared/commit_message_container', params: params,
- placeholder: 'Replace this file because...'
+ placeholder: 'Replace file'
.form-group
.col-sm-offset-2.col-sm-10
= button_tag 'Replace file', class: 'btn btn-small btn-primary btn-replace-file', id: 'submit-all'
diff --git a/app/views/projects/blob/_upload.html.haml b/app/views/projects/blob/_upload.html.haml
index 4666faca013..4ed36cb8aa0 100644
--- a/app/views/projects/blob/_upload.html.haml
+++ b/app/views/projects/blob/_upload.html.haml
@@ -12,13 +12,12 @@
.dropzone
.dropzone-previews.blob-upload-dropzone-previews
%p.dz-message.light
- Attach files by dragging &amp; dropping or
+ Attach a file by drag &amp; drop or
= link_to 'click to upload', '#', class: "markdown-selector"
-
%br
.dropzone-alerts{class: "alert alert-danger data", "data-dismiss" => "alert", style: "display:none"}
= render 'shared/commit_message_container', params: params,
- placeholder: 'Upload this file because...'
+ placeholder: 'Upload new file'
.form-group
.col-sm-offset-2.col-sm-10
= button_tag 'Upload file', class: 'btn btn-small btn-primary btn-upload-file', id: 'submit-all'
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml
index 9a50a52c453..68c9ec7f802 100644
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
@@ -1,7 +1,8 @@
.gray-content-block.top-block
- Create new file or
- = link_to 'upload existing one', '#modal-upload-blob',
+ Create a new file or
+ = link_to 'upload', '#modal-upload-blob',
{ class: 'upload-link', 'data-target' => '#modal-upload-blob', 'data-toggle' => 'modal'}
+ an existing one
= render 'projects/blob/upload'