From 5b9f51525091f439f52936f970b9765119389187 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Jan 22 2012 01:45:02 +0000
Subject: new approach for web themes


---

diff --git a/www/conf/kojiweb.conf b/www/conf/kojiweb.conf
index 96c8dd7..a82c050 100644
--- a/www/conf/kojiweb.conf
+++ b/www/conf/kojiweb.conf
@@ -12,6 +12,7 @@ Alias /koji "/usr/share/koji-web/scripts/"
     PythonOption SiteName Koji
     PythonOption KojiHubURL http://hub.example.com/kojihub
     PythonOption KojiFilesURL http://server.example.com/mnt/koji
+    #PythonOption KojiTheme mytheme
     PythonOption WebPrincipal koji/web@EXAMPLE.COM
     PythonOption WebKeytab /etc/httpd.keytab
     PythonOption WebCCache /var/tmp/kojiweb.ccache
diff --git a/www/kojiweb/buildsbystatus.chtml b/www/kojiweb/buildsbystatus.chtml
index 8a27dd0..be7b6cb 100644
--- a/www/kojiweb/buildsbystatus.chtml
+++ b/www/kojiweb/buildsbystatus.chtml
@@ -37,17 +37,17 @@
     </tr>
     <tr class="row-odd taskclosed">
       <td>Succeeded</td>
-      <td width="#echo $graphWidth + 5#"><img src="/koji-static/images/1px.gif" width="#echo $increment * $numSucceeded#" height="15" class="graphrow" alt="graph row"/></td>
+      <td width="#echo $graphWidth + 5#"><img src="$util.themePath('images/1px.gif')" width="#echo $increment * $numSucceeded#" height="15" class="graphrow" alt="graph row"/></td>
       <td>$numSucceeded</td>
     </tr>
     <tr class="row-even taskfailed">
       <td>Failed</td>
-      <td width="#echo $graphWidth + 5#"><img src="/koji-static/images/1px.gif" width="#echo $increment * $numFailed#" height="15" class="graphrow" alt="graph row"/></td>
+      <td width="#echo $graphWidth + 5#"><img src="$util.themePath('images/1px.gif')" width="#echo $increment * $numFailed#" height="15" class="graphrow" alt="graph row"/></td>
       <td>$numFailed</td>
     </tr>
     <tr class="row-odd taskcanceled">
       <td>Canceled</td>
-      <td width="#echo $graphWidth + 5#"><img src="/koji-static/images/1px.gif" width="#echo $increment * $numCanceled#" height="15" class="graphrow" alt="graph row"/></td>
+      <td width="#echo $graphWidth + 5#"><img src="$util.themePath('images/1px.gif')" width="#echo $increment * $numCanceled#" height="15" class="graphrow" alt="graph row"/></td>
       <td>$numCanceled</td>
     </tr>
   </table>
diff --git a/www/kojiweb/buildsbytarget.chtml b/www/kojiweb/buildsbytarget.chtml
index e68cb5b..97a7e7b 100644
--- a/www/kojiweb/buildsbytarget.chtml
+++ b/www/kojiweb/buildsbytarget.chtml
@@ -62,7 +62,7 @@
     #for $target in $targets
     <tr class="$util.rowToggle($self)">
       <td><a href="buildtargetinfo?name=$target.name">$target.name</a></td>
-      <td width="#echo $graphWidth + 5#"><img src="/koji-static/images/1px.gif" width="#echo $increment * $target.builds#" height="15" class="graphrow" alt="graph row"/></td>
+      <td width="#echo $graphWidth + 5#"><img src=$util.themePath('images/1px.gif') width="#echo $increment * $target.builds#" height="15" class="graphrow" alt="graph row"/></td>
       <td>$target.builds</td>
     </tr>
     #end for
diff --git a/www/kojiweb/buildsbyuser.chtml b/www/kojiweb/buildsbyuser.chtml
index e3740fa..002f645 100644
--- a/www/kojiweb/buildsbyuser.chtml
+++ b/www/kojiweb/buildsbyuser.chtml
@@ -36,7 +36,7 @@
     #for $userBuild in $userBuilds
     <tr class="$util.rowToggle($self)">
       <td><a href="userinfo?userID=$userBuild.id">$userBuild.name</a></td>
-      <td width="#echo $graphWidth + 5#"><img src="/koji-static/images/1px.gif" width="#echo $increment * $userBuild.builds#" height="15" class="graphrow" alt="graph row"/></td>
+      <td width="#echo $graphWidth + 5#"><img src="$util.themePath('images/1px.gif')" width="#echo $increment * $userBuild.builds#" height="15" class="graphrow" alt="graph row"/></td>
       <td>$userBuild.builds</td>
     </tr>
     #end for
diff --git a/www/kojiweb/includes/footer.chtml b/www/kojiweb/includes/footer.chtml
index 4ed3b85..058c88b 100644
--- a/www/kojiweb/includes/footer.chtml
+++ b/www/kojiweb/includes/footer.chtml
@@ -1,8 +1,9 @@
+#from kojiweb import util
         </div>
 
         <p id="footer">
           Copyright &copy; 2006-2010 Red Hat
-          <a href="https://fedorahosted.org/koji/"><img src="/koji-static/images/powered-by-koji.png" alt="Powered By Koji" id="PoweredByKojiLogo"/></a>
+          <a href="https://fedorahosted.org/koji/"><img src="$util.themePath('images/powered-by-koji.png')" alt="Powered By Koji" id="PoweredByKojiLogo"/></a>
         </p>
 
 #set $localfooterpath="/usr/share/koji-web/local/extra-footer.html"
diff --git a/www/kojiweb/includes/header.chtml b/www/kojiweb/includes/header.chtml
index a320483..850250d 100644
--- a/www/kojiweb/includes/header.chtml
+++ b/www/kojiweb/includes/header.chtml
@@ -1,5 +1,6 @@
 #encoding utf-8
 #import koji
+#from kojiweb import util
 #import random
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -33,9 +34,9 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <title>$title | $siteName</title>
-    <link rel="shortcut icon" href="/koji-static/images/koji.ico"/>
-    <link rel="stylesheet" type="text/css" media="screen" title="Koji Style" href="/koji-static/koji.css"/>
-    <link rel="alternate stylesheet" type="text/css" media="screen" title="Debug" href="/koji-static/debug.css"/>
+    <link rel="shortcut icon" href="$util.themePath('images/koji.ico')"/>
+    <link rel="stylesheet" type="text/css" media="screen" title="Koji Style" href="$util.themePath('koji.css')"/>
+    <link rel="alternate stylesheet" type="text/css" media="screen" title="Debug" href="$util.themePath('debug.css')"/>
     <link rel="alternate" type="application/rss+xml" title="Koji: recent builds" href="/koji/recentbuilds"/>
   </head>
   <body id="$pageID">
@@ -45,7 +46,7 @@
 
         <!-- HEADER -->
         <div id="header">
-          <img src="/koji-static/images/koji.png" alt="Koji Logo" id="kojiLogo"/>
+          <img src="$util.themePath('images/koji.png')" alt="Koji Logo" id="kojiLogo"/>
 #set $localnavpath="/usr/share/koji-web/local/extra-nav.html"
 #if os.path.exists($localnavpath)
 #set $localnav="".join(open($localnavpath).readlines())
diff --git a/www/kojiweb/packagesbyuser.chtml b/www/kojiweb/packagesbyuser.chtml
index f32de51..c4e5713 100644
--- a/www/kojiweb/packagesbyuser.chtml
+++ b/www/kojiweb/packagesbyuser.chtml
@@ -36,7 +36,7 @@
     #for $user in $users
     <tr class="$util.rowToggle($self)">
       <td><a href="userinfo?userID=$user.id">$user.name</a></td>
-      <td width="#echo $graphWidth + 5#"><img src="/koji-static/images/1px.gif" width="#echo $increment * $user.packages#" height="15" class="graphrow" alt="graph row"/></td>
+      <td width="#echo $graphWidth + 5#"><img src="$util.themePath('images/1px.gif')" width="#echo $increment * $user.packages#" height="15" class="graphrow" alt="graph row"/></td>
       <td>$user.packages</td>
     </tr>
     #end for
diff --git a/www/kojiweb/rpmsbyhost.chtml b/www/kojiweb/rpmsbyhost.chtml
index 5503a82..2c63368 100644
--- a/www/kojiweb/rpmsbyhost.chtml
+++ b/www/kojiweb/rpmsbyhost.chtml
@@ -68,7 +68,7 @@
     #for $host in $hosts
     <tr class="$util.rowToggle($self)">
       <td><a href="hostinfo?hostID=$host.id">$host.name</a></td>
-      <td width="#echo $graphWidth + 5#"><img src="/koji-static/images/1px.gif" width="#echo $increment * $host.rpms#" height="15" class="graphrow" alt="graph row"/></td>
+      <td width="#echo $graphWidth + 5#"><img src="$util.themePath('images/1px.gif')" width="#echo $increment * $host.rpms#" height="15" class="graphrow" alt="graph row"/></td>
       <td>$host.rpms</td>
     </tr>
     #end for
diff --git a/www/kojiweb/tasksbyhost.chtml b/www/kojiweb/tasksbyhost.chtml
index ba36756..4efa19e 100644
--- a/www/kojiweb/tasksbyhost.chtml
+++ b/www/kojiweb/tasksbyhost.chtml
@@ -52,7 +52,7 @@
     #for $host in $hosts
     <tr class="$util.rowToggle($self)">
       <td><a href="hostinfo?hostID=$host.id">$host.name</a></td>
-      <td width="#echo $graphWidth + 5#"><img src="/koji-static/images/1px.gif" width="#echo $increment * $host.tasks#" height="15" class="graphrow" alt="graph row"/></td>
+      <td width="#echo $graphWidth + 5#"><img src="$util.themePath('images/1px.gif')" width="#echo $increment * $host.tasks#" height="15" class="graphrow" alt="graph row"/></td>
       <td>$host.tasks</td>
     </tr>
     #end for
diff --git a/www/kojiweb/tasksbyuser.chtml b/www/kojiweb/tasksbyuser.chtml
index 1fe2704..843ea18 100644
--- a/www/kojiweb/tasksbyuser.chtml
+++ b/www/kojiweb/tasksbyuser.chtml
@@ -36,7 +36,7 @@
     #for $user in $users
     <tr class="$util.rowToggle($self)">
       <td><a href="userinfo?userID=$user.id">$user.name</a></td>
-      <td width="#echo $graphWidth + 5#"><img src="/koji-static/images/1px.gif" width="#echo $increment * $user.tasks#" height="15" class="graphrow" alt="graph row"/></td>
+      <td width="#echo $graphWidth + 5#"><img src="$util.themePath('images/1px.gif')" width="#echo $increment * $user.tasks#" height="15" class="graphrow" alt="graph row"/></td>
       <td>$user.tasks</td>
     </tr>
     #end for
diff --git a/www/lib/kojiweb/util.py b/www/lib/kojiweb/util.py
index 4b4f8ca..ec8e746 100644
--- a/www/lib/kojiweb/util.py
+++ b/www/lib/kojiweb/util.py
@@ -21,17 +21,44 @@ except:
     SSL_Error = NoSuchException
 
 
+themeInfo = {}
+themeCache = {}
+
 def _initValues(req, title='Build System Info', pageID='summary'):
+    global themeInfo
+    global themeCache
     values = {}
     values['siteName'] = req.get_options().get('SiteName', 'Koji')
     values['title'] = title
     values['pageID'] = pageID
     values['currentDate'] = str(datetime.datetime.now())
+    theme = req.get_options().get('KojiTheme', None)
+    if theme:
+        themeCache.clear()
+        themeInfo['name'] = theme
+        themeInfo['staticdir'] = req.get_options().get('KojiStaticDir', '/usr/share/koji-web/static')
+    else:
+        themeInfo.clear()
 
     req._values = values
 
     return values
 
+def themePath(path):
+    global themeInfo
+    global themeCache
+    if not themeInfo:
+        return "/koji-static/%s" % path
+    if path in themeCache:
+        return themeCache[path]
+    themepath = os.path.join(themeInfo['staticdir'], 'themes', themeInfo['name'], path)
+    if os.path.exists(themepath):
+        ret = "/koji-static/themes/%s/%s" % (themeInfo['name'], path)
+    else:
+        ret = "/koji-static/%s" % path
+    themeCache[path] = ret
+    return ret
+
 class DecodeUTF8(Cheetah.Filters.Filter):
     def filter(self, *args, **kw):
         """Convert all strs to unicode objects"""
@@ -135,9 +162,9 @@ def sortImage(template, sortKey, orderVar='order'):
     """
     orderVal = template.getVar(orderVar)
     if orderVal == sortKey:
-        return '<img src="/koji-static/images/gray-triangle-up.gif" class="sort" alt="ascending sort"/>'
+        return '<img src="%s" class="sort" alt="ascending sort"/>' % themePath("images/gray-triangle-up.gif")
     elif orderVal == '-' + sortKey:
-        return '<img src="/koji-static/images/gray-triangle-down.gif" class="sort" alt="descending sort"/>'
+        return '<img src="%s" class="sort" alt="descending sort"/>' % themePath("images/gray-triangle-down.gif")
     else:
         return ''
 
@@ -306,9 +333,9 @@ def stateName(stateID):
 
 def imageTag(name):
     """Return an img tag that loads an icon with the given name"""
-    return '<img class="stateimg" src="/koji-static/images/%s.png" title="%s" alt="%s"/>' \
-           % (name, name, name)
-    
+    return '<img class="stateimg" src="%s" title="%s" alt="%s"/>' \
+           % (themePath("images/%s.png" % name), name, name)
+
 def stateImage(stateID):
     """Return an IMG tag that loads an icon appropriate for
     the given state"""
diff --git a/www/static/Makefile b/www/static/Makefile
index 453f8b5..9ec4398 100644
--- a/www/static/Makefile
+++ b/www/static/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = images errors js
+SUBDIRS = images errors js themes
 
 SERVERDIR = /usr/share/koji-web/static
 FILES = $(wildcard *.css)
diff --git a/www/static/themes/Makefile b/www/static/themes/Makefile
new file mode 100644
index 0000000..79c3560
--- /dev/null
+++ b/www/static/themes/Makefile
@@ -0,0 +1,18 @@
+SERVERDIR = /themes
+FILES = README
+
+_default:
+	@echo "nothing to make.  try make install"
+
+clean:
+	rm -f *.o *.so *.pyc *~
+
+install:
+	@if [ "$(DESTDIR)" = "" ]; then \
+		echo " "; \
+		echo "ERROR: A destdir is required"; \
+		exit 1; \
+	fi
+
+	mkdir -p $(DESTDIR)/$(SERVERDIR)
+	install -p -m 644 $(FILES) $(DESTDIR)/$(SERVERDIR)
diff --git a/www/static/themes/README b/www/static/themes/README
new file mode 100644
index 0000000..801a3ba
--- /dev/null
+++ b/www/static/themes/README
@@ -0,0 +1,5 @@
+Place static theme content under this directory
+
+Content under koji-static/theme/$NAME/ will be used instead of the normal
+files under koji-static/ if KojiTheme is set to $NAME. Any absent files
+will fall back to the normal koji-static/ path.