Merge branch 'master' into sleepers

install.py

@@ -33,6 +33,19 @@ for root, folders, files in os.walk(join(base, 'static')):
             os.makedirs(target_folder)
         os.symlink(rel_src, target)
 
+for img in ('logo.png', 'icon.png'):
+    f = join('/srv/pandora/static/png', img)
+    custom = join('/srv/pandora/static/png', img.replace('.png', '.%s.png' % name))
+    if os.path.exists(custom):
+        if not os.path.islink(f):
+            os.unlink(f)
+        else:
+            path = os.path.realpath(f)
+            if name not in path:
+                os.unlink(f)
+        if not os.path.exists(f):
+            os.symlink(os.path.basename(custom), f)
+
 if overwrite:
     os.chdir('/srv/pandora/static/js')
     for filename, sitename in overwrite:

static/js/home.collectivecinema.js

@@ -291,7 +291,7 @@ pandora.ui.home = function() {
         if (loadedCSS) {
             callback()
         } else {
-            Ox.getFile('/static/css/home.css', function() {
+            Ox.getFile('/static/css/home.collectivecinema.css', function() {
                 loadedCSS = true
                 callback()
             })