8. 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.

8.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_journal\mhv-journal-portal-portlet\src\main\webapp\views\journal foodJournalSummary.xhtml Sat Jun 3 17:35:16 2017 UTC
2 CIF_MHV_2017.3.0.0_SW_Docx.zip\CIF_MHV_2017.3.0.0.zip\mhv_source\mhv_journal\mhv-journal-portal-portlet\src\main\webapp\views\journal foodJournalSummary.xhtml Mon Jun 19 13:58:45 2017 UTC

8.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 3 268
Changed 2 4
Inserted 0 0
Removed 0 0

8.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

8.4 Active regular expressions

No regular expressions were active.

8.5 Comparison detail

  1   <?xml vers ion="1.0"  encoding=" UTF-8"?>
  2   <!DOCTYPE  html PUBLI C "-//W3C/ /DTD XHTML  1.0 Trans itional//E N" 
  3   "http://ww w.w3.org/T R/xhtml1/D TD/xhtml1- transition al.dtd">
  4   <html xmln s="http:// www.w3.org /1999/xhtm l"
  5           xm lns:f="htt p://java.s un.com/jsf /core"
  6           xm lns:h="htt p://java.s un.com/jsf /html"
  7           xm lns:ui="ht tp://java. sun.com/js f/facelets "
  8           xm lns:p="htt p://primef aces.org/u i"
  9           xm lns:c="htt p://java.s un.com/jsp /jstl/core "
  10           xm lns:fn="ht tp://java. sun.com/js p/jstl/fun ctions">
  11  
  12   <ui:compos ition temp late="/tem plate/layo ut.xhtml">
  13           <u i:define n ame="mainc ontent">
  14  
  15                    <f:l oadBundle  var="msg"  basename=" labels.jou rnals" />
  16                    <h:f orm id="fo odJournalF orm">
  17                             <f:met adata>
  18                                      <f:event  type="pre RenderView " listener ="#{foodJo urnalContr oller.init FoodJornal s}" />
  19                             </f:me tadata>
  20                             
  21                             <div i d="main">
  22                                      <h:panel Group rend ered="#{fo odJournalC ontroller. saveMessag e}" styleC lass="info rmationBox " id="suce ssbox" lay out="block ">
  23                                               <h:graphic Image libr ary="img"  name="icon _alert_yel low.gif"/>  #{msg.sav eMessage}
  24                                 </ h:panelGro up>
  25                                 <h :panelGrou p rendered ="#{foodJo urnalContr oller.dele teMessage} " styleCla ss="inform ationBox"  id="delete box" layou t="block">
  26                                               <h:graphic Image libr ary="img"  name="icon _alert_yel low.gif"/>  #{msg.del eteMessage }
  27                                 </ h:panelGro up>
  28                             
  29                                      <div id= "title">
  30                                               <h2>#{msg. foodJourna lTitle1} < span class ="sh2">#{m sg.foodJou rnalSelf}  </span> <b r/> #{msg. journalLin e1}#{msg.f oodJournal Personal}  #{foodJour nalControl ler.firstN ame} #{foo dJournalCo ntroller.l astName}#{ msg.journa lLine2}</h 2>
  31                                      </div>
  32                                      
  33                                      <hr/>
  34                                      
  35                                      <div cla ss="row">
  36                                               <div class ="span12">
  37                                                       <d iv class=" mhv-nutrit ion-move">
  38                                                                <p>< h:graphicI mage libra ry="img" n ame="logo_ healthy-ea ting1.gif"  /><br />
  39                                                                 <a href="h ttp://www. DNS     /nfs/veter annutritio nlinks.htm " target=" _blank" ti tle="Visit  the Nutri tion site  today">Vis it the Nut rition sit e today!</ a></p>
  40                                                                <p>< h:graphicI mage libra ry="img" n ame="logo_ move_small .gif" /><b r />
  41                                                                 <a href="h ttp://www. move. DNS     " target=" _blank" ti tle="Visit  the MOVE!  site toda y">Visit t he MOVE! s ite today. </a></p>
  42                                                       </ div>
  43                                                       <p >#{msg.foo dJournalIn fo1}</p>
  44                                                       <p >#{msg.foo dJournalSm plWorkshee t} <a href ="http://w ww.adobe.c om/product s/acrobat/ readstep2. html" targ et="_blank ">#{msg.ge tAdobeRead er}</a>.</ p>                                   
  45                                                       
  46                                                       <p ><a href=" /documents /25286/258 31/food_jo urnal_work sheet.pdf/ 2507241a-1 ce7-4004-9 e29-9711fe ebcdc5" ta rget="_bla nk">#{msg. foodJrnlWr ksheetPdf} </a></p>
  47                                                       <p ><a href=" /documents /25286/258 31/food_jo urnal_samp le_workshe et.pdf/389 6e10d-cf00 -4658-91bd -03eaff0b1 4f5" targe t="_blank" >#{msg.cmp lSamWrkshe etPdf}</a> </p>
  48                                                       
  49                                                       <d iv class=" text-right ">
  50                                                                         <a hre f="#{foodJ ournalCont roller.mhv Context}/s ummary-scr een-fj" ta rget="_bla nk" title= "#{msg.lab elHelp}"># {msg.label Help} <h:g raphicImag e library= "img" name ="icon_hel p.gif" alt ="help"/>< /a> 
  51                                                                         <h:com mandLink a ction="#{f oodJournal Controller .loadFoodJ ournalSumm aryPrint}"  title="#{ msg.labelP F}">#{msg. labelPF}<h :graphicIm age librar y="img" na me="icoPri nterFriend ly15.gif"  alt="help" /></h:comm andLink>
  52                                                       </ div>
  53                                               </div>
  54                                      </div>                             
  55                                      
  56                                      <h:panel Group  ren dered="#{f n:length(f oodJournal Controller .foodJourn alList) gt  1 and fn: length(foo dJournalCo ntroller.f oodJournal List) lt 1 1}" >
  57                                               #{fn:lengt h(foodJour nalControl ler.foodJo urnalList) } items fo und, displ aying all  items
  58                                      </h:pane lGroup>
  59                                 
  60                                 <h :panelGrou p  rendere d="#{fn:le ngth(foodJ ournalCont roller.foo dJournalLi st) eq 1 } " >
  61                                      One item  found
  62                                 </ h:panelGro up>              
  63                                 <b r /> <br / >                                          
  64  
  65                                      <p:dataT able var=" foodJourna l" value=" #{foodJour nalControl ler.foodJo urnalList} "
  66                                               rows="#{fo odJournalC ontroller. rowsPerPag e}" pagina tor="#{fn: length(foo dJournalCo ntroller.f oodJournal List) ge 1 1}" emptyM essage="#{ msg.nothin gFound}"
  67                                               paginatorT emplate="{ CurrentPag eReport}   {FirstPage Link} {Pre viousPageL ink} {Page Links} {Ne xtPageLink } {LastPag eLink} {Ro wsPerPageD ropdown}"
  68                                               rowsPerPag eTemplate= "10,25,50, 100"
  69                                               id="foodJL ist" curre ntPageRepo rtTemplate ="{totalRe cords} ite ms found,  displaying  {startRec ord} to {e ndRecord}"
  70                                               reflow="tr ue" >
  71                                               <!--select ionMode="s ingle" sel ection="#{ foodJourna lControlle r.selected FoodJourna l}" rowKey ="#{foodJo urnal.food JournalId} " >-->
  72  
  73                                               <p:ajax  e vent="sort "  listene r="#{foodJ ournalCont roller.onS ort}" />
  74                                              
  75                                               <p:column  headerText ="#{msg.da te}" sortB y="#{foodJ ournal.jou rnalDate}"  styleClas s="mhv-lis t-col-sort able">
  76                                                       <f :facet nam e="header" >
  77                                                       <h :outputTex t value="# {msg.date} " id="date Column"/>
  78                                                       <p :tooltip f or="dateCo lumn" valu e="Sort by  #{msg.dat e}."/>
  79                                                       </ f:facet>
  80                                                       <h :commandLi nk action= "#{foodJou rnalContro ller.showD etail(food Journal)}"  id="showD etail" tit le="#{food Journal.di spJournalD ate}">
  81                                     <h:output Text value ="#{foodJo urnal.disp JournalDat e}"/>
  82                                      </h:comm andLink>
  83                                               </p:column >
  84                                              
  85                                               <p:column  headerText ="#{msg.we ekDay}" so rtBy="#{fo odJournal. dayNoOfWee k}" styleC lass="mhv- list-col-s ortable">
  86                                                       <f :facet nam e="header" >
  87                                                                <h:o utputText  value="#{m sg.weekDay }" id="day Column"/>
  88                                                                <p:t ooltip for ="dayColum n" value=" Sort by #{ msg.weekDa y}."/>
  89                                                       </ f:facet>
  90                                                       <h :outputTex t value="# {foodJourn al.abbrWee kDay}"/>
  91                                               </p:column >
  92  
  93                                               <p:column  headerText ="#{msg.su mmary}" so rtBy="#{fo odJournal. summary}"  styleClass ="mhv-list -col-sorta ble">
  94                                                       <f :facet nam e="header" >
  95                                                                <h:o utputText  value="#{m sg.summary }" id="sum maryColumn "/>
  96                                                                <p:t ooltip for ="summaryC olumn" val ue="Sort b y #{msg.su mmary}."/>
  97                                                       </ f:facet>                                          
  98                                                       <h :outputTex t value="# {foodJourn al.summary }"/>
  99                                               </p:column >
  100  
  101                                               <p:column  headerText ="#{msg.ed it}" style Class="tex t-center">
  102                                                   <h:com mandLink a ction="#{f oodJournal Controller .loadEditF oodJournal FromSummar y(foodJour nal)}" id= "edtFoodJo urnal">
  103                                                                <h:g raphicImag e library= "img" name ="edit.gif " title="E dit"  alt= "edit"/>
  104                                                       </ h:commandL ink>
  105                                               </p:column >
  106  
  107                                               <p:column  headerText ="#{msg.de lete}" sty leClass="t ext-center ">
  108                                                       <h :commandLi nk action= "#{foodJou rnalContro ller.loadD eleteFoodJ ournal(foo dJournal)} " id="delF oodJournal ">
  109                                                                <f:p aram name= "foodJourn alReturnPa ge" value= "foodJourn alSummary"  />
  110                                                                <h:g raphicImag e library= "img" name ="toDelete .gif" titl e="Delete"  alt="dele te"/>
  111                                                       </ h:commandL ink>
  112                                               </p:column >
  113  
  114                                      </p:data Table>
  115                                      
  116                                      <hr clas s="dotted- hr" />
  117                                      <br />
  118                                      <h:panel Group  ren dered="#{f n:length(f oodJournal Controller .foodJourn alList) gt  1 and fn: length(foo dJournalCo ntroller.f oodJournal List) lt 1 1}" >
  119                                               #{fn:lengt h(foodJour nalControl ler.foodJo urnalList) } items fo und, displ aying all  items
  120                                      </h:pane lGroup>
  121                                 
  122                                 <h :panelGrou p  rendere d="#{fn:le ngth(foodJ ournalCont roller.foo dJournalLi st) eq 1 } " >
  123                                      One item  found
  124                                 </ h:panelGro up>     
  125                                 <b r />
  126                                              
  127                                 <d iv class=" mhv-button -container -align-rig ht">
  128                                               <h:command Button id= "addnewBut ton" value ="#{msg.ad dnew}" act ion="#{foo dJournalCo ntroller.l oadAddNewF oodJournal }" styleCl ass="input -button" t itle="#{ms g.addnew}" >
  129                                                       <f :param nam e="foodJou rnalReturn Page" valu e="foodJou rnalSummar y" />
  130                                               </h:comman dButton>
  131                                 </ div>
  132                             </div>
  133                    </h: form>
  134           </ ui:define>
  135   </ui:compo sition>
  136   </html>