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

7.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 activityJournalSummary.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 activityJournalSummary.xhtml Mon Jun 19 13:58:41 2017 UTC

7.2 Comparison summary

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

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

7.4 Active regular expressions

No regular expressions were active.

7.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="ac tivityJour nalForm">
  17                             <f:met adata>
  18                                      <f:event  type="pre RenderView " listener ="#{activi tyJournalC ontroller. initActivi tyJornals} " />
  19                             </f:me tadata>
  20  
  21                             <div i d="main">
  22                                      <h:panel Group rend ered="#{ac tivityJour nalControl ler.saveMe ssage}" st yleClass=" informatio nBox" id=" sucessbox"  layout="b lock">
  23                                               <h:graphic Image libr ary="img"  name="icon _alert_yel low.gif" a lt="#{msg. saveMessag e}"/> #{ms g.saveMess age}
  24                                 </ h:panelGro up>
  25                                 <h :panelGrou p rendered ="#{activi tyJournalC ontroller. deleteMess age}" styl eClass="in formationB ox" id="de letebox" l ayout="blo ck">
  26                                               <h:graphic Image libr ary="img"  name="icon _alert_yel low.gif" a lt="#{msg. deleteMess age}"/> #{ msg.delete Message}
  27                                 </ h:panelGro up>
  28                                      <div id= "title">
  29                                               <h2>#{msg. activityJo urnalTitle 1} <span c lass="sh2" >#{msg.act ivityJourn alSelf} </ span> <br/ > #{msg.jo urnalLine1 }#{msg.act ivityJourn alPersonal } #{activi tyJournalC ontroller. firstName}  #{activit yJournalCo ntroller.l astName}#{ msg.journa lLine2}</h 2>
  30                                      </div>
  31                                      
  32                                      <hr/>
  33                                      
  34                                      <div cla ss="row">
  35                                               <div class ="span10">
  36                                                       <p >#{msg.act ivityJourn alInfo1}</ p>
  37                                                       <p >#{msg.act ivityJourn alSmplWork sheet} <a  href="http ://www.ado be.com/pro ducts/acro bat/readst ep2.html"  target="_b lank">#{ms g.getAdobe Reader}</a >.</p>                               
  38                                                       
  39                                                       <p ><a href=" /documents /25286/258 31/activit y_journal_ worksheet_ v3.pdf/97c ade13-012a -4830-a881 -ce90d632a 5e4" targe t="_blank"  title="#{ msg.activi tyJrnlWrks heetPdf}"> #{msg.acti vityJrnlWr ksheetPdf} </a></p>
  40                                                       <p ><a href=" /documents /25286/258 31/activit y_journal_ sample_wor ksheet_v3. pdf/44db6e b5-a81c-42 58-b161-9a 6397e637d4 " target=" _blank" ti tle="#{msg .cmplSamWr ksheetPdf} ">#{msg.cm plSamWrksh eetPdf}</a ></p>
  41                    
  42                                                       <d iv class=" text-right ">
  43                                                                         <a hre f="#{activ ityJournal Controller .mhvContex t}/summary -screen-aj " target=" _blank" ti tle="#{msg .labelHelp }">#{msg.l abelHelp}  <h:graphic Image libr ary="img"  name="icon _help.gif"  alt="Help "/></a>
  44                                                                         <h:com mandLink a ction="#{a ctivityJou rnalContro ller.loadA ctivityJou rnalSummar yPrint}" t itle="#{ms g.labelPF} ">#{msg.la belPF}<h:g raphicImag e library= "img" name ="icoPrint erFriendly 15.gif" al t="#{msg.l abelPF}"/> </h:comman dLink>
  45                                                       </ div>
  46                                                       
  47                                               </div>
  48                                               <div class ="span2">
  49                                                       <d iv class=" mhv-nutrit ion-move">
  50                                                                <p>< h:graphicI mage libra ry="img" n ame="logo_ healthy-ea ting1.gif"  alt="Visi t the Nutr ition site  today!"/> <br />
  51                                                                 <a href="h ttp://www. DNS     /nfs/veter annutritio nlinks.htm " target=" _blank" ti tle="Visit  the Nutri tion site  today!">Vi sit the Nu trition si te today!< /a></p>
  52                                                                
  53                                                                <p>< h:graphicI mage libra ry="img" n ame="logo_ move_small .gif" alt= "Visit the  MOVE! sit e today"/> <br />
  54                                                                 <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>
  55                                                       </ div>
  56                                               </div>
  57                                      </div>
  58                                      
  59                                      <h:panel Group  ren dered="#{f n:length(a ctivityJou rnalContro ller.activ ityJournal List) gt 1  and fn:le ngth(activ ityJournal Controller .activityJ ournalList ) lt 11}"  >
  60                                               #{fn:lengt h(activity JournalCon troller.ac tivityJour nalList)}  items foun d, display ing all it ems
  61                                      </h:pane lGroup>
  62                                 
  63                                 <h :panelGrou p  rendere d="#{fn:le ngth(activ ityJournal Controller .activityJ ournalList ) eq 1 }"  >
  64                                      One item  found
  65                                 </ h:panelGro up>     
  66                                 <b r />       <br />
  67                                      
  68                                      <p:dataT able var=" activityJo urnal" val ue="#{acti vityJourna lControlle r.activity JournalLis t}"
  69                                               rows="#{ac tivityJour nalControl ler.rowsPe rPage}" pa ginator="# {fn:length (activityJ ournalCont roller.act ivityJourn alList) ge  11}" empt yMessage=" #{msg.noth ingFound}"
  70                                               paginatorT emplate="{ CurrentPag eReport}   {FirstPage Link} {Pre viousPageL ink} {Page Links} {Ne xtPageLink } {LastPag eLink} {Ro wsPerPageD ropdown}"
  71                                               rowsPerPag eTemplate= "10,25,50, 100"
  72                                               id="activi tyJList" c urrentPage ReportTemp late="{tot alRecords}  items fou nd, displa ying {star tRecord} t o {endReco rd}" 
  73                                               reflow="tr ue" >
  74  
  75                                               <p:ajax  e vent="sort "  listene r="#{activ ityJournal Controller .onSort}"/ >
  76                                               <p:column  headerText ="#{msg.da te}" sortB y="#{activ ityJournal .journalDa te}">
  77                                                       <f :facet nam e="header" >
  78                                                       <h :outputTex t value="# {msg.date} " id="date Column"/>
  79                                                       <p :tooltip f or="dateCo lumn" valu e="Sort by  #{msg.dat e}."/>
  80                                                       </ f:facet>
  81                                                       <h :commandLi nk action= "#{activit yJournalCo ntroller.s howDetail( activityJo urnal)}" i d="showDet ail" title ="#{activi tyJournal. dispJourna lDate}">
  82                                     <h:output Text value ="#{activi tyJournal. dispJourna lDate}"/>
  83                                      </h:comm andLink>
  84                                               </p:column >
  85                                              
  86                                               <p:column  headerText ="#{msg.we ekDay}" so rtBy="#{ac tivityJour nal.dayNoO fWeek}">
  87                                                       <f :facet nam e="header" >
  88                                                       <h :outputTex t value="# {msg.weekD ay}" id="d ayColumn"/ >
  89                                                       <p :tooltip f or="dayCol umn" value ="Sort by  #{msg.week Day}. "/>
  90                                                       </ f:facet>
  91                                                       <h :outputTex t value="# {activityJ ournal.abb rWeekDay}" />
  92                                               </p:column >
  93  
  94                                               <p:column  headerText ="#{msg.su mmary}" so rtBy="#{ac tivityJour nal.summar y}" >
  95                                                       <f :facet nam e="header" >
  96                                                       <h :outputTex t value="# {msg.summa ry}" id="s ummaryColu mn"/>
  97                                                       <p :tooltip f or="summar yColumn" v alue="Sort  by #{msg. summary}.  "/>
  98                                                       </ f:facet>
  99                                                       <h :outputTex t value="# {activityJ ournal.sum mary}"/>
  100                                               </p:column >
  101  
  102                                               <p:column  headerText ="#{msg.ed it}" style Class="tex t-center">
  103                                                   <h:com mandLink a ction="#{a ctivityJou rnalContro ller.loadE ditActivit yJournalFr omSummary( activityJo urnal)}" i d="editDis play" titl e="#{msg.e dit}">
  104                                                                <h:g raphicImag e library= "img" name ="edit.gif "  alt="ed it"/>
  105                                                       </ h:commandL ink>
  106                                               </p:column >
  107  
  108                                               <p:column  headerText ="#{msg.de lete}" sty leClass="t ext-center ">
  109                                                    <h:co mmandLink  action="#{ activityJo urnalContr oller.load DeleteActi vityJourna l(activity Journal)}"  id="delet eDisplay"  title="#{m sg.delete} ">
  110                                                       <f :param nam e="activit yJournalRe turnPage"  value="act ivityJourn alSummary"  />
  111                                                                <h:g raphicImag e library= "img" name ="toDelete .gif" alt= "delete" / >
  112                                                       </ h:commandL ink>
  113                                               </p:column >
  114  
  115                                      </p:data Table>
  116                                      
  117                                      <hr clas s="dotted- hr" />
  118                                      <br />
  119                                      
  120                                      <h:panel Group  ren dered="#{f n:length(a ctivityJou rnalContro ller.activ ityJournal List) gt 1  and fn:le ngth(activ ityJournal Controller .activityJ ournalList ) lt 11}"  >
  121                                               #{fn:lengt h(activity JournalCon troller.ac tivityJour nalList)}  items foun d, display ing all it ems
  122                                      </h:pane lGroup>
  123                                 
  124                                 <h :panelGrou p  rendere d="#{fn:le ngth(activ ityJournal Controller .activityJ ournalList ) eq 1 }"  >
  125                                      One item  found
  126                                 </ h:panelGro up>                       
  127  
  128                                      <br />
  129                                 <d iv class=" mhv-button -container -align-rig ht">
  130                                               <h:command Button id= "addnewBut ton" value ="#{msg.ad dnew}" act ion="#{act ivityJourn alControll er.loadAdd NewActivit yJournal}"  styleClas s="input-b utton">
  131                                                       <f :param nam e="activit yJournalRe turnPage"  value="act ivityJourn alSummary"  title="#{ msg.addnew }"/>
  132                                               </h:comman dButton>
  133                                 </ div>
  134                             </div>
  135                    </h: form>
  136           </ ui:define>
  137   </ui:compo sition>
  138   </html>