Author: jure
Date: Wed Feb 27 12:52:42 2013
New Revision: 1450762
URL: http://svn.apache.org/r1450762
Log:
Sync merge from trunk
Added:
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap.js
- copied unchanged from r1450761,
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/setup.cfg
- copied unchanged from r1450761,
incubator/bloodhound/trunk/bloodhound_multiproduct/setup.cfg
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/tests/search_resources/base.py
- copied unchanged from r1450761,
incubator/bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/setup.cfg
- copied unchanged from r1450761,
incubator/bloodhound/trunk/bloodhound_theme/setup.cfg
Removed:
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-affix.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-alert.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-button.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-carousel.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-collapse.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-dropdown.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-modal.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-popover.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-scrollspy.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-tab.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-tooltip.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-transition.js
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-typeahead.js
Modified:
incubator/bloodhound/branches/bep_0003_multiproduct/ (props changed)
incubator/bloodhound/branches/bep_0003_multiproduct/RELEASE_NOTES
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/css/bootstrap-responsive.css
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/css/bootstrap.css
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/img/glyphicons-halflings.png
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/layouts/bootstrap.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/setup.cfg
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/setup.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/setup.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/api.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/search_resources/base.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/search_resources/milestone_search.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/search_resources/ticket_search.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/search_resources/wiki_search.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/tests/__init__.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/tests/base.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/tests/index_with_whoosh.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/tests/search_resources/milestone_search.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/tests/search_resources/ticket_search.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/tests/search_resources/wiki_search.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/tests/web_ui.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/tests/whoosh_backend.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/bhsearch/whoosh_backend.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/setup.cfg
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_search/setup.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/htdocs/bloodhound.css
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_components.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_enums.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_plugins.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_products.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_versions.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_milestone_delete.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_milestone_edit.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_report_delete.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_report_edit.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket_change.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_wiki_delete.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_wiki_edit_form.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_wiki_rename.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/theme.py
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/setup.py
incubator/bloodhound/branches/bep_0003_multiproduct/installer/bloodhound_setup.py
incubator/bloodhound/branches/bep_0003_multiproduct/trac/ (props changed)
incubator/bloodhound/branches/bep_0003_multiproduct/trac/trac/ticket/api.py
incubator/bloodhound/branches/bep_0003_multiproduct/trac/trac/ticket/model.py
incubator/bloodhound/branches/bep_0003_multiproduct/trac/trac/ticket/tests/model.py
Propchange: incubator/bloodhound/branches/bep_0003_multiproduct/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 27 12:52:42 2013
@@ -1,7 +1,7 @@
*.DS_Store
.idea
.project
-.pydev
+.pydevproject
.git
.gitignore
.hg
Propchange: incubator/bloodhound/branches/bep_0003_multiproduct/
------------------------------------------------------------------------------
Merged /incubator/bloodhound/trunk:r1447711-1450761
Modified: incubator/bloodhound/branches/bep_0003_multiproduct/RELEASE_NOTES
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/RELEASE_NOTES?rev=1450762&r1=1450761&r2=1450762&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/RELEASE_NOTES (original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/RELEASE_NOTES Wed Feb
27 12:52:42 2013
@@ -1,3 +1,9 @@
+0.5
+
+ * Upgraded Bootstrap to version 2.3.0.
+ * Upgraded Trac to version 1.0.1.
+ * Various bug fixes.
+
0.4
* Replaces ticket edit form with a new 'in-place' edit and workflow control
Modified:
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/css/bootstrap-responsive.css
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/css/bootstrap-responsive.css?rev=1450762&r1=1450761&r2=1450762&view=diff
==============================================================================
---
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/css/bootstrap-responsive.css
(original)
+++
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/htdocs/css/bootstrap-responsive.css
Wed Feb 27 12:52:42 2013
@@ -1,5 +1,5 @@
/*!
- * Bootstrap Responsive v2.1.0
+ * Bootstrap Responsive v2.3.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -40,6 +40,10 @@
box-sizing: border-box;
}
+@-ms-viewport {
+ width: device-width;
+}
+
.hidden {
display: none;
visibility: hidden;
@@ -91,6 +95,19 @@
}
}
+.visible-print {
+ display: none !important;
+}
+
+@media print {
+ .visible-print {
+ display: inherit !important;
+ }
+ .hidden-print {
+ display: none !important;
+ }
+}
+
@media (min-width: 1200px) {
.row {
margin-left: -30px;
@@ -107,6 +124,7 @@
}
[class*="span"] {
float: left;
+ min-height: 1px;
margin-left: 30px;
}
.container,
@@ -214,6 +232,9 @@
.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
+ .row-fluid .controls-row [class*="span"] + [class*="span"] {
+ margin-left: 2.564102564102564%;
+ }
.row-fluid .span12 {
width: 100%;
*width: 99.94680851063829%;
@@ -453,6 +474,7 @@
}
[class*="span"] {
float: left;
+ min-height: 1px;
margin-left: 20px;
}
.container,
@@ -560,6 +582,9 @@
.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
+ .row-fluid .controls-row [class*="span"] + [class*="span"] {
+ margin-left: 2.7624309392265194%;
+ }
.row-fluid .span12 {
width: 100%;
*width: 99.94680851063829%;
@@ -780,7 +805,8 @@
padding-left: 20px;
}
.navbar-fixed-top,
- .navbar-fixed-bottom {
+ .navbar-fixed-bottom,
+ .navbar-static-top {
margin-right: -20px;
margin-left: -20px;
}
@@ -811,11 +837,15 @@
margin-left: 0;
}
[class*="span"],
+ .uneditable-input[class*="span"],
.row-fluid [class*="span"] {
display: block;
float: none;
- width: auto;
+ width: 100%;
margin-left: 0;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
}
.span12,
.row-fluid .span12 {
@@ -824,6 +854,9 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
}
+ .row-fluid [class*="offset"]:first-child {
+ margin-left: 0;
+ }
.input-large,
.input-xlarge,
.input-xxlarge,
@@ -845,6 +878,9 @@
display: inline-block;
width: auto;
}
+ .controls-row [class*="span"] + [class*="span"] {
+ margin-left: 0;
+ }
.modal {
position: fixed;
top: 20px;
@@ -853,8 +889,11 @@
width: auto;
margin: 0;
}
+ .modal.fade {
+ top: -100px;
+ }
.modal.fade.in {
- top: auto;
+ top: 20px;
}
}
@@ -870,7 +909,7 @@
input[type="radio"] {
border: 1px solid #ccc;
}
- .form-horizontal .control-group > label {
+ .form-horizontal .control-label {
float: none;
width: auto;
padding-top: 0;
@@ -886,6 +925,16 @@
padding-right: 10px;
padding-left: 10px;
}
+ .media .pull-left,
+ .media .pull-right {
+ display: block;
+ float: none;
+ margin-bottom: 10px;
+ }
+ .media-object {
+ margin-right: 0;
+ margin-left: 0;
+ }
.modal {
top: 10px;
right: 10px;
@@ -944,14 +993,14 @@
display: none;
}
.nav-collapse .nav .nav-header {
- color: #555555;
+ color: #777777;
text-shadow: none;
}
.nav-collapse .nav > li > a,
.nav-collapse .dropdown-menu a {
padding: 9px 15px;
font-weight: bold;
- color: #555555;
+ color: #777777;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
@@ -967,11 +1016,19 @@
margin-bottom: 2px;
}
.nav-collapse .nav > li > a:hover,
- .nav-collapse .dropdown-menu a:hover {
+ .nav-collapse .nav > li > a:focus,
+ .nav-collapse .dropdown-menu a:hover,
+ .nav-collapse .dropdown-menu a:focus {
background-color: #f2f2f2;
}
+ .navbar-inverse .nav-collapse .nav > li > a,
+ .navbar-inverse .nav-collapse .dropdown-menu a {
+ color: #999999;
+ }
.navbar-inverse .nav-collapse .nav > li > a:hover,
- .navbar-inverse .nav-collapse .dropdown-menu a:hover {
+ .navbar-inverse .nav-collapse .nav > li > a:focus,
+ .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+ .navbar-inverse .nav-collapse .dropdown-menu a:focus {
background-color: #111111;
}
.nav-collapse.in .btn-group {
@@ -982,7 +1039,7 @@
position: static;
top: auto;
left: auto;
- display: block;
+ display: none;
float: none;
max-width: none;
padding: 0;
@@ -996,6 +1053,9 @@
-moz-box-shadow: none;
box-shadow: none;
}
+ .nav-collapse .open > .dropdown-menu {
+ display: block;
+ }
.nav-collapse .dropdown-menu:before,
.nav-collapse .dropdown-menu:after {
display: none;
@@ -1003,6 +1063,10 @@
.nav-collapse .dropdown-menu .divider {
display: none;
}
+ .nav-collapse .nav > li > .dropdown-menu:before,
+ .nav-collapse .nav > li > .dropdown-menu:after {
+ display: none;
+ }
.nav-collapse .navbar-form,
.nav-collapse .navbar-search {
float: none;
@@ -1014,6 +1078,11 @@
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0
rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0
rgba(255, 255, 255, 0.1);
}
+ .navbar-inverse .nav-collapse .navbar-form,
+ .navbar-inverse .nav-collapse .navbar-search {
+ border-top-color: #111111;
+ border-bottom-color: #111111;
+ }
.navbar .nav-collapse .nav.pull-right {
float: none;
margin-left: 0;
