From 525f46aba60d26a907a8e1cd7f1a798b8d34c822 Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Wed, 1 Jun 2016 13:08:09 +0200
Subject: [PATCH 1/2] [feature] ability to use HTML in machine specs and
 description

---
 app/assets/javascripts/filters/filters.coffee | 15 ++++++++++++++-
 app/assets/templates/machines/_form.html.erb  |  6 ++++--
 app/assets/templates/machines/index.html.erb  |  2 +-
 app/assets/templates/machines/show.html.erb   |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/filters/filters.coffee b/app/assets/javascripts/filters/filters.coffee
index 9b6334d91..2bd145688 100644
--- a/app/assets/javascripts/filters/filters.coffee
+++ b/app/assets/javascripts/filters/filters.coffee
@@ -98,10 +98,23 @@ Application.Filters.filter "humanize", [ ->
     Humanize.truncate(element, param, null)
 ]
 
+##
+# This filter will convert ASCII carriage-return character to the HTML break-line tag
+##
 Application.Filters.filter "breakFilter", [ ->
   (text) ->
     if text != undefined
-      text.replace(/\n/g, '<br />')
+      text.replace(/\n+/g, '<br />')
+]
+
+##
+# This filter will take a HTML text as input and will return it without the html tags
+##
+Application.Filters.filter "simpleText", [ ->
+  (text) ->
+    if text != undefined
+      text = text.replace(/<br\s*\/?>/g, '\n')
+      text.replace(/<\/?\w+>/g, '')
 ]
 
 Application.Filters.filter "toTrusted", [ "$sce", ($sce) ->
diff --git a/app/assets/templates/machines/_form.html.erb b/app/assets/templates/machines/_form.html.erb
index 0aa424824..3f60f290f 100644
--- a/app/assets/templates/machines/_form.html.erb
+++ b/app/assets/templates/machines/_form.html.erb
@@ -46,7 +46,8 @@
     <div class="form-group m-b-xl" ng-class="{'has-error': machineForm['machine[description]'].$dirty && machineForm['machine[description]'].$invalid}">
       <label for="description" class="col-sm-2 control-label">{{ 'description' | translate }} *</label>
       <div class="col-sm-10">
-        <textarea ng-model="machine.description" class="form-control" rows="12" id="machine_description" placeholder="" name="machine[description]" required></textarea>
+        <input type="hidden" name="machine[description]" ng-value="machine.description" />
+        <summernote ng-model="machine.description" id="machine_description" placeholder="" config="summernoteOpts" name="machine[description]" required></summernote>
         <span class="help-block" ng-show="machineForm['machine[description]'].$dirty && machineForm['machine[description]'].$error.required" translate>{{ 'description_is_required' }}</span>
       </div>
     </div>
@@ -54,7 +55,8 @@
     <div class="form-group m-b-xl" ng-class="{'has-error': machineForm['machine[spec]'].$dirty && machineForm['machine[spec]'].$invalid}">
       <label for="spec" class="col-sm-2 control-label">{{ 'technical_specifications' | translate }} *</label>
       <div class="col-sm-10">
-        <textarea ng-model="machine.spec" class="form-control" rows="12" id="machine_spec" placeholder="" name="machine[spec]" required></textarea>
+        <input type="hidden" name="machine[spec]" ng-value="machine.spec" />
+        <summernote ng-model="machine.spec" id="machine_spec" placeholder="" config="summernoteOpts" name="machine[spec]" required></summernote>
         <span class="help-block" ng-show="machineForm['machine[spec]'].$dirty && machineForm['machine[spec]'].$error.required" translate>{{ 'technical_specifications_are_required' }}</span>
       </div>
     </div>
diff --git a/app/assets/templates/machines/index.html.erb b/app/assets/templates/machines/index.html.erb
index f6804be64..2f08ecd20 100644
--- a/app/assets/templates/machines/index.html.erb
+++ b/app/assets/templates/machines/index.html.erb
@@ -35,7 +35,7 @@
             </div>
             <div class="panel-body" style="heigth:170px;">
               <h1 class="m-b">{{machine.name}}</h1>
-              <p>{{machine.description | humanize : 140 }}</p>
+              <p ng-bind-html="machine.description | simpleText | breakFilter | humanize : 140"></p>
             </div>
             <div class="panel-footer no-padder">
 
diff --git a/app/assets/templates/machines/show.html.erb b/app/assets/templates/machines/show.html.erb
index 5d77707fe..e5b8f5068 100644
--- a/app/assets/templates/machines/show.html.erb
+++ b/app/assets/templates/machines/show.html.erb
@@ -48,7 +48,7 @@
         </div>
         <div class="widget-content no-bg wrapper">
           <h3></h3>
-          <p><pre>{{machine.spec}}</pre></p>
+          <p ng-bind-html="machine.spec"></p>
         </div>
       </div>
 

From 0e6698a9ed37c0976ad5cf2796b8d8da274fda31 Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Wed, 1 Jun 2016 13:53:55 +0200
Subject: [PATCH 2/2] fix short descriptions in machines index

---
 app/assets/javascripts/filters/filters.coffee | 2 +-
 app/assets/templates/machines/index.html.erb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/filters/filters.coffee b/app/assets/javascripts/filters/filters.coffee
index 2bd145688..babeea9df 100644
--- a/app/assets/javascripts/filters/filters.coffee
+++ b/app/assets/javascripts/filters/filters.coffee
@@ -114,7 +114,7 @@ Application.Filters.filter "simpleText", [ ->
   (text) ->
     if text != undefined
       text = text.replace(/<br\s*\/?>/g, '\n')
-      text.replace(/<\/?\w+>/g, '')
+      text.replace(/<\/?\w+[^>]*>/g, '')
 ]
 
 Application.Filters.filter "toTrusted", [ "$sce", ($sce) ->
diff --git a/app/assets/templates/machines/index.html.erb b/app/assets/templates/machines/index.html.erb
index 2f08ecd20..e31795edb 100644
--- a/app/assets/templates/machines/index.html.erb
+++ b/app/assets/templates/machines/index.html.erb
@@ -35,7 +35,7 @@
             </div>
             <div class="panel-body" style="heigth:170px;">
               <h1 class="m-b">{{machine.name}}</h1>
-              <p ng-bind-html="machine.description | simpleText | breakFilter | humanize : 140"></p>
+              <p ng-bind-html="machine.description | simpleText | humanize : 140 | breakFilter"></p>
             </div>
             <div class="panel-footer no-padder">