3. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/20/2017 7:20:06 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.

3.1 Files compared

# Location File Last Modified
1 CIF_MHV_2017.3.0.0_SW_Docx.zip\CIF_MHV_2017.3.0.0.zip\mhv_source\mhv_bootstrap_theme\src\main\webapp\templates navigation.vm Sat Jun 3 17:36:02 2017 UTC
2 CIF_MHV_2017.3.0.0_SW_Docx.zip\CIF_MHV_2017.3.0.0.zip\mhv_source\mhv_bootstrap_theme\src\main\webapp\templates navigation.vm Mon Jun 19 13:54:38 2017 UTC

3.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 244
Changed 1 2
Inserted 0 0
Removed 0 0

3.3 Comparison options

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

3.4 Active regular expressions

No regular expressions were active.

3.5 Comparison detail

  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                                                                
  12                                                                $the me.search( )
  13                                                       </ div>
  14                                               </div>  
  15                                               <ul class= "float-rig ht">
  16                                                        <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> 
  17                                                       <l i><a href= "$siteRoot /about-mhv " tabindex ="0">About  MHV</a></ li> 
  18                                                       <l i><a href= "$siteRoot /rss-feeds " tabindex ="0">RSS F eeds</a></ li>
  19                                                       <l i><a href= "$siteRoot /help" tab index="0"> Help</a></ li> 
  20                                                       <l i><a href= "$siteRoot /faqs" tab index="0"> FAQs</a></ li> 
  21                                                       <l i><a href= "$siteRoot /contact-m hv" tabind ex="0">Con tact MHV</ a></li>
  22                                                       #i f (! $is_s igned_in)
  23                                                       <l i id="logi n-scroller -link">
  24                                                                <a h ref="#p_56 " class="l ogin-scrol ler-link"  tabindex=" 0">
  25                                                                         Login
  26                                                                         <img i d="login-s croller-li nk-img" sr c="$images _folder/lo gin-scroll er-link.pn g"/>
  27                                                                </a>
  28                                                       </ li>
  29                                                       #e nd
  30                                                       #i f ($is_sig ned_in)
  31                                                       <l i id="logo ut-scrolle r-link">
  32                                                                <a h ref="#p_56 " class="l ogout-scro ller-link"  tabindex= "0">
  33                                                                         Logout
  34                                                                         <img i d="logout- scroller-l ink-img" s rc="$image s_folder/l ogout-scro ller-link. png"/>
  35                                                                </a>
  36                                                       </ li>
  37                                                       #e nd
  38                                               </ul>
  39                                                                                  
  40                                      </div>
  41                             </div>
  42                    </di v>
  43   ## ******* ********** ********** ********** *********        
  44                    <div  class="co llapse nav -collapse  hidden-mob ile">
  45   ##               <div >
  46                             <ul ar ia-label=" #language  ("site-pag es")" clas s="nav nav -collapse"  role="men ubar" id=" primary-na v-containe r">
  47   ##                        <ul ar ia-label=" #language  ("site-pag es")" clas s="nav cle ar-both" r ole="menub ar">
  48                                      #foreach  ($nav_ite m in $nav_ items)
  49                                                       #s et ($nav_i tem_attr_s elected="" )
  50                                                       #s et ($nav_i tem_attr_h as_popup=" ")
  51                                                       #s et ($nav_i tem_caret= "")
  52                                                       #s et ($nav_i tem_css_cl ass="lfr-n av-item")
  53                                                       #s et ($nav_i tem_link_c ss_class=" ")
  54  
  55                                               #if ($nav_ item.isSel ected())
  56                                                       #s et ($nav_i tem_attr_s elected="a ria-select ed='true'" )
  57                                                       #s et ($nav_i tem_css_cl ass="$nav_ item_css_c lass selec ted active ")
  58                                               #end
  59  
  60                                               #if ($nav_ item.hasCh ildren())
  61                                                       #s et ($nav_i tem_attr_h as_popup=" aria-haspo pup='true' ")
  62                                                       #s et ($nav_i tem_caret= '<b class= "icon-care t-down"></ b>')
  63                                                       #s et ($nav_i tem_css_cl ass="$nav_ item_css_c lass dropd own")
  64                                                       #s et ($nav_i tem_link_c ss_class=" dropdown-t oggle")
  65                                                       #s et ($hasCh ildren = t rue)
  66                                               #end
  67  
  68                                               <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">
  69                                                       <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" >
  70                                                                <spa n>$nav_ite m.icon() $ nav_item.g etName()</ span>
  71                                                       </ a>
  72                                               </li>
  73  
  74                                               <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">
  75                                                       <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">
  76                                                                <spa n>$nav_ite m.icon() $ nav_item.g etName()</ span>
  77                                                                #if  ($nav-item .hasChildr en())
  78                                                                         #set ( $nav_item_ caret='<b  class="ico n-caret-do wn"></b>')
  79                                                                #end
  80                                                                <ul  class="chi ld-menu dr opdown-men u">
  81                                                                         #if($h asChildren )
  82                                                                                  <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>                                                         
  83                                                                         #forea ch($nav_ch ild in $na v_item.get Children() )
  84                                                                                  <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>
  85                                                                         #end
  86                                                                         #end
  87                                                                </ul >
  88                                                       </ a>
  89                                               </li>                                      
  90                                      #end
  91                             </ul>
  92                    </di v>
  93           </ div>
  94           
  95           #f oreach($na v_item in  $nav_items )
  96                    #if  ($nav_item .isSelecte d())
  97                             #if($n av_item.ha sChildren( ))
  98                                      <div id  = "subNav_ $nav_item. getName()"  class="su bNavDiv">
  99                                               <div id="s ubNavDiv">
  100                                                       <u l class="s ubNavItems ">
  101                                                                #for each($nav_ child in $ nav_item.g etChildren ())
  102                                                                         
  103                                                                         
  104                                                                         
  105                                                                         #if ($ nav_child. isSelected ())
  106                                                                                  <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>
  107                                                                         #else
  108                                                                                  <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>
  109                                                                         #end
  110                                                                #end
  111                                                       </ ul>
  112                                               </div>  
  113                                      </div>
  114                             #end
  115                    #end
  116           #e nd
  117  
  118           #p arse ("$fu ll_templat es_path/su bnav.vm")
  119   </nav>
  120  
  121   <script>
  122           Li feray.Data .NAV_LIST_ SELECTOR =  '#primary -nav-conta iner';
  123   </script>