Produced by Araxis Merge on 6/9/2017 3:51:37 PM Eastern 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 | Fri Jun 9 19:51:37 2017 UTC | ||
| 2 | eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\nvap-web\src\main\webapp\WEB-INF\tags\formatting | mainTemplate.tag | Fri Apr 21 20:15:58 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 1 | 61 |
| 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 | <%@tag des cription=" Simple Wra pper Tag" pageEncodi ng="UTF-8" %> | |||||
| 2 | <%@attribu te name="h eaderText" required= "true"%> | |||||
| 3 | <%@taglib uri="http: //java.sun .com/jsp/j stl/core" prefix="c" %> | |||||
| 4 | ||||||
| 5 | <% | |||||
| 6 | String userName = request. getHeader( "adSamAcco untName"); | |||||
| 7 | %> | |||||
| 8 | ||||||
| 9 | <!DOCTYPE HTML PUBLI C "-//W3C/ /DTD HTML 4.01 Trans itional//E N" "http:/ /www.w3.or g/TR/html4 /loose.dtd "> | |||||
| 10 | ||||||
| 11 | <html lang ="en"> | |||||
| 12 | <head> | |||||
| 13 | <t itle>Veter ans Author izations a nd Prefere nces</titl e> | |||||
| 14 | <j sp:include page="/WE B-INF/web/ metaCommon .jsp" /> | |||||
| 15 | </head > | |||||
| 16 | <body> | |||||
| 17 | <d iv id="con tainer"> | |||||
| 18 | <h1> | |||||
| 19 | <jsp :include p age="/WEB- INF/web/he ader.jsp"> | |||||
| 20 | <jsp:param name="use rName" val ue="<%=use rName%>" / > | |||||
| 21 | </js p:include> | |||||
| 22 | </h1> | |||||
| 23 | <div id= "left"> | |||||
| 24 | <jsp :include p age="/WEB- INF/web/le ftMenu.jsp "> | |||||
| 25 | <jsp:param name="use rName" val ue="<%=use rName%>" / > | |||||
| 26 | </js p:include> | |||||
| 27 | </div> | |||||
| 28 | <div id= "right"> | |||||
| 29 | <div class="ti tle-bar" s tyle="text -align: le ft;">${hea derText}</ div> | |||||
| 30 | <div class="pa d-left-20 pad-top-20 pad-right -10 pad-bo ttom-20"> | |||||
| 31 | <jsp:doBod y/> | |||||
| 32 | </di v> | |||||
| 33 | <div class="bo ttom-solid -black-bor der"> | |||||
| 34 | <jsp:inclu de page="/ WEB-INF/we b/footer.j sp" /> | |||||
| 35 | </di v> | |||||
| 36 | </div> | |||||
| 37 | </ div> | |||||
| 38 | <! -- common modal cont ent --> | |||||
| 39 | <d iv id="exp ort-alert" style="di splay: non e;" title= "Export No tice"> | |||||
| 40 | <p> | |||||
| 41 | The informatio n that you are about to downlo ad is for official u se only an d is consi dered prot ected heal th informa tion and m ust be app ropriately protected using enc ryption pe r VA polic y. | |||||
| 42 | </p> | |||||
| 43 | </ div> | |||||
| 44 | <d iv id="sch eduled-exp ort-alert" style="di splay: non e;" title= "Export No tice"> | |||||
| 45 | <p> | |||||
| 46 | The informatio n that you are about to downlo ad is for official u se only an d is consi dered prot ected heal th informa tion and m ust be app ropriately protected using enc ryption pe r VA polic y. | |||||
| 47 | </p> | |||||
| 48 | <p> | |||||
| 49 | Clic k the Expo rt button below to g enerate th e Excel ex port. This will appe ar on the Scheduled Exports pa ge when co mpleted. | |||||
| 50 | </p> | |||||
| 51 | </ div> | |||||
| 52 | <d iv id="sch eduled-csv -export-al ert" style ="display: none;" ti tle="Expor t Notice"> | |||||
| 53 | <p> | |||||
| 54 | The informatio n that you are about to downlo ad is for official u se only an d is consi dered prot ected heal th informa tion and m ust be app ropriately protected using enc ryption pe r VA polic y. | |||||
| 55 | </p> | |||||
| 56 | <p> | |||||
| 57 | Clic k the Expo rt button below to g enerate th e CSV expo rt. This w ill appear on the Sc heduled Ex ports page when comp leted. | |||||
| 58 | </p> | |||||
| 59 | </ div> | |||||
| 60 | </body > | |||||
| 61 | </html> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.