ICU-8988 merge r31477 from 0.12

X-SVN-Rev: 31478
This commit is contained in:
Steven R. Loomis 2012-02-21 22:06:18 +00:00
parent f918c9a0bc
commit f6cd9b7461
5 changed files with 36 additions and 11 deletions

1
.gitattributes vendored
View File

@ -761,6 +761,7 @@ tools/scripts/icurun -text
tools/trac/IcuCodeTools/0.11/icucodetools/__init__.py -text
tools/trac/IcuCodeTools/0.11/icucodetools/dcut.py -text
tools/trac/IcuCodeTools/0.11/icucodetools/htdocs/css/icuxtn.css -text
tools/trac/IcuCodeTools/0.11/icucodetools/htdocs/js/review.js -text
tools/trac/IcuCodeTools/0.11/icucodetools/review.py -text
tools/trac/IcuCodeTools/0.11/icucodetools/templates/nothing.html -text
tools/trac/IcuCodeTools/0.11/icucodetools/templates/review.html -text

View File

@ -0,0 +1,27 @@
// Copyright (C) 2007-2012 IBM and Others. All Rights Reserved
var setBranchNames = function() {
var cst = document.getElementById("changesettable");
var trs=cst.getElementsByTagName("tr");
for( i=1 ; i < trs.length ; i++ ) {
var sec = trs[i].getElementsByTagName('td')[0];
var brk = sec.getElementsByTagName('a');
for(j=0;j<brk.length;j++) {
var bri = brk[j];
var str = bri.innerHTML;
if(str.indexOf("trunk")>-1) {
bri.className = 'branch-trunk';
} else if(str.indexOf("branches")>-1) {
bri.className = 'branch-branches';
} else if(str.indexOf("tags")>-1) {
bri.className = 'branch-tags';
}
}
}
}
// http://ckon.wordpress.com/2008/07/25/stop-using-windowonload-in-javascript/
if (window.attachEvent) {window.attachEvent('onload', setBranchNames);}
else if (window.addEventListener) {window.addEventListener('load', setBranchNames, false);}
else {document.addEventListener('load', setBranchNames, false);}

View File

@ -10,7 +10,7 @@ from trac.core import ComponentManager
from trac.core import TracError
from trac.util import Markup
from trac.web import IRequestHandler
from trac.web.chrome import add_stylesheet, ITemplateProvider, add_ctxtnav
from trac.web.chrome import add_stylesheet, add_script, ITemplateProvider, add_ctxtnav
from trac.versioncontrol import Changeset
from trac.web.api import IRequestFilter
from trac.wiki import wiki_to_html, wiki_to_oneliner, IWikiSyntaxProvider
@ -326,5 +326,6 @@ class ReviewModule(Component):
content_type = "text/html"
add_stylesheet(req, 'icucodetools/css/icuxtn.css')
add_script(req, 'icucodetools/js/review.js')
return 'review.html', data, content_type

View File

@ -17,12 +17,13 @@
<div id="content" class="icucodereview">
<h1>Ticket <a href='${href.ticket(ticket_id)}'>#${ticket_id}</a></h1>
<py:if test="revcount">
<h2>${revcount} Changesets</h2>
<table class='icureview'>
<table id='changesettable' class='icureview'>
<thead>
<tr>
<th>r</th>
@ -39,8 +40,8 @@
<td>
<!-- sections -->
<py:for each="branch in rev.branches">
<b>
<a href="#${branch}">${branch}</a>
<b class='branchlist'>
<a class='branch-unknown' href="#${branch}">${branch}</a>
</b>
</py:for>
</td>
@ -70,11 +71,6 @@
</h3>
</a>
<style type='text/css'>
</style>
<blockquote>
<table class='icureview'>

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# Copyright (C) 2007-2010 IBM and Others. All Rights Reserved.
# Copyright (C) 2007-2012 IBM and Others. All Rights Reserved.
# All rights reserved.
#
@ -21,7 +21,7 @@ setup(
'htdocs/css/*.css',
'templates/*.html',
## 'htdocs/img/*.png',
# 'htdocs/js/*.js',
'htdocs/js/*.js',
]
},
entry_points = {