Merge "Omaha #3450 fixed grid lightning menu ids so more than one can be torn off at a time" into omaha_14.4.1

Former-commit-id: f1e3f44b0b [formerly 1f7d7daab2] [formerly f1e3f44b0b [formerly 1f7d7daab2] [formerly c73dc25f13 [formerly 77f8abc658b07ff8703aa884c97ed1f1ec42bf45]]]
Former-commit-id: c73dc25f13
Former-commit-id: b8ea5967a9 [formerly 1714f055ba]
Former-commit-id: 8c1ff628ae
This commit is contained in:
Nate Jensen 2014-07-28 16:00:00 -05:00 committed by Gerrit Code Review
commit ba67471449
2 changed files with 8 additions and 8 deletions

View file

@ -19,32 +19,32 @@
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="subMenu" menuText="1km" id="1kmLightningGridSubmenu">
<contribute xsi:type="subMenu" menuText="1km" id="${source}1kmLightningGridSubmenu">
<contribute xsi:type="subinclude" fileName="menus/lightning/gridLightningBundleItems.xml">
<substitute key="resolution" value="1" />
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="3km" id="3kmLightningGridSubmenu">
<contribute xsi:type="subMenu" menuText="3km" id="${source}3kmLightningGridSubmenu">
<contribute xsi:type="subinclude" fileName="menus/lightning/gridLightningBundleItems.xml">
<substitute key="resolution" value="3" />
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="5km" id="5kmLightningGridSubmenu">
<contribute xsi:type="subMenu" menuText="5km" id="${source}5kmLightningGridSubmenu">
<contribute xsi:type="subinclude" fileName="menus/lightning/gridLightningBundleItems.xml">
<substitute key="resolution" value="5" />
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="8km" id="8kmLightningGridSubmenu">
<contribute xsi:type="subMenu" menuText="8km" id="${source}8kmLightningGridSubmenu">
<contribute xsi:type="subinclude" fileName="menus/lightning/gridLightningBundleItems.xml">
<substitute key="resolution" value="8" />
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="20km" id="20kmLightningGridSubmenu">
<contribute xsi:type="subMenu" menuText="20km" id="${source}20kmLightningGridSubmenu">
<contribute xsi:type="subinclude" fileName="menus/lightning/gridLightningBundleItems.xml">
<substitute key="resolution" value="20" />
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="40km" id="40kmLightningGridSubmenu">
<contribute xsi:type="subMenu" menuText="40km" id="${source}40kmLightningGridSubmenu">
<contribute xsi:type="subinclude" fileName="menus/lightning/gridLightningBundleItems.xml">
<substitute key="resolution" value="40" />
</contribute>

View file

@ -24,7 +24,7 @@
<substitute key="source" value="NLDN"/>
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="NLDN Grid" id="entlnGridSubmenu">
<contribute xsi:type="subMenu" menuText="NLDN Grid" id="nldnGridSubmenu">
<contribute xsi:type="subinclude" fileName="menus/lightning/gridLightningMenuItems.xml">
<substitute key="source" value="NLDN"/>
</contribute>
@ -34,7 +34,7 @@
<substitute key="source" value="GLD"/>
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="GLD Grid" id="entlnGridSubmenu">
<contribute xsi:type="subMenu" menuText="GLD Grid" id="GLDGridSubmenu">
<contribute xsi:type="subinclude" fileName="menus/lightning/gridLightningMenuItems.xml">
<substitute key="source" value="GLD"/>
</contribute>