Commit 2eb1220f authored by Jeroen van Baarsen's avatar Jeroen van Baarsen

Removed expiration from snippets

* Removed the expiration from the project snippets
* Fixed the layout for the project snippets
parent 753a2f17
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
= @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}" = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
%hr %hr
.snippet-form-holder .snippet-form-holder
= form_for [@project, @snippet], as: :project_snippet, url: url do |f| = form_for [@project, @snippet], as: :project_snippet, url: url, html: {class: "form-horizontal snippet-form"} do |f|
-if @snippet.errors.any? -if @snippet.errors.any?
.alert.alert-danger .alert.alert-danger
%ul %ul
...@@ -10,14 +10,11 @@ ...@@ -10,14 +10,11 @@
%li= msg %li= msg
.form-group .form-group
= f.label :title = f.label :title, class: 'control-label'
.col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true
.form-group
= f.label "Lifetime"
.col-sm-10= f.select :expires_at, lifetime_select_options, {}, {class: 'select2 span2'}
.form-group .form-group
.file-editor .file-editor
= f.label :file_name, "File" = f.label :file_name, "File", class: 'control-label'
.col-sm-10 .col-sm-10
.file-holder.snippet .file-holder.snippet
.file-title .file-title
...@@ -31,10 +28,11 @@ ...@@ -31,10 +28,11 @@
= f.submit 'Create snippet', class: "btn-create btn" = f.submit 'Create snippet', class: "btn-create btn"
- else - else
= f.submit 'Save', class: "btn-save btn" = f.submit 'Save', class: "btn-save btn"
= link_to "Cancel", project_snippets_path(@project), class: "btn btn-cancel"
- unless @snippet.new_record? - unless @snippet.new_record?
.pull-right.prepend-left-20
= link_to 'Remove snippet', project_snippet_path(@project, @snippet), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn pull-right btn-remove delete-snippet prepend-left-10", id: "destroy_snippet_#{@snippet.id}" = link_to 'Remove snippet', project_snippet_path(@project, @snippet), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn pull-right btn-remove delete-snippet prepend-left-10", id: "destroy_snippet_#{@snippet.id}"
= link_to "Cancel", project_snippets_path(@project), class: "btn btn-cancel"
:javascript :javascript
var editor = ace.edit("editor"); var editor = ace.edit("editor");
......
...@@ -53,7 +53,6 @@ class ProjectSnippets < Spinach::FeatureSteps ...@@ -53,7 +53,6 @@ class ProjectSnippets < Spinach::FeatureSteps
And 'I submit new snippet "Snippet three"' do And 'I submit new snippet "Snippet three"' do
fill_in "project_snippet_title", :with => "Snippet three" fill_in "project_snippet_title", :with => "Snippet three"
select "forever", :from => "project_snippet_expires_at"
fill_in "project_snippet_file_name", :with => "my_snippet.rb" fill_in "project_snippet_file_name", :with => "my_snippet.rb"
within('.file-editor') do within('.file-editor') do
find(:xpath, "//input[@id='project_snippet_content']").set 'Content of snippet three' find(:xpath, "//input[@id='project_snippet_content']").set 'Content of snippet three'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment