Author: gjm
Date: Wed Jun 13 15:40:34 2012
New Revision: 1349920
URL: http://svn.apache.org/viewvc?rev=1349920&view=rev
Log:
dashboard: moving htdocs files to definitive location - towards #77 (from
olemis)
Added:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/css/
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/css/bootstrap.css
- copied unchanged from r1349832,
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/bootstrap.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/css/grids.css
- copied unchanged from r1349832,
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/grids.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/css/reset-fonts-grids.css
- copied unchanged from r1349832,
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/reset-fonts-grids.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/css/roadmap.css
- copied unchanged from r1349832,
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/roadmap.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/css/skin.css
- copied unchanged from r1349832,
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/skin.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/css/timeline.css
- copied unchanged from r1349832,
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/timeline.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/img/
- copied from r1349832,
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/images/
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/js/
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-button.js
- copied unchanged from r1349832,
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/htdocs/bootstrap-button.js
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap-tab.js
- copied unchanged from r1349832,
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/htdocs/bootstrap-tab.js
Removed:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/bootstrap.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/grids.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/images/
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/reset-fonts-grids.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/roadmap.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/skin.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/htdocs/timeline.css
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/htdocs/
Modified:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/bootstrap.py
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/ticket.py
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/timeline.py
incubator/bloodhound/trunk/bloodhound_dashboard/setup.py
Modified:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/bootstrap.py
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/bootstrap.py?rev=1349920&r1=1349919&r2=1349920&view=diff
==============================================================================
---
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/bootstrap.py
(original)
+++
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/bootstrap.py
Wed Jun 13 15:40:34 2012
@@ -56,7 +56,7 @@ class BootstrapLayout(Component):
"""Specify bootstrap layout template
"""
req = context.req
- add_stylesheet(req, 'dashboard/bootstrap.css')
+ add_stylesheet(req, 'dashboard/css/bootstrap.css')
if name == 'bootstrap_btnbar':
self._process_btnbar(req, options)
@@ -81,8 +81,8 @@ class BootstrapLayout(Component):
def _process_btnbar(self, req, options):
"""Determine toolbar groups
"""
- add_script(req, 'layouts/bootstrap-button.js')
- add_script(req, 'layouts/bootstrap-tab.js')
+ add_script(req, 'dashboard/js/bootstrap-button.js')
+ add_script(req, 'dashboard/js/bootstrap-tab.js')
layout_data = options['schema']
orig_tb = layout_data.get('toolbar', [])
ready = layout_data.get('ready')
Modified:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/ticket.py
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/ticket.py?rev=1349920&r1=1349919&r2=1349920&view=diff
==============================================================================
---
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/ticket.py
(original)
+++
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/ticket.py
Wed Jun 13 15:40:34 2012
@@ -262,7 +262,7 @@ class TicketGroupStatsWidget(WidgetBase)
tickets = apply_ticket_permissions(self.env, req, tickets)
stat = get_ticket_stats(self.stats_provider, tickets)
- add_stylesheet('dashboard/bootstrap.css')
+ add_stylesheet('dashboard/css/bootstrap.css')
return 'widget_progress.html', \
{
'title' : title,
Modified:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/timeline.py
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/timeline.py?rev=1349920&r1=1349919&r2=1349920&view=diff
==============================================================================
---
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/timeline.py
(original)
+++
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/widgets/timeline.py
Wed Jun 13 15:40:34 2012
@@ -112,7 +112,7 @@ class TimelineWidget(WidgetBase):
raise
else:
merge_links(srcreq=fakereq, dstreq=req, exclude=["stylesheet"])
- add_stylesheet(req, 'dashboard/timeline.css')
+ add_stylesheet(req, 'dashboard/css/timeline.css')
data['today'] = today = datetime.now(req.tz)
data['yesterday'] = today - timedelta(days=1)
return 'widget_timeline.html', \
Modified: incubator/bloodhound/trunk/bloodhound_dashboard/setup.py
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/setup.py?rev=1349920&r1=1349919&r2=1349920&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_dashboard/setup.py (original)
+++ incubator/bloodhound/trunk/bloodhound_dashboard/setup.py Wed Jun 13
15:40:34 2012
@@ -92,7 +92,8 @@ PKG_INFO = {'bhdashboard' : ('bhdashboar
# Package data
['../CHANGES', '../TODO', '../COPYRIGHT',
'../NOTICE', '../README', '../TESTING_README',
- 'htdocs/*.css'],
+ 'htdocs/*.*', 'htdocs/css/*.css',
+ 'htdocs/img/*.*', 'htdocs/js/*.js'],
),
'bhdashboard.widgets' : ('bhdashboard/widgets', # Package dir
# Package data
@@ -100,7 +101,7 @@ PKG_INFO = {'bhdashboard' : ('bhdashboar
),
'bhdashboard.layouts' : ('bhdashboard/layouts', # Package dir
# Package data
- ['templates/*', 'htdocs/*'],
+ ['templates/*'],
),
'bhdashboard.tests' : ('bhdashboard/tests', # Package dir
# Package data
