deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2000 from riyad/fix-editor

Browse source 
Fix editor
This commit is contained in:
Valeriy Sizov 2012-11-17 08:31:39 -08:00
commit d412abd108
2 changed files with 67 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/assets/stylesheets/sections/editor.scss
View file

@ -1,14 +1,48 @@
.file-editor { .file-editor {
#editor{ #editor{
border: none;
border-radius: 0;
height: 500px; height: 500px;
width: 100%; margin: 0;
padding: 0;
position: relative; position: relative;
width: 100%;
} }
.editor-commit-comment {
padding-top:20px; .cancel-btn {
color: #B94A48;
&:hover {
color: #B94A48;
}
}
.commit-button-annotation {
@extend .alert;
@extend .alert-info;
display: inline-block;
margin: 0;
padding: 2px;
> * {
float: left;
}
.commit-btn {
@extend .save-btn;
}
.message {
display: inline-block;
margin: 5px 8px 0 8px;
}
}
.commit_message-group {
margin-top: 20px;
label {
font-size: 16px;
line-height: 20px;
}
textarea { textarea {
width: 50%; @extend .span8;
margin-left: 20px;
} }
} }
} }

40
app/views/tree/edit.html.haml
View file

@ -1,28 +1,44 @@
.file-editor .file-editor
= form_tag(project_tree_path(@project, @id), :method => :put) do = form_tag(project_tree_path(@project, @id), method: :put, class: "form-horizontal") do
.file_holder .file_holder
.file_title .file_title
%i.icon-file %i.icon-file
%span.file_name %span.file_name
= "#{@tree.path} (#{@ref})" = @tree.path
%small
on
%strong= @ref
%span.options
.btn-group.tree-btn-group
= link_to "Cancel", project_tree_path(@project, @id), class: "btn very_small cancel-btn", confirm: "Are you sure?"
.file_content.code .file_content.code
#editor= @tree.data %pre#editor= @tree.data
.editor-commit-comment .control-group.commit_message-group
= label_tag 'commit_message' do = label_tag 'commit_message', class: "control-label" do
%p.slead Commit message Commit message
= text_area_tag 'commit_message', '', :required => true .controls
= text_area_tag 'commit_message', '', placeholder: "Update #{@tree.name}", required: true, rows: 3
.form-actions .form-actions
= hidden_field_tag 'last_commit', @last_commit = hidden_field_tag 'last_commit', @last_commit
= hidden_field_tag 'content', '', :id => :file_content = hidden_field_tag 'content', '', id: :file_content
= button_tag "Commit", class: 'btn save-btn' .commit-button-annotation
= button_tag "Commit", class: 'btn commit-btn js-commit-button'
.message
to branch
%strong= @ref
= link_to "Cancel", project_tree_path(@project, @id), class: "btn cancel-btn", confirm: "Are you sure?" = link_to "Cancel", project_tree_path(@project, @id), class: "btn cancel-btn", confirm: "Are you sure?"
:javascript :javascript
var ace_mode = "#{@tree.language.try(:ace_mode)}";
var editor = ace.edit("editor"); var editor = ace.edit("editor");
editor.getSession().setMode("ace/mode/javascript"); if (ace_mode) {
editor.getSession().setMode('ace/mode/' + ace_mode);
}
$(".save-btn").click(function(){ disableButtonIfEmptyField("#commit_message", ".js-commit-button");
$(".js-commit-button").click(function(){
$("#file_content").val(editor.getValue()); $("#file_content").val(editor.getValue());
$(".form_editor form").submit(); $(".file-editor form").submit();
}); });