You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bloodhound.apache.org by gj...@apache.org on 2012/06/20 19:24:13 UTC
svn commit: r1352216 - in /incubator/bloodhound/trunk/bloodhound_dashboard:
bhdashboard/templates/ bhdashboard/templates/bh_model_view.html
bhdashboard/web_ui.py setup.py
Author: gjm
Date: Wed Jun 20 17:24:13 2012
New Revision: 1352216
URL: http://svn.apache.org/viewvc?rev=1352216&view=rev
Log:
dashboard: adding a generic template for model views - towards #93 (from olemis)
Added:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.html (with props)
Modified:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py
incubator/bloodhound/trunk/bloodhound_dashboard/setup.py
Added: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.html?rev=1352216&view=auto
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.html (added)
+++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.html Wed Jun 20 17:24:13 2012
@@ -0,0 +1,49 @@
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<div xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ xmlns:bh="http://issues.apache.org/bloodhound/wiki/Ui/Dashboard"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ py:strip="">
+ <xi:include href="widget_macros.html" />
+
+ <div class="${'span8' if bhdb else 'span12'}">
+ <div class="stickyBox">
+ <div id="overview" class="stickyStatus">
+ <div class="whitebox"></div>
+ $heading
+ <br/>
+ <py:choose>
+ <py:when test="progress_data">
+ <xi:include href="widget_progress.html"
+ py:with="view = 'compact'; legend = True;
+ stats = progress_data.stats;
+ interval_hrefs = progress_data.interval_hrefs;
+ " />
+ </py:when>
+ <py:when test="progress_query">
+ <!--! TODO: Insert ticket stats widget -->
+ </py:when>
+ </py:choose>
+ <div class="stickyEndMark"></div>
+ </div>
+ </div>
+ <script type="text/javascript">
+ setup_sticky_panel('#overview');
+ </script>
+ <div class="${'span7' if bhdb else 'span11'}" >
+ <div class="well">
+ $description
+ $buttons
+ </div>
+ </div>
+ <div class="span8">
+ $widgets
+ </div>
+ </div>
+ <div py:if="bhdb" class="span4">
+ <bh:widget urn="Timeline" />
+ </div>
+</div>
Propchange: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/templates/bh_model_view.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=1352216&r1=1352215&r2=1352216&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py (original)
+++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui.py Wed Jun 20 17:24:13 2012
@@ -128,7 +128,7 @@ class DashboardModule(Component):
"""
resource_filename = pkg_resources.resource_filename
return [resource_filename('bhdashboard.layouts', 'templates'),
- resource_filename('bhdashboard.web_ui', 'templates'),
+ resource_filename('bhdashboard', 'templates'),
resource_filename('bhdashboard.widgets', 'templates')]
# Temp vars
Modified: incubator/bloodhound/trunk/bloodhound_dashboard/setup.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/setup.py?rev=1352216&r1=1352215&r2=1352216&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_dashboard/setup.py (original)
+++ incubator/bloodhound/trunk/bloodhound_dashboard/setup.py Wed Jun 20 17:24:13 2012
@@ -93,7 +93,8 @@ PKG_INFO = {'bhdashboard' : ('bhdashboar
['../CHANGES', '../TODO', '../COPYRIGHT',
'../NOTICE', '../README', '../TESTING_README',
'htdocs/*.*', 'htdocs/css/*.css',
- 'htdocs/img/*.*', 'htdocs/js/*.js'],
+ 'htdocs/img/*.*', 'htdocs/js/*.js',
+ 'templates/*'],
),
'bhdashboard.widgets' : ('bhdashboard/widgets', # Package dir
# Package data