Merge branch 'master' of github.com:mrjoes/flask-admin

doc/quickstart.rst

@@ -274,7 +274,7 @@ administrative views.
 File Admin
 ----------
 
-Flask-Admin comes with another handy battery - file admin. It gives you ability to manage files on your server
+Flask-Admin comes with another handy battery - file admin. It gives you the ability to manage files on your server
 (upload, delete, rename, etc).
 
 Here is simple example::

flask_admin/contrib/pymongo/tools.py

+import re
+
 def parse_like_term(term):
     """
         Parse search term into (operation, term) tuple
@@ -6,8 +8,8 @@ def parse_like_term(term):
             Search term
     """
     if term.startswith('^'):
-        return '^%s' % term[1]
+        return '^{}'.format(re.escape(term[1:]))
     elif term.startswith('='):
-        return '^%s$' % term[1:]
+        return '^{}$'.format(re.escape(term[1:]))
 
-    return '%s' % term
+    return re.escape(term)

flask_admin/templates/bootstrap3/admin/base.html

@@ -36,7 +36,7 @@
 	  {% endblock %}
 	</div>
 	<!-- navbar content -->
-        <div class="collapse navbar-collapse" id="#admin-navbar-collapse">
+        <div class="collapse navbar-collapse" id="admin-navbar-collapse">
           {% block main_menu %}
           <ul class="nav navbar-nav">
             {{ layout.menu() }}