rename template files to .html.j2

This commit is contained in:
Mike McLean 2025-03-08 14:40:30 -05:00 committed by Tomas Kopecek
parent dee1127ce8
commit 402f319283
53 changed files with 143 additions and 143 deletions

View file

@ -1,7 +1,7 @@
SUBDIRS = includes
SERVERDIR = /usr/share/koji-web/scripts
FILES = $(wildcard *.py *.chtml)
FILES = $(wildcard *.py *.html.j2)
_default:
@echo "nothing to make. try make install"

View file

@ -1,4 +1,4 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#set _PASSTHROUGH = ['userID']

View file

@ -1,4 +1,4 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>API reference <small>(hub version: {{ koji_version }}, web version: {{ web_version }})</small></h4>
@ -34,4 +34,4 @@ except koji.GenericError:
#endfor
</ul>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,7 +1,7 @@
#set _PASSTHROUGH = ['archiveID', 'fileOrder', 'fileStart', 'buildrootOrder', 'buildrootStart']
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for archive <a href="archiveinfo?archiveID={{ archive.id }}">{{ archive.filename }}</a></h4>
<table>
@ -156,4 +156,4 @@
#endif
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#macro getID()
#if type == 'image'
@ -89,4 +89,4 @@ buildrootID={{ buildroot.id }}
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#set nvrpath = pathinfo.build(build)
<h4>Information for build <a href="buildinfo?buildID={{ build.id }}">{{ koji.buildLabel(build) }}</a></h4>
@ -258,4 +258,4 @@
#endif
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for buildroot <a href="buildrootinfo?buildrootID={{ buildroot.id }}">{{ util.brLabel(buildroot) }}</a></h4>
@ -56,4 +56,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for external buildroot <a href="buildrootinfo?buildrootID={{ buildroot.id }}">{{ util.brLabel(buildroot) }}</a></h4>
@ -41,4 +41,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,7 +1,7 @@
#set _PASSTHROUGH = ['repoID', 'order', 'state']
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Buildroots in repo <a href="repoinfo?repoID={{ repoID }}">{{ repoID }}</a></h4>
@ -92,4 +92,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,7 +1,7 @@
#set _PASSTHROUGH = ['userID', 'tagID', 'packageID', 'order', 'prefix', 'state', 'inherited', 'latest', 'type']
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#macro getDescription()
#if latest
@ -184,4 +184,4 @@ in tag <a href="taginfo?tagID={{ tag.id }}">{{ tag.name }}</a>
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -8,7 +8,7 @@
#set numTotal = numSucceeded + numFailed + numCanceled
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Succeeded/Failed/Canceled Builds{{ ' in the last %i days' % days if days != -1 else '' }}</h4>
<table class="data-list">
@ -60,4 +60,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -6,7 +6,7 @@
<option value="{{ value }}"{{ ' selected' if value == days else '' }}>{{ label }}</option>
#endmacro
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Builds by Target{{ ' in the last %i days' % days if days != -1 else '' }}</h4>
<table class="data-list">
@ -95,4 +95,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Builds by User</h4>
<table class="data-list">
@ -69,4 +69,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#if target
<h4>Edit target {{ target.name }}</h4>
@ -59,4 +59,4 @@
</table>
</form>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,4 +1,4 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for target <a href="buildtargetinfo?targetID={{ target.id }}">{{ target.name }}</a></h4>
@ -25,4 +25,4 @@
#endif
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Build Targets</h4>
<table class="data-list">
@ -72,4 +72,4 @@
<a href="buildtargetcreate{{ util.authToken(first=True) }}">Create new Build Target</a>
#endif
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for channel <a href="channelinfo?channelID={{ channel.id }}">{{ channel.name }}</a></h4>
@ -56,4 +56,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -6,7 +6,7 @@
<option value="{{ value }}"{{ ' selected' if value == arch else '' }}>{{ label }}</option>
#endmacro
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<style>
span {
display: inline-block;
@ -80,4 +80,4 @@
#endfor
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,4 +1,4 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Error</h4>
@ -24,4 +24,4 @@
</pre>
</div>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,4 +1,4 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for external repo <a href="externalrepoinfo?extrepoID={{ extRepo.id }}">{{ extRepo.name }}</a></h4>
@ -26,4 +26,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#if rpm
<h4>Information for file <a href="fileinfo?rpmID={{ rpm.id }}&amp;filename={{ file.name|urlencode }}">{{ file.name }}</a></h4>
#elif archive
@ -58,4 +58,4 @@
#endif
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Edit host {{ host.name }}</h4>
@ -53,4 +53,4 @@
</table>
</form>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for host <a href="hostinfo?hostID={{ host.id }}">{{ host.name }}</a></h4>
@ -87,4 +87,4 @@
#endif
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -35,7 +35,7 @@ in {{ channel }} channel
#set _PASSTHROUGH = ['state', 'order', 'ready', 'channel', 'arch']
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>{{ headerState(state) }} {{ headerReady(ready) }} {{ headerArch(arch) }} {{ headerChannel(channel) }}</h4>
<table class="data-list">
@ -165,4 +165,4 @@ in {{ channel }} channel
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
SERVERDIR = /includes
FILES = $(wildcard *.chtml)
FILES = $(wildcard *.html.j2)
_default:
@echo "nothing to make. try make install"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<div class="pageHeader">{{ welcomeMessage }}</div>
@ -156,4 +156,4 @@
<a href="notificationcreate{{ util.authToken(first=True) }}">Add a Notification</a>
#endif
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -386,7 +386,7 @@ def index(environ, packageOrder='package_name', packageStart=None):
values['koji'] = koji
return _genHTML(environ, 'index.chtml', jinja=True)
return _genHTML(environ, 'index.html.j2', jinja=True)
def notificationedit(environ, notificationID):
@ -432,7 +432,7 @@ def notificationedit(environ, notificationID):
tags = server.listTags(queryOpts={'order': 'name'})
values['tags'] = tags
return _genHTML(environ, 'notificationedit.chtml', jinja=True)
return _genHTML(environ, 'notificationedit.html.j2', jinja=True)
def notificationcreate(environ):
@ -477,7 +477,7 @@ def notificationcreate(environ):
tags = server.listTags(queryOpts={'order': 'name'})
values['tags'] = tags
return _genHTML(environ, 'notificationedit.chtml', jinja=True)
return _genHTML(environ, 'notificationedit.html.j2', jinja=True)
def notificationdelete(environ, notificationID):
@ -640,7 +640,7 @@ def tasks(environ, owner=None, state='active', view='tree', method='all', hostID
values['S'] = SafeValue
values['koji'] = koji
return _genHTML(environ, 'tasks.chtml', jinja=True)
return _genHTML(environ, 'tasks.html.j2', jinja=True)
def taskinfo(environ, taskID):
@ -800,7 +800,7 @@ def taskinfo(environ, taskID):
values['koji'] = koji
values['S'] = SafeValue
return _genHTML(environ, 'taskinfo.chtml', jinja=True)
return _genHTML(environ, 'taskinfo.html.j2', jinja=True)
def taskstatus(environ, taskID):
@ -937,7 +937,7 @@ def tags(environ, start=None, order=None, childID=None):
else:
values['childID'] = int(childID)
return _genHTML(environ, 'tags.chtml', jinja=True)
return _genHTML(environ, 'tags.html.j2', jinja=True)
_PREFIX_CHARS = [chr(char) for char in list(range(48, 58)) + list(range(97, 123))]
@ -980,7 +980,7 @@ def packages(environ, tagID=None, userID=None, order='package_name', start=None,
values['chars'] = _PREFIX_CHARS
return _genHTML(environ, 'packages.chtml', jinja=True)
return _genHTML(environ, 'packages.html.j2', jinja=True)
def packageinfo(environ, packageID, tagOrder='name', tagStart=None, buildOrder='-completion_time',
@ -1004,7 +1004,7 @@ def packageinfo(environ, packageID, tagOrder='name', tagStart=None, buildOrder='
start=buildStart, dataName='builds', prefix='build',
order=buildOrder)
return _genHTML(environ, 'packageinfo.chtml', jinja=True)
return _genHTML(environ, 'packageinfo.html.j2', jinja=True)
def taginfo(environ, tagID, all='0', packageOrder='package_name', packageStart=None,
@ -1020,7 +1020,7 @@ def taginfo(environ, tagID, all='0', packageOrder='package_name', packageStart=N
values['tagID'] = tag['id']
if 'revoke_event' in tag:
values['delete_ts'] = server.getEvent(tag['revoke_event'])['ts']
return _genHTML(environ, 'taginfo_deleted.chtml', jinja=True)
return _genHTML(environ, 'taginfo_deleted.html.j2', jinja=True)
all = int(all)
@ -1068,7 +1068,7 @@ def taginfo(environ, tagID, all='0', packageOrder='package_name', packageStart=N
allPerms = dict([(perm['id'], perm['name']) for perm in permList])
values['allPerms'] = allPerms
return _genHTML(environ, 'taginfo.chtml', jinja=True)
return _genHTML(environ, 'taginfo.html.j2', jinja=True)
def tagcreate(environ):
@ -1104,7 +1104,7 @@ def tagcreate(environ):
values['tag'] = None
values['permissions'] = server.getAllPerms()
return _genHTML(environ, 'tagedit.chtml', jinja=True)
return _genHTML(environ, 'tagedit.html.j2', jinja=True)
def tagedit(environ, tagID):
@ -1147,7 +1147,7 @@ def tagedit(environ, tagID):
values['tag'] = tag
values['permissions'] = server.getAllPerms()
return _genHTML(environ, 'tagedit.chtml', jinja=True)
return _genHTML(environ, 'tagedit.html.j2', jinja=True)
def tagdelete(environ, tagID):
@ -1213,7 +1213,7 @@ def tagparent(environ, tagID, parentID, action):
'tag %i has tag %i listed as a parent more than once' %
(tag['id'], parent['id']))
return _genHTML(environ, 'tagparent.chtml', jinja=True)
return _genHTML(environ, 'tagparent.html.j2', jinja=True)
elif action == 'remove':
data = server.getInheritanceData(tag['id'])
for datum in data:
@ -1242,7 +1242,7 @@ def externalrepoinfo(environ, extrepoID):
values['extRepo'] = extRepo
values['repoTags'] = repoTags
return _genHTML(environ, 'externalrepoinfo.chtml', jinja=True)
return _genHTML(environ, 'externalrepoinfo.html.j2', jinja=True)
def buildinfo(environ, buildID):
@ -1390,7 +1390,7 @@ def buildinfo(environ, buildID):
values['pathinfo'] = pathinfo
values['koji'] = koji
return _genHTML(environ, 'buildinfo.chtml', jinja=True)
return _genHTML(environ, 'buildinfo.html.j2', jinja=True)
def builds(environ, userID=None, tagID=None, packageID=None, state=None, order='-build_id',
@ -1478,7 +1478,7 @@ def builds(environ, userID=None, tagID=None, packageID=None, state=None, order='
values['chars'] = _PREFIX_CHARS
values['koji'] = koji
return _genHTML(environ, 'builds.chtml', jinja=True)
return _genHTML(environ, 'builds.html.j2', jinja=True)
def users(environ, order='name', start=None, prefix=None):
@ -1498,7 +1498,7 @@ def users(environ, order='name', start=None, prefix=None):
values['chars'] = _PREFIX_CHARS
return _genHTML(environ, 'users.chtml', jinja=True)
return _genHTML(environ, 'users.html.j2', jinja=True)
def userinfo(environ, userID, packageOrder='package_name', packageStart=None,
@ -1526,7 +1526,7 @@ def userinfo(environ, userID, packageOrder='package_name', packageStart=None,
start=buildStart, dataName='builds', prefix='build',
order=buildOrder, pageSize=10)
return _genHTML(environ, 'userinfo.chtml', jinja=True)
return _genHTML(environ, 'userinfo.html.j2', jinja=True)
# headers shown in rpminfo and buildinfo pages
@ -1589,7 +1589,7 @@ def rpminfo(environ, rpmID, fileOrder='name', fileStart=None, buildrootOrder='-i
values['koji'] = koji
values['time'] = time # TODO rework template so it doesn't need this
return _genHTML(environ, 'rpminfo.chtml', jinja=True)
return _genHTML(environ, 'rpminfo.html.j2', jinja=True)
def archiveinfo(environ, archiveID, fileOrder='name', fileStart=None, buildrootOrder='-id',
@ -1635,7 +1635,7 @@ def archiveinfo(environ, archiveID, fileOrder='name', fileStart=None, buildrootO
values['koji'] = koji
return _genHTML(environ, 'archiveinfo.chtml', jinja=True)
return _genHTML(environ, 'archiveinfo.html.j2', jinja=True)
def fileinfo(environ, filename, rpmID=None, archiveID=None):
@ -1670,7 +1670,7 @@ def fileinfo(environ, filename, rpmID=None, archiveID=None):
values['file'] = file
return _genHTML(environ, 'fileinfo.chtml', jinja=True)
return _genHTML(environ, 'fileinfo.html.j2', jinja=True)
def cancelbuild(environ, buildID):
@ -1754,7 +1754,7 @@ def hosts(environ, state='enabled', start=None, order='name', ready='all', chann
values['zip'] = zip # TODO FIXME
return _genHTML(environ, 'hosts.chtml', jinja=True)
return _genHTML(environ, 'hosts.html.j2', jinja=True)
def hostinfo(environ, hostID=None, userID=None):
@ -1800,7 +1800,7 @@ def hostinfo(environ, hostID=None, userID=None):
else:
values['perms'] = []
return _genHTML(environ, 'hostinfo.chtml', jinja=2)
return _genHTML(environ, 'hostinfo.html.j2', jinja=2)
def hostedit(environ, hostID):
@ -1850,7 +1850,7 @@ def hostedit(environ, hostID):
values['allChannels'] = allChannels
values['hostChannels'] = server.listChannels(hostID=host['id'])
return _genHTML(environ, 'hostedit.chtml', jinja=True)
return _genHTML(environ, 'hostedit.html.j2', jinja=True)
def disablehost(environ, hostID):
@ -1900,7 +1900,7 @@ def channelinfo(environ, channelID):
values['enabled_hosts'] = len([h for h in hosts if h['enabled']])
values['ready_hosts'] = len([h for h in hosts if h['ready']])
return _genHTML(environ, 'channelinfo.chtml', jinja=True)
return _genHTML(environ, 'channelinfo.html.j2', jinja=True)
def buildrootinfo(environ, buildrootID):
@ -1914,11 +1914,11 @@ def buildrootinfo(environ, buildrootID):
raise koji.GenericError('unknown buildroot ID: %i' % buildrootID)
elif buildroot['br_type'] == koji.BR_TYPES['STANDARD']:
template = 'buildrootinfo.chtml'
template = 'buildrootinfo.html.j2'
values['task'] = server.getTaskInfo(buildroot['task_id'], request=True)
else:
template = 'buildrootinfo_cg.chtml'
template = 'buildrootinfo_cg.html.j2'
# TODO - fetch tools and extras info
values['title'] = '%s | Buildroot Info' % kojiweb.util.brLabel(buildroot)
@ -1980,7 +1980,7 @@ def rpmlist(environ, type, buildrootID=None, imageID=None, start=None, order='nv
values['type'] = type
values['order'] = order
return _genHTML(environ, 'rpmlist.chtml', jinja=True)
return _genHTML(environ, 'rpmlist.html.j2', jinja=True)
def archivelist(environ, type, buildrootID=None, imageID=None, start=None, order='filename'):
@ -2027,7 +2027,7 @@ def archivelist(environ, type, buildrootID=None, imageID=None, start=None, order
values['type'] = type
values['order'] = order
return _genHTML(environ, 'archivelist.chtml', jinja=True)
return _genHTML(environ, 'archivelist.html.j2', jinja=True)
def buildtargets(environ, start=None, order='name'):
@ -2043,7 +2043,7 @@ def buildtargets(environ, start=None, order='name'):
else:
values['perms'] = []
return _genHTML(environ, 'buildtargets.chtml', jinja=True)
return _genHTML(environ, 'buildtargets.html.j2', jinja=True)
def buildtargetinfo(environ, targetID=None, name=None):
@ -2073,7 +2073,7 @@ def buildtargetinfo(environ, targetID=None, name=None):
else:
values['perms'] = []
return _genHTML(environ, 'buildtargetinfo.chtml', jinja=True)
return _genHTML(environ, 'buildtargetinfo.html.j2', jinja=True)
def buildtargetedit(environ, targetID):
@ -2113,7 +2113,7 @@ def buildtargetedit(environ, targetID):
values['target'] = target
values['tags'] = tags
return _genHTML(environ, 'buildtargetedit.chtml', jinja=True)
return _genHTML(environ, 'buildtargetedit.html.j2', jinja=True)
def buildtargetcreate(environ):
@ -2148,7 +2148,7 @@ def buildtargetcreate(environ):
values['target'] = None
values['tags'] = tags
return _genHTML(environ, 'buildtargetedit.chtml')
return _genHTML(environ, 'buildtargetedit.html.j2')
def buildtargetdelete(environ, targetID):
@ -2173,7 +2173,7 @@ def reports(environ):
values['loggedInUser'] = True
else:
values['loggedInUser'] = False
return _genHTML(environ, 'reports.chtml', jinja=True)
return _genHTML(environ, 'reports.html.j2', jinja=True)
def buildsbyuser(environ, start=None, order='-builds'):
@ -2201,7 +2201,7 @@ def buildsbyuser(environ, start=None, order='-builds'):
values['increment'] = graphWidth / maxBuilds
kojiweb.util.paginateList(values, users, start, 'userBuilds', 'userBuild', order)
return _genHTML(environ, 'buildsbyuser.chtml', jinja=True)
return _genHTML(environ, 'buildsbyuser.html.j2', jinja=True)
def rpmsbyhost(environ, start=None, order=None, hostArch=None, rpmArch=None):
@ -2246,7 +2246,7 @@ def rpmsbyhost(environ, start=None, order=None, hostArch=None, rpmArch=None):
values['increment'] = graphWidth / maxRPMs
kojiweb.util.paginateList(values, hosts, start, 'hosts', 'host', order)
return _genHTML(environ, 'rpmsbyhost.chtml', jinja=True)
return _genHTML(environ, 'rpmsbyhost.html.j2', jinja=True)
def packagesbyuser(environ, start=None, order=None):
@ -2276,7 +2276,7 @@ def packagesbyuser(environ, start=None, order=None):
values['increment'] = graphWidth / maxPackages
kojiweb.util.paginateList(values, users, start, 'users', 'user', order)
return _genHTML(environ, 'packagesbyuser.chtml', jinja=True)
return _genHTML(environ, 'packagesbyuser.html.j2', jinja=True)
def tasksbyhost(environ, start=None, order='-tasks', hostArch=None):
@ -2314,7 +2314,7 @@ def tasksbyhost(environ, start=None, order='-tasks', hostArch=None):
values['increment'] = graphWidth / maxTasks
kojiweb.util.paginateList(values, hosts, start, 'hosts', 'host', order)
return _genHTML(environ, 'tasksbyhost.chtml', jinja=True)
return _genHTML(environ, 'tasksbyhost.html.j2', jinja=True)
def tasksbyuser(environ, start=None, order='-tasks'):
@ -2343,7 +2343,7 @@ def tasksbyuser(environ, start=None, order='-tasks'):
values['increment'] = graphWidth / maxTasks
kojiweb.util.paginateList(values, users, start, 'users', 'user', order)
return _genHTML(environ, 'tasksbyuser.chtml', jinja=True)
return _genHTML(environ, 'tasksbyuser.html.j2', jinja=True)
def buildsbystatus(environ, days='7'):
@ -2382,7 +2382,7 @@ def buildsbystatus(environ, days='7'):
values['maxBuilds'] = maxBuilds
values['increment'] = graphWidth / maxBuilds
return _genHTML(environ, 'buildsbystatus.chtml', jinja=True)
return _genHTML(environ, 'buildsbystatus.html.j2', jinja=True)
def buildsbytarget(environ, days='7', start=None, order='-builds'):
@ -2422,7 +2422,7 @@ def buildsbytarget(environ, days='7', start=None, order='-builds'):
values['maxBuilds'] = maxBuilds
values['increment'] = graphWidth / maxBuilds
return _genHTML(environ, 'buildsbytarget.chtml', jinja=True)
return _genHTML(environ, 'buildsbytarget.html.j2', jinja=True)
def _filter_hosts_by_arch(hosts, arch):
@ -2482,7 +2482,7 @@ def clusterhealth(environ, arch='__all__'):
values['arches'] = sorted(arches)
values['graphWidth'] = graphWidth
values['channels'] = sorted(channels, key=lambda x: x['name'])
return _genHTML(environ, 'clusterhealth.chtml', jinja=True)
return _genHTML(environ, 'clusterhealth.html.j2', jinja=True)
def recentbuilds(environ, user=None, tag=None, package=None):
@ -2553,7 +2553,7 @@ def recentbuilds(environ, user=None, tag=None, package=None):
values['koji'] = koji
environ['koji.headers'].append(['Content-Type', 'text/xml'])
return _genHTML(environ, 'recentbuilds.chtml', jinja=True)
return _genHTML(environ, 'recentbuilds.html.j2', jinja=True)
_infoURLs = {'package': 'packageinfo?packageID=%(id)i',
@ -2606,7 +2606,7 @@ def search(environ, start=None, order=None):
except Exception:
values['error'] = 'Invalid regular expression'
values['terms'] = ''
return _genHTML(environ, 'search.chtml')
return _genHTML(environ, 'search.html.j2')
infoURL = _infoURLs.get(type)
if not infoURL:
@ -2630,9 +2630,9 @@ def search(environ, start=None, order=None):
else:
typeLabel = '%ss' % type
values['typeLabel'] = typeLabel
return _genHTML(environ, 'search.chtml', jinja=True)
return _genHTML(environ, 'search.html.j2', jinja=True)
else:
return _genHTML(environ, 'search.chtml', jinja=True)
return _genHTML(environ, 'search.html.j2', jinja=True)
def api(environ):
@ -2647,7 +2647,7 @@ def api(environ):
except koji.GenericError:
values['koji_version'] = "Can't determine (older then 1.23)"
return _genHTML(environ, 'api.chtml', jinja=True)
return _genHTML(environ, 'api.html.j2', jinja=True)
def watchlogs(environ, taskID):
@ -2700,7 +2700,7 @@ def repoinfo(environ, repoID):
values['numBuildroots'] = num_buildroots
values['state_name'] = kojiweb.util.repoState(repo_info['state'])
values['create_time'] = kojiweb.util.formatTimeLong(repo_info['create_ts'])
return _genHTML(environ, 'repoinfo.chtml', jinja=True)
return _genHTML(environ, 'repoinfo.html.j2', jinja=True)
def activesession(environ, start=None, order=None):
@ -2721,7 +2721,7 @@ def activesession(environ, start=None, order=None):
kojiweb.util.paginateList(values, activesess, start, 'activesess', order=order)
return _genHTML(environ, 'activesession.chtml', jinja=True)
return _genHTML(environ, 'activesession.html.j2', jinja=True)
def activesessiondelete(environ, sessionID):
@ -2752,4 +2752,4 @@ def buildroots(environ, repoID=None, order='id', start=None, state=None):
values['koji'] = koji
return _genHTML(environ, 'buildroots.chtml', jinja=True)
return _genHTML(environ, 'buildroots.html.j2', jinja=True)

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#if notif
<h4>Edit notification</h4>
@ -52,4 +52,4 @@
</table>
</form>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for package <a href="packageinfo?packageID={{ package.id }}">{{ package.name }}</a></h4>
@ -123,4 +123,4 @@
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,7 +1,7 @@
#set _PASSTHROUGH = ['userID', 'tagID', 'order', 'prefix', 'inherited', 'blocked']
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#macro getDescription()
Packages
@ -133,4 +133,4 @@ owned by <a href="userinfo?userID={{ user.id }}">{{ user.name }}</a>
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Packages by User</h4>
<table class="data-list">
@ -69,4 +69,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,4 +1,4 @@
{% include "includes/header2.chtml" %}
{% include "includes/header.html.j2" %}
<h4>Information for repo {{ repo_id }}</h4>
@ -23,4 +23,4 @@ Repo {{ repo_id }} not found.
{% endif %}
{% include "includes/footer2.chtml" %}
{% include "includes/footer.html.j2" %}

View file

@ -1,4 +1,4 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Reports</h4>
@ -16,4 +16,4 @@
#endif
</ul>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,7 +1,7 @@
#set _PASSTHROUGH = ['rpmID', 'fileOrder', 'fileStart', 'buildrootOrder', 'buildrootStart']
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#set epoch = (rpm.epoch|string + ':' if rpm.epoch != None else '')
<h4>Information for RPM <a href="rpminfo?rpmID={{ rpm.id }}">{{ rpm.name }}-{{ epoch }}{{ rpm.version }}-{{ rpm.release }}.{{rpm.arch}}.rpm</a></h4>
@ -312,4 +312,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#macro getID()
#if type == 'image'
@ -106,4 +106,4 @@ colspan="2"
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>{{ rpmArch + ' ' if rpmArch else '' }}RPMs by Host{{ ' (%s)' % hostArch if hostArch else '' }}</h4>
<table class="data-list">
@ -103,4 +103,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,4 +1,4 @@
{% include "includes/header2.chtml" %}
{% include "includes/header.html.j2" %}
<h4>Search</h4>
@ -112,4 +112,4 @@
</table>
{% endif %}
{% include "includes/footer2.chtml" %}
{% include "includes/footer.html.j2" %}

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#if tag
<h4>Edit tag {{ tag.name }}</h4>
@ -61,4 +61,4 @@
</table>
</form>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for tag <a href="taginfo?tagID={{ tag.id }}">{{ tag.name }}</a></h4>
@ -174,4 +174,4 @@
#endif
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,4 +1,4 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for deleted tag <a href="taginfo?tagID={{ tag.id }}">{{ tag.name }}</a></h4>
@ -14,4 +14,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#if inheritanceData
<h4>Edit Parent</h4>
@ -68,4 +68,4 @@
</table>
</form>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Tags</h4>
<table class="data-list">
@ -72,4 +72,4 @@
<a href="tagcreate{{ util.authToken(first=True) }}">Create new Tag</a>
#endif
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -88,7 +88,7 @@ None
#endmacro
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for task <a href="taskinfo?taskID={{ task.id }}">{{ koji.taskLabel(task) }}</a></h4>
@ -316,4 +316,4 @@ None
})();
</script>
#endif
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -36,7 +36,7 @@ All
#set _PASSTHROUGH = ['owner', 'state', 'view', 'method', 'hostID', 'channelID', 'order']
#include "includes/header2.chtml"
#include "includes/header.html.j2"
#macro getDescription()
{{ headerPrefix(state) }}
@ -228,4 +228,4 @@ in channel <a href="channelinfo?channelID={{ channel.id }}">{{ channel.name }}</
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Tasks by Host{{ ' (%s)' % hostArch if hostArch else '' }}</h4>
<table class="data-list">
@ -86,4 +86,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Tasks by User</h4>
<table class="data-list">
@ -69,4 +69,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Information for user <a href="userinfo?userID={{ user.id }}">{{ user.name }}</a></h4>
@ -104,4 +104,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -1,5 +1,5 @@
#include "includes/header2.chtml"
#include "includes/header.html.j2"
<h4>Users {{ ' starting with "%s"' % prefix if prefix else '' }}</h4>
<table class="data-list">
@ -90,4 +90,4 @@
</tr>
</table>
#include "includes/footer2.chtml"
#include "includes/footer.html.j2"

View file

@ -344,7 +344,7 @@ class Dispatcher(object):
environ['koji.values'].setdefault('mavenEnabled', False)
environ['koji.values'].setdefault('winEnabled', False)
# import pdb; pdb.set_trace()
result = _genHTML(environ, 'error.chtml', jinja=True)
result = _genHTML(environ, 'error.html.j2', jinja=True)
result = self._tobytes(result)
headers = [
('Allow', 'GET, POST, HEAD'),

View file

@ -3,7 +3,7 @@ PYFILES = $(wildcard *.py)
PKGDIR = $(shell $(PYTHON) ../../devtools/get_site_packages.py )/$(PACKAGE)
SERVERDIR = /kojiweb
FILES = $(wildcard *.py *.chtml)
FILES = $(wildcard *.py *.html.j2)
_default:
@echo "nothing to make. try make install"