- Don't register the bootstrap.min.js file. This should be done wethe…

…r with

  yafowil.bootstrap or another Twitter Bootstrap integration package.
  [thet]

- Fix resource group names to reflect the package name.
  [thet]

HISTORY.rst

@@ -2,6 +2,17 @@
 History
 =======
 
+1.1 (unreleased)
+----------------
+
+- Don't register the bootstrap.min.js file. This should be done wether with
+  yafowil.bootstrap or another Twitter Bootstrap integration package.
+  [thet]
+
+- Fix resource group names to reflect the package name.
+  [thet]
+
+
 1.0
 ---
 

README.rst

@@ -8,6 +8,11 @@ editor with optionally `bootstrap-wysihtml5 <https://github.com/jhollingworth/bo
 - `Documentation <http://docs.yafowil.info/en/latest/blueprints.html#wysihtml5>`_
 - `DEMO - see it Live <http://demo.yafowil.info/++widget++yafowil.widget.wysihtml5/index.html>`_
 
+Note
+====
+For the Bootstrap integration, you will need yafowil.bootstrap or another
+Twitter-Bootstrap integration. This packages does not register the Bootstrap
+base files.
 
 Source Code
 ===========

src/yafowil/widget/wysihtml5/__init__.py

@@ -4,28 +4,24 @@
 
 resourcedir = os.path.join(os.path.dirname(__file__), 'resources')
 js = [{
-    'group': 'yafowil.widget.wysihtml.dependencies',
+    'group': 'yafowil.widget.wysihtml5.dependencies',
     'resource': 'wysihtml5/dist/wysihtml5-0.3.0.js',
     'order': 21,
 }, {
-    'group': 'yafowil.widget.wysihtml.dependencies',
-    'resource': 'bootstrap-wysihtml5/lib/js/bootstrap.min.js',
-    'order': 22,
-}, {
-    'group': 'yafowil.widget.wysihtml.dependencies',
+    'group': 'yafowil.widget.wysihtml5.dependencies',
     'resource': 'bootstrap-wysihtml5/src/bootstrap-wysihtml5.js',
     'order': 22,
 }, {
-    'group': 'yafowil.widget.wysihtml.common',
+    'group': 'yafowil.widget.wysihtml5.common',
     'resource': 'widget.js',
     'order': 23,
 }]
 css = [{
-    'group': 'yafowil.widget.wysihtml.dependencies',
+    'group': 'yafowil.widget.wysihtml5.dependencies',
     'resource': 'bootstrap-wysihtml5/src/bootstrap-wysihtml5.css',
     'order': 21,
 }, {
-    'group': 'yafowil.widget.wysihtml.common',
+    'group': 'yafowil.widget.wysihtml5.common',
     'resource': 'widget.css',
     'order': 22,
 }]
@@ -34,4 +30,4 @@
 def register():
     import widget
     factory.register_theme('default', 'yafowil.widget.wysihtml5',
-                           resourcedir, js=js, css=css)
+                           resourcedir, js=js, css=css)