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\mhv_source\mhv_bootstrap_theme\src\main\webapp\templates | navigation.vm | Fri Jul 7 03:08:22 2017 UTC |
2 | MHV_CIF_2017.4.0.0.zip\MHV_CIF_2017.4.0.0\MHV_CIF_2017.4.0.0\mhv_source\mhv_bootstrap_theme\src\main\webapp\templates | navigation.vm | Thu Sep 7 18:53:58 2017 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 242 |
Changed | 1 | 2 |
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 | <d iv class=" navbar-inn er mhv-nav bar-inner- 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 | <div id="h eader-sear ch-span" c lass="floa t-right"> | |
10 | <d iv id="sea rch-box"> | |
11 | $the me.search( ) | |
12 | </ div> | |
13 | </div> | |
14 | <ul class= "float-rig ht"> | |
15 | <li><a hre f="http:// www1. DNS /directory /guide/hom e.asp?isfl ash=1" tar get="_blan k" tabinde x="0">VA F acility Lo cator</a>< /li> | |
16 | <l i><a href= "$siteRoot /about-mhv " tabindex ="0">About MHV</a></ li> | |
17 | <l i><a href= "$siteRoot /rss-feeds " tabindex ="0">RSS F eeds</a></ li> | |
18 | <l i><a href= "$siteRoot /help" tab index="0"> Help</a></ li> | |
19 | <l i><a href= "$siteRoot /faqs" tab index="0"> FAQs</a></ li> | |
20 | <l i><a href= "$siteRoot /contact-m hv" tabind ex="0">Con tact MHV</ a></li> | |
21 | #i f (! $is_s igned_in) | |
22 | <l i id="logi n-scroller -link"> | |
23 | <a h ref="#p_56 " class="l ogin-scrol ler-link" tabindex=" 0"> | |
24 | Login | |
25 | <img i d="login-s croller-li nk-img" sr c="$images _folder/lo gin-scroll er-link.pn g"/> | |
26 | </a> | |
27 | </ li> | |
28 | #e nd | |
29 | #i f ($is_sig ned_in) | |
30 | <l i id="logo ut-scrolle r-link"> | |
31 | <a h ref="#p_56 " class="l ogout-scro ller-link" tabindex= "0"> | |
32 | Logout | |
33 | <img i d="logout- scroller-l ink-img" s rc="$image s_folder/l ogout-scro ller-link. png"/> | |
34 | </a> | |
35 | </ li> | |
36 | #e nd | |
37 | </ul> | |
38 | ||
39 | </div> | |
40 | </div> | |
41 | </di v> | |
42 | ## ******* ********** ********** ********** ********* | |
43 | <div class="co llapse nav -collapse hidden-mob ile"> | |
44 | ## <div > | |
45 | <ul ar ia-label=" #language ("site-pag es")" clas s="nav nav -collapse" role="men ubar" id=" primary-na v-containe r"> | |
46 | ## <ul ar ia-label=" #language ("site-pag es")" clas s="nav cle ar-both" r ole="menub ar"> | |
47 | #foreach ($nav_ite m in $nav_ items) | |
48 | #s et ($nav_i tem_attr_s elected="" ) | |
49 | #s et ($nav_i tem_attr_h as_popup=" ") | |
50 | #s et ($nav_i tem_caret= "") | |
51 | #s et ($nav_i tem_css_cl ass="lfr-n av-item") | |
52 | #s et ($nav_i tem_link_c ss_class=" ") | |
53 | ||
54 | #if ($nav_ item.isSel ected()) | |
55 | #s et ($nav_i tem_attr_s elected="a ria-select ed='true'" ) | |
56 | #s et ($nav_i tem_css_cl ass="$nav_ item_css_c lass selec ted active ") | |
57 | #end | |
58 | ||
59 | #if ($nav_ item.hasCh ildren()) | |
60 | #s et ($nav_i tem_attr_h as_popup=" aria-haspo pup='true' ") | |
61 | #s et ($nav_i tem_caret= '<b class= "icon-care t-down"></ b>') | |
62 | #s et ($nav_i tem_css_cl ass="$nav_ item_css_c lass dropd own") | |
63 | #s et ($nav_i tem_link_c ss_class=" dropdown-t oggle") | |
64 | #s et ($hasCh ildren = t rue) | |
65 | #end | |
66 | ||
67 | <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"> | |
68 | <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="$porta lUtil.getP athProxy() $nav_item. getLayout( ).getFrien dlyURL()" $nav_item. getTarget( ) role="me nuitem" ta bindex="0" > | |
69 | <spa n>$nav_ite m.icon() $ nav_item.g etName()</ span> | |
70 | </ a> | |
71 | </li> | |
72 | ||
73 | <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"> | |
74 | <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="$portal Util.getPa thProxy()$ nav_item.g etLayout() .getFriend lyURL()" $ nav_item.g etTarget() role="men uitem" tab index="0"> | |
75 | <spa n>$nav_ite m.icon() $ nav_item.g etName()</ span> | |
76 | #if ($nav-item .hasChildr en()) | |
77 | #set ( $nav_item_ caret='<b class="ico n-caret-do wn"></b>') | |
78 | #end | |
79 | <ul class="chi ld-menu dr opdown-men u"> | |
80 | #if($h asChildren ) | |
81 | <li id=" subnav-par ent"><a hr ef="$porta lUtil.getP athProxy() $nav_item. getLayout( ).getFrien dlyURL()" $nav_child .getTarget () role="m enuitem" t abindex="0 "><span>$n av_item.ge tName() Ho me</span>< /a></li> | |
82 | #forea ch($nav_ch ild in $na v_item.get Children() ) | |
83 | <li id=" subNavItem _$nav_chil d.getName( )"><a href ="$portalU til.getPat hProxy()$n av_child.g etLayout() .getFriend lyURL()" $ nav_child. getTarget( ) role="me nuitem" ta bindex="0" ><span>$na v_child.ge tName()</s pan></a></ li> | |
84 | #end | |
85 | #end | |
86 | </ul > | |
87 | </ a> | |
88 | </li> | |
89 | #end | |
90 | </ul> | |
91 | </di v> | |
92 | </ div> | |
93 | ||
94 | #f oreach($na v_item in $nav_items ) | |
95 | #if ($nav_item .isSelecte d()) | |
96 | #if($n av_item.ha sChildren( )) | |
97 | <div id = "subNav_ $nav_item. getName()" class="su bNavDiv"> | |
98 | <div id="s ubNavDiv"> | |
99 | <u l class="s ubNavItems "> | |
100 | #for each($nav_ child in $ nav_item.g etChildren ()) | |
101 | ||
102 | ||
103 | ||
104 | #if ($ nav_child. isSelected ()) | |
105 | <li id=" subNavItem _$nav_chil d.getName( )" class=" subNavItem sub-nav-s elected">< a href="$p ortalUtil. getPathPro xy()$nav_c hild.getLa yout().get FriendlyUR L()" $nav_ child.getT arget() ro le="menuit em" tabind ex="0">$na v_child.ge tName()</a ></li> | |
106 | #else | |
107 | <li id=" subNavItem _$nav_chil d.getName( )" class=" subNavItem sub-nav-n on-selecte d"><a href ="$portalU til.getPat hProxy()$n av_child.g etLayout() .getFriend lyURL()" $ nav_child. getTarget( ) role="me nuitem" ta bindex="0" >$nav_chil d.getName( )</a></li> | |
108 | #end | |
109 | #end | |
110 | </ ul> | |
111 | </div> | |
112 | </div> | |
113 | #end | |
114 | #end | |
115 | #e nd | |
116 | ||
117 | #p arse ("$fu ll_templat es_path/su bnav.vm") | |
118 | </nav> | |
119 | ||
120 | <script> | |
121 | Li feray.Data .NAV_LIST_ SELECTOR = '#primary -nav-conta iner'; | |
122 | </script> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.