particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update the web UI to conform to XHTML 1.0 Transitional (thanks W3C Validator!)

Browse source
This commit is contained in:
Mike Bonnet 2008-10-03 10:56:52 -04:00
parent 58972ec76f
commit 5c9f719979
29 changed files with 150 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

4
www/kojiweb/buildrootinfo.chtml
View file

@ -44,10 +44,10 @@
<th>Repo Created</th><td>$util.formatTimeLong($buildroot.repo_create_event_time)</td>
</tr>
<tr>
<th colspan="2"><a href="rpmlist?buildrootID=$buildroot.id&type=component" title="RPMs that are installed into this buildroot when building packages">Component RPMs</a></th>
<th colspan="2"><a href="rpmlist?buildrootID=$buildroot.id&amp;type=component" title="RPMs that are installed into this buildroot when building packages">Component RPMs</a></th>
</tr>
<tr>
<th colspan="2"><a href="rpmlist?buildrootID=$buildroot.id&type=built" title="RPMs that have been built in this buildroot">Built RPMs</a></th>
<th colspan="2"><a href="rpmlist?buildrootID=$buildroot.id&amp;type=built" title="RPMs that have been built in this buildroot">Built RPMs</a></th>
</tr>
</table>

8
www/kojiweb/builds.chtml
View file

@ -66,11 +66,11 @@
<tr>
<td class="paginate" colspan="#if $tag then '6' else '5'#">
#if $len($buildPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'builds?start=' + this.value * $buildRange + '$util.passthrough_except($self)';">
#for $pageNum in $buildPages
<option value="$pageNum"#if $pageNum == $buildCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $buildCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -118,11 +118,11 @@
<tr>
<td class="paginate" colspan="#if $tag then '6' else '5'#">
#if $len($buildPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'builds?start=' + this.value * $buildRange + '$util.passthrough_except($self)';">
#for $pageNum in $buildPages
<option value="$pageNum"#if $pageNum == $buildCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $buildCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

10
www/kojiweb/buildsbystatus.chtml
View file

@ -4,7 +4,7 @@
#if not $label
#set $label = $value
#end if
<option value="$value"#if $value == $days then ' selected' else ''#>$label</option>
<option value="$value"#if $value == $days then ' selected="selected"' else ''#>$label</option>
#end def
#include "includes/header.chtml"
@ -13,7 +13,7 @@
<table class="data-list">
<tr style="text-align: left">
<td colspan="3">
<form>
<form action="">
Show last
<select onchange="javascript: window.location = 'buildsbystatus?days=' + this.value;">
$printOption(1)
@ -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"/></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>$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"/></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>$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"/></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>$numCanceled</td>
</tr>
</table>

14
www/kojiweb/buildsbytarget.chtml
View file

@ -4,7 +4,7 @@
#if not $label
#set $label = $value
#end if
<option value="$value"#if $value == $days then ' selected' else ''#>$label</option>
<option value="$value"#if $value == $days then ' selected="selected"' else ''#>$label</option>
#end def
#include "includes/header.chtml"
@ -13,7 +13,7 @@
<table class="data-list">
<tr style="text-align: left">
<td colspan="3">
<form>
<form action="">
Show last
<select onchange="javascript: window.location = 'buildsbytarget?days=' + this.value + '$util.passthrough($self, 'order')';">
$printOption(1)
@ -33,11 +33,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($targetPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'buildsbytarget?start=' + this.value * $targetRange + '$util.passthrough($self, 'days', 'order')';">
#for $pageNum in $targetPages
<option value="$pageNum"#if $pageNum == $targetCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $targetCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -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"/></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>$target.builds</td>
</tr>
#end for
@ -74,11 +74,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($targetPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'buildsbytarget?start=' + this.value * $targetRange + '$util.passthrough($self, 'days', 'order')';">
#for $pageNum in $targetPages
<option value="$pageNum"#if $pageNum == $targetCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $targetCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

10
www/kojiweb/buildsbyuser.chtml
View file

@ -7,11 +7,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($userBuildPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'buildsbyuser?start=' + this.value * $userBuildRange + '$util.passthrough($self, 'order')';">
#for $pageNum in $userBuildPages
<option value="$pageNum"#if $pageNum == $userBuildCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $userBuildCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -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"/></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>$userBuild.builds</td>
</tr>
#end for
@ -48,11 +48,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($userBuildPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'buildsbyuser?start=' + this.value * $userBuildRange + '$util.passthrough($self, 'order')';">
#for $pageNum in $userBuildPages
<option value="$pageNum"#if $pageNum == $userBuildCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $userBuildCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

7
www/kojiweb/buildtargetedit.chtml
View file

@ -30,7 +30,7 @@
<select name="buildTag">
<option value="">select tag</option>
#for $tag in $tags
<option value="$tag.id"#if $target and $target.build_tag == $tag.id then ' selected' else ''#>$tag.name</option>
<option value="$tag.id"#if $target and $target.build_tag == $tag.id then ' selected="selected"' else ''#>$tag.name</option>
#end for
</select>
</td>
@ -41,7 +41,7 @@
<select name="destTag">
<option value="">select tag</option>
#for $tag in $tags
<option value="$tag.id"#if $target and $target.dest_tag == $tag.id then ' selected' else ''#>$tag.name</option>
<option value="$tag.id"#if $target and $target.dest_tag == $tag.id then ' selected="selected"' else ''#>$tag.name</option>
#end for
</select>
</td>
@ -56,6 +56,7 @@
</td>
<td><button type="submit" name="cancel" value="Cancel">Cancel</button></td>
</tr>
</table>
</table>
</form>
#include "includes/footer.chtml"

8
www/kojiweb/buildtargets.chtml
View file

@ -7,11 +7,11 @@
<tr>
<td class="paginate" colspan="2">
#if $len($targetPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'buildtargets?start=' + this.value * $targetRange + '$util.passthrough($self, 'order')';">
#for $pageNum in $targetPages
<option value="$pageNum"#if $pageNum == $targetCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $targetCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -46,11 +46,11 @@
<tr>
<td class="paginate" colspan="2">
#if $len($targetPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'buildtargets?start=' + this.value * $targetRange + '$util.passthrough($self, 'order')';">
#for $pageNum in $targetPages
<option value="$pageNum"#if $pageNum == $targetCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $targetCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

6
www/kojiweb/fileinfo.chtml
View file

@ -2,11 +2,11 @@
#import urllib
#include "includes/header.chtml"
<h4>Information for file <a href="fileinfo?rpmID=$rpm.id&filename=$urllib.quote($file.name)">$file.name</a></h4>
<h4>Information for file <a href="fileinfo?rpmID=$rpm.id&amp;filename=$urllib.quote($file.name)">$file.name</a></h4>
<table>
<tr>
<th>Name</th><td>$file.name</a></td>
<th>Name</th><td>$file.name</td>
</tr>
<tr>
<th>MD5 Sum</th><td>$file.md5</td>
@ -24,7 +24,7 @@
</tr>
<tr>
#set $epoch = ($rpm.epoch != None and $str($rpm.epoch) + ':' or '')
<th>RPM</th><td><a href="rpminfo?rpmID=$rpm.id">$rpm.name-$epoch$rpm.version-$rpm.release.${rpm.arch}.rpm</td>
<th>RPM</th><td><a href="rpminfo?rpmID=$rpm.id">$rpm.name-$epoch$rpm.version-$rpm.release.${rpm.arch}.rpm</a></td>
</tr>
</table>

8
www/kojiweb/hosts.chtml
View file

@ -7,11 +7,11 @@
<tr>
<td class="paginate" colspan="6">
#if $len($hostPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'hosts?start=' + this.value * $hostRange + '$util.passthrough($self, 'order')';">
#for $pageNum in $hostPages
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -54,11 +54,11 @@
<tr>
<td class="paginate" colspan="6">
#if $len($hostPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'hosts?start=' + this.value * $hostRange + '$util.passthrough($self, 'order')';">
#for $pageNum in $hostPages
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

24
www/kojiweb/includes/header.chtml
View file

@ -1,7 +1,7 @@
#import koji
#import random
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
#def greeting()
#set $greetings = ('hello', 'hi', 'yo', "what's up", "g'day", 'back to work',
@ -65,16 +65,16 @@
<div id="mainNav">
<h4 class="hide">Main Site Links:</h4>
<ul>
<li id="summary"><a href="index">Summary</a></li>
<li id="packages"><a href="packages">Packages</a></li>
<li id="builds"><a href="builds">Builds</a></li>
<li id="tasks"><a href="tasks">Tasks</a></li>
<li id="tags"><a href="tags">Tags</a></li>
<li id="buildtargets"><a href="buildtargets">Build Targets</a></li>
<li id="users"><a href="users">Users</a></li>
<li id="hosts"><a href="hosts">Hosts</a></li>
<li id="reports"><a href="reports">Reports</a></li>
<li id="search"><a href="search">Search</a></li>
<li id="summaryTab"><a href="index">Summary</a></li>
<li id="packagesTab"><a href="packages">Packages</a></li>
<li id="buildsTab"><a href="builds">Builds</a></li>
<li id="tasksTab"><a href="tasks">Tasks</a></li>
<li id="tagsTab"><a href="tags">Tags</a></li>
<li id="buildtargetsTab"><a href="buildtargets">Build Targets</a></li>
<li id="usersTab"><a href="users">Users</a></li>
<li id="hostsTab"><a href="hosts">Hosts</a></li>
<li id="reportsTab"><a href="reports">Reports</a></li>
<li id="searchTab"><a href="search">Search</a></li>
</ul>
</div><!-- end mainNav -->

12
www/kojiweb/index.chtml
View file

@ -10,11 +10,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($buildPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'index?buildStart=' + this.value * $buildRange + '$util.passthrough($self, 'buildOrder', 'packageOrder', 'packageStart', 'taskOrder', 'taskStart')#buildlist';">
#for $pageNum in $buildPages
<option value="$pageNum"#if $pageNum == $buildCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $buildCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -57,11 +57,11 @@
<tr>
<td class="paginate" colspan="5">
#if $len($taskPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'index?taskStart=' + this.value * $taskRange + '$util.passthrough($self, 'taskOrder', 'packageOrder', 'packageStart', 'buildOrder', 'buildStart')#tasklist';">
#for $pageNum in $taskPages
<option value="$pageNum"#if $pageNum == $taskCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $taskCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -109,11 +109,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($packagePages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'index?packageStart=' + this.value * $packageRange + '$util.passthrough($self, 'packageOrder', 'buildOrder', 'buildStart', 'taskOrder', 'taskStart')#packagelist';">
#for $pageNum in $packagePages
<option value="$pageNum"#if $pageNum == $packageCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $packageCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

13
www/kojiweb/index.py
View file

@ -4,6 +4,7 @@ import re
import sys
import mod_python
import mod_python.Cookie
import Cheetah.Filters
import Cheetah.Template
import datetime
import time
@ -85,6 +86,16 @@ def _initValues(req, title='Build System Info', pageID='summary'):
return values
# Escape ampersands so the output can be valid XHTML
class XHTMLFilter(Cheetah.Filters.EncodeUnicode):
def filter(self, *args, **kw):
result = super(XHTMLFilter, self).filter(*args, **kw)
result = result.replace('&', '&amp;')
result = result.replace('&amp;nbsp;', '&nbsp;')
result = result.replace('&amp;lt;', '&lt;')
result = result.replace('&amp;gt;', '&gt;')
return result
def _genHTML(req, fileName):
os.chdir(os.path.dirname(req.filename))
@ -93,7 +104,7 @@ def _genHTML(req, fileName):
else:
req._values['currentUser'] = None
return Cheetah.Template.Template(file=fileName, searchList=[req._values], filter='EncodeUnicode').respond()
return Cheetah.Template.Template(file=fileName, searchList=[req._values], filter=XHTMLFilter).respond()
def _getServer(req):
serverURL = req.get_options().get('KojiHubURL', 'http://localhost/kojihub')

10
www/kojiweb/notificationedit.chtml
View file

@ -17,9 +17,9 @@
<th>Package</th>
<td>
<select name="package">
<option value="all"#if $notif and not $notif.package_id then ' selected' else ''#>all</option>
<option value="all"#if $notif and not $notif.package_id then ' selected="selected"' else ''#>all</option>
#for $package in $packages
<option value="$package.package_id"#if $notif and $notif.package_id == $package.package_id then ' selected' else ''#>$package.package_name</option>
<option value="$package.package_id"#if $notif and $notif.package_id == $package.package_id then ' selected="selected"' else ''#>$package.package_name</option>
#end for
</select>
</td>
@ -28,16 +28,16 @@
<th>Tag</th>
<td>
<select name="tag">
<option value="all"#if $notif and not $notif.tag_id then ' selected' else ''#>all</option>
<option value="all"#if $notif and not $notif.tag_id then ' selected="selected"' else ''#>all</option>
#for $tag in $tags
<option value="$tag.id"#if $notif and $notif.tag_id == $tag.id then ' selected' else ''#>$tag.name</option>
<option value="$tag.id"#if $notif and $notif.tag_id == $tag.id then ' selected="selected"' else ''#>$tag.name</option>
#end for
</select>
</td>
</tr>
<tr>
<th>Success Only?</th>
<td><input type="checkbox" name="success_only" value="yes"#if $notif and $notif.success_only then ' checked' else ''#>
<td><input type="checkbox" name="success_only" value="yes"#if $notif and $notif.success_only then ' checked' else ''#/></td>
</tr>
<tr>
<td>

8
www/kojiweb/packageinfo.chtml
View file

@ -20,11 +20,11 @@
<tr>
<td class="paginate" colspan="4">
#if $len($buildPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'packageinfo?buildStart=' + this.value * $buildRange + '$util.passthrough($self, 'packageID', 'buildOrder', 'tagOrder', 'tagStart')#buildlist';">
#for $pageNum in $buildPages
<option value="$pageNum"#if $pageNum == $buildCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $buildCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -68,11 +68,11 @@
<tr>
<td class="paginate" colspan="4">
#if $len($tagPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'packageinfo?tagStart=' + this.value * $tagRange + '$util.passthrough($self, 'packageID', 'tagOrder', 'buildOrder', 'buildStart')#taglist';">
#for $pageNum in $tagPages
<option value="$pageNum"#if $pageNum == $tagCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $tagCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

8
www/kojiweb/packages.chtml
View file

@ -36,11 +36,11 @@
<tr>
<td class="paginate" colspan="#if $tag or $user then '5' else '2'#">
#if $len($packagePages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'packages?start=' + this.value * $packageRange + '$util.passthrough($self, 'userID', 'tagID', 'order', 'prefix', 'inherited')';">
#for $pageNum in $packagePages
<option value="$pageNum"#if $pageNum == $packageCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $packageCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -85,11 +85,11 @@
<tr>
<td class="paginate" colspan="#if $tag or $user then '5' else '2'#">
#if $len($packagePages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'packages?start=' + this.value * $packageRange + '$util.passthrough($self, 'userID', 'tagID', 'order', 'prefix', 'inherited')';">
#for $pageNum in $packagePages
<option value="$pageNum"#if $pageNum == $packageCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $packageCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

10
www/kojiweb/packagesbyuser.chtml
View file

@ -7,11 +7,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($userPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'packagesbyuser?start=' + this.value * $userRange + '$util.passthrough($self, 'order')';">
#for $pageNum in $userPages
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -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"/></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>$user.packages</td>
</tr>
#end for
@ -48,11 +48,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($userPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'packagesbyuser?start=' + this.value * $userRange + '$util.passthrough($self, 'order')';">
#for $pageNum in $userPages
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

14
www/kojiweb/rpminfo.chtml
View file

@ -46,7 +46,7 @@
<table class="nested">
#for $dep in $provides
<tr>
<td>$util.formatDep($dep.name, $dep.version, $dep.flags)</td>
<td>$util.escapeHTML($util.formatDep($dep.name, $dep.version, $dep.flags))</td>
</tr>
#end for
</table>
@ -62,7 +62,7 @@
<table class="nested">
#for $dep in $requires
<tr>
<td>$util.formatDep($dep.name, $dep.version, $dep.flags)</td>
<td>$util.escapeHTML($util.formatDep($dep.name, $dep.version, $dep.flags))</td>
</tr>
#end for
</table>
@ -78,7 +78,7 @@
<table class="nested">
#for $dep in $obsoletes
<tr>
<td>$util.formatDep($dep.name, $dep.version, $dep.flags)</td>
<td>$util.escapeHTML($util.formatDep($dep.name, $dep.version, $dep.flags))</td>
</tr>
#end for
</table>
@ -94,7 +94,7 @@
<table class="nested">
#for $dep in $conflicts
<tr>
<td>$util.formatDep($dep.name, $dep.version, $dep.flags)</td>
<td>$util.escapeHTML($util.formatDep($dep.name, $dep.version, $dep.flags))</td>
</tr>
#end for
</table>
@ -111,11 +111,11 @@
<tr>
<td class="paginate" colspan="2">
#if $len($filePages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'rpminfo?fileStart=' + this.value * $fileRange + '$util.passthrough($self, 'rpmID', 'fileOrder')#filelist';">
#for $pageNum in $filePages
<option value="$pageNum"#if $pageNum == $fileCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $fileCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -135,7 +135,7 @@
</tr>
#for $file in $files
<tr class="$util.rowToggle($self)">
<td><a href="fileinfo?rpmID=$rpm.id&filename=$urllib.quote($file.name)">$file.name</a></td><td>$file.size</td>
<td><a href="fileinfo?rpmID=$rpm.id&amp;filename=$urllib.quote($file.name)">$file.name</a></td><td>$file.size</td>
</tr>
#end for
</table>

8
www/kojiweb/rpmlist.chtml
View file

@ -12,11 +12,11 @@
<tr>
<td class="paginate" colspan="#if $type == 'component' then '2' else '1'#">
#if $len($rpmPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'rpmlist?buildrootID=$buildroot.id&start=' + this.value * $rpmRange + '$util.passthrough($self, 'order', 'type')';">
#for $pageNum in $rpmPages
<option value="$pageNum"#if $pageNum == $rpmCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $rpmCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -57,11 +57,11 @@
<tr>
<td class="paginate" colspan="#if $type == 'component' then '2' else '1'#">
#if $len($rpmPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'rpmlist?buildrootID=$buildroot.id&start=' + this.value * $rpmRange + '$util.passthrough($self, 'order', 'type')';">
#for $pageNum in $rpmPages
<option value="$pageNum"#if $pageNum == $rpmCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $rpmCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

10
www/kojiweb/rpmsbyhost.chtml
View file

@ -39,11 +39,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($hostPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'rpmsbyhost?start=' + this.value * $hostRange + '$util.passthrough($self, 'order', 'hostArch', 'rpmArch')';">
#for $pageNum in $hostPages
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -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"/></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>$host.rpms</td>
</tr>
#end for
@ -80,11 +80,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($hostPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'rpmsbyhost?start=' + this.value * $hostRange + '$util.passthrough($self, 'order', 'hostArch', 'rpmArch')';">
#for $pageNum in $hostPages
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

8
www/kojiweb/searchresults.chtml
View file

@ -9,11 +9,11 @@
<tr>
<td class="paginate" colspan="2">
#if $len($resultPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'search?start=' + this.value * $resultRange + '$util.passthrough($self, 'order', 'terms', 'type', 'match')';">
#for $pageNum in $resultPages
<option value="$pageNum"#if $pageNum == $resultCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $resultCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -50,11 +50,11 @@
<tr>
<td class="paginate" colspan="2">
#if $len($resultPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'search?start=' + this.value * $resultRange + '$util.passthrough($self, 'order', 'terms', 'type', 'match')';">
#for $pageNum in $resultPages
<option value="$pageNum"#if $pageNum == $resultCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $resultCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

4
www/kojiweb/tagedit.chtml
View file

@ -25,13 +25,13 @@
</tr>
<tr>
<th>Locked</th>
<td><input type="checkbox" name="locked" value="yes" #if $tag and $tag.locked then 'checked' else ''#>
<td><input type="checkbox" name="locked" value="yes" #if $tag and $tag.locked then 'checked' else ''#/></td>
</tr>
<tr>
<th>Permission</th>
<td>
<select name="permission">
<option value="none" #if $tag and not $tag.perm_id then 'selected' else ''#>none</option>
<option value="none" #if $tag and not $tag.perm_id then 'selected="selected"' else ''#>none</option>
#for $permission in $permissions
<option value="$permission.id" #if $tag and $tag.perm_id == $permission.id then 'selected' else ''#>$permission.name</option>
#end for

8
www/kojiweb/tags.chtml
View file

@ -7,11 +7,11 @@
<tr>
<td class="paginate" colspan="2">
#if $len($tagPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'tags?start=' + this.value * $tagRange + '$util.passthrough($self, 'userID', 'tagID', 'order', 'childID')';">
#for $pageNum in $tagPages
<option value="$pageNum"#if $pageNum == $tagCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $tagCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -46,11 +46,11 @@
<tr>
<td class="paginate" colspan="2">
#if $len($tagPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'tags?start=' + this.value * $tagRange + '$util.passthrough($self, 'userID', 'tagID', 'order', 'childID')';">
#for $pageNum in $tagPages
<option value="$pageNum"#if $pageNum == $tagCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $tagCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

8
www/kojiweb/tasks.chtml
View file

@ -108,11 +108,11 @@ All
<tr>
<td class="paginate" colspan="6">
#if $len($taskPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'tasks?start=' + this.value * $taskRange + '$util.passthrough_except($self)';">
#for $pageNum in $taskPages
<option value="$pageNum"#if $pageNum == $taskCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $taskCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -167,11 +167,11 @@ All
<tr>
<td class="paginate" colspan="6">
#if $len($taskPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'tasks?start=' + this.value * $taskRange + '$util.passthrough_except($self)';">
#for $pageNum in $taskPages
<option value="$pageNum"#if $pageNum == $taskCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $taskCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

10
www/kojiweb/tasksbyhost.chtml
View file

@ -23,11 +23,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($hostPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'tasksbyhost?start=' + this.value * $hostRange + '$util.passthrough($self, 'order', 'hostArch')';">
#for $pageNum in $hostPages
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -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"/></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>$host.tasks</td>
</tr>
#end for
@ -64,11 +64,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($hostPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'tasksbyhost?start=' + this.value * $hostRange + '$util.passthrough($self, 'order', 'hostArch')';">
#for $pageNum in $hostPages
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $hostCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

10
www/kojiweb/tasksbyuser.chtml
View file

@ -7,11 +7,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($userPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'tasksbyuser?start=' + this.value * $userRange + '$util.passthrough($self, 'order')';">
#for $pageNum in $userPages
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -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"/></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>$user.tasks</td>
</tr>
#end for
@ -48,11 +48,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($userPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'tasksbyuser?start=' + this.value * $userRange + '$util.passthrough($self, 'order')';">
#for $pageNum in $userPages
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

8
www/kojiweb/userinfo.chtml
View file

@ -22,11 +22,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($packagePages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'userinfo?packageStart=' + this.value * $packageRange + '$util.passthrough($self, 'userID', 'packageOrder', 'buildOrder', 'buildStart')#packagelist';">
#for $pageNum in $packagePages
<option value="$pageNum"#if $pageNum == $packageCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $packageCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -66,11 +66,11 @@
<tr>
<td class="paginate" colspan="3">
#if $len($buildPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'userinfo?buildStart=' + this.value * $buildRange + '$util.passthrough($self, 'userID', 'buildOrder', 'packageOrder', 'packageStart')#buildlist';">
#for $pageNum in $buildPages
<option value="$pageNum"#if $pageNum == $buildCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $buildCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

8
www/kojiweb/users.chtml
View file

@ -24,11 +24,11 @@
<tr>
<td class="paginate" colspan="5">
#if $len($userPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'users?start=' + this.value * $userRange + '$util.passthrough($self, 'order', 'prefix')';">
#for $pageNum in $userPages
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>
@ -69,11 +69,11 @@
<tr>
<td class="paginate" colspan="5">
#if $len($userPages) > 1
<form class="pageJump">
<form class="pageJump" action="">
Page:
<select onchange="javascript: window.location = 'users?start=' + this.value * $userRange + '$util.passthrough($self, 'order', 'prefix')';">
#for $pageNum in $userPages
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected' else ''#>#echo $pageNum + 1#</option>
<option value="$pageNum"#if $pageNum == $userCurrentPage then ' selected="selected"' else ''#>#echo $pageNum + 1#</option>
#end for
</select>
</form>

4
www/lib/kojiweb/util.py
View file

@ -43,9 +43,9 @@ def sortImage(template, sortKey, orderVar='order'):
"""
orderVal = template.getVar(orderVar)
if orderVal == sortKey:
return '<img src="/koji-static/images/gray-triangle-up.gif" width="10" height="9" class="sort"/>'
return '<img src="/koji-static/images/gray-triangle-up.gif" width="10" height="9" class="sort" alt="ascending sort"/>'
elif orderVal == '-' + sortKey:
return '<img src="/koji-static/images/gray-triangle-down.gif" width="10" height="9" class="sort"/>'
return '<img src="/koji-static/images/gray-triangle-down.gif" width="10" height="9" class="sort" alt="descending sort"/>'
else:
return ''

26
www/static/koji.css
View file

@ -126,16 +126,16 @@ p#footer a {
border-color: #ddd;
}
body#summary #mainNav li#summary a,
body#tasks #mainNav li#tasks a,
body#tags #mainNav li#tags a,
body#builds #mainNav li#builds a,
body#packages #mainNav li#packages a,
body#users #mainNav li#users a,
body#hosts #mainNav li#hosts a,
body#buildtargets #mainNav li#buildtargets a,
body#reports #mainNav li#reports a,
body#search #mainNav li#search a {
body#summary #mainNav li#summaryTab a,
body#tasks #mainNav li#tasksTab a,
body#tags #mainNav li#tagsTab a,
body#builds #mainNav li#buildsTab a,
body#packages #mainNav li#packagesTab a,
body#users #mainNav li#usersTab a,
body#hosts #mainNav li#hostsTab a,
body#buildtargets #mainNav li#buildtargetsTab a,
body#reports #mainNav li#reportsTab a,
body#search #mainNav li#searchTab a {
background-color: #eee;
color: #000;
}
@ -325,11 +325,13 @@ tr.list-header th {
}
tr.list-header th:first-child {
-moz-border-radius-topleft: 15px;
-moz-border-radius-topleft: 1em;
-webkit-border-top-left-radius: 1em;
}
tr.list-header th:last-child {
-moz-border-radius-topright: 15px;
-moz-border-radius-topright: 1em;
-webkit-border-top-right-radius: 1em;
}
tr.row-odd {