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 | portal_normal.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 | portal_normal.vm | Thu Sep 7 18:51:48 2017 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 262 |
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 | <!DOCTYPE html> | |
2 | ||
3 | #parse ($i nit) | |
4 | ||
5 | #set ($sit eRoot = "/ ") | |
6 | #if (!($th emeDisplay .getPathFr iendlyURLP ublic() == "/" || $t hemeDispla y.getPathF riendlyURL Public() = = "")) | |
7 | #s et ($siteR oot = $the meDisplay. getPathFri endlyURLPu blic()) | |
8 | #end | |
9 | #if (!($la yout.getGr oup().frie ndlyURL == "/" || $l ayout.getG roup().fri endlyURL = = "")) | |
10 | #s et ($siteR oot = "$si teRoot$lay out.getGro up().frien dlyURL" ) | |
11 | #end | |
12 | ||
13 | <html clas s="$root_c ss_class" dir="#lang uage ("lan g.dir")" l ang="$w3c_ language_i d"> | |
14 | ||
15 | <head> | |
16 | <m eta http-e quiv="X-UA -Compatibl e" content ="IE=edge" /> | |
17 | <t itle>$the_ title - My HealtheVe t Admin</t itle> | |
18 | <m eta name=" language" content="$ locale.lan guage" /> | |
19 | <m eta conten t="initial -scale=1.0 , width=de vice-width " name="vi ewport" /> | |
20 | <m eta name=" type" cont ent="Gener al Informa tion"> | |
21 | ||
22 | ||
23 | #j s ("$javas cript_fold er/jquery- 1.11.1.js" ) | |
24 | #j s ("$javas cript_fold er/jquery- ui.js") | |
25 | <s cript src= "https://c dnjs.cloud flare.com/ ajax/libs/ twitter-bo otstrap/2. 3.2/js/boo tstrap.min .js" type= "text/java script"></ script> | |
26 | #j s ("$javas cript_fold er/mhv.js" ) | |
27 | #j s ("$javas cript_fold er/jquery. slicknav.m in.js") | |
28 | $t heme.inclu de($top_he ad_include ) | |
29 | ||
30 | <s cript id= "_fed_an_u a_tag" lan guage="jav ascript" s rc="https: //dap.digi talgov.gov /Universal -Federated -Analytics -Min.js?ve r=true&age ncy=VA& ;pua=UA-63 485645-1"> </script> | |
31 | </head> | |
32 | ||
33 | ## To put the edit c ontrols on the left side | |
34 | <body clas s="$css_cl ass"> | |
35 | ## To put the edit c ontrols at the top | |
36 | ## <body> | |
37 | ||
38 | <a href="# main-conte nt" id="sk ip-to-cont ent">#lang uage ("ski p-to-conte nt")</a> | |
39 | ||
40 | $theme.inc lude($body _top_inclu de) | |
41 | ||
42 | #if ($is_s igned_in) | |
43 | #s et ($usrRo les = $use r.getRoles ()) | |
44 | #s et($isCont entManager = false) | |
45 | #f oreach( $u srRole in $usrRoles ) | |
46 | #if( $usrRole.g etName().e quals("MHV Content M anager")) | |
47 | #set($ isContentM anager = t rue) | |
48 | #end | |
49 | #e nd | |
50 | #if ($ isContentM anager | |
51 | || $ permission Checker.is OmniAdmin( $group_id) | |
52 | || $ permission Checker.is GroupOwner ($group_id ) | |
53 | || $ permission Checker.is GroupAdmin ($group_id )) | |
54 | #dockbar() | |
55 | #end | |
56 | #end | |
57 | ||
58 | #parse ("$ full_templ ates_path/ navigation -mobile.vm ") | |
59 | ||
60 | <div class ="containe r-fluid" i d="wrapper "> | |
61 | <h eader> | |
62 | <div id="headi ng"> | |
63 | <div i d="header- banner-ima ge"> | |
64 | <img src ="$images_ folder/hea der-banner -va760.jpg " alt="MyH ealtheVet Banner"/> | |
65 | </div> | |
66 | <div i d="header- link-vahom e"> | |
67 | <a href="h ttp://www. DNS /" class=" external-l ink-va" ta rget="_bla nk"><img s rc="$image s_folder/h eader-link -vahome.gi f" alt="Go to VA Hom e"/></a> | |
68 | <div cla ss="admin- img-div" s tyle="floa t:right;ma rgin-top:- 30px;"> | |
69 | <img src=" $images_fo lder/admin istration- transparen t.png" sty le="margin -top: 45px ;"></img> | |
70 | </div> | |
71 | </div> | |
72 | ||
73 | </di v> | |
74 | ||
75 | ||
76 | #if ($has_navi gation || $is_signed _in) | |
77 | #parse ("$full_t emplates_p ath/naviga tion.vm") | |
78 | #end | |
79 | ||
80 | </ header> | |
81 | ||
82 | <d iv id="con tent"> | |
83 | <m ain> | |
84 | <!-- <nav id="b readcrumbs ">#breadcr umbs()</na v>--> | |
85 | ||
86 | #if ($selectab le) | |
87 | $theme .include($ content_in clude) | |
88 | #els e | |
89 | $portl etDisplay. recycle() | |
90 | ||
91 | $portl etDisplay. setTitle($ the_title) | |
92 | ||
93 | $theme .wrapPortl et("portle t.vm", $co ntent_incl ude) | |
94 | #end | |
95 | </ main> | |
96 | </ div> | |
97 | ||
98 | #set ($webCont entTitle = "MegaFoot er") | |
99 | #set ($webCont entURLTitl e = $strin gUtil.repl ace($strin gUtil.lowe rCase("$we bContentTi tle"),' ', '-')) | |
100 | #set ($journal ArticleLoc alService = $service Locator.fi ndService( "com.lifer ay.portlet .journal.s ervice.Jou rnalArticl eLocalServ ice")) | |
101 | #set ($journal Article = $journalAr ticleLocal Service.ge tLatestArt icleByUrlT itle($them eDisplay.g etScopeGro upId(),$we bContentUR LTitle, 0) ) | |
102 | #if ($journalA rticle) | |
103 | #set ($VOI D = $veloc ityPortlet Preference s.setValue ('groupId' , $themeDi splay.getS copeGroupI d().toStri ng())) | |
104 | #set ($VOI D = $veloc ityPortlet Preference s.setValue ('articleI d', $journ alArticle. getArticle Id())) | |
105 | #end | |
106 | #set ($VOID = $velocityP ortletPref erences.se tValue('po rtletSetup ShowBorder s', 'false ')) | |
107 | #set ($portlet _id = '56' ) | |
108 | #set ($instanc e_id = "12 3abc678iuy ") | |
109 | #set ($my_port let_id = " ${portlet_ id}_INSTAN CE_${insta nce_id}") | |
110 | $the me.runtime ($my_portl et_id, "", $velocity PortletPre ferences.t oString()) | |
111 | $vel ocityPortl etPreferen ces.reset( ) | |
112 | ||
113 | </div> | |
114 | ||
115 | $theme.inc lude($body _bottom_in clude) | |
116 | ||
117 | $theme.inc lude($bott om_include ) | |
118 | ||
119 | <script> | |
120 | $j q(function () { | |
121 | $jq( '#mobile-m enu').slic knav({ | |
122 | label: 'Menu', | |
123 | durati on: 1000, | |
124 | easing Open: "eas eOutBounce ", | |
125 | closeO nClick: tr ue, | |
126 | allowP arentLinks : true | |
127 | }); | |
128 | }) ; | |
129 | </script> | |
130 | </body> | |
131 | ||
132 | </html> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.