Merge pull request #65 from 4teamwork/jone-keywords-improvements

Improvements on keywords tab
4teamwork · May 20, 2014 · ed57c89 · ed57c89
2 parents de1f45d + f39846e
commit ed57c89
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/ftw/book/browser/resources/ftwbook.css b/ftw/book/browser/resources/ftwbook.css
@@ -109,7 +109,7 @@ div#portal-column-one div.portletWrapper dl.portletGoToParent {
 	background: url("++resource++ftw.book.tinymce.keyword/img/keyword.png") no-repeat center center;
 }
 
-body.mceContentBody span.keyword {
+span.keyword {
   border: 1px dashed green;
   padding-left: 1px;
   padding-right: 1px;

diff --git a/ftw/book/browser/resources/keywords.js b/ftw/book/browser/resources/keywords.js
@@ -8,6 +8,6 @@ jQuery().ready(function($) {
     $(".keyword-results").load(url);
   });
 
-  $("#keyword").select2({width: "300px"});
+  $("#keyword").select2({width: "300px", allowClear: true});
 
 });
diff --git a/ftw/book/tests/test_fti_htmlblock.py b/ftw/book/tests/test_fti_htmlblock.py
@@ -89,7 +89,7 @@ def test_latex_fields_available(self, browser):
         factoriesmenu.add('HTML Block')
 
         form = browser.find('Title').parent('form')
-        labels = form.field_labels(form)
+        labels = form.field_labels
 
         self.assertIn('LaTeX code above content', labels)
         self.assertIn('LaTeX code beneath content', labels)

diff --git a/ftw/book/tests/test_fti_remark.py b/ftw/book/tests/test_fti_remark.py
@@ -45,7 +45,7 @@ def test_latex_fields_available(self, browser):
         factoriesmenu.add('Remark')
 
         form = browser.find('Title').parent('form')
-        labels = form.field_labels(form)
+        labels = form.field_labels
 
         self.assertIn('LaTeX code above content', labels)
         self.assertIn('LaTeX code beneath content', labels)

diff --git a/ftw/book/tests/test_fti_table.py b/ftw/book/tests/test_fti_table.py
@@ -105,7 +105,7 @@ def test_latex_fields_available(self, browser):
         factoriesmenu.add('Table')
 
         form = browser.find('Title').parent('form')
-        labels = form.field_labels(form)
+        labels = form.field_labels
 
         self.assertIn('LaTeX code above content', labels)
         self.assertIn('LaTeX code beneath content', labels)
diff --git a/ftw/book/tests/test_fti_textblock.py b/ftw/book/tests/test_fti_textblock.py
@@ -82,7 +82,7 @@ def test_latex_fields_available(self, browser):
         factoriesmenu.add('Text Block')
 
         form = browser.find('Title').parent('form')
-        labels = form.field_labels(form)
+        labels = form.field_labels
 
         self.assertIn('LaTeX code above content', labels)
         self.assertIn('LaTeX code beneath content', labels)