Produced by Araxis Merge on 9/11/2017 8:05:37 AM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
# | Location | File | Last Modified |
---|---|---|---|
1 | MHV_CIF_2017.4.0.0.zip\MHV_CIF_2017.4.0.0\MHV_CIF_2017.4.0.0\ap_redesign\mhv_source\mhv_admin_theme\src\main\webapp\templates | navigation.vm | Wed Jul 5 17:41:10 2017 UTC |
2 | MHV_CIF_2017.4.0.0.zip\MHV_CIF_2017.4.0.0\MHV_CIF_2017.4.0.0\ap_redesign\mhv_source\mhv_admin_theme\src\main\webapp\templates | navigation.vm | Thu Sep 7 18:51:48 2017 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 190 |
Changed | 1 | 4 |
Inserted | 0 | 0 |
Removed | 0 | 0 |
Whitespace | |
---|---|
Character case | Differences in character case are significant |
Line endings | Differences in line endings (CR and LF characters) are ignored |
CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
1 | <nav class ="$nav_css _class nav bar site-n avigation" id="navig ation" rol e="navigat ion"> | |
2 | ||
3 | <div class ="navbar-i nner mhv-n avbar-inne r-lg"> | |
4 | ||
5 | ## Addded the head n av search bar ****** ********** | |
6 | <div id="heade r-nav-sear ch-bar"> | |
7 | <div c lass="row" > | |
8 | <div id= "header-na v-span" cl ass="float -right"> | |
9 | <ul class= "float-rig ht"> | |
10 | <li><a hre f="http:// www1. DNS /directory /guide/hom e.asp" tar get="_blan k" tabinde x="0">VA F acility Lo cator</a>< /li> | |
11 | <li><a hre f="http:// www.myheal th. DNS " target=" _blank" ta bindex="0" >Visit My HealtheVet </a></li> | |
12 | <li><a href="/he lp" target ="_mhvHelp " tabindex ="0">Help< /a></li> | |
13 | </ul> | |
14 | </div> | |
15 | </div> | |
16 | </di v> | |
17 | ## ******* ********** ********** ********** ********* | |
18 | <div class="co llapse nav -collapse hidden-mob ile"> | |
19 | ## <div > | |
20 | <ul ar ia-label=" #language ("site-pag es")" clas s="nav nav -collapse" role="men ubar" id=" primary-na v-containe r"> | |
21 | ## <ul ar ia-label=" #language ("site-pag es")" clas s="nav cle ar-both" r ole="menub ar"> | |
22 | #foreach ($nav_ite m in $nav_ items) | |
23 | #s et ($nav_i tem_attr_s elected="" ) | |
24 | #s et ($nav_i tem_attr_h as_popup=" ") | |
25 | #s et ($nav_i tem_caret= "") | |
26 | #s et ($nav_i tem_css_cl ass="lfr-n av-item") | |
27 | #s et ($nav_i tem_link_c ss_class=" ") | |
28 | ||
29 | #if ($nav_ item.isSel ected()) | |
30 | #s et ($nav_i tem_attr_s elected="a ria-select ed='true'" ) | |
31 | #s et ($nav_i tem_css_cl ass="$nav_ item_css_c lass selec ted active ") | |
32 | #end | |
33 | ||
34 | #if ($nav_ item.hasCh ildren()) | |
35 | #s et ($nav_i tem_attr_h as_popup=" aria-haspo pup='true' ") | |
36 | #s et ($nav_i tem_caret= '<b class= "icon-care t-down"></ b>') | |
37 | #s et ($nav_i tem_css_cl ass="$nav_ item_css_c lass dropd own") | |
38 | #s et ($nav_i tem_link_c ss_class=" dropdown-t oggle") | |
39 | #s et ($hasCh ildren = t rue) | |
40 | #end | |
41 | ||
42 | <li class= "$nav_item _css_class mhv-main- nav-li mhv -main-nav- lg" id="la yout_$nav_ item.getLa youtId()" $nav_item_ attr_selec ted role=" presentati on"> | |
43 | <a aria-labe lledby="la yout_$nav_ item.getLa youtId()" $nav_item_ attr_has_p opup class ="$nav_ite m_link_css _class" hr ef="$nav_i tem.getURL ()" $nav_i tem.getTar get() role ="menuitem " tabindex ="0"> | |
44 | <spa n>$nav_ite m.icon() $ nav_item.g etName()</ span> | |
45 | </ a> | |
46 | </li> | |
47 | ||
48 | <li class= "$nav_item _css_class mhv-main- nav-li dro pdown mhv- main-nav-s m" id="lay out_$nav_i tem.getLay outId()" $ nav_item_a ttr_select ed role="p resentatio n"> | |
49 | <a aria-labe lledby="la yout_$nav_ item.getLa youtId()" $nav_item_ attr_has_p opup class ="$nav_ite m_link_css _class dro pdown-togg le" data-t oggle="dro pdown" hre f="$nav_it em.getURL( )" $nav_it em.getTarg et() role= "menuitem" tabindex= "0"> | |
50 | <spa n>$nav_ite m.icon() $ nav_item.g etName()</ span> | |
51 | #if ($nav-item .hasChildr en()) | |
52 | #set ( $nav_item_ caret='<b class="ico n-caret-do wn"></b>') | |
53 | #end | |
54 | <ul class="chi ld-menu dr opdown-men u"> | |
55 | #if($h asChildren ) | |
56 | <li id=" subnav-par ent"><a hr ef="$nav_i tem.getURL ()" $nav_c hild.getTa rget() rol e="menuite m" tabinde x="0"><spa n>$nav_ite m.getName( ) Home</sp an></a></l i> | |
57 | #forea ch($nav_ch ild in $na v_item.get Children() ) | |
58 | <li id=" subNavItem _$nav_chil d.getName( )"><a href ="$nav_chi ld.getURL( )" $nav_ch ild.getTar get() role ="menuitem " tabindex ="0"><span >$nav_chil d.getName( )</span></ a></li> | |
59 | #end | |
60 | #end | |
61 | </ul > | |
62 | </ a> | |
63 | </li> | |
64 | #end | |
65 | </ul> | |
66 | </di v> | |
67 | </ div> | |
68 | ||
69 | #f oreach($na v_item in $nav_items ) | |
70 | #if ($nav_item .isSelecte d()) | |
71 | #if($n av_item.ha sChildren( )) | |
72 | <div id = "subNav_ $nav_item. getName()" class="su bNavDiv"> | |
73 | <div id="s ubNavDiv"> | |
74 | <u l class="s ubNavItems "> | |
75 | #for each($nav_ child in $ nav_item.g etChildren ()) | |
76 | ||
77 | ||
78 | ||
79 | #if ($ nav_child. isSelected ()) | |
80 | <li id=" subNavItem _$nav_chil d.getName( )" class=" subNavItem sub-nav-s elected">< a href="$n av_child.g etURL()" $ nav_child. getTarget( ) role="me nuitem" ta bindex="0" >$nav_chil d.getName( )</a></li> | |
81 | #else | |
82 | <li id=" subNavItem _$nav_chil d.getName( )" class=" subNavItem sub-nav-n on-selecte d"><a href ="$nav_chi ld.getURL( )" $nav_ch ild.getTar get() role ="menuitem " tabindex ="0">$nav_ child.getN ame()</a>< /li> | |
83 | #end | |
84 | #end | |
85 | </ ul> | |
86 | </div> | |
87 | </div> | |
88 | #end | |
89 | #end | |
90 | #e nd | |
91 | ||
92 | #p arse ("$fu ll_templat es_path/su bnav.vm") | |
93 | </nav> | |
94 | ||
95 | <script> | |
96 | Li feray.Data .NAV_LIST_ SELECTOR = '#primary -nav-conta iner'; | |
97 | </script> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.