Added: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_one_col.html URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_one_col.html?rev=1307972&view=auto ============================================================================== --- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_one_col.html (added) +++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_one_col.html Sun Apr 1 01:07:06 2012 @@ -0,0 +1,46 @@ + + + + + $title + + + + +
+ +
+
+
+
${w.title}
+
+
+ ${w.content} +
+
+
+ +
+ + Propchange: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_one_col.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_one_col.html ------------------------------------------------------------------------------ svn:mime-type = text/html Added: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_two_col.html URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_two_col.html?rev=1307972&view=auto ============================================================================== --- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_two_col.html (added) +++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_two_col.html Sun Apr 1 01:07:06 2012 @@ -0,0 +1,65 @@ + + + + + $title + + + + +
+
+
${w.title}
+
+
+ ${w.content} +
+
+ + +
+
+ +
+
+
+ + + ${widget_container(w)} + + +
+
+ + + ${widget_container(w)} + + +
+
+
+ +
+
+ + Propchange: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_two_col.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/yui_two_col.html ------------------------------------------------------------------------------ svn:mime-type = text/html Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py?rev=1307972&r1=1307971&r2=1307972&view=diff ============================================================================== --- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py (original) +++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py Sun Apr 1 01:07:06 2012 @@ -53,9 +53,8 @@ class DashboardModule(Component): """Initially this will render static widgets. With time it will be more and more dynamic and flexible. """ - add_stylesheet(req, 'dashboard/grids.css') - add_stylesheet(req, 'dashboard/skin.css') - return 'bhdb_two_col.html', \ + add_stylesheet(req, 'dashboard/bootstrap.css') + return 'bootstrap_two_col_2_1.html', \ { 'context' : Context.from_request(req), 'widgets' : self.expand_widget_data(req), @@ -115,15 +114,7 @@ class DashboardModule(Component): }, { 'c' : TimelineWidget(self.env), - 'args' : ['Timeline', ctx, {'args' : {'max' : 10}}] - }, - { - 'c' : TicketReportWidget(self.env), - 'args' : ['TicketReport', ctx, {'args' : {'id' : 5}}] - }, - { - 'c' : TicketReportWidget(self.env), - 'args' : ['TicketReport', ctx, {'args' : {'id' : 4}}] + 'args' : ['Timeline', ctx, {'args' : {}}] }, ] chrome = Chrome(self.env) Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/report.py URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/report.py?rev=1307972&r1=1307971&r2=1307972&view=diff ============================================================================== --- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/report.py (original) +++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/report.py Sun Apr 1 01:07:06 2012 @@ -72,17 +72,17 @@ class TicketReportWidget(WidgetBase): rptid, page, user = self.bind_params(name, options, *params) user = user or req.authname - rptreq = dummy_request(self.env, req.authname) - rptreq.args = {'page' : page, 'user' : user} - del rptreq.redirect # raise RequestDone as usual + fakereq = dummy_request(self.env, req.authname) + fakereq.args = {'page' : page, 'user' : user} + del fakereq.redirect # raise RequestDone as usual rptmdl = self.env[ReportModule] if rptmdl is None : raise TracError('Report module not available (disabled?)') if trac_version < trac_tags[0]: - args = rptreq, self.env.get_db_cnx(), rptid + args = fakereq, self.env.get_db_cnx(), rptid else: - args = rptreq, rptid + args = fakereq, rptid data = rptmdl._render_view(*args)[1] except ResourceNotFound, exc: raise InvalidIdentifier(unicode(exc)) Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/templates/widget_timeline.html URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/templates/widget_timeline.html?rev=1307972&r1=1307971&r2=1307972&view=diff ============================================================================== --- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/templates/widget_timeline.html (original) +++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/templates/widget_timeline.html Sun Apr 1 01:07:06 2012 @@ -4,21 +4,30 @@ xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude"> - -

${day}: ${day == today and 'Today' or day == yesterday and 'Yesterday' or None}

-
- + + + + ${day}: ${day == today and 'Today' or day == yesterday and 'Yesterday' or None} + + + + + -
- - ${format_time(event.date, str('%H:%M'))} ${event.render('title', context)} - by ${format_author(event.author)} - -
-
- ${event.render('description', context)} -
-
-
-
+ +
+ + ${format_time(event.date, str('%H:%M'))} ${event.render('title', context)} + by ${format_author(event.author)} + +
+
+ ${event.render('description', context)} +
+ + + +