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=1507818&r1=1507817&r2=1507818&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 Sun Jul 28 17:22:23 2013 @@ -32,10 +32,10 @@ <head> <title>Login</title> <script type="text/javascript"> - jQuery(document).ready(function($) { + jQuery(document).ready(function($) { $("body").addClass("login"); - $('#user')[0].focus(); - }); + $('#user').focus(); + }); </script> </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=1507818&r1=1507817&r2=1507818&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 Sun Jul 28 17:22:23 2013 @@ -61,10 +61,10 @@ <body> <div id="content" class="milestone row"> <span class="span12"> - <py:choose test="milestone.exists"> - <h1 py:when="True">Edit Milestone ${milestone.name}</h1> - <h1 py:otherwise="">New Milestone</h1> - </py:choose> + <py:choose test="milestone.exists"> + <h1 py:when="True">Edit Milestone ${milestone.name}</h1> + <h1 py:otherwise="">New Milestone</h1> + </py:choose> </span> <form id="edit" action="" method="post" class="form-horizontal"> @@ -144,9 +144,9 @@ ${milestone.description}</textarea></p> </div> <div class="buttons span12" py:choose="milestone.exists"> <input py:when="True" type="submit" value="${_('Submit changes')}" - class="btn" /> + class="btn" /> <input py:otherwise="" type="submit" value="${_('Add milestone')}" - class="btn" /> + class="btn" /> <input type="submit" name="cancel" value="${_('Cancel')}" class="btn-link" /> </div> @@ -155,8 +155,8 @@ ${milestone.description}</textarea></p> <div id="help" class="span12" i18n:msg=""> <p class="help-block pull-right"> <span class="label label-info">Note</span> See - <a href="${href.wiki('TracRoadmap')}">TracRoadmap</a> for help on using - the roadmap. + <a href="${href.wiki('TracRoadmap')}">TracRoadmap</a> + for help on using the roadmap. </p> </div> Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_account.html URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_account.html?rev=1507818&r1=1507817&r2=1507818&view=diff ============================================================================== --- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_account.html (original) +++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_prefs_account.html Sun Jul 28 17:22:23 2013 @@ -71,6 +71,11 @@ <head> <title>Account</title> + <script type="text/javascript"> + jQuery(document).ready(function($) { + $("#old_password_chg").focus(); + }); + </script> </head> <body> Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html?rev=1507818&r1=1507817&r2=1507818&view=diff ============================================================================== --- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html (original) +++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html Sun Jul 28 17:22:23 2013 @@ -160,6 +160,10 @@ } function install_workflow(){ + <py:if test="bhrelations"> + var act = $('#action_resolve_resolve_resolution').parent(); + act.append('<span id="duplicate_id" class="hide">Duplicate ID: <input name="duplicate_id" type="text" class="input-mini" value="${ticket_duplicate_of}"></input></span>'); + </py:if> var actions_box = $('#workflow-actions') .click(function(e) { e.stopPropagation(); }); $('#action').children('div').each(function() { @@ -180,7 +184,17 @@ else if (newowner) newlabel = newlabel + ' to ' + newowner; else if (newresolution) + { newlabel = newlabel + ' as ' + newresolution; + if (newresolution === 'duplicate') + { + $('#duplicate_id').show(); + } + else + { + $('#duplicate_id').hide(); + } + } $('#submit-action-label').text(newlabel); // Enable | disable action controls @@ -412,6 +426,9 @@ </label> </p> + <!-- Current product prefix, used to override default_product from config. --> + <input type="hidden" id="field-product" name="field_product" value="$req.perm.env.product.prefix" /> + <div class="buttons"> <input type="submit" class="btn" name="submit" value="${_('Create ticket')}" /> </div> Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_timeline.html URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_timeline.html?rev=1507818&r1=1507817&r2=1507818&view=diff ============================================================================== --- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_timeline.html (original) +++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_timeline.html Sun Jul 28 17:22:23 2013 @@ -35,54 +35,41 @@ </head> <body> - <div id="content" class="timeline"> + <div id="content" class="timeline row"> - <h1>Timeline</h1> + <h1 class="span12">Timeline</h1> - <form id="prefs" method="get" action=""> - <div i18n:msg=""> - <label>View changes from <input type="text" id="fromdate" size="10" name="from" value="${format_date(fromdate)}" /></label> <br /> - and <label><input type="text" size="3" name="daysback" value="$daysback" /> days back</label><br /> - <label>done by <input type="text" size="16" name="authors" value="$authors" /></label> - </div> - <fieldset> - <label py:for="filter in filters"> - <input type="checkbox" name="${filter.name}" - checked="${filter.enabled or None}"/> ${filter.label} - </label> - </fieldset> - <div class="buttons"> - <input type="submit" name="update" value="${_('Update')}" /> - </div> - </form> - - <py:for each="day, events in groupby(events, key=lambda e: format_date(e.date))"> - <h2>${day}: ${_("Today") if day == today else _("Yesterday") if day == yesterday else None}</h2> - <dl py:for="unread, events in groupby(events, key=lambda e: lastvisit and lastvisit < e.dateuid)" - class="${'unread' if unread else None}"> - <py:for each="event in events" - py:with="highlight = precision and precisedate and timedelta(0) <= (event.date - precisedate) < precision"> - <dt class="${classes(event.kind, highlight=highlight, unread=unread)}"> - <a href="${event.render('url', context)}" py:choose=""> - <py:when test="event.author"><i18n:msg params="time, title, author"> - <span class="time">${format_time(event.date, 'short')}</span> ${event.render('title', context)} - by <span class="author">${format_author(event.author)}</span> - </i18n:msg></py:when> - <py:otherwise> - <span class="time">${format_time(event.date, 'short')}</span> ${event.render('title', context)} - </py:otherwise> - </a> - </dt> - <dd class="${classes(event.kind, highlight=highlight)}"> - ${event.render('description', context)} - </dd> - </py:for> - </dl> - </py:for> - - <div id="help" i18n:msg=""> - <strong>Note:</strong> See <a href="${href.wiki('TracTimeline')}">TracTimeline</a> - for information about the timeline view. + <div class="span12"> + <div class="well"> + <form id="prefs" method="get" action="" class="form-inline"> + <div i18n:msg=""> + <label>View changes from <input type="text" id="fromdate" size="10" name="from" value="${format_date(fromdate)}" /></label> + and <label><input type="text" class="input-mini" name="daysback" value="$daysback" /> days back</label> + <label>done by <input type="text" size="16" name="authors" value="$authors" /></label> + </div> + <fieldset> + <label py:for="filter in filters"> + <input type="checkbox" name="${filter.name}" + checked="${filter.enabled or None}"/> ${filter.label} + </label> + </fieldset><br /> + <div class="buttons"> + <input type="submit" class="btn" name="update" value="${_('Update')}" /> + </div> + </form> + </div> + </div> + + <div class="span12"> + <xi:include href="widget_timeline.html" /> + </div> + + <div id="help" class="span12" i18n:msg=""> + <p class="help-block pull-right"> + <span class="label label-info">Note:</span> See + <a href="${href.wiki('TracTimeline')}">TracTimeline</a> + for information about the timeline view. + </p> </div> </div> Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_wiki_edit.html URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_wiki_edit.html?rev=1507818&r1=1507817&r2=1507818&view=diff ============================================================================== --- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_wiki_edit.html (original) +++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_wiki_edit.html Sun Jul 28 17:22:23 2013 @@ -115,19 +115,6 @@ ↓ </div> <h1 class="span12" i18n:msg="name">Editing ${name_of(page.resource)}</h1> - <div py:if="merge" class="system-message span12"> - <div class="alert"> - <p><span class="label label-important">Important</span> - Someone else has modified that page since you started your edits.</p><br /> - <p i18n:msg=""><strong>If you save right away, you risk to revert those changes - (highlighted below as deletions).</strong></p><br /> - <p i18n:msg="">Please review all those changes and manually merge them with your - own changes. <br /> - If you're unsure about what you're doing, please press <code>Cancel</code> - (losing your changes) and start editing the latest version of the page - again.</p> - </div> - </div> <!--/p! @@ -153,10 +140,35 @@ (the #preview will float at the right of the edit form's textarea) --> - <div py:if="not sidebyside" class="span12"> - <xi:include href="bh_wiki_edit_form.html" /> - </div> <py:choose test="action"> + <py:when test="'collision'"> + <div class="span12"> + <div class="alert alert-error"> + <span class="label label-important">Oops !</span> + Sorry, this page has been modified by somebody else since you started + editing. Your changes cannot be saved. + </div> + </div> + <div py:if="sidebyside" class="span12"> + <xi:include href="bh_wiki_edit_form.html" /> + </div> + </py:when> + <div py:if="not sidebyside" class="span12"> + <xi:include href="bh_wiki_edit_form.html" /> + </div> + <div py:if="merge" class="system-message span12"> + <div class="alert"> + <p><span class="label label-important">Important</span> + Someone else has modified that page since you started your edits.</p><br /> + <p i18n:msg=""><strong>If you save right away, you risk to revert those changes + (highlighted below as deletions).</strong></p><br /> + <p i18n:msg="">Please review all those changes and manually merge them with your + own changes. <br /> + If you're unsure about what you're doing, please press <code>Cancel</code> + (losing your changes) and start editing the latest version of the page + again.</p> + </div> + </div> <py:when test="'preview'"> <div class="span12"> <table id="info" summary="Revision info"> @@ -197,18 +209,6 @@ </div> </div> </py:when> - <py:when test="'collision'"> - <div class="span12"> - <div class="alert alert-error"> - <span class="label label-important">Oops !</span> - Sorry, this page has been modified by somebody else since you started - editing. Your changes cannot be saved. - </div> - </div> - <div class="span12"> - <xi:include href="bh_wiki_edit_form.html" /> - </div> - </py:when> </py:choose> <div class="span12"> Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bloodhound_theme.html URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bloodhound_theme.html?rev=1507818&r1=1507817&r2=1507818&view=diff ============================================================================== --- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bloodhound_theme.html (original) +++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bloodhound_theme.html Sun Jul 28 17:22:23 2013 @@ -226,11 +226,12 @@ class="${classes(first_last(idx, chrome.nav.mainnav), active=item.active)}">${item.label}</li> <li class="dropdown ${all(not i.active for i in chrome.nav.mainnav if i.name in mainnav_show) and 'active' or None}" py:if="len([i for i in chrome.nav.metanav if i.name not in metanav_hide] + - [i for i in chrome.nav.mainnav if i.name not in mainnav_show + mainnav_to_meta])"> + [i for i in chrome.nav.mainnav if i.name not in mainnav_show + mainnav_to_meta])"> <a class="dropdown-toggle" data-toggle="dropdown" href="#">More<b class="caret"></b></a> <ul class="dropdown-menu"> <li py:if="chrome.nav.mainnav" - py:for="idx, item in enumerate(i for i in chrome.nav.mainnav if i.name not in mainnav_show)" + py:for="idx, item in enumerate(i for i in chrome.nav.mainnav + if i.name not in mainnav_show + mainnav_to_meta)" class="${classes(first_last(idx, chrome.nav.mainnav), active=item.active)}">${item.label}</li> <py:if test="chrome.nav.metanav"> <li py:if="len([i for i in chrome.nav.metanav if i.name not in metanav_hide])" Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/theme.py URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/theme.py?rev=1507818&r1=1507817&r2=1507818&view=diff ============================================================================== --- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/theme.py (original) +++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/theme.py Sun Jul 28 17:22:23 2013 @@ -26,11 +26,12 @@ from genshi.output import DocType from trac.config import ListOption, Option from trac.core import Component, TracError, implements from trac.mimeview.api import get_mimetype -from trac.resource import Resource +from trac.resource import get_resource_url, Neighborhood, Resource from trac.ticket.model import Ticket, Milestone from trac.ticket.notification import TicketNotifyEmail from trac.ticket.web_ui import TicketModule from trac.util.compat import set +from trac.util.presentation import to_json from trac.util.translation import _ from trac.versioncontrol.web_ui.browser import BrowserModule from trac.web.api import IRequestFilter, IRequestHandler, ITemplateStreamFilter @@ -65,6 +66,8 @@ class BloodhoundTheme(ThemeBase): ) BLOODHOUND_TEMPLATE_MAP = { # Admin + 'admin_accountsconfig.html': ('bh_admin_accountsconfig.html', '_modify_admin_breadcrumb'), + 'admin_accountsnotification.html': ('bh_admin_accountsnotification.html', '_modify_admin_breadcrumb'), 'admin_basics.html': ('bh_admin_basics.html', '_modify_admin_breadcrumb'), 'admin_components.html': ('bh_admin_components.html', '_modify_admin_breadcrumb'), 'admin_enums.html': ('bh_admin_enums.html', '_modify_admin_breadcrumb'), @@ -72,22 +75,23 @@ class BloodhoundTheme(ThemeBase): 'admin_milestones.html': ('bh_admin_milestones.html', '_modify_admin_breadcrumb'), 'admin_perms.html': ('bh_admin_perms.html', '_modify_admin_breadcrumb'), 'admin_plugins.html': ('bh_admin_plugins.html', '_modify_admin_breadcrumb'), + 'admin_products.html': ('bh_admin_products.html', '_modify_admin_breadcrumb'), 'admin_repositories.html': ('bh_admin_repositories.html', '_modify_admin_breadcrumb'), + 'admin_users.html': ('bh_admin_users.html', '_modify_admin_breadcrumb'), 'admin_versions.html': ('bh_admin_versions.html', '_modify_admin_breadcrumb'), - 'admin_products.html': ('bh_admin_products.html', '_modify_admin_breadcrumb'), + # no template substitutions below - use the default template, # but call the modifier nonetheless - 'admin_accountsconfig.html': ('bh_admin_accountsconfig.html', '_modify_admin_breadcrumb'), - 'admin_users.html': ('bh_admin_users.html', '_modify_admin_breadcrumb'), 'repository_links.html': ('repository_links.html', '_modify_admin_breadcrumb'), # Preferences 'prefs.html': ('bh_prefs.html', None), + 'prefs_account.html': ('bh_prefs_account.html', None), 'prefs_advanced.html': ('bh_prefs_advanced.html', None), 'prefs_datetime.html': ('bh_prefs_datetime.html', None), 'prefs_general.html': ('bh_prefs_general.html', None), - 'prefs_language.html': ('bh_prefs_language.html', None), 'prefs_keybindings.html': ('bh_prefs_keybindings.html', None), + 'prefs_language.html': ('bh_prefs_language.html', None), 'prefs_pygments.html': ('bh_prefs_pygments.html', None), 'prefs_userinterface.html': ('bh_prefs_userinterface.html', None), @@ -107,24 +111,24 @@ class BloodhoundTheme(ThemeBase): 'milestone_edit.html': ('bh_milestone_edit.html', '_modify_roadmap_page'), 'milestone_delete.html': ('bh_milestone_delete.html', '_modify_roadmap_page'), 'milestone_view.html': ('bh_milestone_view.html', '_modify_roadmap_page'), - 'roadmap.html': ('roadmap.html', '_modify_roadmap_page'), 'query.html': ('bh_query.html', '_add_products_general_breadcrumb'), 'report_delete.html': ('bh_report_delete.html', '_add_products_general_breadcrumb'), 'report_edit.html': ('bh_report_edit.html', '_add_products_general_breadcrumb'), 'report_list.html': ('bh_report_list.html', '_add_products_general_breadcrumb'), 'report_view.html': ('bh_report_view.html', '_add_products_general_breadcrumb'), + 'roadmap.html': ('roadmap.html', '_modify_roadmap_page'), 'ticket.html': ('bh_ticket.html', '_modify_ticket'), - 'ticket_preview.html': ('bh_ticket_preview.html', None), 'ticket_delete.html': ('bh_ticket_delete.html', None), + 'ticket_preview.html': ('bh_ticket_preview.html', None), # Attachment 'attachment.html': ('bh_attachment.html', None), 'preview_file.html': ('bh_preview_file.html', None), # Version control - 'revisionlog.html': ('bh_revisionlog.html', '_modify_browser'), 'browser.html': ('bh_browser.html', '_modify_browser'), 'dir_entries.html': ('bh_dir_entries.html', None), + 'revisionlog.html': ('bh_revisionlog.html', '_modify_browser'), # Multi Product 'product_view.html': ('bh_product_view.html', '_add_products_general_breadcrumb'), @@ -137,7 +141,10 @@ class BloodhoundTheme(ThemeBase): # Account manager plugin 'account_details.html': ('bh_account_details.html', None), 'login.html': ('bh_login.html', None), - 'prefs_account.html': ('bh_prefs_account.html', None), + 'register.html': ('bh_register.html', None), + 'reset_password.html': ('bh_reset_password.html', None), + 'user_table.html': ('bh_user_table.html', None), + 'verify_email.html': ('bh_verify_email.html', None), } BOOTSTRAP_CSS_DEFAULTS = ( # ('XPath expression', ['default', 'bootstrap', 'css', 'classes']) @@ -391,9 +398,15 @@ class BloodhoundTheme(ThemeBase): def _modify_admin_breadcrumb(self, req, template, data, content_type, is_active): # override 'normal' product list with the admin one - glsettings = (None, _('(Global settings)'), req.href.admin()) - admin_url = lambda x: req.href.products(x, 'admin') - data['admin_product_list'] = [glsettings] + \ + + def admin_url(prefix): + env = ProductEnvironment.lookup_env(self.env, prefix) + href = ProductEnvironment.resolve_href(env, self.env) + return href.admin() + + global_settings = (None, _('(Global settings)'), admin_url(None)) + + data['admin_product_list'] = [global_settings] + \ ProductModule.get_product_list(self.env, req, admin_url) if isinstance(req.perm.env, ProductEnvironment): @@ -402,7 +415,7 @@ class BloodhoundTheme(ThemeBase): (product.prefix, product.name, req.href.products(product.prefix, 'admin')) else: - data['admin_current_product'] = glsettings + data['admin_current_product'] = global_settings data['resourcepath_template'] = 'bh_path_general.html' def _modify_browser(self, req, template, data, content_type, is_active): @@ -509,12 +522,16 @@ class QuickCreateTicketDialog(Component) desc = "" attrs = dict([k[6:], v] for k, v in req.args.iteritems() if k.startswith('field_')) - ticket_id = self.create(req, summary, desc, attrs, True) + product, tid = self.create(req, summary, desc, attrs, True) except Exception, exc: self.log.exception("BH: Quick create ticket failed %s" % (exc,)) req.send(str(exc), 'plain/text', 500) else: - req.send(str(ticket_id), 'plain/text') + tres = Neighborhood('product', product)('ticket', tid) + href = req.href + req.send(to_json({'product': product, 'id': tid, + 'url': get_resource_url(self.env, tres, href)}), + 'application/json') def _get_ticket_module(self): ptm = None @@ -550,7 +567,7 @@ class QuickCreateTicketDialog(Component) except Exception, e: self.log.exception("Failure sending notification on creation " "of ticket #%s: %s" % (t.id, e)) - return t.id + return t['product'], t.id from pkg_resources import get_distribution application_version = get_distribution('BloodhoundTheme').version Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/setup.py URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/setup.py?rev=1507818&r1=1507817&r2=1507818&view=diff ============================================================================== --- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/setup.py (original) +++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/setup.py Sun Jul 28 17:22:23 2013 @@ -23,11 +23,11 @@ import sys setup( name = 'BloodhoundTheme', - version = '0.6.0', + version = '0.7.0', description = "Theme for Apache(TM) Bloodhound.", author = "Apache Bloodhound", license = "Apache License v2", - url = "http://incubator.apache.org/bloodhound/";, + url = "https://bloodhound.apache.org/";, keywords = "trac plugin theme bloodhound", packages = ['bhtheme'], package_data = {'bhtheme': ['htdocs/*.*', 'htdocs/img/*.*', Modified: bloodhound/branches/bep_0007_embeddable_objects/doc/Bloodhound logo.svg URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/doc/Bloodhound%20logo.svg?rev=1507818&r1=1507817&r2=1507818&view=diff ============================================================================== --- bloodhound/branches/bep_0007_embeddable_objects/doc/Bloodhound logo.svg (original) +++ bloodhound/branches/bep_0007_embeddable_objects/doc/Bloodhound logo.svg Sun Jul 28 17:22:23 2013 @@ -1,3 +1,22 @@ +<!--! + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + <svg width="160" height="120" xmlns="http://www.w3.org/2000/svg";> <!-- Created with SVG-edit - http://svg-edit.googlecode.com/ --> Modified: bloodhound/branches/bep_0007_embeddable_objects/installer/bloodhound_setup.py URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/installer/bloodhound_setup.py?rev=1507818&r1=1507817&r2=1507818&view=diff ============================================================================== --- bloodhound/branches/bep_0007_embeddable_objects/installer/bloodhound_setup.py (original) +++ bloodhound/branches/bep_0007_embeddable_objects/installer/bloodhound_setup.py Sun Jul 28 17:22:23 2013 @@ -93,6 +93,8 @@ BASE_CONFIG = {'components': {'bhtheme.* 'global_validators': 'NoSelfReferenceValidator,ExclusiveValidator,' 'BlockerValidator', + 'duplicate_relation': + 'duplicateof', }, 'bhrelations_links': { 'children.label': 'Child', @@ -134,6 +136,7 @@ ACCOUNTS_CONFIG = {'account-manager': {' 'acct_mgr.api.accountmanager' : 'enabled', 'acct_mgr.guard.accountguard' : 'enabled', 'acct_mgr.htfile.htdigeststore' : 'enabled', + 'acct_mgr.macros.*': 'enabled', 'acct_mgr.web_ui.accountmodule' : 'enabled', 'acct_mgr.web_ui.loginmodule' : 'enabled', 'trac.web.auth.loginmodule' : 'disabled', Propchange: bloodhound/branches/bep_0007_embeddable_objects/trac/ ------------------------------------------------------------------------------ Merged /bloodhound/trunk/trac:r1497828-1507814 Modified: bloodhound/branches/bep_0007_embeddable_objects/trac/trac/wiki/tests/wiki-tests.txt URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/trac/trac/wiki/tests/wiki-tests.txt?rev=1507818&r1=1507817&r2=1507818&view=diff ============================================================================== --- bloodhound/branches/bep_0007_embeddable_objects/trac/trac/wiki/tests/wiki-tests.txt (original) +++ bloodhound/branches/bep_0007_embeddable_objects/trac/trac/wiki/tests/wiki-tests.txt Sun Jul 28 17:22:23 2013 @@ -474,9 +474,9 @@ th:'wiki:"my test spaced wiki3"' ============================== Another arbitrary protocol Link svn+ssh://secureserver.org [svn+ssh://secureserver.org SVN link] -rfc-2396.compatible://link +[rfc-2396.compatible://link] [rfc-2396.compatible://link RFC 2396] -rfc-2396+under_score://link +[rfc-2396+under_score://link] [rfc-2396+under_score://link underscore] unsafe://scheme is not rendered ------------------------------ @@ -490,6 +490,15 @@ unsafe://scheme is not rendered unsafe://scheme is not rendered </p> ------------------------------ +============================== Another arbitrary protocol Link without [] - SKIP as it clashes with Jira ticket syntax +rfc-2396.compatible://link +rfc-2396+under_score://link +------------------------------ +<p> +<a class="ext-link" href="rfc-2396.compatible://link"><span class="icon"></span>rfc-2396.compatible://link</a> +<a class="ext-link" href="rfc-2396+under_score://link"><span class="icon"></span>rfc-2396+under_score://link</a> +</p> +------------------------------ ============================== WikiCreole style for the above examples [[link:WikiStart| Foo]] [[http://www.edgewall.com/|Edgewall]]
