server/dev.cfg | 2
server/mirrormanager/controllers.py | 99 +++++++++++++++---------------
server/mirrormanager/templates/static.kid | 2
3 files changed, 53 insertions(+), 50 deletions(-)
New commits:
commit ffd9042206b829b569e9851f7952b6a666315be9
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Tue Nov 15 21:32:13 2011 -0600
add support for branded css
diff --git a/server/dev.cfg b/server/dev.cfg
index eeeb047..780b482 100644
--- a/server/dev.cfg
+++ b/server/dev.cfg
@@ -7,6 +7,7 @@
#mirrormanager.cssroot = "https://lisas.de/mirrormanager/static/css/"
#mirrormanager.copyright = "rpmfusion"
#mirrormanager.upstream = "rsync://download1.rpmfusion.org/rpmfusion/"
+#mirrormanager.branded_css = "rpmfusion.css"
#mirrormanager.branded_templates = "mirrormanager.templates.rpmfusion"
#mirrormanager.max_ipv4_netblock_size = '/16'
#mirrormanager.max_ipv6_netblock_size = '/32'
diff --git a/server/mirrormanager/templates/static.kid
b/server/mirrormanager/templates/static.kid
index 46c4dc4..b61f772 100644
--- a/server/mirrormanager/templates/static.kid
+++ b/server/mirrormanager/templates/static.kid
@@ -5,7 +5,7 @@
<meta content="text/html; charset=UTF-8"
http-equiv="content-type" py:replace="''"/>
<title>MirrorManager</title>
<link rel="stylesheet" type="text/css" media="all"
- py:attrs="{'href': tg.config('mirrormanager.cssroot',
'/mirrormanager/static/css/') + 'fedora.css'}"/>
+ py:attrs="{'href': tg.config('mirrormanager.cssroot',
'/mirrormanager/static/css/') + tg.config('mirrormanager.branded_css',
'fedora.css')}"/>
<link rel="stylesheet" type="text/css" media="all"
py:attrs="{'href': tg.config('mirrormanager.cssroot',
'/mirrormanager/static/css/') + 'main.css'}"/>
<link rel="stylesheet" type="text/css" media="all"
commit 5e016a4fc1d7b1d42b0baf553002cb1cd63920c1
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Tue Nov 15 21:28:31 2011 -0600
add support for branded templates
diff --git a/server/dev.cfg b/server/dev.cfg
index 962453d..eeeb047 100644
--- a/server/dev.cfg
+++ b/server/dev.cfg
@@ -7,6 +7,7 @@
#mirrormanager.cssroot = "https://lisas.de/mirrormanager/static/css/"
#mirrormanager.copyright = "rpmfusion"
#mirrormanager.upstream = "rsync://download1.rpmfusion.org/rpmfusion/"
+#mirrormanager.branded_templates = "mirrormanager.templates.rpmfusion"
#mirrormanager.max_ipv4_netblock_size = '/16'
#mirrormanager.max_ipv6_netblock_size = '/32'
#mirrormanager.report_problems_to_email = 'mirror-admin at fedoraproject.org'
diff --git a/server/mirrormanager/controllers.py b/server/mirrormanager/controllers.py
index e0f7fd9..3f5bd85 100644
--- a/server/mirrormanager/controllers.py
+++ b/server/mirrormanager/controllers.py
@@ -4,6 +4,7 @@ import cherrypy
from turbogears import config
admin_group = config.get('mirrormanager.admin_group', 'sysadmin')
+branded_templates = config.get('mirrormanager.branded_templates',
'mirrormanager.templates')
import turbogears
from turbogears import controllers, expose, validate, redirect, widgets
@@ -105,18 +106,18 @@ class SiteController(controllers.Controller,
identity.SecureResource, content):
site = Site.get(id)
return dict(values=site, disabled_fields=self.disabled_fields(site=site))
- @expose(template="mirrormanager.templates.site")
+ @expose(template=branded_templates+".site")
def read(self, site):
downstream_siteadmin_check(site, identity)
submit_action = "/site/%s/update" % site.id
return dict(form=site_form, values=site, action=submit_action,
disabled_fields=self.disabled_fields(site=site))
- @expose(template="mirrormanager.templates.site")
+ @expose(template=branded_templates+".site")
def new(self, **kwargs):
submit_action = "/site/0/create"
return dict(form=site_form, values=None, action=submit_action,
disabled_fields=self.disabled_fields())
- @expose(template="mirrormanager.templates.site")
+ @expose(template=branded_templates+".site")
@validate(form=site_form)
@error_handler(new)
def create(self, tg_errors=None, **kwargs):
@@ -138,7 +139,7 @@ class SiteController(controllers.Controller, identity.SecureResource,
content):
turbogears.flash("Site created.")
raise turbogears.redirect("/site/%s" % site.id)
- @expose(template="mirrormanager.templates.site")
+ @expose(template=branded_templates+".site")
@validate(form=site_form)
@error_handler()
def update(self, site, tg_errors=None, **kwargs):
@@ -157,13 +158,13 @@ class SiteController(controllers.Controller,
identity.SecureResource, content):
turbogears.flash("Site Updated")
raise turbogears.redirect("/site/%s" % site.id)
- @expose(template="mirrormanager.templates.site")
+ @expose(template=branded_templates+".site")
def delete(self, site, **kwargs):
siteadmin_check(site, identity)
site.destroySelf()
raise turbogears.redirect("/")
- @expose(template="mirrormanager.templates.site")
+ @expose(template=branded_templates+".site")
def s2s_delete(self, site, **kwargs):
siteadmin_check(site, identity)
dsite = Site.get(kwargs['dsite'])
@@ -187,7 +188,7 @@ class SiteAdminController(controllers.Controller,
identity.SecureResource, conte
v = SiteAdmin.get(id)
return dict(values=v, site=v.site, page_title="Site Admin")
- @expose(template="mirrormanager.templates.boringsiteform")
+ @expose(template=branded_templates+".boringsiteform")
def new(self, **kwargs):
siteid=kwargs['siteid']
try:
@@ -199,7 +200,7 @@ class SiteAdminController(controllers.Controller,
identity.SecureResource, conte
submit_action = "/siteadmin/0/create?siteid=%s" % siteid
return dict(form=siteadmin_form, values=None, action=submit_action,
page_title="New Site Admin", site=site)
- @expose(template="mirrormanager.templates.boringsiteform")
+ @expose(template=branded_templates+".boringsiteform")
@error_handler(new)
@validate(form=siteadmin_form)
def create(self, **kwargs):
@@ -223,7 +224,7 @@ class SiteAdminController(controllers.Controller,
identity.SecureResource, conte
turbogears.flash("SiteAdmin created.")
raise turbogears.redirect("/site/%s" % siteid)
- @expose(template="mirrormanager.templates.boringsiteform")
+ @expose(template=branded_templates+".boringsiteform")
def delete(self, siteadmin, **kwargs):
site = siteadmin.my_site()
siteadmin_check(site, identity)
@@ -251,7 +252,7 @@ class SiteToSiteController(controllers.Controller,
identity.SecureResource, cont
v = SiteToSite.get(id)
return dict(values=v, site=v.upstream_site)
- @expose(template="mirrormanager.templates.boringsiteform")
+ @expose(template=branded_templates+".boringsiteform")
def new(self, **kwargs):
siteid=kwargs['siteid']
try:
@@ -339,7 +340,7 @@ class HostController(controllers.Controller, identity.SecureResource,
content):
host = Host.get(id)
return dict(values=host)
- @expose(template="mirrormanager.templates.host")
+ @expose(template=branded_templates+".host")
def new(self, **kwargs):
try:
siteid=kwargs['siteid']
@@ -350,7 +351,7 @@ class HostController(controllers.Controller, identity.SecureResource,
content):
return dict(form=host_form, values=None, action=submit_action,
disabled_fields=self.disabled_fields(),
page_title="Create Host", site=Site.get(siteid))
- @expose(template="mirrormanager.templates.host")
+ @expose(template=branded_templates+".host")
@validate(form=host_form)
@error_handler(new)
def create(self, siteid=None, tg_errors=None, **kwargs):
@@ -377,14 +378,14 @@ class HostController(controllers.Controller,
identity.SecureResource, content):
raise turbogears.redirect("/host/%s" % host.id)
- @expose(template="mirrormanager.templates.host")
+ @expose(template=branded_templates+".host")
def read(self, host):
downstream_siteadmin_check(host.my_site(), identity)
submit_action = "/host/%s/update" % host.id
return dict(form=host_form, values=host, action=submit_action,
disabled_fields=self.disabled_fields(host=host),
page_title="Host", site=host.site)
- @expose(template="mirrormanager.templates.host")
+ @expose(template=branded_templates+".host")
@validate(form=host_form)
@error_handler()
def update(self, host, tg_errors=None, **kwargs):
@@ -473,7 +474,7 @@ class HostCategoryController(controllers.Controller,
identity.SecureResource, co
hc = HostCategory.get(id)
return dict(values=hc)
- @expose(template="mirrormanager.templates.hostcategory")
+ @expose(template=branded_templates+".hostcategory")
def new(self, **kwargs):
try:
@@ -486,14 +487,14 @@ class HostCategoryController(controllers.Controller,
identity.SecureResource, co
return dict(form=host_category_form_new, values=None, action=submit_action,
disabled_fields=self.disabled_fields(), host=host)
- @expose(template="mirrormanager.templates.hostcategory")
+ @expose(template=branded_templates+".hostcategory")
def read(self, hostcategory):
downstream_siteadmin_check(hostcategory.my_site(), identity)
submit_action = "/host_category/%s/update" % hostcategory.id
disabled_fields=self.disabled_fields()
return dict(form=host_category_form_read, values=hostcategory,
action=submit_action, disabled_fields=self.disabled_fields(), host=hostcategory.host)
- @expose(template="mirrormanager.templates.hostcategory")
+ @expose(template=branded_templates+".hostcategory")
@validate(form=host_category_form_new)
@error_handler(new)
def create(self, **kwargs):
@@ -526,7 +527,7 @@ class HostCategoryController(controllers.Controller,
identity.SecureResource, co
raise turbogears.redirect("/host_category/%s" % hostcategory.id)
- @expose(template="mirrormanager.templates.hostcategory")
+ @expose(template=branded_templates+".hostcategory")
@validate(form=host_category_form_read)
@error_handler()
def update(self, hostcategory, tg_errors=None, **kwargs):
@@ -545,7 +546,7 @@ class HostCategoryController(controllers.Controller,
identity.SecureResource, co
turbogears.flash("HostCategory Updated")
raise turbogears.redirect("/")
- @expose(template="mirrormanager.templates.hostcategory")
+ @expose(template=branded_templates+".hostcategory")
def delete(self, hostcategory, **kwargs):
siteadmin_check(hostcategory.my_site(), identity)
hostid = hostcategory.host.id
@@ -561,7 +562,7 @@ class HostListitemController(controllers.Controller,
identity.SecureResource, co
def get(self, id):
return self.do_get(id)
- @expose(template="mirrormanager.templates.boringhostform")
+ @expose(template=branded_templates+".boringhostform")
def new(self, **kwargs):
try:
hostid=kwargs['hostid']
@@ -573,7 +574,7 @@ class HostListitemController(controllers.Controller,
identity.SecureResource, co
submit_action = "%s/0/create?hostid=%s" % (self.submit_action_prefix,
hostid)
return dict(form=self.form, values=None, action=submit_action,
page_title=self.page_title, host=host)
- @expose(template="mirrormanager.templates.boringhostform")
+ @expose(template=branded_templates+".boringhostform")
@validate(form=form)
@error_handler(new)
def create(self, **kwargs):
@@ -601,7 +602,7 @@ class HostListitemController(controllers.Controller,
identity.SecureResource, co
raise turbogears.redirect("/host/%s" % host.id)
- @expose(template="mirrormanager.templates.boringhostform")
+ @expose(template=branded_templates+".boringhostform")
def delete(self, thing, **kwargs):
host = thing.host
siteadmin_check(host.my_site(), identity)
@@ -705,7 +706,7 @@ class HostCategoryUrlController(controllers.Controller,
identity.SecureResource,
v = HostCategoryUrl.get(id)
return dict(values=v, host_category=v.host_category)
- @expose(template="mirrormanager.templates.hostcategoryurl")
+ @expose(template=branded_templates+".hostcategoryurl")
def new(self, **kwargs):
try:
hcid=kwargs['hcid']
@@ -719,7 +720,7 @@ class HostCategoryUrlController(controllers.Controller,
identity.SecureResource,
submit_action = "/host_category_url/0/create?hcid=%s" % hcid
return dict(form=self.form, values=None, action=submit_action,
page_title=self.page_title, host_category=host_category)
- @expose(template="mirrormanager.templates.hostcategoryurl")
+ @expose(template=branded_templates+".hostcategoryurl")
@validate(form=form)
@error_handler(new)
def create(self, **kwargs):
@@ -765,13 +766,13 @@ class HostCategoryUrlController(controllers.Controller,
identity.SecureResource,
turbogears.flash("Success: HostCategoryURL created.")
raise turbogears.redirect("/host_category/%s" % hcid)
- @expose(template="mirrormanager.templates.hostcategoryurl")
+ @expose(template=branded_templates+".hostcategoryurl")
def read(self, hcurl):
downstream_siteadmin_check(hcurl.my_site(), identity)
submit_action = "/host_category_url/%s/update" % hcurl.id
return dict(form=self.form, values=hcurl, action=submit_action,
page_title=self.page_title, host_category=hcurl.host_category)
- @expose(template="mirrormanager.templates.hostcategoryurl")
+ @expose(template=branded_templates+".hostcategoryurl")
def update(self, hcurl, **kwargs):
siteadmin_check(hcurl.my_site(), identity)
if kwargs['url'].endswith('/'):
@@ -784,7 +785,7 @@ class HostCategoryUrlController(controllers.Controller,
identity.SecureResource,
- @expose(template="mirrormanager.templates.hostcategoryurl")
+ @expose(template=branded_templates+".hostcategoryurl")
def delete(self, hcurl, **kwargs):
hc = hcurl.host_category
siteadmin_check(hcurl.my_site(), identity)
@@ -809,7 +810,7 @@ class SimpleDbObjectController(controllers.Controller,
identity.SecureResource,
v = self.myClass.get(id)
return dict(values=v)
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
def new(self, **kwargs):
submit_action = "/%s/0/create" % self.url_prefix
@@ -824,7 +825,7 @@ class SimpleDbObjectController(controllers.Controller,
identity.SecureResource,
turbogears.flash("Success: Object created.")
turbogears.redirect("/adminview")
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
def read(self, obj):
submit_action = "/%s/%s/update" % (self.url_prefix, obj.id)
return dict(form=self.form, values=obj, action=submit_action,
page_title=self.page_title)
@@ -835,7 +836,7 @@ class SimpleDbObjectController(controllers.Controller,
identity.SecureResource,
submit_action = "/%s/%s/update" % (self.url_prefix, obj.id)
return dict(form=self.form, values=obj, action=submit_action,
page_title=self.page_title)
- @expose(template="mirrormanager.templates.boringdeleteform")
+ @expose(template=branded_templates+".boringdeleteform")
def delete(self, obj, **kwargs):
confirmed = kwargs.get('confirmed', None)
confirm_delete_form = widgets.TableForm(fields=ConfirmDeleteFields(),
submit_text="Yes, really delete it!")
@@ -865,7 +866,7 @@ class ArchController(SimpleDbObjectController):
url_prefix="arch"
form = arch_form
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
@validate(form=arch_form)
@error_handler(SimpleDbObjectController.new)
def create(self, **kwargs):
@@ -887,7 +888,7 @@ class EmbargoedCountryController(SimpleDbObjectController):
url_prefix="embargoed_country"
form = embargoed_country_form
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
@validate(form=embargoed_country_form)
@error_handler(SimpleDbObjectController.new)
def create(self, **kwargs):
@@ -909,7 +910,7 @@ class ProductController(SimpleDbObjectController):
myClass = Product
url_prefix="product"
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
@validate(form=product_form)
@error_handler(SimpleDbObjectController.new)
def create(self, came_from='/', **kwargs):
@@ -935,14 +936,14 @@ class RepositoryController(SimpleDbObjectController):
myClass = Repository
url_prefix="repository"
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
@validate(form=repository_form)
@error_handler(SimpleDbObjectController.new)
def create(self, **kwargs):
return SimpleDbObjectController.create(self, **kwargs)
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
@validate(form=repository_form)
@error_handler(SimpleDbObjectController.new)
def update(self, obj, **kwargs):
@@ -973,7 +974,7 @@ class VersionController(SimpleDbObjectController):
url_prefix="version"
form = version_form
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
@validate(form=form)
@error_handler(SimpleDbObjectController.new)
def create(self, **kwargs):
@@ -987,7 +988,7 @@ class VersionController(SimpleDbObjectController):
SimpleDbObjectController.create(self, product=product, **kwargs)
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
@validate(form=form)
@error_handler()
def update(self, obj, **kwargs):
@@ -1008,13 +1009,13 @@ class RepositoryRedirectController(SimpleDbObjectController):
url_prefix="repository_redirect"
form = repository_redirect_form
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
@validate(form=form)
@error_handler(SimpleDbObjectController.new)
def create(self, **kwargs):
SimpleDbObjectController.create(self, **kwargs)
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
@validate(form=form)
@error_handler()
def update(self, obj, **kwargs):
@@ -1035,13 +1036,13 @@ class
CountryContinentRedirectController(SimpleDbObjectController):
url_prefix="country_continent_redirect"
form = country_continent_redirect_form
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
@validate(form=form)
@error_handler(SimpleDbObjectController.new)
def create(self, **kwargs):
SimpleDbObjectController.create(self, **kwargs)
- @expose(template="mirrormanager.templates.boringform")
+ @expose(template=branded_templates+".boringform")
@validate(form=form)
@error_handler()
def update(self, obj, **kwargs):
@@ -1074,7 +1075,7 @@ class Root(controllers.RootController):
from mirrormanager.xmlrpc import XmlrpcController
xmlrpc = XmlrpcController()
- @expose(template="mirrormanager.templates.welcome")
+ @expose(template=branded_templates+".welcome")
@identity.require(identity.not_anonymous())
def index(self):
if admin_group in identity.current.groups:
@@ -1083,7 +1084,7 @@ class Root(controllers.RootController):
sites = user_sites(identity)
return {"sites":sites}
- @expose(template="mirrormanager.templates.help")
+ @expose(template=branded_templates+".help")
@identity.require(identity.not_anonymous())
def help(self):
if admin_group in identity.current.groups:
@@ -1092,7 +1093,7 @@ class Root(controllers.RootController):
sites = user_sites(identity)
return {}
- @expose(template="mirrormanager.templates.adminview")
+ @expose(template=branded_templates+".adminview")
@identity.require(identity.in_group(admin_group))
def adminview(self):
return {"sites":Site.select(orderBy='name'),
@@ -1108,7 +1109,7 @@ class Root(controllers.RootController):
"country_continent_redirects":CountryContinentRedirect.select(orderBy='country'),
}
- @expose(template="mirrormanager.templates.rsync_acl",
format="plain", content_type="text/plain")
+ @expose(template=branded_templates+".rsync_acl", format="plain",
content_type="text/plain")
def rsync_acl(self, **kwargs):
internet2_only=False
public_only=False
@@ -1120,14 +1121,14 @@ class Root(controllers.RootController):
result = rsync_acl_list(internet2_only=internet2_only, public_only=public_only)
return dict(values=result)
- @expose(template="mirrormanager.templates.rsync_acl",
format="plain", content_type="text/plain", allow_json=True)
+ @expose(template=branded_templates+".rsync_acl", format="plain",
content_type="text/plain", allow_json=True)
def mirroradmins(self, **kwargs):
if 'host' not in kwargs:
return dict(values=[])
host = kwargs['host']
return dict(values=host_siteadmins(host))
- @expose(template="mirrormanager.templates.rsyncFilter",
format="plain", content_type="text/plain")
+ @expose(template=branded_templates+".rsyncFilter",
format="plain", content_type="text/plain")
def rsyncFilter(self, **kwargs):
def parents(dir):
@@ -1183,7 +1184,7 @@ class Root(controllers.RootController):
includes[i] += u'/'
return dict(includes=includes, excludes=excludes, message=message)
- @expose(template="genshi:mirrormanager.templates.login", allow_json=True)
+ @expose(template="genshi:"+branded_templates+".login",
allow_json=True)
def login(self, forward_url=None, previous_url=None, *args, **kw):
login_dict = fc_login(forward_url, previous_url, args, kw)
return login_dict
@@ -1192,7 +1193,7 @@ class Root(controllers.RootController):
def logout(self):
return fc_logout()
- @expose(template="mirrormanager.templates.register")
+ @expose(template=branded_templates+".register")
def register(self, username="", display_name="",
email_address="", tg_errors=None):
if tg_errors:
turbogears.flash(createErrorString(tg_errors))