Working setup.py, and single character fix to kasey's javascript.

pygeek · Mar 25, 2011 · 3f40752 · 3f40752
1 parent 1175bf6
commit 3f40752
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,4 +2,9 @@ include LICENSE.txt
 include README.md
 include AUTHORS.txt
 recursive-include servee *
+recursive-include servee/frontendadmin/templates *
+recursive-include servee/frontendadmin/static *
+recursive-include servee/wysiwyg *
+recursive-include servee/wysiwyg/tinymce/static *
+recursive-include servee/wysiwyg/tinymce/templates *
 recursive-include docs *
diff --git a/servee/__init__.py b/servee/__init__.py
@@ -1,7 +1,8 @@
 VERSION = (0, 6, 0, "a", 1)  # following PEP 386
-DEV_N = None
-
+DEV_N = "5"
 
+# cribbed from pinax
+# https://github.com/pinax/pinax/raw/master/LICENSE
 def get_version():
     version = "%s.%s" % (VERSION[0], VERSION[1])
     if VERSION[2]:

diff --git a/servee/frontendadmin/templates/servee/change_form.html b/servee/frontendadmin/templates/servee/change_form.html
@@ -79,7 +79,7 @@
 
 		if  ($(window).scrollTop() <= $(".scrollidentifier").offset({ scroll: false }).top){
 		   $(".submit-row").css("position", "relative");
-		   $(".submit-row").css("bottom", $(".scrollidentifier").offset();
+		   $(".submit-row").css("bottom", $(".scrollidentifier").offset());
 		}
 	}); 
 });

diff --git a/setup.py b/setup.py
@@ -112,13 +112,14 @@ def find_package_data(
     packages = find_packages(exclude=["example_project*",]),
     package_data = find_package_data('servee',only_in_packages=False),
     install_requires = [
-        'Django>1.2.5',
+        'Django==1.3',
         'django-uni-form>=0.7',
         'django-classy-tags',
     ],
     #tests_require = [
     #    'Django', 'django-classy-tags', 'django-uni-form'
     #],
+    include_package_data=True,
     classifiers = [
         'Development Status :: 3 - Alpha',
         'Framework :: Django',