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/04/16 15:24:00 UTC
svn commit: r1326605 - in
/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard:
layouts/templates/widget_macros.html web_ui/templates/bhmilestone.html
Author: gjm
Date: Mon Apr 16 13:24:00 2012
New Revision: 1326605
URL: http://svn.apache.org/viewvc?rev=1326605&view=rev
Log:
dashboard: Attribute urn rather than type for widget/layout names
Modified:
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/templates/widget_macros.html
incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui/templates/bhmilestone.html
Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/templates/widget_macros.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/templates/widget_macros.html?rev=1326605&r1=1326604&r2=1326605&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/templates/widget_macros.html (original)
+++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/layouts/templates/widget_macros.html Mon Apr 16 13:24:00 2012
@@ -42,18 +42,18 @@
<!--
Sample layout tag
- <bh:layout type="LayoutName">
+ <bh:layout urn="LayoutName">
<bh:schema>
JSON object describing positioning and ...
</bh:schema>
<bh:widgets>
- <bh:w id="simple_widget" type="WidgetName" altlinks="false">
+ <bh:w id="simple_widget" urn="WidgetName" altlinks="false">
<bh:args>
<bh:arg name="arg1">value1</bh:arg>
<bh:arg name="arg2">value2</bh:arg>
</bh:args>
</bh:w>
- <bh:l id="nested_layout" type="LayoutName">
+ <bh:l id="nested_layout" urn="LayoutName">
<bh:schema>
JSON object describing positioning and ...
</bh:schema>
@@ -67,7 +67,7 @@
<py:match path="bh:layout">
<py:choose test="">
<py:when test="bhdb">
- ${bhdb.embed_layout(context, layout=select('@type'), schema=select('bh:schema'), widgets=select('bh:widgets'))}
+ ${bhdb.embed_layout(context, layout=select('@urn'), schema=select('bh:schema'), widgets=select('bh:widgets'))}
</py:when>
<py:otherwise>
${bhnotfound()}
@@ -77,7 +77,7 @@
<!--
Sample widget tag
- <bh:widget id="simple_widget" type="WidgetName" altlinks="false">
+ <bh:widget id="simple_widget" urn="WidgetName" altlinks="false">
<bh:args>
<bh:arg name="arg1">value1</bh:arg>
<bh:arg name="arg2">value2</bh:arg>
@@ -88,7 +88,7 @@
<py:match path="bh:widget">
<py:choose test="">
<py:when test="bhdb"
- py:with="wnm = unicode(select('@type')); args = unicode(select('bh:args/text()')) or {}; altlinks = unicode(select('@altlinks')) != 'false'; ctxtnav = unicode(select('@ctxtnav')) != 'false';">
+ py:with="wnm = unicode(select('@urn')); args = unicode(select('bh:args/text()')) or {}; altlinks = unicode(select('@altlinks')) != 'false'; ctxtnav = unicode(select('@ctxtnav')) != 'false';">
${widget_container(bhdb.expand_widget(context, dict(args=[wnm, None, {'args': args}], altlinks=altlinks, ctxtnav=ctxtnav)))}
</py:when>
<py:otherwise>
Modified: incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui/templates/bhmilestone.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui/templates/bhmilestone.html?rev=1326605&r1=1326604&r2=1326605&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui/templates/bhmilestone.html (original)
+++ incubator/bloodhound/trunk/bloodhound_dashboard/bhdashboard/web_ui/templates/bhmilestone.html Mon Apr 16 13:24:00 2012
@@ -21,7 +21,7 @@
</div>
</div>
<div class="span4">
- <bh:widget type="Timeline" />
+ <bh:widget urn="Timeline" />
</div>
</div>
</body>