Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0a8ef29b
Commit
0a8ef29b
authored
Sep 15, 2015
by
Robert Schilling
Committed by
Stan Hu
Sep 15, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve wording for header and placeholders
parent
e14aa19e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
app/views/projects/blob/_replace.html.haml
app/views/projects/blob/_replace.html.haml
+2
-2
app/views/projects/blob/_upload.html.haml
app/views/projects/blob/_upload.html.haml
+2
-3
app/views/projects/blob/new.html.haml
app/views/projects/blob/new.html.haml
+3
-2
No files found.
app/views/projects/blob/_replace.html.haml
View file @
0a8ef29b
...
@@ -12,12 +12,12 @@
...
@@ -12,12 +12,12 @@
.dropzone
.dropzone
.dropzone-previews.blob-upload-dropzone-previews
.dropzone-previews.blob-upload-dropzone-previews
%p
.dz-message.light
%p
.dz-message.light
Attach
files by dragging
&
dropping
or
Attach
a file by drag
&
drop
or
=
link_to
'click to upload'
,
'#'
,
class:
"markdown-selector"
=
link_to
'click to upload'
,
'#'
,
class:
"markdown-selector"
%br
%br
.dropzone-alerts
{
class:
"alert alert-danger data"
,
"data-dismiss"
=>
"alert"
,
style:
"display:none"
}
.dropzone-alerts
{
class:
"alert alert-danger data"
,
"data-dismiss"
=>
"alert"
,
style:
"display:none"
}
=
render
'shared/commit_message_container'
,
params:
params
,
=
render
'shared/commit_message_container'
,
params:
params
,
placeholder:
'Replace
this file because...
'
placeholder:
'Replace
file
'
.form-group
.form-group
.col-sm-offset-2.col-sm-10
.col-sm-offset-2.col-sm-10
=
button_tag
'Replace file'
,
class:
'btn btn-small btn-primary btn-replace-file'
,
id:
'submit-all'
=
button_tag
'Replace file'
,
class:
'btn btn-small btn-primary btn-replace-file'
,
id:
'submit-all'
...
...
app/views/projects/blob/_upload.html.haml
View file @
0a8ef29b
...
@@ -12,13 +12,12 @@
...
@@ -12,13 +12,12 @@
.dropzone
.dropzone
.dropzone-previews.blob-upload-dropzone-previews
.dropzone-previews.blob-upload-dropzone-previews
%p
.dz-message.light
%p
.dz-message.light
Attach
files by dragging
&
dropping
or
Attach
a file by drag
&
drop
or
=
link_to
'click to upload'
,
'#'
,
class:
"markdown-selector"
=
link_to
'click to upload'
,
'#'
,
class:
"markdown-selector"
%br
%br
.dropzone-alerts
{
class:
"alert alert-danger data"
,
"data-dismiss"
=>
"alert"
,
style:
"display:none"
}
.dropzone-alerts
{
class:
"alert alert-danger data"
,
"data-dismiss"
=>
"alert"
,
style:
"display:none"
}
=
render
'shared/commit_message_container'
,
params:
params
,
=
render
'shared/commit_message_container'
,
params:
params
,
placeholder:
'Upload
this file because...
'
placeholder:
'Upload
new file
'
.form-group
.form-group
.col-sm-offset-2.col-sm-10
.col-sm-offset-2.col-sm-10
=
button_tag
'Upload file'
,
class:
'btn btn-small btn-primary btn-upload-file'
,
id:
'submit-all'
=
button_tag
'Upload file'
,
class:
'btn btn-small btn-primary btn-upload-file'
,
id:
'submit-all'
...
...
app/views/projects/blob/new.html.haml
View file @
0a8ef29b
.gray-content-block.top-block
.gray-content-block.top-block
Create new file or
Create
a
new file or
=
link_to
'upload
existing one
'
,
'#modal-upload-blob'
,
=
link_to
'upload'
,
'#modal-upload-blob'
,
{
class:
'upload-link'
,
'data-target'
=>
'#modal-upload-blob'
,
'data-toggle'
=>
'modal'
}
{
class:
'upload-link'
,
'data-target'
=>
'#modal-upload-blob'
,
'data-toggle'
=>
'modal'
}
an existing one
=
render
'projects/blob/upload'
=
render
'projects/blob/upload'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment