Merge lp:~dholbach/loco-team-portal/init into lp:loco-team-portal

[Daniel Holbach]

[lp:~dholbach/loco-team-portal/init]

47. By Daniel Holbach on 2010-01-19

update instructions again

48. By Daniel Holbach on 2010-01-19

check if settings.py and settings.py.sample do exist, simplify jquery* link creation and package check

Unmerged revisions

=== modified file 'INSTALL'
--- INSTALL	2010-01-18 15:11:42 +0000
+++ INSTALL	2010-01-19 16:57:13 +0000
@@ -8,18 +8,14 @@
  - sudo -u postgres createdb -O postgres loco_directory
 
 Generally:
- - sudo apt-get install python-django python-launchpadlib libjs-jquery-ui
- - install python-django-openid-auth from karmic or from:
-   http://archive.ubuntu.com/ubuntu/pool/universe/p/python-django-openid-auth/
+ - sudo apt-get install python-django python-launchpadlib libjs-jquery-ui python-django-openid-auth
  - cd loco_directory
  - cp settings.py.sample settings.py
- - ln -s /usr/share/javascript/jquery media/jquery
- - ln -s /usr/share/javascript/jquery-ui media/jquery-ui
+# edit settings.py and set DATABASE_USER, DATABASE_PASSWORD, SECRET_KEY
  ** Karmic users must also do the following:
  - sudo ln -s /usr/share/javascript/jquery-ui/jquery-ui-1.7.1.custom.min.js /usr/share/javascript/jquery-ui/jquery-ui.js
  - sudo ln -s /usr/share/javascript/jquery-ui/css/css/smoothness /usr/share/javascript/jquery-ui/css/smoothness
  - sudo ln -s /usr/share/javascript/jquery-ui/css/smoothness/jquery-ui-1.7.1.custom.css /usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.css
-# edit settings.py and set DATABASE_USER, DATABASE_PASSWORD, SECRET_KEY
  - ./manage.py syncdb
  - ./manage.py init-ld
  - ./manage.py lpupdate

=== modified file 'loco_directory/teams/management/commands/init-ld.py'
--- loco_directory/teams/management/commands/init-ld.py	2010-01-18 15:24:59 +0000
+++ loco_directory/teams/management/commands/init-ld.py	2010-01-19 16:57:13 +0000
@@ -7,18 +7,47 @@
 import settings
 
 import subprocess
+import os
 
 class Command(NoArgsCommand):
     help = "Make sure the LoCo Directory is set up properly."
 
     def handle_noargs(self, **options):
-        print "Compiling messages."
+        print " * Compiling messages."
         subprocess.call(["./manage.py", "compilemessages"])
 
-        print "Checking if LoCo Council is in Auth teams:", 
+        print " * Checking if LoCo Council is in Auth teams:", 
         (lc, new_object) = Group.objects.get_or_create(name="ubuntu-lococouncil")
         if new_object:
             lc.save()
             print "added."
         else:
             print "yes."
+
+        print " * Creating jquery symlinks:", 
+        updated = False
+        path = settings.PROJECT_PATH
+        javascript_dir = "/usr/share/javascript"
+        media_dir = os.path.join(path, "media")
+        link_mapping = [("libjs-jquery", "jquery"),
+                        ("libjs-jquery-ui", "jquery-ui")]
+        for (package, pathname) in link_mapping:
+            src = os.path.join(javascript_dir, pathname)
+            if not os.path.exists(src):
+                print >> sys.stderr, "Please install the %s package." % package
+                sys.exit(1)
+            dest = os.path.join(media_dir, pathname)
+            if not os.path.exists(dest):
+                os.symlink(src, dest)
+                updated = True
+        if updated:
+            print "updated."
+        else:
+            print "not necessary."
+        
+        if os.path.exists(os.path.join(path, "settings.py.sample")) and \
+           os.path.exists(os.path.join(path, "settings.py")):
+            print " * Showing diff between settings.py.sample and settings.py."
+            subprocess.call(["diff", "-u", 
+                             os.path.join(path, "settings.py.sample"),
+                             os.path.join(path, "settings.py")])