raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Product Descriptions formatting

Browse Source
This commit is contained in:
Matt-Yorkley
2016-11-17 13:27:21 +00:00
committed by Rob Harrington
parent 268bea25d0
commit c43dea60b7
6 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/products/products.js.coffee
View File

@@ -1 +1 @@
angular.module("admin.products", ["admin.utils"])
angular.module("admin.products", ["textAngular", "admin.utils"])

1
app/assets/javascripts/templates/product_modal.html.haml
View File

@@ -17,6 +17,7 @@
%div{"ng-if" => "product.description"}
%hr
%p.text-small{"ng-bind" => "::product.description"}
{{product.description}}
%hr
.columns.small-12.large-6

8
app/assets/stylesheets/admin/openfoodnetwork.css.scss
View File

@@ -200,6 +200,13 @@ table#listing_enterprise_groups {
// textAngular wysiwyg
text-angular {
.ta-toolbar {
border: 1px solid #cdd9e4;
padding: 0.4em;
margin-bottom: -1px;
background-color: #f1f1f1;
border-radius: 0.25em 0.25em 0 0;
}
.ta-scroll-window > .ta-bind {
max-height: 400px;
min-height: 100px;
@@ -216,6 +223,7 @@ text-angular {
margin-right: 8px;
button {
padding: 5px 10px;
margin-right: 0.25em;
}
}
}

2
app/overrides/spree/admin/products/_form/add_description_wysiwyg.html.haml.deface Normal file
View File

@@ -0,0 +1,2 @@
/ replace "[data-hook=admin_product_form_left] code[erb-loud]:contains('f.text_area :description')"
<text-angular ng-model='product.description' id='product_description' name='product[description]' class='text-angular' ta-toolbar="[['bold','italics','underline','clear'],['insertLink']]"></text-angular>

2
app/overrides/spree/admin/products/new/replace_form.html.haml.deface
View File

@@ -72,7 +72,7 @@
= f.field_container :description do
= f.label :product_description, t(:product_description)
%br/
= f.text_area :description, class: 'fullwidth', rows: 3
%text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', 'ta-toolbar' => "[['bold','italics','underline','clear'],['insertLink']]"}
= f.error_message_on :description
.four.columns.omega{ style: "text-align: center" }
%fieldset.no-border-bottom{ id: "image" }

2
app/serializers/api/product_serializer.rb
View File

@@ -50,7 +50,7 @@ class Api::CachedProductSerializer < ActiveModel::Serializer
has_one :supplier, serializer: Api::IdSerializer
def description
strip_tags object.description
sanitize(object.description, options = {tags: "p, b, strong, em, i"}).html_safe
end
def properties_with_values