incubator-bloodhound-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdreim...@apache.org
Subject svn commit: r1325262 - in /incubator/bloodhound/trunk/doc/html-templates: ./ css/ js/ placeholders/
Date Thu, 12 Apr 2012 13:56:37 GMT
Author: jdreimann
Date: Thu Apr 12 13:56:36 2012
New Revision: 1325262

URL: http://svn.apache.org/viewvc?rev=1325262&view=rev
Log:
Replaced iframes with divs filled by javascript. Also updated new layout (only on Product page so far) and refactored the javascript and css used to make the stickyStatus work on all pages.

Added:
    incubator/bloodhound/trunk/doc/html-templates/js/bootstrap-modal.js   (with props)
    incubator/bloodhound/trunk/doc/html-templates/placeholders/
    incubator/bloodhound/trunk/doc/html-templates/placeholders/activity.html
      - copied, changed from r1309496, incubator/bloodhound/trunk/doc/html-templates/activity-iframe.html
    incubator/bloodhound/trunk/doc/html-templates/placeholders/header.html   (with props)
    incubator/bloodhound/trunk/doc/html-templates/placeholders/ticketlist.html   (with props)
Removed:
    incubator/bloodhound/trunk/doc/html-templates/activity-iframe.html
Modified:
    incubator/bloodhound/trunk/doc/html-templates/css/bloodhound-custom.css
    incubator/bloodhound/trunk/doc/html-templates/dashboard.html
    incubator/bloodhound/trunk/doc/html-templates/js/bloodhound-stickyscroll.js
    incubator/bloodhound/trunk/doc/html-templates/milestone.html
    incubator/bloodhound/trunk/doc/html-templates/product.html
    incubator/bloodhound/trunk/doc/html-templates/search.html
    incubator/bloodhound/trunk/doc/html-templates/source.html
    incubator/bloodhound/trunk/doc/html-templates/ticket.html
    incubator/bloodhound/trunk/doc/html-templates/version.html
    incubator/bloodhound/trunk/doc/html-templates/wiki.html

Modified: incubator/bloodhound/trunk/doc/html-templates/css/bloodhound-custom.css
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/css/bloodhound-custom.css?rev=1325262&r1=1325261&r2=1325262&view=diff
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/css/bloodhound-custom.css (original)
+++ incubator/bloodhound/trunk/doc/html-templates/css/bloodhound-custom.css Thu Apr 12 13:56:36 2012
@@ -2,6 +2,7 @@
 
 div#stickyStatus {
 	position: relative;
+	top: 0px;
 }
 
 div#belowStatus {
@@ -25,6 +26,7 @@ div#stickyStatus #whitebox {
 	background-color: white;
 	height: 115px;
 	width: 620px;
+	border-bottom: 2px solid white;
 }
 
 div#stickyStatus #statusBar {
@@ -59,17 +61,11 @@ div#statusBar .other {
 
 ul.oocss {
 	list-style-type: none;
-	padding-left: 30px;
-	margin: 0;
+	margin: 0px;
 }
 
-ul.oocss h3,
 ul.oocss h6 {
-	display: inline;
-}
-
-ul.oocss h3 {
-	margin-right: 20px;
+	margin-top: -5px;
 }
 
 /* @end */
@@ -79,27 +75,56 @@ ul.oocss h3 {
 ul.statusitems {
 	list-style-type: none;
 	margin: 0;
-	text-align: center;
-	border-bottom: 1px dashed gray;
 }
 
 ul.statusitems li {
 	display: inline-block;
-	margin-right: 50px;
+	text-align: center;
+	margin-right: 30px;
+}
+
+ul.statusitems li.first {
+	text-align: left;
+	width: 200px;
+	overflow: hidden;
+	white-space: nowrap;
 }
 
 ul.statusitems li p {
 	margin-bottom: -2px;
 }
 
-ul.statusitems li a {
-	font-size: 150%;
+ul.statusitems li p + a {
+	font-size: 120%;
+}
+
+ul.statusitems .progressbar {
+	position: relative;
+	top: -17px;
+	width: 85px;
 }
 
 ul.statusitems li .progress {
-	width: 200%;
 	margin-bottom: 0px;
-	margin-top: 0;
+	margin-top: 0px;
+}
+
+/* @end */
+
+.section {
+	margin-bottom: 20px;
 }
 
-/* @end */
\ No newline at end of file
+.section h2 {
+	position: relative;
+	display: inline;
+	margin-right: 10px;
+}
+
+.section .well {
+	display: inline;
+	padding:4px;
+	position: relative;
+	top: -6px;
+	color: whiteSmoke;
+}
\ No newline at end of file

Modified: incubator/bloodhound/trunk/doc/html-templates/dashboard.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/dashboard.html?rev=1325262&r1=1325261&r2=1325262&view=diff
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/dashboard.html (original)
+++ incubator/bloodhound/trunk/doc/html-templates/dashboard.html Thu Apr 12 13:56:36 2012
@@ -8,17 +8,7 @@
 	<div class="container">
 		<header>
 		<div class="row">
-			<div class="span6">
-				<div id="logo" style="position:relative;">
-					<p style="margin-top:20px; margin-bottom:0px; line-height:65%; font-weight:lighter;">Apache<sup style="font-size:65%;">TM</sup></p>
-					<p style="margin-top:0px; font-weight:bold; font-size:120%;">Bloodhound</p>
-					<img src="img/logo.png" alt="Bloodhound Logo" height="40" width="55" style="position:absolute;
-					top:-15px; left:100px;"/>
-				</div>
-			</div>
-			<div class="span6">
-				<div class="pull-right" style="margin-top:5px; margin-right:20px;">Hi Joachim (<a href="#">logout</a>) <a href="preferences.html" style="margin-left:10px;">Preferences</a><a href="help.html" style="margin-left:10px;">Help</a></div>
-			</div>
+				<div id="logo-container"></div>
 		</div>
 		<div class="row">
 <!-- Search box -->
@@ -63,173 +53,40 @@
 				</ul>
 			</div>
      	</div>
-		</header>     	
-
-<!--	#	Header ends 
-		#	Main body begins	-->
-
+		</header>
 		<div class="row">
-<!-- Main element starts -->
+<!-- Main content -->
       		<div class="span8" id="content">
       			<div style="position: relative;"><h1 style="display:inline;">Dashboard</h1>
-      			
-<!-- Dashboard button toolbar -->
-      		<div class="btn-toolbar" style="position: absolute; bottom: -9px; left: 180px;">
-      			<div class="btn-group"  data-toggle="buttons-radio">
-      				<button class="btn" href="#">Products</button>
-      				<button class="btn active" href="#">My tickets</button>
-      				<button class="btn" href="#">All tickets</button>
-      				<button class="btn" href="#">Projects</button>
-      				<button class="btn" href="#">Components</button>
       			</div>
-      		</div></div>
       		
 <!-- My tickets table -->
-      		<table class="table table-condensed" id="myTickets" style="margin-top:8px;">
-      		<thead>
-      			<tr>
-      				<th style="text-align:right;">Date</th>
-      				<th>Ticket</th>
-      				<th>Summary</th>
-      				<th>Owner</th>
-      				<th>Priority</th>
-      			</tr>
-      		</thead>
-      		<tr>
-      			<td style="text-align:right;">Today</td>
-      			<td><a href="ticket.html">wiki-5476</a></td>
-      			<td>All Tickets report on this site: Example.com/bh</td>
-      			<td>Me (<a href="myprofile.html">view all</a>)</td>
-      			<td>High</td>
-      		</tr>
-				<tr>
-      			<td></td>
-      			<td><a href="ticket.html">E-5476</a></td>
-      			<td>Grouping doesn't work in ...</td>
-      			<td><a href="profile.html">Warren</a></td>
-      			<td>High</td>
-      		</tr>
-				<tr>
-      			<td></td>
-      			<td><a href="ticket.html">EF-492</a></td>
-      			<td>Protocol http is hard coded in ...</td>
-      			<td>Me (<a href="myprofile.html">view all</a>)</td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-			<tr>
-      			<td></td>
-      			<td><a href="ticket.html">ipad-2911</a></td>
-      			<td>Fix header graphic</td>
-      			<td><a href="profile.html">Vince</a></td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-      		<tr>
-      			<td style="text-align:right;">Yesterday</td>
-      			<td><a href="ticket.html">E-1920</a></td>
-      			<td>SQL report realm/id decoration</td>
-      			<td><a href="profile.html">Montgomery</a></td>
-      			<td>High</td>
-      		</tr>
-				<tr>
-      			<td></td>
-      			<td><a href="ticket.html">TR-2930</a></td>
-      			<td>Change main button</td>
-      			<td>Me (<a href="myprofile.html">view all</a>)</td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-				<tr>
-      			<td></td>
-      			<td><a href="ticket.html">mobile-281</a></td>
-      			<td>AttachmentManipulators cannot ...</td>
-      			<td><a href="profile.html">Seraphinia</a></td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-			<tr>
-      			<td style="text-align:right;">15 Mar</td>
-      			<td><a href="ticket.html">PL-8491</a></td>
-      			<td>Use of svn:mime-type: text/x-trac-wiki ...</td>
-      			<td><a href="profile.html">Gambolputty</a></td>
-      			<td>High</td>
-      		</tr>
-      		<tr>
-      			<td></td>
-      			<td><a href="ticket.html">ipad-2841</a></td>
-      			<td>uber logo placement</td>
-      			<td><a href="profile.html">Deepakeesh</a></td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-				<tr>
-      			<td></td>
-      			<td><a href="ticket.html">J-2913</a></td>
-      			<td>[PATCH] Empty folders excluded ...</td>
-      			<td><a href="profile.html">Thandayutha</a></td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-				<tr>
-      			<td style="text-align:right;">16 Mar</td>
-      			<td><a href="ticket.html">mobile-6932</a></td>
-      			<td>Permission check of Repository ...</td>
-      			<td>Me (<a href="myprofile.html">view all</a>)</td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-			<tr>
-      			<td></td>
-      			<td><a href="ticket.html">J-2941</a></td>
-      			<td>Load front banner</td>
-      			<td><a href="profile.html">David</a></td>
-      			<td style="text-align:right;">Low</td>
-      		</tr>
-      		<tr>
-      			<td style="text-align:right;">21 Mar</td>
-      			<td><a href="ticket.html">ipad-1823</a></td>
-      			<td>resync single revision doesn't resync ...</td>
-      			<td><a href="profile.html">Caroline</a></td>
-      			<td>High</td>
-      		</tr>
-				<tr>
-      			<td style="text-align:right;">23 Mar</td>
-      			<td><a href="ticket.html">PO-1824</a></td>
-      			<td>Update jquery to 1.4.4</td>
-      			<td>Me (<a href="myprofile.html">view all</a>)</td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-				<tr>
-      			<td style="text-align:right;">24 Mar</td>
-      			<td><a href="ticket.html">G-1938</a></td>
-      			<td>Wrong wrapping field with long and ...</td>
-      			<td><a href="profile.html">Gary</a></td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-      		</table>
-      		
-<!--	#	Product <Well>
-      		<div class="well">
-      		<h3 style="display:inline;">Products</h3>&nbsp;&nbsp;&nbsp;<a href="#">View all</a>
-      		<p style="font-size:medium; line-height:150%"><a href="product.html">uberSVN&nbsp;&nbsp;&nbsp;WANdisco&nbsp;&nbsp;&nbsp;wandisco.com&nbsp;&nbsp;&nbsp;MultiSite&nbsp;&nbsp;&nbsp;Access Control Pro</a></p>
-      		</div>
-      		 -->
+      		<div id="ticketlist-container"></div>
       		</div>
       		
-<!-- Activity starts -->
-			<div id="Activity" class="span4">
+<!-- Activity -->
+		<div id="activity" class="span4">
+			<div id="stickyActivity">
 				<h1>Activity</h1>
-      			<iframe name="activity-iframe" src="activity-iframe.html" frameborder="0" border="0" cellspacing="0" style="border-style: none; height: 450px; width: 100%;"></iframe>
-      		</div>
-      		
-     	</div>
-<!-- Activity ends -->
+			</div>
+			<div id="activity-container"></div>
+		</div>		
+     </div>
      	
 <!-- Footer -->
-     	<div class="row">
-     	<footer style="border-top: 1px solid #EEE; margin-top:20px;">
-     		<div class="span12" style="color:grey; margin-top:10px;">Powered by <a href="#" style="color:#565656;">Bloodhound</a>. Standing on the shoulders of <a href="#" style="color:#565656;">Trac 0.13</a>.</div>
-     		</div>
-     	</footer>
-     	</div>
+     	<div class="row" id="footer-container"></div>
     </div>
+    
+<!-- Scripts -->
 <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap-dropdown.js"></script>
 <script type="text/javascript" src="js/bootstrap-button.js"></script>
+<script type="text/javascript">
+    $('div#logo-container').load('placeholders/header.html #logo-user');
+    $('div#ticketlist-container').load('placeholders/ticketlist.html #myAll');
+    $('div#activity-container').load('placeholders/activity.html');
+    $('div#footer-container').load('placeholders/header.html footer');
+</script>
 </body>
 </html>
 

Modified: incubator/bloodhound/trunk/doc/html-templates/js/bloodhound-stickyscroll.js
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/js/bloodhound-stickyscroll.js?rev=1325262&r1=1325261&r2=1325262&view=diff
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/js/bloodhound-stickyscroll.js (original)
+++ incubator/bloodhound/trunk/doc/html-templates/js/bloodhound-stickyscroll.js Thu Apr 12 13:56:36 2012
@@ -1,23 +1,21 @@
-	$(document).ready(function stickyStatus() {
+$(document).ready(function stickyStatus() {
 	$(window).scroll(function onScroll() {
 	
-    var docViewTop = $(window).scrollTop();
-    var docViewBottom = docViewTop + $(window).height();
+	    var docViewTop = $(window).scrollTop();
+	    var docViewBottom = docViewTop + $(window).height();
 
-    var elemTop = $("header").offset().top;
-    var elemBottom = elemTop + $("header").height();
+	    var elemTop = $("header").offset().top;
+	    var elemBottom = elemTop + $("header").height();
     
-	if (docViewTop > elemBottom) {
-		$("#stickyactivity").attr("style", "position: fixed; top: 0;")
-		$("#stickyStatus").attr("style", "position: fixed; top: 0; width: 620px;")
-		$("#belowStatus").attr("style", "position: relative; top: 135px;")
-		$("#whitebox").attr("style", "position: absolute; z-index: 10; background-color: white; height: 115px; width: 620px; border-bottom: 2px solid #A4A4A4;")
+		if (docViewTop > elemBottom) {
+//			$("#stickyActivity").css({'position': 'fixed', 'top': '0'});
+			$("#stickyStatus").css({'position': 'fixed'});
+			$("#whitebox").css({'border-bottom': '2px solid #A4A4A4'});
 		}
-	else {
-		$("#stickyactivity").attr("style", "")
-		$("#stickyStatus").attr("style", "position: relative; width: 620px;") 
-		$("#belowStatus").attr("style", "position: relative; top: 135px;")
-		$("#whitebox").attr("style", "position: absolute; z-index: 10; background-color: white; height: 115px; width: 620px;")
-		}
-		
-	})});
\ No newline at end of file
+		else {
+//			$("#stickyActivity").css({'position': '', 'top': ''});
+			$("#stickyStatus").css({'position': ''}); 
+			$("#whitebox").css({'border-bottom': ''});
+			}
+	});
+});
\ No newline at end of file

Added: incubator/bloodhound/trunk/doc/html-templates/js/bootstrap-modal.js
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/js/bootstrap-modal.js?rev=1325262&view=auto
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/js/bootstrap-modal.js (added)
+++ incubator/bloodhound/trunk/doc/html-templates/js/bootstrap-modal.js Thu Apr 12 13:56:36 2012
@@ -0,0 +1,210 @@
+/* =========================================================
+ * bootstrap-modal.js v2.0.2
+ * http://twitter.github.com/bootstrap/javascript.html#modals
+ * =========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed 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.
+ * ========================================================= */
+
+
+!function( $ ){
+
+  "use strict"
+
+ /* MODAL CLASS DEFINITION
+  * ====================== */
+
+  var Modal = function ( content, options ) {
+    this.options = options
+    this.$element = $(content)
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+  }
+
+  Modal.prototype = {
+
+      constructor: Modal
+
+    , toggle: function () {
+        return this[!this.isShown ? 'show' : 'hide']()
+      }
+
+    , show: function () {
+        var that = this
+
+        if (this.isShown) return
+
+        $('body').addClass('modal-open')
+
+        this.isShown = true
+        this.$element.trigger('show')
+
+        escape.call(this)
+        backdrop.call(this, function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
+          !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position
+
+          that.$element
+            .show()
+
+          if (transition) {
+            that.$element[0].offsetWidth // force reflow
+          }
+
+          that.$element.addClass('in')
+
+          transition ?
+            that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
+            that.$element.trigger('shown')
+
+        })
+      }
+
+    , hide: function ( e ) {
+        e && e.preventDefault()
+
+        if (!this.isShown) return
+
+        var that = this
+        this.isShown = false
+
+        $('body').removeClass('modal-open')
+
+        escape.call(this)
+
+        this.$element
+          .trigger('hide')
+          .removeClass('in')
+
+        $.support.transition && this.$element.hasClass('fade') ?
+          hideWithTransition.call(this) :
+          hideModal.call(this)
+      }
+
+  }
+
+
+ /* MODAL PRIVATE METHODS
+  * ===================== */
+
+  function hideWithTransition() {
+    var that = this
+      , timeout = setTimeout(function () {
+          that.$element.off($.support.transition.end)
+          hideModal.call(that)
+        }, 500)
+
+    this.$element.one($.support.transition.end, function () {
+      clearTimeout(timeout)
+      hideModal.call(that)
+    })
+  }
+
+  function hideModal( that ) {
+    this.$element
+      .hide()
+      .trigger('hidden')
+
+    backdrop.call(this)
+  }
+
+  function backdrop( callback ) {
+    var that = this
+      , animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+    if (this.isShown && this.options.backdrop) {
+      var doAnimate = $.support.transition && animate
+
+      this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+        .appendTo(document.body)
+
+      if (this.options.backdrop != 'static') {
+        this.$backdrop.click($.proxy(this.hide, this))
+      }
+
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+      this.$backdrop.addClass('in')
+
+      doAnimate ?
+        this.$backdrop.one($.support.transition.end, callback) :
+        callback()
+
+    } else if (!this.isShown && this.$backdrop) {
+      this.$backdrop.removeClass('in')
+
+      $.support.transition && this.$element.hasClass('fade')?
+        this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) :
+        removeBackdrop.call(this)
+
+    } else if (callback) {
+      callback()
+    }
+  }
+
+  function removeBackdrop() {
+    this.$backdrop.remove()
+    this.$backdrop = null
+  }
+
+  function escape() {
+    var that = this
+    if (this.isShown && this.options.keyboard) {
+      $(document).on('keyup.dismiss.modal', function ( e ) {
+        e.which == 27 && that.hide()
+      })
+    } else if (!this.isShown) {
+      $(document).off('keyup.dismiss.modal')
+    }
+  }
+
+
+ /* MODAL PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.modal = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else if (options.show) data.show()
+    })
+  }
+
+  $.fn.modal.defaults = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL DATA-API
+  * ============== */
+
+  $(function () {
+    $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
+      var $this = $(this), href
+        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+        , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data())
+
+      e.preventDefault()
+      $target.modal(option)
+    })
+  })
+
+}( window.jQuery );
\ No newline at end of file

Propchange: incubator/bloodhound/trunk/doc/html-templates/js/bootstrap-modal.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/bloodhound/trunk/doc/html-templates/js/bootstrap-modal.js
------------------------------------------------------------------------------
    svn:mime-type = text/javascript

Modified: incubator/bloodhound/trunk/doc/html-templates/milestone.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/milestone.html?rev=1325262&r1=1325261&r2=1325262&view=diff
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/milestone.html (original)
+++ incubator/bloodhound/trunk/doc/html-templates/milestone.html Thu Apr 12 13:56:36 2012
@@ -9,17 +9,7 @@
 	<div class="container">
 	<header>
 		<div class="row">
-			<div class="span6">
-				<div id="logo" style="position:relative;">
-					<p style="margin-top:20px; margin-bottom:0px; line-height:65%; font-weight:lighter;">Apache<sup style="font-size:65%;">TM</sup></p>
-					<p style="margin-top:0px; font-weight:bold; font-size:120%;">Bloodhound</p>
-					<img src="img/logo.png" alt="Bloodhound Logo" height="40" width="55" style="position:absolute;
-					top:-15px; left:100px;"/>
-				</div>
-			</div>
-			<div class="span6">
-				<div class="pull-right" style="margin-top:5px; margin-right:20px;">Hi Joachim (<a href="#">logout</a>) <a href="#" style="margin-left:10px;">Preferences</a><a href="#" style="margin-left:10px;">Help</a></div>
-			</div>
+			<div id="logo-container"></div>
 		</div>
 		<div class="row">
 <!-- Search box -->
@@ -107,159 +97,37 @@
 							<p>Sodales donec sem risus bibendum semper. Velit et mauris. Vestibulum sit quam mollis massa consectetuer nonummy mattis imperdiet. Ornare varius natoque. Tortor amet venenatis pede.</p>
 							<button	class="btn" style="margin-right: 10px;"><i class="icon-edit"></i> Edit</button> <button class="btn"><i class="icon-file"></i> Attach file</button>
 				</div>
-				<div class="btn-toolbar">
-					<div class="btn-group offset1"  data-toggle="buttons-radio">
-						<a class="btn active" href="#">My tickets</a>
-						<a class="btn" href="#">All tickets</a>
-					</div>
-					<div class="btn-group">
-						<a class="btn" href="#">Projects</a>
-						<a class="btn" href="#">Components</a>
-					</div>
-				</div>
-      			<table class="table table-condensed">
-      		<thead>
-      			<tr>
-      				<th style="text-align:right;">Date</th>
-      				<th>Ticket</th>
-      				<th>Summary</th>
-      				<th>Owner</th>
-      				<th>Priority</th>
-      			</tr>
-      		</thead>
-      		<tr>
-      			<td style="text-align:right;">Today</td>
-      			<td><a href="#"><a href="#">wiki-5476</a></a></td>
-      			<td>All Tickets report on this site: Example.com/bh</td>
-      			<td>Me (<a href="#">view all</a>)</td>
-      			<td>High</td>
-      		</tr>
-				<tr>
-      			<td></td>
-      			<td><a href="#">E-5476</a></td>
-      			<td>Grouping doesn't work in ...</td>
-      			<td><a href="#">Warren</a></td>
-      			<td>High</td>
-      		</tr>
-				<tr>
-      			<td></td>
-      			<td><a href="#">EF-492</a></td>
-      			<td>Protocol http is hard coded in ...</td>
-      			<td>Me (<a href="#">view all</a>)</td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-			<tr>
-      			<td></td>
-      			<td><a href="#">ipad-2911</a></td>
-      			<td>Fix header graphic</td>
-      			<td><a href="#">Vince</a></td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-      		<tr>
-      			<td style="text-align:right;">Yesterday</td>
-      			<td><a href="#">E-1920</a></td>
-      			<td>SQL report realm/id decoration</td>
-      			<td><a href="#">Montgomery</a></td>
-      			<td>High</td>
-      		</tr>
-				<tr>
-      			<td></td>
-      			<td><a href="#">TR-2930</a></td>
-      			<td>Change main button</td>
-      			<td>Me (<a href="#">view all</a>)</td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-				<tr>
-      			<td></td>
-      			<td><a href="#">mobile-281</a></td>
-      			<td>AttachmentManipulators cannot ...</td>
-      			<td><a href="#">Seraphinia</a></td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-			<tr>
-      			<td style="text-align:right;">15 Mar</td>
-      			<td><a href="#">PL-8491</a></td>
-      			<td>Use of svn:mime-type: text/x-trac-wiki ...</td>
-      			<td><a href="#">Gambolputty</a></td>
-      			<td>High</td>
-      		</tr>
-      		<tr>
-      			<td></td>
-      			<td><a href="#">ipad-2841</a></td>
-      			<td>uber logo placement</td>
-      			<td><a href="#">Deepakeesh</a></td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-				<tr>
-      			<td></td>
-      			<td><a href="#">J-2913</a></td>
-      			<td>[PATCH] Empty folders excluded ...</td>
-      			<td><a href="#">Thandayutha</a></td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-				<tr>
-      			<td style="text-align:right;">16 Mar</td>
-      			<td><a href="#">mobile-6932</a></td>
-      			<td>Permission check of Repository ...</td>
-      			<td>Me (<a href="#">view all</a>)</td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-			<tr>
-      			<td></td>
-      			<td><a href="#">J-2941</a></td>
-      			<td>Load front banner</td>
-      			<td><a href="#">David</a></td>
-      			<td style="text-align:right;">Low</td>
-      		</tr>
-      		<tr>
-      			<td style="text-align:right;">21 Mar</td>
-      			<td><a href="#">ipad-1823</a></td>
-      			<td>resync single revision doesn't resync ...</td>
-      			<td><a href="#">Caroline</a></td>
-      			<td>High</td>
-      		</tr>
-				<tr>
-      			<td style="text-align:right;">23 Mar</td>
-      			<td><a href="#">PO-1824</a></td>
-      			<td>Update jquery to 1.4.4</td>
-      			<td>Me (<a href="#">view all</a>)</td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-				<tr>
-      			<td style="text-align:right;">24 Mar</td>
-      			<td><a href="#">G-1938</a></td>
-      			<td>Wrong wrapping field with long and ...</td>
-      			<td><a href="#">Gary</a></td>
-      			<td style="text-align:right;">Med</td>
-      		</tr>
-      		</table>
+
+				<div id="ticketlist-container"></div>
       			
 				<!-- This is only here to force the footer further down! -->
 				<div style="height:150px;"></div>
       			<!-- Likely due to a poisition: style that I got wrong somewhere in the 'content' div -->
       		</div>
       		</div>
-<!-- Activity starts -->
-      		<div id="activity" class="span4">
-      		<div id="stickyactivity">
-      			<h1>Activity</h1>
-      		    <iframe name="activity-iframe" src="activity-iframe.html" frameborder="0" border="0" cellspacing="0" style="border-style: none; height: 450px; width: 100%;"></iframe>
-      		</div>
-     	</div>
+<!-- Activity -->
+			<div id="activity" class="span4">
+				<div id="stickyActivity">
+					<h1>Activity</h1>
+				</div>
+				<div id="activity-container"></div>
+			</div>
      	</div>
 <!-- Footer -->
-     	<div class="row">
-     	<footer style="border-top: 1px solid #EEE; margin-top:20px;">
-     		<div class="span12" style="color:grey; margin-top:10px;">Powered by <a href="#" style="color:#565656;">Bloodhound</a>. Standing on the shoulders of <a href="#" style="color:#565656;">Trac 0.13</a>.</div>
-     		</div>
-     	</footer>
-     	</div>
+     	<div class="row" id="footer-container"></div>
+     	
     </div>
     <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap-dropdown.js"></script>
     <script type="text/javascript" src="js/bootstrap-button.js"></script>
     <script type="text/javascript" src="js/bloodhound-activitysize.js"></script>
     <script type="text/javascript" src="js/bloodhound-stickyscroll.js"></script>
+    <script type="text/javascript">
+        $('div#logo-container').load('placeholders/header.html #logo-user');
+        $('div#ticketlist-container').load('placeholders/ticketlist.html #myAll');
+        $('div#activity-container').load('placeholders/activity.html');
+        $('div#footer-container').load('placeholders/header.html footer');
+    </script>
 </body>
 </html>
 

Copied: incubator/bloodhound/trunk/doc/html-templates/placeholders/activity.html (from r1309496, incubator/bloodhound/trunk/doc/html-templates/activity-iframe.html)
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/placeholders/activity.html?p2=incubator/bloodhound/trunk/doc/html-templates/placeholders/activity.html&p1=incubator/bloodhound/trunk/doc/html-templates/activity-iframe.html&r1=1309496&r2=1325262&rev=1325262&view=diff
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/activity-iframe.html (original)
+++ incubator/bloodhound/trunk/doc/html-templates/placeholders/activity.html Thu Apr 12 13:56:36 2012
@@ -1,12 +1,3 @@
-<!DOCTYPE html>
-<link rel="stylesheet" type="text/css" href="css/bootstrap.css" />
-<html>
-<head>
-	<title>Activity iframe</title>
-	<base target="_parent" />
-</head>
-<body>
-<div>
 <table class="table">
 	<thead>
 		<tr><th>Today</th></tr>
@@ -70,7 +61,4 @@
 		<td><a href="profile.html">Warren</a> commented on <a href="ticket.html">E-5476</a> (Fix header graphic) saying:
 		<div style="color:grey;">"The header graphic is going to need a re-think"</div></td>
 	</tr>
-</table>
-</div>
-</body>
-</html>
\ No newline at end of file
+</table>
\ No newline at end of file

Added: incubator/bloodhound/trunk/doc/html-templates/placeholders/header.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/placeholders/header.html?rev=1325262&view=auto
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/placeholders/header.html (added)
+++ incubator/bloodhound/trunk/doc/html-templates/placeholders/header.html Thu Apr 12 13:56:36 2012
@@ -0,0 +1,19 @@
+<div id="logo-user">
+	<div class="span6">
+		<div id="logo" style="position:relative;">
+			<p style="margin-top:20px; margin-bottom:0px; line-height:65%; font-weight:lighter;">Apache<sup style="font-size:65%;">TM</sup></p>
+			<p style="margin-top:0px; font-weight:bold; font-size:120%;">Bloodhound</p>
+			<img src="img/logo.png" alt="Bloodhound Logo" height="40" width="55" style="position:absolute;
+			top:-15px; left:100px;"/>
+		</div>
+	</div>
+	<div class="span6">
+		<div class="pull-right" style="margin-top:5px; margin-right:20px;">Hi Joachim (<a href="#">logout</a>) <a href="#" style="margin-left:10px;">Preferences</a><a href="#" style="margin-left:10px;">Help</a></div>
+	</div>
+</div>
+
+
+<footer style="border-top: 1px solid #EEE; margin-top:20px;">
+	<div class="span12" style="color:grey; margin-top:10px;">Powered by <a href="#" style="color:#565656;">Bloodhound</a>. Standing on the shoulders of <a href="#" style="color:#565656;">Trac 0.13</a>.</div>
+	</div>
+</footer>
\ No newline at end of file

Propchange: incubator/bloodhound/trunk/doc/html-templates/placeholders/header.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/bloodhound/trunk/doc/html-templates/placeholders/header.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: incubator/bloodhound/trunk/doc/html-templates/placeholders/ticketlist.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/placeholders/ticketlist.html?rev=1325262&view=auto
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/placeholders/ticketlist.html (added)
+++ incubator/bloodhound/trunk/doc/html-templates/placeholders/ticketlist.html Thu Apr 12 13:56:36 2012
@@ -0,0 +1,159 @@
+<table class="table table-condensed" id="myHigh" style="margin-top:8px;">
+<!-- Only high importance tickets related to the user (owner or viewer), to be shown for example on Product and Version pages -->
+	<thead>
+		<tr>
+			<th style="text-align:right;">Date</th>
+			<th>Ticket</th>
+			<th>Summary</th>
+			<th>Owner</th>
+			<th>Priority</th>
+		</tr>
+	</thead>
+	<tr>
+		<td style="text-align:right;">Today</td>
+		<td><a href="ticket.html">wiki-5476</a></td>
+		<td>All Tickets report on this site: Example.com/bh</td>
+		<td>Me (<a href="myprofile.html">view all</a>)</td>
+		<td>High</td>
+	</tr>
+	<tr>
+		<td style="text-align:right;">Tomorrow</td>
+		<td><a href="ticket.html">E-5476</a></td>
+		<td>Grouping doesn't work in ...</td>
+		<td><a href="profile.html">Warren</a></td>
+		<td>High</td>
+	</tr>
+	<tr>
+		<td style="text-align:right;">1 Week</td>
+		<td><a href="ticket.html">EF-492</a></td>
+		<td>Protocol http is hard coded in ...</td>
+		<td>Me (<a href="myprofile.html">view all</a>)</td>
+		<td>High</td>
+	</tr>
+<tr>
+		<td style="text-align:right;">2 Weeks</td>
+		<td><a href="ticket.html">ipad-2911</a></td>
+		<td>Fix header graphic</td>
+		<td><a href="profile.html">Vince</a></td>
+		<td>High</td>
+	</tr>
+</table>
+
+
+<table class="table table-condensed" id="myAll" style="margin-top:8px;">
+<!--All tickets related to the user (owner or viewer) at this level and below, to be shown for example on Dashboard, Milestone, Project and Component pages.-->
+	<thead>
+		<tr>
+			<th style="text-align:right;">Date</th>
+			<th>Ticket</th>
+			<th>Summary</th>
+			<th>Owner</th>
+			<th>Priority</th>
+		</tr>
+	</thead>
+	<tr>
+		<td style="text-align:right;">Today</td>
+		<td><a href="ticket.html">wiki-5476</a></td>
+		<td>All Tickets report on this site: Example.com/bh</td>
+		<td>Me (<a href="myprofile.html">view all</a>)</td>
+		<td>High</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td><a href="ticket.html">E-5476</a></td>
+		<td>Grouping doesn't work in ...</td>
+		<td><a href="profile.html">Warren</a></td>
+		<td>High</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td><a href="ticket.html">EF-492</a></td>
+		<td>Protocol http is hard coded in ...</td>
+		<td>Me (<a href="myprofile.html">view all</a>)</td>
+		<td style="text-align:right;">Med</td>
+	</tr>
+<tr>
+		<td></td>
+		<td><a href="ticket.html">ipad-2911</a></td>
+		<td>Fix header graphic</td>
+		<td><a href="profile.html">Vince</a></td>
+		<td style="text-align:right;">Med</td>
+	</tr>
+	<tr>
+		<td style="text-align:right;">Yesterday</td>
+		<td><a href="ticket.html">E-1920</a></td>
+		<td>SQL report realm/id decoration</td>
+		<td><a href="profile.html">Montgomery</a></td>
+		<td>High</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td><a href="ticket.html">TR-2930</a></td>
+		<td>Change main button</td>
+		<td>Me (<a href="myprofile.html">view all</a>)</td>
+		<td style="text-align:right;">Med</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td><a href="ticket.html">mobile-281</a></td>
+		<td>AttachmentManipulators cannot ...</td>
+		<td><a href="profile.html">Seraphinia</a></td>
+		<td style="text-align:right;">Med</td>
+	</tr>
+<tr>
+		<td style="text-align:right;">15 Mar</td>
+		<td><a href="ticket.html">PL-8491</a></td>
+		<td>Use of svn:mime-type: text/x-trac-wiki ...</td>
+		<td><a href="profile.html">Gambolputty</a></td>
+		<td>High</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td><a href="ticket.html">ipad-2841</a></td>
+		<td>uber logo placement</td>
+		<td><a href="profile.html">Deepakeesh</a></td>
+		<td style="text-align:right;">Med</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td><a href="ticket.html">J-2913</a></td>
+		<td>[PATCH] Empty folders excluded ...</td>
+		<td><a href="profile.html">Thandayutha</a></td>
+		<td style="text-align:right;">Med</td>
+	</tr>
+	<tr>
+		<td style="text-align:right;">16 Mar</td>
+		<td><a href="ticket.html">mobile-6932</a></td>
+		<td>Permission check of Repository ...</td>
+		<td>Me (<a href="myprofile.html">view all</a>)</td>
+		<td style="text-align:right;">Med</td>
+	</tr>
+<tr>
+		<td></td>
+		<td><a href="ticket.html">J-2941</a></td>
+		<td>Load front banner</td>
+		<td><a href="profile.html">David</a></td>
+		<td style="text-align:right;">Low</td>
+	</tr>
+	<tr>
+		<td style="text-align:right;">21 Mar</td>
+		<td><a href="ticket.html">ipad-1823</a></td>
+		<td>resync single revision doesn't resync ...</td>
+		<td><a href="profile.html">Caroline</a></td>
+		<td>High</td>
+	</tr>
+	<tr>
+		<td style="text-align:right;">23 Mar</td>
+		<td><a href="ticket.html">PO-1824</a></td>
+		<td>Update jquery to 1.4.4</td>
+		<td>Me (<a href="myprofile.html">view all</a>)</td>
+		<td style="text-align:right;">Med</td>
+	</tr>
+	<tr>
+		<td style="text-align:right;">24 Mar</td>
+		<td><a href="ticket.html">G-1938</a></td>
+		<td>Wrong wrapping field with long and ...</td>
+		<td><a href="profile.html">Gary</a></td>
+		<td style="text-align:right;">Med</td>
+	</tr>
+	</table>
\ No newline at end of file

Propchange: incubator/bloodhound/trunk/doc/html-templates/placeholders/ticketlist.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/bloodhound/trunk/doc/html-templates/placeholders/ticketlist.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Modified: incubator/bloodhound/trunk/doc/html-templates/product.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/product.html?rev=1325262&r1=1325261&r2=1325262&view=diff
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/product.html (original)
+++ incubator/bloodhound/trunk/doc/html-templates/product.html Thu Apr 12 13:56:36 2012
@@ -8,19 +8,7 @@
 <body>
 	<div class="container">
 	<header>
-		<div class="row">
-			<div class="span6">
-				<div id="logo" style="position:relative;">
-					<p style="margin-top:20px; margin-bottom:0px; line-height:65%; font-weight:lighter;">Apache<sup style="font-size:65%;">TM</sup></p>
-					<p style="margin-top:0px; font-weight:bold; font-size:120%;">Bloodhound</p>
-					<img src="img/logo.png" alt="Bloodhound Logo" height="40" width="55" style="position:absolute;
-					top:-15px; left:100px;"/>
-				</div>
-			</div>
-			<div class="span6">
-				<div class="pull-right" style="margin-top:5px; margin-right:20px;">Hi Joachim (<a href="#">logout</a>) <a href="#" style="margin-left:10px;">Preferences</a><a href="#" style="margin-left:10px;">Help</a></div>
-			</div>
-		</div>
+		<div class="row" id="logo-container"></div>
 		<div class="row">
 <!-- Search box -->
 			<div class="span4">
@@ -76,21 +64,21 @@
 					<div id="statusBarBox"></div>
 						<div style="width: 150px; margin-left: 40px;" class="first">
 							<p style="margin-bottom:-2px;">24% complete</p>
-							<div class="progress">
+							<div class="progress progress-danger">
 								<div class="bar" style="width: 24%;"></div>
 							</div>
 						</div>
 					<div id="status" class="other">
 						<p style="margin-bottom:-2px;">In progress</p>
-						<p style="font-size:150%;"><a href="#">14</a></p>
+						<p style="font-size:150%;"><a href="#">10</a></p>
 					</div>
 					<div id="type" class="other">
 						<p style="margin-bottom:-2px;">Open</p>
-						<p style="font-size:150%;"><a href="#">20</a></p>
+						<p style="font-size:150%;"><a href="#">24</a></p>
 					</div>
 					<div id="type" class="other">
 						<p style="margin-bottom:-2px;">Complete</p>
-						<p style="font-size:150%;"><a href="#">24</a></p>
+						<p style="font-size:150%;"><a href="#">76</a></p>
 					</div>
 				</div>
 			</div>
@@ -108,118 +96,436 @@
 				</ul>
 				<button	class="btn" style="margin-right: 10px;"><i class="icon-edit"></i> Edit</button> <button class="btn"><i class="icon-file"></i> Attach file</button>
 			</div>
-			<div id="Versions">
+			<div id="tickets" class="section">
+				<h2>Tickets</h2>
+				<div class="well">
+					-<a href="#ticketEdit" data-toggle="modal"><i class="icon-edit"></i></a>
+					<a href="#ticketList" data-toggle="modal"><i class="icon-list"></i></a>-
+				</div>
+				<div class="modal hide fade" id="ticketEdit" style="display: none;">
+				  <div class="modal-header">
+				    <a class="close" data-dismiss="modal">&times;</a>
+				    <h3>New Ticket</h3>
+				  </div>
+				  <div class="modal-body">
+				  </div>
+				  <div class="modal-footer">
+				    <a href="#" class="btn" data-dismiss="modal">Close</a>
+				    <a href="#" class="btn btn-primary">Save changes</a>
+				  </div>
+				</div>
+				<div class="modal hide fade" id="ticketList" style="display: none;">
+				  <div class="modal-header">
+				    <a class="close" data-dismiss="modal">&times;</a>
+				    <h3>All Tickets</h3>
+				  </div>
+				  <div class="modal-body">
+				  	<p>test</p>
+				  </div>
+				  <div class="modal-footer">
+				    <a href="#" class="btn" data-dismiss="modal">Close</a>
+				    <a href="#" class="btn btn-primary">Save changes</a>
+				  </div>
+				</div>
+				<div id="ticketlist-container"></div>
+			</div>
+			<div id="versions" class="section">
 				<h2>Versions</h2>
-				<a href="">Add new</a>
+				<div class="modal hide fade" id="versionEdit" style="display: none;">
+				  <div class="modal-header">
+				    <a class="close" data-dismiss="modal">&times;</a>
+				    <h3>Edit versions</h3>
+				  </div>
+				  <div class="modal-body">
+					<p>edit body</p>
+				  </div>
+				  <div class="modal-footer">
+				    <a href="#" class="btn">Close</a>
+				    <a href="#" class="btn btn-primary">Save changes</a>
+				  </div>
+				</div>
+				<div class="modal hide fade" id="versionList" style="display: none;">
+				  <div class="modal-header">
+				    <a class="close" data-dismiss="modal">&times;</a>
+				    <h3>Versions</h3>
+				  </div>
+				  <div class="modal-body">
+				  <ul class="oocss" style="margin-left: 100px;">
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  				<h3><a href="version.html">14.3 Rutland</a></h3>
+				  				<h6>Due in <time datetime="2012-04-27"><a href="#">1 month</a></time></h6>
+				  			</li>
+				  			<li><p style="position: relative; top: -17px;">40%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-warning">
+				  					<div class="bar" style="width: 40%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>14.2.2 Bugfix</h3></a>
+				  			<h6>Due in <time datetime="2012-04-27"><a href="#">6 days</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">90%</p>
+				  				<div class="progressbar">
+				  					<div class="progress progress-info">
+				  						<div class="bar" style="width: 90%;"></div>
+				  					</div>
+				  				</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>14.2.1 Bugfix sprint</h3></a>
+				  			<h6>Completed <time datetime="2012-04-27"><a href="#">2 months ago</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">100%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-success">
+				  					<div class="bar" style="width: 100%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>14.2 Oklahoma</h3></a>
+				  			<h6>Completed <time datetime="2012-04-27"><a href="#">3 months ago</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">100%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-success">
+				  					<div class="bar" style="width: 100%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>14.1.2 Bugfix</h3></a>
+				  			<h6>Completed <time datetime="2012-04-27"><a href="#">2 months ago</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">100%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-success">
+				  					<div class="bar" style="width: 100%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>	
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>14.1.1 - Bugfix</h3></a>
+				  			<h6>Completed <time datetime="2012-04-27"><a href="#">2 months ago</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">100%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-success">
+				  					<div class="bar" style="width: 100%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>14.1 Castel Gadolfo</h3></a>
+				  			<h6>Completed <time datetime="2012-04-27"><a href="#">2 months ago</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">100%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-success">
+				  					<div class="bar" style="width: 100%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>14.0.1 Bugfix</h3></a>
+				  			<h6>Completed <time datetime="2012-04-27"><a href="#">2 months ago</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">100%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-success">
+				  					<div class="bar" style="width: 100%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>14 - Amadeus</h3></a>
+				  			<h6>Completed <time datetime="2012-04-27"><a href="#">2 months ago</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">100%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-success">
+				  					<div class="bar" style="width: 100%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>13.2 - Bugfix sprint</h3></a>
+				  			<h6>Completed <time datetime="2012-04-27"><a href="#">2 months ago</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">100%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-success">
+				  					<div class="bar" style="width: 100%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>14.2.1 - Bugfix sprint</h3></a>
+				  			<h6>Completed <time datetime="2012-04-27"><a href="#">2 months ago</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">100%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-success">
+				  					<div class="bar" style="width: 100%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>14.2.1 - Bugfix sprint</h3></a>
+				  			<h6>Completed <time datetime="2012-04-27"><a href="#">2 months ago</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">100%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-success">
+				  					<div class="bar" style="width: 100%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  	<li>
+				  		<ul class="statusitems">
+				  			<li class="first">
+				  			<a href="version.html"><h3>14.2.1 - Bugfix sprint</h3></a>
+				  			<h6>Completed <time datetime="2012-04-27"><a href="#">2 months ago</a></time></h6></li>
+				  			<li><p style="position: relative; top: -17px;">100%</p>
+				  			<div class="progressbar">
+				  				<div class="progress progress-success">
+				  					<div class="bar" style="width: 100%;"></div>
+				  				</div>
+				  			</div>
+				  			</li>
+				  		</ul>
+				  	</li>
+				  </ul>	  
+				  </div>
+				  <div class="modal-footer">
+				    <a href="#" class="btn" data-dismiss="modal">Close</a>
+				    <a href="#" class="btn btn-primary">Save changes</a>
+				  </div>
+				</div>
+				<div class="well">
+					-<a href="#versionEdit" data-toggle="modal"><i class="icon-edit"></i></a>
+					<a href="#versionList" data-toggle="modal"><i class="icon-list"></i></a>-
+				</div>
 				<ul class="oocss">
-					<li><a href="version.html"><h3>14.3 Rutland</h3></a><h6>Due in <time datetime="2012-05-27"><a href="#">3 weeks</a></time>, assigned to <a href="profile.html">Werner Hoffer</a></h6>
+					<li>
 						<ul class="statusitems">
-							<li style="margin-right: 80px;"><p style="position: relative; top: -17px;">75% complete</p>
-							<div class="progress" style="position: relative; top: -17px; left: -50%;">
-								<div class="bar" style="width: 75%;"></div>
-							</div></li>
+							<li class="first">
+								<h3><a href="version.html">14.3 Rutland</a></h3>
+								<h6>Due in <time datetime="2012-04-27"><a href="#">1 month</a></time></h6>
+							</li>
+							<li><p style="position: relative; top: -17px;">40%</p>
+							<div class="progressbar">
+								<div class="progress progress-warning">
+									<div class="bar" style="width: 40%;"></div>
+								</div>
+							</div>
+							</li>
 							<li><p>In progress</p><a href="#">14</a></li>
 							<li><p>Open</p><a href="#">20</a></li>
 							<li><p>Complete</p><a href="#">24</a></li>
 						</ul>
 					</li>
-					<li><a href="#"><h3>14.2.2 - Bugfix</h3></a><h6>Due in <time datetime="2012-05-27"><a href="#">6 days</a></time>, assigned to <a href="profile.html">Werner Hoffer</a></h6>
+					<li>
 						<ul class="statusitems">
-							<li style="margin-right: 80px;"><p style="position: relative; top: -17px;">90% complete</p>
-							<div class="progress" style="position: relative; top: -17px; left: -50%;">
-								<div class="bar" style="width: 90%;"></div>
-							</div></li>
-							<li><p>In progress</p><a href="#">14</a></li>
-							<li><p>Open</p><a href="#">20</a></li>
-							<li><p>Complete</p><a href="#">24</a></li>
+							<li class="first">
+							<a href="version.html"><h3>14.2.2 - Bugfix</h3></a>
+							<h6>Due in <time datetime="2012-04-27"><a href="#">6 days</a></time></h6></li>
+							<li><p style="position: relative; top: -17px;">90%</p>
+								<div class="progressbar">
+									<div class="progress progress-info">
+										<div class="bar" style="width: 90%;"></div>
+									</div>
+								</div>
+							</li>
+							<li><p>In progress</p><a href="#">1</a></li>
+							<li><p>Open</p><a href="#">2</a></li>
+							<li><p>Complete</p><a href="#">8</a></li>
 						</ul>
 					</li>
-					<li><a href="#"><h3>14.2.1 - Bugfix release</h3></a><h6>Completed <time datetime="2012-05-27"><a href="#">2 months ago</a></time>, owned by <a href="profile.html">Werner Hoffer</a></h6>
+					<li>
 						<ul class="statusitems">
-							<li style="margin-right: 80px;"><p style="position: relative; top: -17px;">100% complete</p>
-							<div class="progress" style="position: relative; top: -17px; left: -50%;">
-								<div class="bar" style="width: 100%;"></div>
+							<li class="first">
+							<a href="version.html"><h3>14.2.1 - Bugfix sprint</h3></a>
+							<h6>Completed <time datetime="2012-04-27"><a href="#">2 months ago</a></time></h6></li>
+							<li><p style="position: relative; top: -17px;">100%</p>
+							<div class="progressbar">
+								<div class="progress progress-success">
+									<div class="bar" style="width: 100%;"></div>
+								</div>
 							</div></li>
-							<li><p>In progress</p><a href="#">14</a></li>
-							<li><p>Open</p><a href="#">20</a></li>
-							<li><p>Complete</p><a href="#">24</a></li>
+							<li><p>In progress</p><a href="#">0</a></li>
+							<li><p>Open</p><a href="#">0</a></li>
+							<li><p>Complete</p><a href="#">12</a></li>
 						</ul>
 					</li>
 				</ul>
-				<a href="">View more</a>
 			</div>
+			<div id="projects" class="section">
+			<h2>Projects</h2>
+			<div class="well">
+				-<a href="#projectEdit" data-toggle="modal"><i class="icon-edit"></i></a>
+				<a href="#projectList" data-toggle="modal"><i class="icon-list"></i></a>-
+			</div>
+			<div class="modal hide fade" id="projectEdit" style="display: none;">
+			  <div class="modal-header">
+			    <a class="close" data-dismiss="modal">&times;</a>
+			    <h3>New Project</h3>
+			  </div>
+			  <div class="modal-body">
+			  </div>
+			  <div class="modal-footer">
+			    <a href="#" class="btn" data-dismiss="modal">Close</a>
+			    <a href="#" class="btn btn-primary">Save changes</a>
+			  </div>
+			</div>
+			<div class="modal hide fade" id="projectList" style="display: none;">
+			  <div class="modal-header">
+			    <a class="close" data-dismiss="modal">&times;</a>
+			    <h3>All Projects</h3>
+			  </div>
+			  <div class="modal-body">
+			  	<p>test</p>
+			  </div>
+			  <div class="modal-footer">
+			    <a href="#" class="btn" data-dismiss="modal">Close</a>
+			    <a href="#" class="btn btn-primary">Save changes</a>
+			  </div>
+			</div>
+			<ul class="oocss">
+				<li>
+					<ul class="statusitems">
+						<li class="first"><a href="project.html"><h3 style="display: block;">Rebranding</h3></a>
+						<h6>Due in <time datetime="2012-05-27"><a href="#">3 weeks</a></time></h6>
+						</li>
+						<li><p style="position: relative; top: -17px;">100%</p>
+						<div class="progressbar">
+							<div class="progress progress-success">
+								<div class="bar" style="width: 100%;"></div>
+							</div>
+						</div></li>
+						<li><p>In progress</p><a href="#">0</a></li>
+						<li><p>Open</p><a href="#">0</a></li>
+						<li><p>Complete</p><a href="#">40</a></li>
+					</ul>
+				</li>
+			</ul>
+		</div>
+			<div id="components" class="section">
+					<h2>Components</h2>
+					<div class="well">
+						-<a href="#componentEdit" data-toggle="modal"><i class="icon-edit"></i></a>
+						<a href="#componentList" data-toggle="modal"><i class="icon-list"></i></a>-
+					</div>
+					<div class="modal hide fade" id="componentEdit" style="display: none;">
+					  <div class="modal-header">
+					    <a class="close" data-dismiss="modal">&times;</a>
+					    <h3>New Component</h3>
+					  </div>
+					  <div class="modal-body">
+					  </div>
+					  <div class="modal-footer">
+					    <a href="#" class="btn" data-dismiss="modal">Close</a>
+					    <a href="#" class="btn btn-primary">Save changes</a>
+					  </div>
+					</div>
+					<div class="modal hide fade" id="componentList" style="display: none;">
+					  <div class="modal-header">
+					    <a class="close" data-dismiss="modal">&times;</a>
+					    <h3>All Components</h3>
+					  </div>
+					  <div class="modal-body">
+					  	<p>test</p>
+					  </div>
+					  <div class="modal-footer">
+					    <a href="#" class="btn" data-dismiss="modal">Close</a>
+					    <a href="#" class="btn btn-primary">Save changes</a>
+					  </div>
+					</div>
+					<ul class="oocss block">
+						<li>
+							<a href="component.html"><h3>Interface</h3></a>
+							<h6>Owned by <a href="profile.html">Warren Warwick</a></h6>
+						</li>
+						<li>
+							<a href="component.html"><h3>Database</h3></a>
+							<h6>Owned by <a href="profile.html">Warren Warwick</a></h6>
+						</li>
+						<li>
+							<a href="component.html"><h3>Core</h3></a>
+							<h6>Owned by <a href="profile.html">Warren Warwick</a></h6>
+						</li>
+					</ul>
+				</div>
   		</div>
 	</div>
-<!-- Buttonbar and below					<div class="btn-toolbar">
-      							<div class="btn-group offset1"  data-toggle="buttons-radio">
-      								<a class="btn active" href="#">Versions</a>
-      								<a class="btn" href="#">My tickets</a>
-      								<a class="btn" href="#">All tickets</a>
-      							</div>
-      							<div class="btn-group">
-      								<a class="btn" href="#">Projects</a>
-      								<a class="btn" href="#">Components</a>
-      							</div>
-      							</div>
-      			      			<div class="tabbable tabs-left">
-      							<ul class="nav nav-tabs" style="text-align:right;">
-      								<li><a href="#"><span class="label">Undefined</span></a></li>
-      								<li><a href="#14.3">14.3<br /><br /><div class="progress progress-warning">
-      									<div class="bar" style="width: 35%;"></div>
-      								</div></a></li>
-      								<li class="active"><a href="#14.3"><span class="label label-warning" style="">14.3</span>
-      								<br /><br /><div class="progress progress-success">
-      									<div class="bar" style="width: 75%;"></div>
-      								</div></a></li>
-      								<li><a href="#">14.2<br /><br /><div class="progress progress-success">
-      									<div class="bar" style="width: 100%;"></div>
-      								</div></a></li>
-      								<li><a href="#">14.1<br /><br /><div class="progress progress-success">
-      									<div class="bar" style="width: 100%;"></div>
-      								</div></a></li>
-      								<li><a href="#">&laquo; Previous</a></li>
-      							</ul>
-      							<div class="tab-content"  style="width: auto;">
-      								<div class="tab-pane active" id="14.3">
-      								<h3><a href="version.html">Version 14.3</a> <span class="label label-warning">Current</span></h3>
-      								<strong>Due in 3 weeks</strong> (15 Feb, 2012) <a href="#">Change</a><div class="pull-right">75% completed</div>
-      									<div class="progress progress-success">
-      										<div class="bar" style="width: 75%;"></div>
-      									</div>
-      									<a href="#">Complete (75)</a><a href="#" class="pull-right">Incomplete (25)</a><br/>
-      									<p>Note to maintainers
-      										<ul>
-      											<li>Move tickets from <a href="#">next-minor-0.14.x</a> to here once you know you're going to fix them for the <a href="#">0.14.2</a> release.</li>
-      											<li>There should be no enhancements here, only defects</li>
-      											<li>There should be only <strong>major</strong> defects here anyway, focus is now on <a href="#">0.15</a></li>
-      										</ul>
-      									</p>
-      								</div>
-      								<div class="tab-pane" id="14.2"></div>
-      								<div class="tab-pane" id="14.1"></div>
-      							</div>
-						</div>-->
-<!-- Activity starts -->
+<!-- Activity -->
 			<div id="activity" class="span4">
+				<div id="stickyActivity">
 					<h1>Activity</h1>
-	      			<iframe name="activity-iframe" src="activity-iframe.html" frameborder="0" border="0" cellspacing="0" style="border-style: none; height: 600px; width: 100%;"></iframe>
+				</div>
+				<div id="activity-container"></div>
       		</div>
+      		
      	</div>
      	<!-- This is only here to force the footer further down! -->
-     	<div style="height:200px;"></div>
-     	<!-- Likely due to a position: style that I got wrong somewhere in the 'content' div -->
+     	<div style="height:50px;"></div>
+     	<!-- Likely due to a poisition: style that I got wrong somewhere in the 'content' div -->
+     	
 <!-- Footer -->
-     	<div class="row">
-     	<footer style="border-top: 1px solid #EEE; margin-top:20px;">
-     		<div class="span12" style="color:grey; margin-top:10px;">Powered by <a href="#" style="color:#565656;">Bloodhound</a>. Standing on the shoulders of <a href="#" style="color:#565656;">Trac 0.13</a>.</div>
-     		</div>
-     	</footer>
-     	</div>
+     	<div class="row" id="footer-container"></div>
     </div>
+    
+<!-- Scripts -->
     <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap-dropdown.js"></script>
     <script type="text/javascript" src="js/bootstrap-button.js"></script>
+    <script type="text/javascript" src="js/bootstrap-modal.js"></script>
     <script type="text/javascript" src="js/bloodhound-stickyscroll.js"></script>
+    <script type="text/javascript">
+	    $('div#logo-container').load('placeholders/header.html #logo-user');
+	    $('div#ticketlist-container').load('placeholders/ticketlist.html #myHigh');
+	    $('div#activity-container').load('placeholders/activity.html');
+	    $('div#footer-container').load('placeholders/header.html footer');
+    </script>
 </body>
 </html>
 

Modified: incubator/bloodhound/trunk/doc/html-templates/search.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/search.html?rev=1325262&r1=1325261&r2=1325262&view=diff
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/search.html (original)
+++ incubator/bloodhound/trunk/doc/html-templates/search.html Thu Apr 12 13:56:36 2012
@@ -7,19 +7,9 @@
 <body>
 	<div class="container">
 		<div class="row">
-			<div class="span6">
-				<div id="logo" style="position:relative;">
-					<p style="margin-top:20px; margin-bottom:0px; line-height:65%; font-weight:lighter;">Apache<sup style="font-size:65%;">TM</sup></p>
-					<p style="margin-top:0px; font-weight:bold; font-size:120%;">Bloodhound</p>
-					<img src="img/logo.png" alt="Bloodhound Logo" height="40" width="55" style="position:absolute;
-						top:-15px; left:100px;"/>
-				</div>
-			</div>
-			<div class="span6">
-				<div class="pull-right" style="margin-top:5px; margin-right:20px;">Hi Joachim (<a href="#">logout</a>) <a href="#" style="margin-left:10px;">Preferences</a><a href="#" style="margin-left:10px;">Help</a></div>
-				</div>
-			</div>
-			<div class="row">
+			<div id="logo-container"></div>
+		</div>
+		<div class="row">
 	<!-- Search box -->
 				<div class="span4">
 				<form class="form-inline" style="margin-bottom:0px;">
@@ -89,15 +79,19 @@
 				</div>
       		</div>
      	</div>
-     	<div class="row">
-     	    <br />
-     		<div class="span8" style="color:grey;">Powered by <a href="#">Bloodhound</a>. Standing on the shoulders of <a href="#">Trac 0.13</a>. <a href="abc"></a></div>
-     		<div class="span4" style="text-align:right; color:grey;">Visit Bloodhound at <a href="">http://bloodhound.io</a></div>
-     	</div>
+<!-- Footer -->
+     	<div class="row" id="footer-container"></div>
+     	
     </div>
     <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap-dropdown.js"></script>
     <script type="text/javascript" src="js/bootstrap-button.js"></script>
+    <script type="text/javascript">
+        $('div#logo-container').load('placeholders/header.html #logo-user');
+        $('div#ticketlist-container').load('placeholders/ticketlist.html #myAll');
+        $('div#activity-container').load('placeholders/activity.html');
+        $('div#footer-container').load('placeholders/header.html footer');
+    </script>
 </body>
 </html>
 

Modified: incubator/bloodhound/trunk/doc/html-templates/source.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/source.html?rev=1325262&r1=1325261&r2=1325262&view=diff
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/source.html (original)
+++ incubator/bloodhound/trunk/doc/html-templates/source.html Thu Apr 12 13:56:36 2012
@@ -8,17 +8,7 @@
 	<div class="container">
 		<header>
 		<div class="row">
-			<div class="span6">
-				<div id="logo" style="position:relative;">
-					<p style="margin-top:20px; margin-bottom:0px; line-height:65%; font-weight:lighter;">Apache<sup style="font-size:65%;">TM</sup></p>
-					<p style="margin-top:0px; font-weight:bold; font-size:120%;">Bloodhound</p>
-					<img src="img/logo.png" alt="Bloodhound Logo" height="40" width="55" style="position:absolute;
-					top:-15px; left:100px;"/>
-				</div>
-			</div>
-			<div class="span6">
-				<div class="pull-right" style="margin-top:5px; margin-right:20px;">Hi Joachim (<a href="#">logout</a>) <a href="#" style="margin-left:10px;">Preferences</a><a href="#" style="margin-left:10px;">Help</a></div>
-			</div>
+			<div id="logo-container"></div>
 		</div>
 		<div class="row">
 <!-- Search box -->
@@ -76,16 +66,17 @@
       	</div>
      	
 <!-- Footer -->
-     	<div class="row">
-     	<footer style="border-top: 1px solid #EEE; margin-top:20px;">
-     		<div class="span12" style="color:grey; margin-top:10px;">Powered by <a href="#" style="color:#565656;">Bloodhound</a>. Standing on the shoulders of <a href="#" style="color:#565656;">Trac 0.13</a>.</div>
-     		</div>
-     	</footer>
-     	</div>
+     	<div class="row" id="footer-container"></div>
     </div>
 <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap-dropdown.js"></script>
 <script type="text/javascript" src="js/bootstrap-button.js"></script>
+<script type="text/javascript">
+    $('div#logo-container').load('placeholders/header.html #logo-user');
+    $('div#ticketlist-container').load('placeholders/ticketlist.html #myAll');
+    $('div#activity-container').load('placeholders/activity.html');
+    $('div#footer-container').load('placeholders/header.html footer');
+</script>
 </body>
 </html>
 

Modified: incubator/bloodhound/trunk/doc/html-templates/ticket.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/ticket.html?rev=1325262&r1=1325261&r2=1325262&view=diff
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/ticket.html (original)
+++ incubator/bloodhound/trunk/doc/html-templates/ticket.html Thu Apr 12 13:56:36 2012
@@ -9,17 +9,7 @@
 	<div class="container">
 		<header>
 		<div class="row">
-			<div class="span6">
-				<div id="logo" style="position:relative;">
-					<p style="margin-top:20px; margin-bottom:0px; line-height:65%; font-weight:lighter;">Apache<sup style="font-size:65%;">TM</sup></p>
-					<p style="margin-top:0px; font-weight:bold; font-size:120%;">Bloodhound</p>
-					<img src="img/logo.png" alt="Bloodhound Logo" height="40" width="55" style="position:absolute;
-					top:-15px; left:100px;"/>
-				</div>
-			</div>
-			<div class="span6" id="user-details">
-				<div class="pull-right" style="margin-top:5px; margin-right:20px;">Hi Joachim (<a href="#">logout</a>) <a href="#" style="margin-left:10px;">Preferences</a><a href="#" style="margin-left:10px;">Help</a></div>
-			</div>
+			<div id="logo-container"></div>
 		</div>
 		<div class="row">
 <!-- Search box -->
@@ -181,25 +171,27 @@
 			</div>
 <!-- Activity starts -->
 			<div id="activity" class="span4">
-			<div id="stickyactivity">
-				<h1>Activity</h1>
-      			<iframe name="activity-iframe" src="activity-iframe.html" frameborder="0" border="0" cellspacing="0" style="border-style: none; height: 480px; width: 100%;"></iframe>
-      		</div>
-      		</div>
-     	</div>
-<!-- Activity ends -->
-     	<div class="row">
-     	<footer style="border-top: 1px solid #EEE; margin-top:20px;">
-     		<div class="span12" style="color:grey; margin-top:10px;">Powered by <a href="#" style="color:#565656;">Bloodhound</a>. Standing on the shoulders of <a href="#" style="color:#565656;">Trac 0.13</a>.</div>
-     		</div>
-     	</footer>
+				<div id="stickyActivity">
+					<h1>Activity</h1>
+				</div>
+				<div id="activity-container"></div>
+			</div>
      	</div>
+<!-- Footer -->
+     	<div class="row" id="footer-container"></div>
+
     </div>
 <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap-dropdown.js"></script>
 <script type="text/javascript" src="js/bootstrap-button.js"></script>
 <script type="text/javascript" src="js/bloodhound-activitysize.js"></script>
 <script type="text/javascript" src="js/bloodhound-stickyscroll.js"></script>
+<script type="text/javascript">
+    $('div#logo-container').load('placeholders/header.html #logo-user');
+    $('div#ticketlist-container').load('placeholders/ticketlist.html #myAll');
+    $('div#activity-container').load('placeholders/activity.html');
+    $('div#footer-container').load('placeholders/header.html footer');
+</script>
 </body>
 </html>
 

Modified: incubator/bloodhound/trunk/doc/html-templates/version.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/version.html?rev=1325262&r1=1325261&r2=1325262&view=diff
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/version.html (original)
+++ incubator/bloodhound/trunk/doc/html-templates/version.html Thu Apr 12 13:56:36 2012
@@ -9,17 +9,7 @@
 	<div class="container">
 	<header>
 		<div class="row">
-			<div class="span6">
-				<div id="logo" style="position:relative;">
-					<p style="margin-top:20px; margin-bottom:0px; line-height:65%; font-weight:lighter;">Apache<sup style="font-size:65%;">TM</sup></p>
-					<p style="margin-top:0px; font-weight:bold; font-size:120%;">Bloodhound</p>
-					<img src="img/logo.png" alt="Bloodhound Logo" height="40" width="55" style="position:absolute;
-					top:-15px; left:100px;"/>
-				</div>
-			</div>
-			<div class="span6">
-				<div class="pull-right" style="margin-top:5px; margin-right:20px;">Hi Joachim (<a href="#">logout</a>) <a href="#" style="margin-left:10px;">Preferences</a><a href="#" style="margin-left:10px;">Help</a></div>
-			</div>
+			<div id="logo-container"></div>
 		</div>
 		<div class="row">
 <!-- Search box -->
@@ -110,18 +100,6 @@
 					</ul>
 					<button	class="btn" style="margin-right: 10px;"><i class="icon-edit"></i> Edit</button> <button class="btn"><i class="icon-file"></i> Attach file</button>
 				</div>
-				<div class="btn-toolbar">
-				<div class="btn-group offset1"  data-toggle="buttons-radio">
-					<a class="btn active" href="#">Milestones</a>
-					<a class="btn" href="#">My tickets</a>
-					<a class="btn" href="#">All tickets</a>
-				</div>
-				<div class="btn-group">
-					<a class="btn" href="#">Projects</a>
-					<a class="btn" href="#">Components</a>
-				</div>
-				</div>
-				<br>
       			<div class="tabbable tabs-left">
 					<ul class="nav nav-tabs" style="text-align:right;">
 						<li class="active"><a href="#Undefined"><span class="label">Undefined</span></a></li>
@@ -148,32 +126,34 @@
 				</div>
       		</div>
       		<!-- This is only here to force the footer further down! -->
-      		<div style="height:350px;"></div>
+      		<div style="height:150px;"></div>
       		<!-- Likely due to a position: style that I got wrong somewhere in the 'content' div -->
       		</div>
       			
-<!-- Activity starts -->
+<!-- Activity -->
 			<div id="activity" class="span4">
-				<div id="stickyactivity">
-				<h1>Activity</h1>
-      			<iframe name="activity-iframe" src="activity-iframe.html" frameborder="0" border="0" cellspacing="0" style="border-style: none; height: 450px; width: 100%;"></iframe>
-	      		</div>
-      		</div>
+				<div id="stickyActivity">
+					<h1>Activity</h1>
+				</div>
+				<div id="activity-container"></div>
+			</div>
      	</div>
      	
 <!-- Footer -->
-     	<footer style="border-top: 1px solid #EEE; margin-top:20px;">
-     	<div class="row">
-     		<div class="span12" style="color:grey; margin-top:10px;">Powered by <a href="#" style="color:#565656;">Bloodhound</a>. Standing on the shoulders of <a href="#" style="color:#565656;">Trac 0.13</a>.</div>
-     		</div>
-     	</div>
-     	</footer>
+     	<div class="row" id="footer-container"></div>
+     	
     </div>
     <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap-dropdown.js"></script>
     <script type="text/javascript" src="js/bootstrap-button.js"></script>
     <script type="text/javascript" src="js/bloodhound-activitysize.js"></script>
     <script type="text/javascript" src="js/bloodhound-stickyscroll.js"></script>
+    <script type="text/javascript">
+        $('div#logo-container').load('placeholders/header.html #logo-user');
+        $('div#ticketlist-container').load('placeholders/ticketlist.html #myHigh');
+        $('div#activity-container').load('placeholders/activity.html');
+        $('div#footer-container').load('placeholders/header.html footer');
+    </script>
 </body>
 </html>
 

Modified: incubator/bloodhound/trunk/doc/html-templates/wiki.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/doc/html-templates/wiki.html?rev=1325262&r1=1325261&r2=1325262&view=diff
==============================================================================
--- incubator/bloodhound/trunk/doc/html-templates/wiki.html (original)
+++ incubator/bloodhound/trunk/doc/html-templates/wiki.html Thu Apr 12 13:56:36 2012
@@ -8,17 +8,7 @@
 	<div class="container">
 		<header>
 		<div class="row">
-			<div class="span6">
-				<div id="logo" style="position:relative;">
-					<p style="margin-top:20px; margin-bottom:0px; line-height:65%; font-weight:lighter;">Apache<sup style="font-size:65%;">TM</sup></p>
-					<p style="margin-top:0px; font-weight:bold; font-size:120%;">Bloodhound</p>
-					<img src="img/logo.png" alt="Bloodhound Logo" height="40" width="55" style="position:absolute;
-					top:-15px; left:100px;"/>
-				</div>
-			</div>
-			<div class="span6">
-				<div class="pull-right" style="margin-top:5px; margin-right:20px;">Hi Joachim (<a href="#">logout</a>) <a href="#" style="margin-left:10px;">Preferences</a><a href="#" style="margin-left:10px;">Help</a></div>
-			</div>
+			<div id="logo-container"></div>
 		</div>
 		<div class="row">
 <!-- Search box -->
@@ -70,7 +60,7 @@
 
 		<div class="row">
 <!-- Main element starts -->
-      		<div class="span12" id="content">
+      		<div class="span8" id="content">
       			<h1>Apache Bloodhound (incubating)</h1>
       			<p>Apache Bloodhound is a tool created for issue tracking and managing of software projects.</p>
       			<h2>Multiple Projects</h2>
@@ -82,19 +72,22 @@
       			<h2>All of Trac's power</h2>
       			<p>Apache Bloodhound is being built on the shoulders of the ​Trac project, a giant in the field of project management and bug tracking. Features such Wiki and a source code browser are deeply integrated.</p>
       		</div>
+      		<div class="span4"></div>
       	</div>
      	
 <!-- Footer -->
-     	<div class="row">
-     	<footer style="border-top: 1px solid #EEE; margin-top:20px;">
-     		<div class="span12" style="color:grey; margin-top:10px;">Powered by <a href="#" style="color:#565656;">Bloodhound</a>. Standing on the shoulders of <a href="#" style="color:#565656;">Trac 0.13</a>.</div>
-     		</div>
-     	</footer>
-     	</div>
+     	<div class="row" id="footer-container"></div>
+
     </div>
 <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap-dropdown.js"></script>
 <script type="text/javascript" src="js/bootstrap-button.js"></script>
+<script type="text/javascript">
+    $('div#logo-container').load('placeholders/header.html #logo-user');
+    $('div#ticketlist-container').load('placeholders/ticketlist.html #myAll');
+    $('div#activity-container').load('placeholders/activity.html');
+    $('div#footer-container').load('placeholders/header.html footer');
+</script>
 </body>
 </html>
 



Mime
View raw message