dan/parsley
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Editor

Browse Source
This commit is contained in:
Dan Elbert 2016-01-14 11:07:15 -06:00
parent 4fe419d414
commit 8989a2848a
6 changed files with 65 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile.lock
View File

@ -187,6 +187,3 @@ DEPENDENCIES
turbolinks turbolinks
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
web-console (~> 2.0) web-console (~> 2.0)
BUNDLED WITH
1.10.6

5
app/assets/stylesheets/application.scss
View File

@ -10,8 +10,7 @@
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope. * file per style scope.
* *
*= require_tree . *= require flash_messages
*= require_self
*/ */
@import "bootstrap-sprockets"; @import "bootstrap-sprockets";
@ -19,6 +18,8 @@
@import "bootstrap"; @import "bootstrap";
@import "spacelab/_bootswatch"; @import "spacelab/_bootswatch";
@import "recipes";
$footer_height: 40px; $footer_height: 40px;
html { html {

2
app/assets/stylesheets/recipes.scss
View File

@ -3,7 +3,7 @@
// You can use Sass (SCSS) here: http://sass-lang.com/ // You can use Sass (SCSS) here: http://sass-lang.com/
@mixin editor { @mixin editor {
border: solid 1px grey; @extend .panel-body;
} }
div.ingredient-editor { div.ingredient-editor {

24
app/views/recipes/_form.html.erb
View File

@ -2,37 +2,37 @@
<%= render partial: 'shared/error_list', locals: {model: @recipe} %> <%= render partial: 'shared/error_list', locals: {model: @recipe} %>
<div class="form-group"> <div class="form-group form-group-sm">
<%= f.label :name %> <%= f.label :name, class: "control-label" %>
<%= f.text_field :name, class: 'form-control' %> <%= f.text_field :name, class: 'form-control' %>
</div> </div>
<div class="form-group"> <div class="form-group form-group-sm">
<%= f.label :description %> <%= f.label :description, class: "control-label" %>
<%= f.text_area :description, class: 'form-control' %> <%= f.text_area :description, class: 'form-control' %>
</div> </div>
<div class="form-group"> <div class="form-group form-group-sm">
<%= f.label :source %> <%= f.label :source, class: "control-label" %>
<%= f.text_field :source, class: 'form-control' %> <%= f.text_field :source, class: 'form-control' %>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-4"> <div class="col-xs-4">
<div class="form-group"> <div class="form-group form-group-sm">
<%= f.label :yields %> <%= f.label :yields, class: "control-label" %>
<%= f.number_field :yields, class: 'form-control', placeholder: 'Servings' %> <%= f.number_field :yields, class: 'form-control', placeholder: 'Servings' %>
</div> </div>
</div> </div>
<div class="col-xs-4"> <div class="col-xs-4">
<div class="form-group"> <div class="form-group form-group-sm">
<%= f.label :total_time %> <%= f.label :total_time, class: "control-label" %>
<%= f.number_field :total_time, class: 'form-control', placeholder: 'Minutes' %> <%= f.number_field :total_time, class: 'form-control', placeholder: 'Minutes' %>
</div> </div>
</div> </div>
<div class="col-xs-4"> <div class="col-xs-4">
<div class="form-group"> <div class="form-group form-group-sm">
<%= f.label :active_time %> <%= f.label :active_time, class: "control-label" %>
<%= f.number_field :active_time, class: 'form-control', placeholder: 'Minutes' %> <%= f.number_field :active_time, class: 'form-control', placeholder: 'Minutes' %>
</div> </div>
</div> </div>

23
app/views/recipes/editor/_ingredient.html.erb
View File

@ -1,29 +1,38 @@
<div class="nested-fields ingredient-editor"> <div class="panel panel-default">
<div class="nested-fields ingredient-editor">
<div class="row"> <div class="row">
<div class="col-xs-11"> <div class="col-xs-10">
<div class="form-group">
<div class="form-group form-group-sm">
<%= f.label :custom_name, "Name" %> <%= f.label :custom_name, "Name" %>
<%= f.text_field :custom_name, class: 'form-control' %> <%= f.text_field :custom_name, class: 'form-control' %>
</div> </div>
<div class="form-group"> <div class="row">
<div class="col-xs-8">
<div class="form-group form-group-sm">
<%= f.label :quantity %> <%= f.label :quantity %>
<%= f.text_field :quantity, class: 'form-control' %> <%= f.text_field :quantity, class: 'form-control' %>
</div> </div>
</div>
<div class="form-group"> <div class="col-xs-4">
<div class="form-group form-group-sm">
<%= f.label :units %> <%= f.label :units %>
<%= f.text_field :units, class: 'form-control' %> <%= f.text_field :units, class: 'form-control' %>
</div> </div>
</div> </div>
</div>
</div>
<div class="col-xs-1"> <div class="col-xs-2">
<%= link_to_remove_association f, class: 'btn btn-danger' do %> <%= link_to_remove_association f, class: 'btn btn-danger' do %>
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
<% end %> <% end %>
</div> </div>
</div> </div>
<%= f.text_field :sort_order, class: 'sort-order' %> <%= f.hidden_field :sort_order, class: 'sort-order' %>
</div>
</div> </div>

12
app/views/recipes/editor/_step.html.erb
View File

@ -1,18 +1,19 @@
<div class="nested-fields step-editor"> <div class="panel panel-default">
<div class="nested-fields step-editor">
<div class="row"> <div class="row">
<div class="col-xs-1"> <div class="col-xs-2">
<span class="sort-order-display"><%= f.object ? f.object.sort_order : '' %></span> <span class="sort-order-display"><%= f.object ? f.object.sort_order : '' %></span>
</div> </div>
<div class="col-xs-10"> <div class="col-xs-8">
<div class="form-group"> <div class="form-group form-group-sm">
<%= f.label :step %> <%= f.label :step %>
<%= f.text_area :step, class: 'form-control' %> <%= f.text_area :step, class: 'form-control' %>
</div> </div>
</div> </div>
<div class="col-xs-1"> <div class="col-xs-2">
<%= link_to_remove_association f, class: 'btn btn-danger' do %> <%= link_to_remove_association f, class: 'btn btn-danger' do %>
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
<% end %> <% end %>
@ -21,4 +22,5 @@
<%= f.hidden_field :sort_order, class: 'sort-order' %> <%= f.hidden_field :sort_order, class: 'sort-order' %>
</div>
</div> </div>