Merge branch 'release/2.0.0'

toscawidgets · May 24, 2012 · 0b1751f · 0b1751f
2 parents 55b205b + ee55a69
commit 0b1751f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 66 deletions.
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 tw2.jqplugins.jqgrid
 =========================
 
-:Author: Ralph Bean <ralph.bean@gmail.com>
+:Author: Ralph Bean <rbean@redhat.com>
 
 .. comment: split here
 
@@ -16,10 +16,10 @@ Peep the `live demonstration <http://tw2-demos.threebean.org/module?module=tw2.j
 
 Links
 -----
-Get the `source from github <http://github.com/ralphbean/tw2.jqplugins.jqgrid>`_.
+Get the `source from github <http://github.com/toscawidgets/tw2.jqplugins.jqgrid>`_.
 
 `PyPI page <http://pypi.python.org/pypi/tw2.jqplugins.jqgrid>`_
-and `bugs <http://github.com/ralphbean/tw2.jqplugins.jqgrid/issues/>`_
+and `bugs <http://github.com/toscawidgets/tw2.jqplugins.jqgrid/issues/>`_
 
 Description
 -----------
@@ -39,15 +39,21 @@ technology, including PHP, ASP, Java Servlets, JSP, ColdFusion, and Perl.
 This module, tw2.jqplugins.jqgrid, provides `toscawidgets2 (tw2)`_ access to
 the `jQuery Grid Plugin`_ widget.
 
-Hacking
--------
+Sampling tw2.jqplugins.jqgrid in the WidgetBrowser
+--------------------------------------------------
 
-Fork the project on github.  Clone your repo locally.  Then::
+The best way to scope out ``tw2.jqplugins.jqgrid`` is to load its widgets in the
+``tw2.devtools`` WidgetBrowser.  To see the source code that configures them,
+check out ``tw2.jqplugins.jqgrid/tw2/jqplugins/jqgrid/samples.py``
 
-  $ cd tw2.jqplugins.jqgrid
-  $ mkvirtualenv jqgrid
-  (jqgrid) $ python setup.py develop
-  (jqgrid) $ pip install tw2.devtools
-  (jqgrid) $ paster tw2.browser
+To give it a try you'll need git, python, and `virtualenvwrapper
+<http://pypi.python.org/pypi/virtualenvwrapper>`_.  Run::
 
+    $ git clone git://github.com/toscawidgets/tw2.jqplugins.jqgrid.git
+    $ cd tw2.jqplugins.jqgrid
+    $ mkvirtualenv tw2.jqplugins.jqgrid
+    (tw2.jqplugins.jqgrid) $ pip install tw2.devtools
+    (tw2.jqplugins.jqgrid) $ python setup.py develop
+    (tw2.jqplugins.jqgrid) $ paster tw2.browser
 
+...and browse to http://localhost:8000/ to check it out.
diff --git a/development-deps/develop-tw2-destroy-and-setup.sh b/development-deps/develop-tw2-destroy-and-setup.sh
diff --git a/development-deps/develop-tw2-start.sh b/development-deps/develop-tw2-start.sh
diff --git a/setup.py b/setup.py
@@ -13,13 +13,13 @@
 
 setup(
     name='tw2.jqplugins.jqgrid',
-    version='2.0b22',
+    version='2.0.0',
     description='toscawidgets2 wrapper for the jQuery grid plugin',
     long_description=long_description,
     author='Ralph Bean',
-    author_email='ralph.bean@gmail.com',
+    author_email='rbean@redhat.com',
     license='MIT',
-    url='http://github.com/ralphbean/tw2.jqplugins.jqgrid',
+    url='http://github.com/toscawidgets/tw2.jqplugins.jqgrid',
     install_requires=[
         "tw2.core>=2.0b2",
         "tw2.jquery",

diff --git a/tw2/jqplugins/jqgrid/__init__.py b/tw2/jqplugins/jqgrid/__init__.py
@@ -1,6 +1,6 @@
 """ TW2 widget wrapper the jquery ui jqgrid
 
-Get the source from http://github.com/ralphbean/tw2.jqplugins.jqgrid
+Get the source from http://github.com/toscawidgets/tw2.jqplugins.jqgrid
 """
 
 from widgets import *
diff --git a/tw2/jqplugins/jqgrid/samples/core.py b/tw2/jqplugins/jqgrid/samples/core.py
@@ -67,7 +67,7 @@ def prepare(self):
         'colModel' : [
             {
                 'name':'authors',
-                'width':75,
+                'width':50,
                 'align':'center',
             },{
                 'name':'title',
@@ -83,7 +83,7 @@ def prepare(self):
         'rowList':[15,30,50],
         'viewrecords':True,
         'imgpath': 'scripts/jqGrid/themes/green/images',
-        'width': 900,
+        'width': 590,
         'height': 'auto',
     }
     pager_options = { "search" : True, "refresh" : True, "add" : False, }

diff --git a/tw2/jqplugins/jqgrid/samples/sqla.py b/tw2/jqplugins/jqgrid/samples/sqla.py
@@ -26,7 +26,7 @@ def prepare(self):
         'rowList':[15,30,50],
         'viewrecords':True,
         'imgpath': 'scripts/jqGrid/themes/green/images',
-        'width': 900,
+        'width': 590,
         'height': 'auto',
     }