You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bloodhound.apache.org by rj...@apache.org on 2014/02/27 03:14:38 UTC
svn commit: r1572404 [7/8] - in
/bloodhound/branches/bep_0007_embeddable_objects: ./ bloodhound_dashboard/
bloodhound_dashboard/bhdashboard/
bloodhound_dashboard/bhdashboard/default-pages/
bloodhound_dashboard/bhdashboard/layouts/ bloodhound_dashboard/...
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/bhsearch/whoosh_backend.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/bhsearch/whoosh_backend.py?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/bhsearch/whoosh_backend.py (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/bhsearch/whoosh_backend.py Thu Feb 27 02:14:33 2014
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: UTF-8 -*-
# Licensed to the Apache Software Foundation (ASF) under one
@@ -39,10 +38,6 @@ from whoosh.collectors import FilterColl
from whoosh.writing import AsyncWriter
from datetime import datetime
-from bhsearch.whoosh_fixes import fixes_for
-for fix in fixes_for(whoosh.__version__):
- apply(fix)
-
UNIQUE_ID = "unique_id"
@@ -57,27 +52,30 @@ class WhooshBackend(Component):
'whoosh_index_dir',
default='whoosh_index',
doc="""Relative path is resolved relatively to the
- directory of the environment.""")
+ directory of the environment.""", doc_domain='bhsearch')
advanced_security = Option(
BHSEARCH_CONFIG_SECTION,
'advanced_security',
default=False,
- doc="Check view permission for each document when retrieving results."
+ doc="Check view permission for each document when retrieving results.",
+ doc_domain='bhsearch'
)
max_fragment_size = IntOption(
BHSEARCH_CONFIG_SECTION,
'max_fragment_size',
default=240,
- doc="The maximum number of characters allowed in a fragment.")
+ doc="The maximum number of characters allowed in a fragment.",
+ doc_domain='bhsearch')
fragment_surround = IntOption(
BHSEARCH_CONFIG_SECTION,
'fragment_surround',
default=60,
doc="""The number of extra characters of context to add both before
- the first matched term and after the last matched term.""")
+ the first matched term and after the last matched term.""",
+ doc_domain='bhsearch')
#This is schema prototype. It will be changed later
#TODO: add other fields support, add dynamic field support.
@@ -283,26 +281,11 @@ class WhooshBackend(Component):
searcher.collector = collector
def _create_unique_id(self, product, doc_type, doc_id):
- product, doc_type, doc_id = \
- self._apply_empty_facets_workaround(product, doc_type, doc_id)
-
if product:
return u"%s:%s:%s" % (product, doc_type, doc_id)
else:
return u"%s:%s" % (doc_type, doc_id)
- def _apply_empty_facets_workaround(self, product, doc_type, doc_id):
- # Apply the same workaround that is used at insertion time
- doc = {
- IndexFields.PRODUCT: product,
- IndexFields.TYPE: doc_type,
- IndexFields.ID: doc_id,
- }
- WhooshEmptyFacetErrorWorkaround(self.env).pre_process(doc)
- return (doc[IndexFields.PRODUCT],
- doc[IndexFields.TYPE],
- doc[IndexFields.ID])
-
def _to_whoosh_format(self, value):
if isinstance(value, basestring):
value = unicode(value)
@@ -472,90 +455,6 @@ class WhooshEmFormatter(whoosh.highlight
template = '<em>%(t)s</em>'
-class WhooshEmptyFacetErrorWorkaround(Component):
- """
- Whoosh 2.4.1 raises "IndexError: list index out of range"
- when search contains facets on field that is missing in at least one
- document in the index. The error manifests only when index contains
- more than one segment.
-
- The goal of this class is to temporary solve the problem for
- prototype phase. Fro non-prototype phase, the problem should be solved
- by the next version of Whoosh.
-
- Remove this class when fixed version of Whoosh is introduced.
- """
- implements(IDocIndexPreprocessor)
- implements(IResultPostprocessor)
- implements(IQueryPreprocessor)
-
- NULL_MARKER = u"empty"
-
- should_not_be_empty_fields = [
- IndexFields.STATUS,
- TicketFields.MILESTONE,
- TicketFields.COMPONENT,
- IndexFields.PRODUCT,
- ]
-
- #IDocIndexPreprocessor methods
- def pre_process(self, doc):
- for field in self.should_not_be_empty_fields:
- if field not in doc or doc[field] is None or doc[field] == empty:
- doc[field] = self.NULL_MARKER
-
- #IResultPostprocessor methods
- def post_process(self, query_result):
- #fix facets
- if query_result.facets:
- for count_dict in query_result.facets.values():
- for field, count in count_dict.iteritems():
- if field == self.NULL_MARKER:
- count_dict[None] = count
- del count_dict[self.NULL_MARKER]
-
- #fix query_result.docs
- for doc in query_result.docs:
- for field, value in doc.items():
- if value == self.NULL_MARKER:
- del doc[field]
-
- #IQueryPreprocessor methods
- def query_pre_process(self, query_parameters, context=None):
- """
- Go through filter queries and replace "NOT (field_name:*)" query with
- "field_name:NULL_MARKER" query.
-
- This is really quick fix to make prototype working with hope that
- the next Whoosh version will be released soon.
- """
- # pylint: disable=unused-argument
- if "filter" in query_parameters and query_parameters["filter"]:
- term_to_replace = \
- self._find_and_fix_condition(query_parameters["filter"])
- if term_to_replace:
- query_parameters["filter"] = term_to_replace
- if "query" in query_parameters and query_parameters["query"]:
- term_to_replace = \
- self._find_and_fix_condition(query_parameters["query"])
- if term_to_replace:
- query_parameters["query"] = term_to_replace
-
- def _find_and_fix_condition(self, filter_condition):
- if isinstance(filter_condition, whoosh.query.CompoundQuery):
- sub_queries = list(filter_condition.subqueries)
- for i, subquery in enumerate(sub_queries):
- term_to_replace = self._find_and_fix_condition(subquery)
- if term_to_replace:
- filter_condition.subqueries[i] = term_to_replace
- elif isinstance(filter_condition, whoosh.query.Not):
- not_query = filter_condition.query
- if isinstance(not_query, whoosh.query.Every) and \
- not_query.fieldname in self.should_not_be_empty_fields:
- return whoosh.query.Term(not_query.fieldname, self.NULL_MARKER)
- return None
-
-
class AdvancedFilterCollector(FilterCollector):
"""An advanced filter collector, accepting a callback function that
will be called for each document to determine whether it should be
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/setup.cfg
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/setup.cfg?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/setup.cfg (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/setup.cfg Thu Feb 27 02:14:33 2014
@@ -23,3 +23,24 @@ tag_svn_revision = true
[sdist]
formats = gztar,bztar,ztar,tar,zip
+[extract_messages]
+add_comments = TRANSLATOR:
+copyright_holder = Apache Software Foundation
+msgid_bugs_address = dev@bloodhound.apache.org
+output_file = bhsearch/locale/messages.pot
+keywords = _ ngettext:1,2 N_ tag_ tagn_:1,2 Option:4 BoolOption:4 IntOption:4 ListOption:6 ExtensionOption:5 OrderedExtensionsOption:6 PathOption:4
+no-wrap = true
+
+[init_catalog]
+input_file = bhsearch/locale/messages.pot
+output_dir = bhsearch/locale
+domain = bhsearch
+
+[compile_catalog]
+directory = bhsearch/locale
+domain = bhsearch
+
+[update_catalog]
+input_file = bhsearch/locale/messages.pot
+output_dir = bhsearch/locale
+domain = bhsearch
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/setup.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/setup.py?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/setup.py (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_search/setup.py Thu Feb 27 02:14:33 2014
@@ -92,7 +92,8 @@ PKG_INFO = {'bhsearch' : ('bhsearch',
'../NOTICE', '../README', '../TESTING_README',
'htdocs/*.*', 'htdocs/css/*.css',
'htdocs/img/*.*', 'htdocs/js/*.js',
- 'templates/*', 'default-pages/*'],
+ 'templates/*', 'default-pages/*',
+ 'locale/*/LC_MESSAGES/*.mo'],
),
'bhsearch.search_resources' : (
'bhsearch/search_resources', # Package dir
@@ -115,6 +116,10 @@ PKG_INFO = {'bhsearch' : ('bhsearch',
# Package data
['data/*.*'],
),
+ 'bhsearch.utils' : ('bhsearch/utils', # Package dir
+ # Package data
+ [],
+ ),
}
ENTRY_POINTS = {
@@ -136,6 +141,26 @@ ENTRY_POINTS = {
'bhsearch.whoosh_backend = bhsearch.whoosh_backend',
],
}
+
+extra = {}
+try:
+ from trac.util.dist import get_l10n_js_cmdclass
+ cmdclass = get_l10n_js_cmdclass()
+ if cmdclass:
+ extra['cmdclass'] = cmdclass
+ extractors = [
+ ('**.py', 'trac.dist:extract_python', None),
+ ('**/templates/**.html', 'genshi', None),
+ ('**/templates/**.txt', 'genshi', {
+ 'template_class': 'genshi.template:TextTemplate'
+ }),
+ ]
+ extra['message_extractors'] = {
+ 'bhsearch': extractors,
+ }
+except ImportError:
+ pass
+
setup(
name=DIST_NM,
version=latest,
@@ -147,7 +172,7 @@ setup(
install_requires = [
'setuptools>=0.6b1',
'Trac>=0.11',
- 'whoosh==2.4.1',
+ 'whoosh>=2.5.1',
],
package_dir = dict([p, i[0]] for p, i in PKG_INFO.iteritems()),
packages = PKG_INFO.keys(),
@@ -160,6 +185,6 @@ setup(
classifiers = cats,
long_description= DESC,
test_suite='bhsearch.tests.test_suite',
- tests_require=['unittest2' if parse_version(sys.version) < parse_version('2.7') else '']
+ tests_require=['unittest2' if parse_version(sys.version) < parse_version('2.7') else ''],
+ **extra
)
-
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/__init__.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/__init__.py?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/__init__.py (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/__init__.py Thu Feb 27 02:14:33 2014
@@ -1,3 +1,4 @@
+# -*- coding: UTF-8 -*-
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/htdocs/bloodhound.css
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/htdocs/bloodhound.css?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/htdocs/bloodhound.css (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/htdocs/bloodhound.css Thu Feb 27 02:14:33 2014
@@ -33,7 +33,7 @@ body {
}
#logo {
- margin-bottom: 10px;
+ margin-bottom: 10px;
}
#searchbox {
@@ -175,8 +175,8 @@ div.reports form {
}
#duplicate_id {
- margin-left: 10px;
- margin-right: 10px;
+ margin-left: 10px;
+ margin-right: 10px;
}
#trac-ticket-title {
@@ -187,18 +187,12 @@ div.reports form {
font-weight: normal;
}
-.activityfeed {
- background-image: url("img/change_history_arrow_line.png");
- background-repeat: repeat-y;
- background-position: 20px 0px;
-}
-
.timeline .activityfeed {
- background-image: none;
+ background-image: none;
}
.activityfeed .help-block {
- margin-left: 30px;
+ margin-left: 30px;
}
#mobile-activity {
@@ -247,6 +241,13 @@ pre {
display: none;
}
+.underline { text-decoration: underline }
+ol.loweralpha { list-style-type: lower-alpha }
+ol.upperalpha { list-style-type: upper-alpha }
+ol.lowerroman { list-style-type: lower-roman }
+ol.upperroman { list-style-type: upper-roman }
+ol.arabic { list-style-type: decimal }
+
/* @end */
/* @group Ticket page modifications */
@@ -291,7 +292,7 @@ pre {
}
#edit-comment {
- margin-top: 30px;
+ margin-top: 30px;
}
.trac-loading {
@@ -306,8 +307,8 @@ pre {
}
.relations {
- margin-top: 30px;
- margin-bottom: 30px;
+ margin-top: 30px;
+ margin-bottom: 30px;
}
/* @end */
@@ -315,8 +316,8 @@ pre {
/* @group Quick Create Ticket popup */
#qct-box {
- width: 300px;
- padding: 0px 0px 5px 0px;
+ width: 300px;
+ padding: 0px 0px 5px 0px;
}
#qct-box p {
@@ -331,17 +332,19 @@ pre {
}
#qct-inline {
- position: relative;
- max-width: inherit;
- box-shadow: none;
- z-index: 0;
- margin-top: 20px;
+ position: relative;
+ max-width: inherit;
+ box-shadow: none;
+ z-index: 0;
+ margin-top: 20px;
}
#qct-inline h4 {
- margin-top: 5px;
- margin-bottom: 5px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+#qct-more {
+ visibility: hidden;
}
-
/*
workaround for -hidden/-visible buttons in a btn-group, which don't
@@ -349,16 +352,21 @@ pre {
(the first button always gets picked, regardless of visibility)
*/
#qct-inline-newticket {
- margin-left: 0;
- -webkit-border-bottom-left-radius: 4px;
- border-bottom-left-radius: 4px;
- -webkit-border-top-left-radius: 4px;
- border-top-left-radius: 4px;
- -moz-border-radius-bottomleft: 4px;
- -moz-border-radius-topleft: 4px;
+ margin-left: 0;
+ -webkit-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ -webkit-border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
+ -moz-border-radius-bottomleft: 4px;
+ -moz-border-radius-topleft: 4px;
}
#qct-inline-alert-cancel {
- display: inline;
+ display: inline;
+}
+
+#qct-last-container {
+ background-color: #FFFFCC;
+ margin-top: 4px;
}
/* @end */
@@ -406,23 +414,23 @@ h1, h2, h3 {
background-color: #ffffff;
border: 1px solid #cccccc;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
- -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
- -o-transition: border linear 0.2s, box-shadow linear 0.2s;
- transition: border linear 0.2s, box-shadow linear 0.2s;
+ -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+ -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+ transition: border linear 0.2s, box-shadow linear 0.2s;
}
[contenteditable="true"]:focus {
border-color: rgba(82, 168, 236, 0.8);
outline: 0;
- outline: thin dotted \9;
+ outline: thin dotted \9;
/* IE6-9 */
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
}
/* @end */
@@ -498,7 +506,7 @@ h1, h2, h3 {
}
.comment blockquote p {
- font-size: 13px;
+ font-size: 13px;
}
/* @end */
@@ -546,6 +554,12 @@ table.listing th.sel, table.listing td.s
width: 1%
}
+.query fieldset .table th,
+.query fieldset .table td,
+.query fieldset .table tbody {
+ border: none;
+}
+
/* @end */
#filters td .trac-clause-lsep {
@@ -627,6 +641,14 @@ input[type="submit"].btn.btn-micro {
display: none !important;
}
+.shade-desktop {
+ opacity: 0.2;
+}
+
+.visible-desktop-hover:hover .shade-desktop {
+ opacity: 1;
+}
+
.hidden-desktop {
display: none !important;
}
@@ -648,41 +670,40 @@ input[type="submit"].btn.btn-micro {
}
#breadcrumbbar .btn-group a:hover {
- text-decoration: none;
+ text-decoration: none;
}
.icon, a.trac-rawlink, a.trac-ziplink {
- background-image: url("../dashboard/img/glyphicons-halflings.png");
- background-repeat: no-repeat;
- *margin-right: .3em;
- padding-left: 15px;
- vertical-align: text-top;
+ background-image: url("../dashboard/img/glyphicons-halflings.png");
+ background-repeat: no-repeat;
+ *margin-right: .3em;
+ padding-left: 15px;
+ vertical-align: text-top;
}
a.ext-link .icon {
- background-position: -336px -144px;
+ background-position: -336px -144px;
}
a.mail-link .icon {
- background-position: -72px 0;
+ background-position: -72px 0;
}
a.trac-rawlink, a.trac-ziplink {
- background-position: -96px -24px;
+ background-position: -96px -24px;
}
a.missing:link, a.missing:visited, a.missing, span.missing,
-a.forbidden, span.forbidden {
- color: #998;
+a.forbidden, span.forbidden {
+ color: #998;
}
a.missing:link:hover, a.missing:visited:hover,
a.missing:hover, span.missing:hover, a.forbidden:hover, span.forbidden:hover {
- color: black;
- background-color: #EEE;
+ color: black;
+ background-color: #EEE;
}
a.closed:link, a.closed:visited, span.closed {
- text-decoration: line-through;
+ text-decoration: line-through;
}
-
@media (max-width: 979px) {
.hidden-desktop {
display: inherit !important;
@@ -693,6 +714,7 @@ a.closed:link, a.closed:visited, span.cl
.facets {
width: 220px;
}
+
.span9.search_results {
width: 920px;
}
@@ -720,6 +742,7 @@ a.closed:link, a.closed:visited, span.cl
#logo {
width: 33%;
}
+
#usermenu {
width: 67%;
}
@@ -822,8 +845,8 @@ tt {
padding: 2px 4px;
white-space: nowrap;
-webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
}
/* @end */
@@ -843,10 +866,10 @@ tt {
.ui-datepicker {
background-color: #FBFBFB;
background-image: -webkit-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: -moz-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: -o-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: -ms-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: -moz-linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: -o-linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: -ms-linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: linear-gradient(center top, #FFFFFF, #F5F5F5);
background-repeat: repeat-x;
border: 1px solid #DDDDDD;
border-radius: 3px 3px 3px 3px;
@@ -862,10 +885,10 @@ tt {
.ui-datepicker a.ui-datepicker-next {
background-color: #FBFBFB;
background-image: -webkit-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: -moz-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: -o-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: -ms-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: -moz-linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: -o-linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: -ms-linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: linear-gradient(center top, #FFFFFF, #F5F5F5);
background-repeat: repeat-x;
border: 1px solid #DDDDDD;
border-radius: 3px 3px 3px 3px;
@@ -899,10 +922,10 @@ tt {
.ui-datepicker-calendar td {
background-color: #FBFBFB;
background-image: -webkit-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: -moz-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: -o-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: -ms-linear-gradient(center top, #FFFFFF, #F5F5F5);
- background-image: linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: -moz-linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: -o-linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: -ms-linear-gradient(center top, #FFFFFF, #F5F5F5);
+ background-image: linear-gradient(center top, #FFFFFF, #F5F5F5);
background-repeat: repeat-x;
border: 1px solid #DDDDDD;
border-radius: 3px 3px 3px 3px;
@@ -953,16 +976,12 @@ tt {
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',
- endColorstr='#ffe6e6e6', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
*zoom: 1;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px
-2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px
-2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px
-2px rgba(0, 0, 0, 0.05);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
border-color: #c5c5c5;
border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
@@ -989,9 +1008,9 @@ tt {
background-position: 0 -15px;
-webkit-transition: background-position 0.1s linear;
- -moz-transition: background-position 0.1s linear;
- -o-transition: background-position 0.1s linear;
- transition: background-position 0.1s linear;
+ -moz-transition: background-position 0.1s linear;
+ -o-transition: background-position 0.1s linear;
+ transition: background-position 0.1s linear;
}
/* @end */
@@ -1016,21 +1035,15 @@ tt {
border-bottom: 1px solid rgba(75%, 75%, 75%, 0.5);
- -webkit-box-shadow: 0px 6px 5px -4px rgba(50%, 50%, 50%, 0.5),
- -20px 0px 0px rgb(93%, 93%, 93%),
- 20px 0px 0px rgb(93%, 93%, 93%);
- -moz-box-shadow: 0px 6px 5px -4px rgba(50%, 50%, 50%, 0.5),
- -20px 0px 0px rgb(93%, 93%, 93%),
- 20px 0px 0px rgb(93%, 93%, 93%);
- box-shadow: 0px 6px 5px -4px rgba(50%, 50%, 50%, 0.5),
- -20px 0px 0px rgb(93%, 93%, 93%),
- 20px 0px 0px rgb(93%, 93%, 93%);
+ -webkit-box-shadow: 0px 6px 5px -4px rgba(50%, 50%, 50%, 0.5), -20px 0px 0px rgb(93%, 93%, 93%), 20px 0px 0px rgb(93%, 93%, 93%);
+ -moz-box-shadow: 0px 6px 5px -4px rgba(50%, 50%, 50%, 0.5), -20px 0px 0px rgb(93%, 93%, 93%), 20px 0px 0px rgb(93%, 93%, 93%);
+ box-shadow: 0px 6px 5px -4px rgba(50%, 50%, 50%, 0.5), -20px 0px 0px rgb(93%, 93%, 93%), 20px 0px 0px rgb(93%, 93%, 93%);
-webkit-transition: all 0.3s ease-out;
- -moz-transition: all 0.3s ease-out;
- -o-transition: all 0.3s ease-out;
- -ms-transition: all 0.3s ease-out;
- transition: all 0.3s ease-out;
+ -moz-transition: all 0.3s ease-out;
+ -o-transition: all 0.3s ease-out;
+ -ms-transition: all 0.3s ease-out;
+ transition: all 0.3s ease-out;
}
#belowStatus {
@@ -1189,61 +1202,61 @@ table.wiki th {
/* @group Dashboard */
#products h4 {
- margin: 5px 0 10px 0;
+ margin: 5px 0 10px 0;
}
#products h5 {
- margin: 5px 0 0 0;
+ margin: 5px 0 0 0;
}
#products .product-well {
- background-color: white;
- padding: 10px;
+ background-color: white;
+ padding: 10px;
}
#products .subset {
- list-style-type: none;
- margin: 0 0 10px 0;
- padding: 0;
+ list-style-type: none;
+ margin: 0 0 10px 0;
+ padding: 0;
}
/* @end */
.lastmod {
- font-size: 90%;
- color: rgb(120, 120, 120);
- font-style: italic;
- margin-bottom: 5px;
+ font-size: 90%;
+ color: rgb(120, 120, 120);
+ font-style: italic;
+ margin-bottom: 5px;
}
.attachments .attachment-info {
- font-weight: normal;
+ font-weight: normal;
}
+#attachments ul { list-style-type: none }
.ticket-properties td {
- border: none;
- padding-left: 0;
+ border: none;
+ padding-left: 0;
}
.ticket-properties input, .ticket-properties select {
- margin-bottom: 0;
+ margin-bottom: 0;
}
-.ticket-properties td:first-child{
- color: rgb(120, 120, 120);
- width: 35%;
+.ticket-properties td:first-child {
+ color: rgb(120, 120, 120);
+ width: 35%;
}
-#trac-add-comment textarea#comment{
+#trac-add-comment textarea#comment {
border-radius: 8px 8px 8px 8px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) inset;
padding: 2px 4px 2px 4px;
min-height: 20px;
}
-
-#changelog div.comment-box{
- border: 1px solid #ccc;
+#changelog div.comment-box {
+ border: 2px solid #ccc;
border-radius: 6px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) inset;
padding: 13px;
@@ -1252,13 +1265,18 @@ table.wiki th {
min-height: 20px;
}
-#trac-add-comment fieldset{
+#changelog div.change:hover div.comment-box {
+ border-color: #FFCC33;
+}
+
+#trac-add-comment fieldset {
width: 100%;
}
-textarea#comment, #trac-add-comment fieldset{
+
+textarea#comment, #trac-add-comment fieldset {
-webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
width: 100%;
}
@@ -1267,31 +1285,107 @@ textarea#comment, #trac-add-comment fiel
content: attr(placeholder-content);
}
-#changelog div.comment-box h4 {
- margin-top: 0px;
+.uparrow div.change,
+.downarrow div.change {
+ margin-bottom: 3px;
+ padding: 1px 0;
+ position: relative;
+ z-index: 1;
}
-#changelog ul.changes {
- list-style-image: url('../common/collapsed.png');
- padding: 0px 0px 0px 11px;
+.uparrow div.change:before,
+.uparrow div.change:after,
+.downarrow div.change:before,
+.downarrow div.change:after {
+ background: none repeat scroll 0 0 #CCCCCC;
+ content: "";
+ height: 100%;
+ position: absolute;
+ top: 0;
+ width: 0.5em;
+ z-index: -1;
}
-.ticket form#prefs input[type="radio"]{
- display: none;
+.uparrow div.change:hover:before,
+.uparrow div.change:hover:after,
+.downarrow div.change:hover:before,
+.downarrow div.change:hover:after {
+ background: none repeat scroll 0 0 #FFCC33;
+}
+
+.uparrow div.change:before,
+.downarrow div.change:before {
+ left: 20px;
+}
+
+.uparrow div.change:after,
+.downarrow div.change:after {
+ left: 15px;
+ right: 100%;
+}
+
+.uparrow div.change:before,
+.downarrow div.change:after {
+ transform: skew(0deg, 26deg);
+ -ms-transform: skew(0deg, 26deg);
+ -webkit-transform: skew(0deg, 26deg);
+}
+
+.uparrow div.change:after,
+.downarrow div.change:before {
+ transform: skew(0deg, -26deg);
+ -ms-transform: skew(0deg, -26deg);
+ -webkit-transform: skew(0deg, -26deg);
+}
+
+#changelog div.comment-box h4 { margin-top: 0px; }
+
+#changelog ul.changes {
+ list-style-type: none;
+ margin: 0 0 0 11px;
}
+#changelog ul.changes > li { padding: 0 20px; }
+
+.ticket form#prefs input[type="radio"] { display: none; }
+
.ticket form#prefs input[type="radio"] + label span {
display: inline-block;
- cursor:pointer;
+ cursor: pointer;
}
+
.ticket form#prefs input[type="radio"]:checked + label span {
display: inline-block;
cursor: pointer;
}
+
input[type="radio"]:checked + label span {
font-weight: bold;
cursor: pointer;
}
+
input[type="radio"]:not(:checked) + label span {
- text-decoration:underline;
+ text-decoration: underline;
}
+
+/* Same styling as ".browser .table td" in boostrap.css */
+.browser .table tbody tr {
+ border-top: 1px solid #dddddd;
+}
+
+/* @group Related tickets */
+
+.relations table {
+ table-layout: fixed;
+ word-wrap: break-word;
+}
+
+.relations table .width-standard {
+ width: 17%;
+}
+.relations table .width-wide {
+ width: 32%;
+}
+/* @end */
+
+#batchmod_action { line-height: 2.75em }
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/htdocs/js/theme.js
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/htdocs/js/theme.js?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/htdocs/js/theme.js (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/htdocs/js/theme.js Thu Feb 27 02:14:33 2014
@@ -50,6 +50,16 @@ $( function () {
});
*/
+ function checkSelections () {
+ return $.inArray('', $('#qct-box select[data-optional=false]').map(function() {
+ return $(this).val();
+ })) == -1;
+ }
+ $('#qct-create').attr("disabled", !checkSelections());
+ $('#qct-box select').change(function () {
+ $('#qct-create').attr("disabled", !checkSelections());
+ });
+
$('#qct-inline-newticket').click(function() {
$('#qct-inline-notice-success, #qct-inline-notice-error').hide();
@@ -74,22 +84,59 @@ $( function () {
title : function () {
ticket = qct_info.ticket;
if (ticket)
- title = 'Ticket #' + qct_info.ticket;
+ title = _('Ticket #') + qct_info.ticket;
else
- title = 'Error creating ticket';
+ title = _('Error creating ticket');
return title + ' <a class="close" id="qct-alert-close" ' +
'data-dismiss="alert" href="#">×</a>'
},
content : function () { return qct_info.msg; }
});
+ /**
+ * POST QCT form fields to full ticket form when "More fields" is clicked
+ */
+ $('#qct-more').click(function(e) {
+ // As we're not creating the ticket, we'll remove hidden fields
+ // that result in unnecessary validation messages.
+ e.preventDefault();
+ $qct_form = $('#qct-form');
+ $qct_form.unbind('submit');
+ new_ticket_url = $qct_form.find(':selected').attr('data-product-new-ticket-url');
+ $qct_form.attr('action', new_ticket_url);
+ $('.qct-product-scope-extra').remove();
+ $qct_form.append('<input type="hidden" value="1" name="preview" />');
+ $qct_form.submit();
+
+ });
+
+ function set_qct_more_visibility(is_visible) {
+ if (is_visible) {
+ $('#qct-more').css('visibility', 'visible');
+ } else {
+ $('#qct-more').css('visibility', 'hidden');
+ }
+ }
+
+ $('#field-product').change(function(e) {
+ set_qct_more_visibility($(this).val());
+ });
+
+ set_qct_more_visibility($('#field-product').val());
+
$('body').on('click.close', '#qct-alert-close',
function (e) { qct_alert_close() });
// Display & hide message triggered by quick create box
function qct_alert(msg) {
qct_info = msg;
- jQuery('#qct-newticket').popover('show');
+ var link_content = '#' + qct_info.product + '-' + qct_info.ticket;
+ var link = $(qct_info.msg).filter('a').html(link_content);
+ $('#qct-last').empty()
+ .append('Last ticket created: ')
+ .append(link);
+ $('#qct-last-container').show();
+ $('#qct-newticket').popover('show');
if (qct_timeout)
clearTimeout(qct_timeout);
qct_timeout = setTimeout(qct_alert_close, 4000);
@@ -100,9 +147,24 @@ $( function () {
}
// Clear input controls inside quick create box
+ var timeout;
+ $('#qct-newticket').click(function () {
+ if (timeout) {
+ clearTimeout(timeout);
+ }
+ });
function qct_clearui() {
- $('#qct-form input[name!="__FORM_TOKEN"], #qct-form select, #qct-form textarea').val('');
- $('#qct-inline-form input[name!="__FORM_TOKEN"], #qct-inline-form select, #qct-inline-form textarea').val('');
+ $('#qct-form input[name!="__FORM_TOKEN"], #qct-form textarea').val('');
+ $('#qct-inline-form input[name!="__FORM_TOKEN"], #qct-inline-form textarea').val('');
+ $('#qct-create').attr("disabled", !checkSelections());
+ if (timeout) {
+ clearTimeout(timeout);
+ }
+ timeout = setTimeout(function () {
+ $('#qct-form select').val('');
+ $('#qct-inline-form select').val('');
+ $('#qct-create').attr("disabled", !checkSelections());
+ }, 120000);
}
// We want to submit via #qct-create
@@ -131,19 +193,20 @@ $( function () {
function(ticket) {
qct_alert({
ticket: ticket.id,
+ product: ticket.product,
msg: '<span class="alert alert-success">' +
- 'Has been created</span> ' +
- '<a href="' + ticket.url + '">View / Edit</a>'
+ _('Has been created') + '</span> ' +
+ '<a href="' + ticket.url + '">' + _('View / Edit') + '</a>'
});
})
.error(function(jqXHR, textStatus, errorMsg) {
var msg = 'Error:' + errorMsg;
if (textStatus === 'timeout')
- msg = 'Request timed out';
+ msg = _('Request timed out');
else if (textStatus === 'error')
- msg = 'Could not create ticket . Error : ' + errorMsg;
+ msg = _('Could not create ticket . Error : ') + errorMsg;
else if (textStatus === 'abort')
- msg = 'Aborted request'
+ msg = _('Aborted request')
qct_alert({
ticket : null,
msg : '<span class="alert alert-error"' +
@@ -161,19 +224,19 @@ $( function () {
product_base_url = '';
$.post(product_base_url + '/qct', $('#qct-inline-form').serialize(),
function(ticket) {
- var msg = 'Ticket #' + ticket.id + ' has been created. ';
- msg += '<a href="' + ticket.url + '">View / Edit</a>';
+ var msg = _('Ticket #') + ticket.id + _(' has been created. ');
+ msg += '<a href="' + ticket.url + '">' + _('View / Edit') + '</a>';
$('#qct-inline-notice-success span').html(msg);
$('#qct-inline-notice-success').show({'duration': 400});
})
.error(function(jqXHR, textStatus, errorMsg) {
var msg;
if (textStatus === 'timeout')
- msg = 'Request timed out';
+ msg = _('Request timed out');
else if (textStatus === 'error')
- msg = 'Could not create ticket. Error : ' + errorMsg;
+ msg = _('Could not create ticket. Error : ') + errorMsg;
else if (textStatus === 'abort')
- msg = 'Aborted request';
+ msg = _('Aborted request');
$('#qct-inline-notice-error span').html(msg);
$('#qct-inline-notice-error').show({'duration': 400});
@@ -221,4 +284,3 @@ function setup_sticky_panel(selector) {
}
})
}
-
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_about.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_about.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_about.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_about.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="layout.html" />
<head>
@@ -47,11 +48,10 @@
<h1>About ${chrome.labels.application_short}
${chrome.labels.application_version}
</h1>
- <p>Standing on the shoulders of <a href="http://trac.edgewall.org/">
- Trac ${trac.version}</a>,
- <a href="http://incubator.apache.org/bloodhound/">
- ${chrome.labels.application_full}</a> is a project hosted by the
- Apache Software Foundation's Incubator project.
+ <p i18n:msg="Trac,Bloodhound">Standing on the shoulders of
+ <a href="http://trac.edgewall.org/">Trac ${trac.version}</a>,
+ <a href="http://incubator.apache.org/bloodhound/">${chrome.labels.application_full}</a>
+ is a project hosted by the Apache Software Foundation's Incubator project.
<br/>
Currently, it has three key aims:
<h4>Multiple Projects</h4>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_basics.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_basics.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_basics.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_basics.html Thu Feb 27 02:14:33 2014
@@ -22,7 +22,9 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:py="http://genshi.edgewall.org/">
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="bh_admin.html" />
<head>
<title>Basics</title>
@@ -61,7 +63,7 @@
<option py:for="tzname in timezones" value="${tzname}"
selected="${tzname == default_timezone or None}">${tzname}</option>
</select>
- <span py:if="has_pytz is False" class="help-inline">
+ <span py:if="has_pytz is False" class="help-inline" i18n:msg="">
<span class="label label-info">Note</span>
Install <code>pytz</code> for a complete list of timezones.
</span>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_components.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_components.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_components.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_components.html Thu Feb 27 02:14:33 2014
@@ -23,7 +23,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:py="http://genshi.edgewall.org/"
- xmlns:i18n="http://genshi.edgewall.org/i18n">
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="bh_admin.html" />
<head>
<title>Components</title>
@@ -71,7 +72,7 @@
class="wikitext trac-resizable"
placeholder="Describe this component using WikiFormatting"
rows="6" cols="60">$component.description</textarea>
- <p class="help-block">
+ <p class="help-block" i18n:msg="">
<span class="label label-info">Tip</span> you may use
<a tabindex="42" href="${href.wiki('WikiFormatting')}">WikiFormatting</a>
here
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_enums.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_enums.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_enums.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_enums.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:py="http://genshi.edgewall.org/">
<xi:include href="bh_admin.html" />
<head>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_logging.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_logging.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_logging.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_logging.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:py="http://genshi.edgewall.org/">
<xi:include href="bh_admin.html" />
<head>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html Thu Feb 27 02:14:33 2014
@@ -23,7 +23,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:py="http://genshi.edgewall.org/"
- xmlns:i18n="http://genshi.edgewall.org/i18n">
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="bh_admin.html" />
<head>
<title>Milestones</title>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_perms.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_perms.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_perms.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_perms.html Thu Feb 27 02:14:33 2014
@@ -24,6 +24,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
py:with="can_revoke = 'PERMISSION_REVOKE' in perm">
<xi:include href="bh_admin.html" />
<head>
@@ -107,17 +108,18 @@
class="${'odd' if idx % 2 else 'even'}">
<td>$subject</td>
<td>
- <py:for each="cnt, (subject,action) in enumerate(perm_group)"
- py:with="subject_action='%s:%s' % (unicode_to_base64(subject),
- unicode_to_base64(action));
- subject_action_id='sa-%d-%d' % (idx, cnt)">
+ <py:for each="cnt, (subject, action) in enumerate(perm_group)"
+ py:with="subject_action = '%s:%s' % (unicode_to_base64(subject),
+ unicode_to_base64(action));
+ subject_action_id = 'sa-%d-%d' % (idx, cnt)">
<!--! base64 make it safe to use ':' as separator when passing
both subject and action as one query parameter -->
<label for="$subject_action_id" class="checkbox inline">
<input py:if="can_revoke" type="checkbox"
id="$subject_action_id"
name="sel" value="$subject_action" />
- $action
+ <span py:strip="action in actions" class="missing"
+ title="Action is no longer defined">${action}</span>
</label>
</py:for>
</td>
@@ -126,8 +128,7 @@
</table>
<h3>Group Membership</h3>
- <table class="table table-bordered table-striped table-condensed"
- id="grouplist">
+ <table class="table table-bordered table-striped table-condensed" id="grouplist">
<thead>
<tr><th>Subject</th><th class="full-x">Action</th></tr>
</thead>
@@ -144,8 +145,7 @@
<!--! base64 makes it safe to use ':' as separator when passing
both subject and action as one query parameter -->
<label for="$subject_action_id" class="checkbox inline">
- <input py:if="can_revoke" type="checkbox"
- id="$subject_action_id"
+ <input py:if="can_revoke" type="checkbox" id="$subject_action_id"
name="sel" value="$subject_action" />
$subject
</label>
@@ -158,7 +158,7 @@
<br/>
<div class="control-group" py:if="can_revoke">
<input class="btn" type="submit" name="remove"
- value="${_('Remove selected items')}" />
+ value="${_('Remove selected items')}" />
</div>
</form>
@@ -174,4 +174,3 @@
</body>
</html>
-
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_plugins.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_plugins.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_plugins.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_plugins.html Thu Feb 27 02:14:33 2014
@@ -23,7 +23,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:py="http://genshi.edgewall.org/"
- xmlns:i18n="http://genshi.edgewall.org/i18n">
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="bh_admin.html" />
<head>
<title>Plugins</title>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_products.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_products.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_products.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_products.html Thu Feb 27 02:14:33 2014
@@ -23,7 +23,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:py="http://genshi.edgewall.org/"
- xmlns:i18n="http://genshi.edgewall.org/i18n">
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="bh_admin.html" />
<head>
<title>Products</title>
@@ -77,7 +78,7 @@
class="wikitext trac-resizable"
placeholder="Describe this product using WikiFormatting"
rows="6" cols="60">$product.description</textarea>
- <p class="help-block">
+ <p class="help-block" i18n:msg="">
<span class="label label-info">Tip</span> you may use
<a tabindex="42" href="${href.wiki('WikiFormatting')}">WikiFormatting</a>
here
@@ -150,9 +151,11 @@
</table>
<div class="control-group">
<input class="btn" type="submit" name="remove"
- value="${_('Remove selected items')}" />
+ value="${_('Remove selected items')}" />
<input class="btn" type="submit" name="apply"
- value="${_('Apply changes')}" />
+ value="${_('Apply changes')}" />
+ <input class="btn" type="submit" name="clear"
+ value="${_('Clear default')}" />
</div>
<p class="help-block">
<span class="label label-info">Note</span>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html Thu Feb 27 02:14:33 2014
@@ -23,7 +23,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:py="http://genshi.edgewall.org/"
- xmlns:i18n="http://genshi.edgewall.org/i18n">
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="bh_admin.html"/>
<head>
<title>Repositories</title>
@@ -119,7 +120,7 @@
<textarea id="description" name="description" class="wikitext trac-resizable"
placeholder="Describe this repository using WikiFormatting"
rows="6" cols="60" readonly="$readonly">$info.description</textarea>
- <p class="help-block">
+ <p class="help-block" i18n:msg="">
<span class="label label-info">Tip</span>
you may use <a tabindex="42" href="${href.wiki('WikiFormatting')}">WikiFormatting</a> here
</p>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_versions.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_versions.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_versions.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_admin_versions.html Thu Feb 27 02:14:33 2014
@@ -23,7 +23,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:py="http://genshi.edgewall.org/"
- xmlns:i18n="http://genshi.edgewall.org/i18n">
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="bh_admin.html" />
<head>
<title>Versions</title>
@@ -66,7 +67,7 @@
class="wikitext trac-resizable" rows="6"
placeholder="Describe this version using WikiFormatting"
cols="60">$version.description</textarea>
- <p class="help-block">
+ <p class="help-block" i18n:msg="">
<span class="label label-info">Tip</span>
you may use <a tabindex="42" href="${href.wiki('WikiFormatting')}">WikiFormatting</a> here
</p>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_attach_file_form.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_attach_file_form.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_attach_file_form.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_attach_file_form.html Thu Feb 27 02:14:33 2014
@@ -28,12 +28,13 @@ Arguments:
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
py:if="alist.can_create" method="get" action="${alist.attach_href}"
id="attachfile" style="display: inline-block">
<input type="hidden" name="action" value="new" />
- <div class="btn-group">
- <button type="submit" class="btn" name="attachfilebutton" id="attachfilebutton">
- <i class="icon-file"></i> ${value_of('add_button_title', None) or _('Attach file')}
+ <div class="btn-group" py:with="value = value_of('add_button_title', None) or _('Attach file');">
+ <button type="submit" class="btn" value="$value" name="attachfilebutton" id="attachfilebutton">
+ <i class="icon-file"></i> $value
</button>
</div>
</form>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_attachment.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_attachment.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_attachment.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_attachment.html Thu Feb 27 02:14:33 2014
@@ -24,6 +24,7 @@
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
py:with="parent = attachments.parent if attachments else attachment.resource.parent">
<xi:include href="layout.html" />
<head>
@@ -152,9 +153,9 @@
</div>
<py:if test="attachment and 'ATTACHMENT_DELETE' in perm(attachment.resource)">
- <div class="span12">
+ <div class="span12 btn-toolbar">
<form method="get" action="">
- <div id="delete control-group">
+ <div id="delete" class="btn-group">
<input type="hidden" name="action" value="delete" />
<input type="submit" class="btn"
value="${_('Delete attachment')}" />
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_batch_modify.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_batch_modify.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_batch_modify.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_batch_modify.html Thu Feb 27 02:14:33 2014
@@ -20,6 +20,7 @@
<form xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude"
id="batchmod_form" method="post" action="${req.href + '/batchmodify'}"
class="form-horizontal" >
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_browser.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_browser.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_browser.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_browser.html Thu Feb 27 02:14:33 2014
@@ -23,7 +23,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:i18n="http://genshi.edgewall.org/i18n">
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="layout.html" />
<head>
<title py:choose="len(path_links)">
@@ -139,7 +140,7 @@
</py:if>
<div py:if="dir" class="span12">
- <table class="listing dirlist" id="dirlist">
+ <table class="listing dirlist table table-striped table-condensed" id="dirlist">
<xi:include href="bh_dirlist_thead.html" />
<tbody>
<py:if test="'up' in chrome.links">
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_diff_options.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_diff_options.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_diff_options.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_diff_options.html Thu Feb 27 02:14:33 2014
@@ -26,6 +26,7 @@
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
py:strip="">
<label for="style">View differences</label>
<select id="style" name="style" class="input-medium">
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_diff_view.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_diff_view.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_diff_view.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_diff_view.html Thu Feb 27 02:14:33 2014
@@ -23,11 +23,11 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="layout.html" />
<head>
<title>$title</title>
- <link rel="stylesheet" type="text/css" href="${chrome.htdocs_location}css/diff.css" />
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
</head>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_dirlist_thead.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_dirlist_thead.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_dirlist_thead.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_dirlist_thead.html Thu Feb 27 02:14:33 2014
@@ -20,7 +20,10 @@
<!--! Template snippet for a standard table header for a dirlist -->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
- xmlns:xi="http://www.w3.org/2001/XInclude" py:strip="">
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
+ py:strip="">
<thead>
<tr>
<xi:include href="bh_sortable_th.html" py:with="class_ = 'name'; title = _('Name')"/>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_history_view.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_history_view.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_history_view.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_history_view.html Thu Feb 27 02:14:33 2014
@@ -23,7 +23,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:i18n="http://genshi.edgewall.org/i18n">
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="layout.html" />
<head>
<title>$title</title>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_list_of_attachments.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_list_of_attachments.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_list_of_attachments.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_list_of_attachments.html Thu Feb 27 02:14:33 2014
@@ -30,6 +30,7 @@ Arguments:
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
py:with="compact = value_of('compact', False);
add_button_title = value_of('add_button_title', None);
foldable = value_of('foldable', False)" py:strip="">
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_login.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_login.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_login.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_login.html Thu Feb 27 02:14:33 2014
@@ -24,7 +24,7 @@
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:i18n="http://genshi.edgewall.org/i18n"
- i18n:domain="bloodhound">
+ i18n:domain="bhtheme">
<xi:include href="layout.html" />
<?python
if _dgettext is not None:
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_delete.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_delete.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_delete.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_delete.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="layout.html" />
<head>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_edit.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_edit.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_edit.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_edit.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="layout.html" />
<head>
@@ -82,7 +83,7 @@
<label for="description" i18n:msg="">Description</label>
<p><textarea id="description" name="description" class="wikitext trac-resizable" rows="10" cols="78" placeholder="Describe this milestone using WikiFormatting">
${milestone.description}</textarea></p>
- <p class="help-block pull-right">
+ <p class="help-block pull-right" i18n:msg="">
<span class="label label-info">Tip</span>
You may use <a tabindex="42"
href="${href.wiki('WikiFormatting')}">WikiFormatting</a> here
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:bh="http://issues.apache.org/bloodhound/wiki/Ui/Dashboard"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="layout.html" />
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_general.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_general.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_general.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_general.html Thu Feb 27 02:14:33 2014
@@ -21,6 +21,7 @@
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude"
py:strip=""
py:with="single_product = not product_list or len(product_list) < 2">
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_search.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_search.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_search.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_search.html Thu Feb 27 02:14:33 2014
@@ -20,6 +20,7 @@
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude"
py:strip="">
<xi:include href="bh_path_general.html" />
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_ticket.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_ticket.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_ticket.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_ticket.html Thu Feb 27 02:14:33 2014
@@ -20,6 +20,7 @@
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude"
py:strip="">
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_wikipage.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_wikipage.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_wikipage.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_path_wikipage.html Thu Feb 27 02:14:33 2014
@@ -20,6 +20,7 @@
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude"
py:strip="" py:with="parts = page.name.split('/')">
<li>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:py="http://genshi.edgewall.org/"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
py:strip="">
<py:def function="intro_and_tabs()">
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_advanced.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_advanced.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_advanced.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_advanced.html Thu Feb 27 02:14:33 2014
@@ -22,7 +22,9 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
- xmlns:xi="http://www.w3.org/2001/XInclude">
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="bh_prefs.html" />
<head>
<title>Advanced</title>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_datetime.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_datetime.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_datetime.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_datetime.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="bh_prefs.html" />
<head>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_general.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_general.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_general.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_general.html Thu Feb 27 02:14:33 2014
@@ -22,7 +22,9 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
- xmlns:xi="http://www.w3.org/2001/XInclude">
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="bh_prefs.html" />
<head>
<title>General</title>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_keybindings.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_keybindings.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_keybindings.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_keybindings.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="bh_prefs.html" />
<head>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_language.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_language.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_language.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_language.html Thu Feb 27 02:14:33 2014
@@ -23,7 +23,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:i18n="http://genshi.edgewall.org/i18n">
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="bh_prefs.html" />
<head>
<title>Language</title>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_pygments.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_pygments.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_pygments.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_pygments.html Thu Feb 27 02:14:33 2014
@@ -22,7 +22,9 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
- xmlns:xi="http://www.w3.org/2001/XInclude">
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme">
<xi:include href="bh_prefs.html" />
<head>
<title>Syntax Highlighting</title>
@@ -58,7 +60,7 @@
The Pygments syntax highlighter can be used with
different coloring styles.</p>
<br/>
- <p><label for="pygmennt_theme">Style:</label>
+ <p><label for="pygment_theme">Style:</label>
<select id="pygment_theme" name="style">
<option py:for="style in sorted(styles)" value="${style}"
selected="${selection == style or None}">${style.title()}</option>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_userinterface.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="bh_prefs.html" />
<head>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_preview_file.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_preview_file.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_preview_file.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_preview_file.html Thu Feb 27 02:14:33 2014
@@ -27,6 +27,7 @@ Arguments:
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
py:strip="">
${preview.rendered}
<py:choose>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_product_view.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_product_view.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_product_view.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_product_view.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:bh="http://issues.apache.org/bloodhound/wiki/Ui/Dashboard"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="layout.html" />
@@ -79,7 +80,7 @@
<bh:widget urn="TicketQuery">
<bh:args>
<bh:arg name="max">10</bh:arg>
- <bh:arg name="query">product=${product.prefix}&status=!closed&group=time&col=id&col=summary&col=owner&col=status&col=priority&order=priority&groupdesc=1&desc=1&owner=$USER</bh:arg>
+ <bh:arg name="query">product=${product.prefix}&status=!closed&group=time&col=id&col=summary&col=owner&col=status&col=priority&order=priority&groupdesc=1&desc=1&owner=$$USER</bh:arg>
<bh:arg name="title">My Tickets</bh:arg>
</bh:args>
</bh:widget>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_query.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_query.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_query.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_query.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="layout.html" />
<head>
@@ -251,8 +252,7 @@
<input py:if="report_resource" type="hidden" name="report" value="$report_resource.id" />
<input type="hidden" name="order" value="$query.order" />
<input py:if="query.desc" type="hidden" name="desc" value="1" />
- <input type="submit" name="update" value="${_('Update')}"
- class="btn" />
+ <input type="submit" class="btn pull-right" name="update" value="${_('Update')}" />
</div>
<hr />
</form>
@@ -260,9 +260,9 @@
<div class="span12">
<xi:include href="widget_query_results.html" />
</div>
- <div class="span12">
+ <div py:if="tickets and batch_modify" class="span12">
<div class="well">
- <xi:include py:if="batch_modify" href="bh_batch_modify.html" />
+ <xi:include href="bh_batch_modify.html" />
</div>
</div>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_register.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_register.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_register.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_register.html Thu Feb 27 02:14:33 2014
@@ -24,7 +24,7 @@
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:i18n="http://genshi.edgewall.org/i18n"
- i18n:domain="bloodhound">
+ i18n:domain="bhtheme">
<xi:include href="layout.html" />
<?python
if _dgettext is not None:
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_report_delete.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_report_delete.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_report_delete.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_report_delete.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="layout.html" />
<head>
Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_report_edit.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_report_edit.html?rev=1572404&r1=1572403&r2=1572404&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_report_edit.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_report_edit.html Thu Feb 27 02:14:33 2014
@@ -23,6 +23,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:i18n="http://genshi.edgewall.org/i18n"
+ i18n:domain="bhtheme"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="layout.html" />
<head>
@@ -53,7 +54,7 @@
<div class="controls">
<textarea id="description" name="description" class="wikitext trac-resizable" rows="10">
$report.description</textarea>
- <p class="help-block">
+ <p class="help-block" i18n:msg="">
<span class="label label-info">Tip</span>
You may use <a tabindex="42" href="${href.wiki('WikiFormatting')}">WikiFormatting</a> here.
</p>
@@ -69,7 +70,7 @@ $report.description</textarea>
<div class="controls">
<textarea id="query" name="query" class="trac-resizable" rows="20">
$report.sql</textarea>
- <p class="help-block">
+ <p class="help-block" i18n:msg="">
<span class="label label-info">Tip</span>
Can be either SQL or, if starting with <code>query:</code>,
a <a tabindex="42" href="${href.wiki('TracQuery') + '#QueryLanguage'}">TracQuery</a> expression.