mockup/master: Merge branch 'theme-filemanager-searching-feature' of github

Repository: mockup
Branch: refs/heads/master
Date: 2017-06-28T06:08:14-05:00
Author: Oshane Bailey (b4oshany) <[email protected]>
Commit: https://github.com/plone/mockup/commit/289a7985a8010cef872d939073e977500f4b8d5f

Merge branch 'theme-filemanager-searching-feature' of github.com:plone/mockup into theme-filemanager-searching-feature

Files changed:
M CHANGES.rst
M mockup/patterns/filemanager/pattern.js
M mockup/patterns/thememapper/pattern.thememapper.less

diff --git a/CHANGES.rst b/CHANGES.rst
index 6bfc5445..72b85eb1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,10 @@ Breaking changes:
 
 New features:
 
+ - Search for files and opening the file upon click.
+ - Search for text within files and opening the file upon click.
+ - Added Bootstrap Dropdown menu to the UI views.
+ - Added Anchor (a) tag to the UI views.
  - Make thumb scale in folder contents listing adjustable/supressable.
    Replace meaningless paper clip icon (fontello) with mime type icons from mimetype registry.
  - Search for files and opening the file upon click
@@ -37,6 +41,17 @@ New features:
  - make thumb size in folder contents listing adjustable/supressable
    replace meaningless paper clip icon (fontello) with mime type icons
    from mimetype registry
+ - Replace meaningless paper clip icon (fontello) with mime type icons from mimetype registry.
+ - Enable Drag and Drop inside of the theme editor file tree.
+ - Upgrade JQTree to 1.4.1
+ - Search for files and opening the file upon click.
+ - Search for text within files and opening the file upon click.
+ - Added Bootstrap Dropdown menu to the UI views.
+ - Added Anchor (a) tag to the UI views.
+
+ - make thumb size in folder contents listing adjustable/supressable
+   replace meaningless paper clip icon (fontello) with mime type icons
+   from mimetype registry
    https://github.com/plone/Products.CMFPlone/issues/1734
    [fgrcon]
 
diff --git a/mockup/patterns/filemanager/pattern.js b/mockup/patterns/filemanager/pattern.js
index d711e972..3bcc6e2a 100644
--- a/mockup/patterns/filemanager/pattern.js
+++ b/mockup/patterns/filemanager/pattern.js
@@ -189,7 +189,8 @@ define([
           findinFilesView.triggerView
         ],
         id: 'find',
-        app: self
+        app: self,
+        disable: function() {}
       })
 
       self.views = [
@@ -329,7 +330,6 @@ define([
         }
       });
 
-
       self.$tree.bind('tree.select', function(e) {
         if (e.node === null) {
           self.toggleButtons(false);
diff --git a/mockup/patterns/thememapper/pattern.thememapper.less b/mockup/patterns/thememapper/pattern.thememapper.less
index 7666065a..4c58cce6 100644
--- a/mockup/patterns/thememapper/pattern.thememapper.less
+++ b/mockup/patterns/thememapper/pattern.thememapper.less
@@ -1,6 +1,6 @@
 @import "@{mockuplessPath}/ui.less";
 /* just be lazy here and include all of bootstrap... */
-@import "@{mockupPath}/filemanager/pattern.filemanager.less";
+@import "@{mockup-patterns-filemanager}";
 
 body.plone-toolbar-left-default {
 	padding-left: 0px;



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot