Produced by Araxis Merge on 9/11/2017 8:05:38 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\mhv_source\mhv_journal\mhv-journal-portal-portlet\src\main\webapp\views\journal | activityJournalSummary.xhtml | Thu Aug 3 15:54:36 2017 UTC |
2 | MHV_CIF_2017.4.0.0.zip\MHV_CIF_2017.4.0.0\MHV_CIF_2017.4.0.0\mhv_source\mhv_journal\mhv-journal-portal-portlet\src\main\webapp\views\journal | activityJournalSummary.xhtml | Thu Sep 7 19:00:37 2017 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 3 | 302 |
Changed | 2 | 4 |
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 | <?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 | <h:p anelGroup rendered=" #{activity JournalCon troller.sa veMessage} "> | |
22 | <div class ="usa-aler t usa-aler t-success" > | |
23 | <d iv class=" usa-alert- body"> | |
24 | <h3 class="usa -alert-hea ding">#{ms g.saveMess age1}</h3> | |
25 | <p c lass="usa- alert-text ">#{msg.sa veMessage2 }</p> | |
26 | </ div> | |
27 | </div> | |
28 | </h:pane lGroup> | |
29 | ||
30 | <h:panel Group rend ered="#{ac tivityJour nalControl ler.delete Message}"> | |
31 | <div class ="usa-aler t usa-aler t-success" > | |
32 | <d iv class=" usa-alert- body"> | |
33 | <h3 class="usa -alert-hea ding">#{ms g.deleteMe ssage1}</h 3> | |
34 | <p c lass="usa- alert-text ">#{msg.de leteMessag e2}</p> | |
35 | </ div> | |
36 | </div> | |
37 | </h:pane lGroup> | |
38 | ||
39 | <h2>#{msg. activityJo urnalTitle 1} #{msg.a ctivityJou rnalSelf} </h2> | |
40 | <h3> #{msg .journalLi ne1}#{msg. activityJo urnalPerso nal} #{act ivityJourn alControll er.firstNa me} #{acti vityJourna lControlle r.lastName }#{msg.jou rnalLine2} </h3> | |
41 | ||
42 | <div cla ss="portle t-toolbar" > | |
43 | <h:command Link | |
44 | ac tion="#{ac tivityJour nalControl ler.loadAc tivityJour nalSummary Print}" | |
45 | ti tle="Food Hournal De tail Print "> | |
46 | <i class="ic on-print"> </i> Print | |
47 | </h:comman dLink> | |
48 | <a | |
49 | hr ef="#{acti vityJourna lControlle r.mhvConte xt}/summar y-screen-a j" | |
50 | ta rget="_bla nk" title= "Help"><i class="ico n-question -sign"></i > | |
51 | He lp</a> | |
52 | ||
53 | </div> | |
54 | ||
55 | <div cla ss="row"> | |
56 | <div class ="span10"> | |
57 | <p >#{msg.act ivityJourn alInfo1}</ p> | |
58 | <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> | |
59 | ||
60 | <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> | |
61 | <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> | |
62 | ||
63 | </div> | |
64 | <div class ="span2"> | |
65 | <d iv class=" mhv-nutrit ion-move"> | |
66 | <p>< h:graphicI mage libra ry="img" n ame="logo_ healthy-ea ting1.gif" alt="Visi t the Nutr ition site today!"/> <br /> | |
67 | <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> | |
68 | ||
69 | <p>< h:graphicI mage libra ry="img" n ame="logo_ move_small .gif" alt= "Visit the MOVE! sit e today"/> <br /> | |
70 | <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> | |
71 | </ div> | |
72 | </div> | |
73 | </div> | |
74 | ||
75 | ||
76 | <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}" > | |
77 | #{fn:lengt h(activity JournalCon troller.ac tivityJour nalList)} items foun d, display ing all it ems | |
78 | </h:pane lGroup> | |
79 | ||
80 | <h :panelGrou p rendere d="#{fn:le ngth(activ ityJournal Controller .activityJ ournalList ) eq 1 }" styleClass ="display- block"> | |
81 | One item found | |
82 | </ h:panelGro up> | |
83 | <b r /> <br /> | |
84 | ||
85 | <p:dataT able var=" activityJo urnal" val ue="#{acti vityJourna lControlle r.activity JournalLis t}" | |
86 | rows="#{ac tivityJour nalControl ler.rowsPe rPage}" pa ginator="# {fn:length (activityJ ournalCont roller.act ivityJourn alList) ge 11}" empt yMessage=" #{msg.noth ingFound}" | |
87 | paginatorT emplate="{ CurrentPag eReport} {FirstPage Link} {Pre viousPageL ink} {Page Links} {Ne xtPageLink } {LastPag eLink} {Ro wsPerPageD ropdown}" | |
88 | rowsPerPag eTemplate= "10,25,50, 100" | |
89 | id="activi tyJList" c urrentPage ReportTemp late="{tot alRecords} items fou nd, displa ying {star tRecord} t o {endReco rd}" | |
90 | reflow="tr ue" > | |
91 | ||
92 | <p:ajax e vent="sort " listene r="#{activ ityJournal Controller .onSort}"/ > | |
93 | <p:column headerText ="#{msg.da te}" sortB y="#{activ ityJournal .journalDa te}"> | |
94 | <f :facet nam e="header" > | |
95 | <h :outputTex t value="# {msg.date} " id="date Column"/> | |
96 | <p :tooltip f or="dateCo lumn" valu e="Sort by #{msg.dat e}."/> | |
97 | </ f:facet> | |
98 | <h :commandLi nk action= "#{activit yJournalCo ntroller.s howDetail( activityJo urnal)}" i d="showDet ail" title ="#{activi tyJournal. dispJourna lDate}"> | |
99 | <h:output Text value ="#{activi tyJournal. dispJourna lDate}"/> | |
100 | </h:comm andLink> | |
101 | </p:column > | |
102 | ||
103 | <p:column headerText ="#{msg.we ekDay}" so rtBy="#{ac tivityJour nal.dayNoO fWeek}"> | |
104 | <f :facet nam e="header" > | |
105 | <h :outputTex t value="# {msg.weekD ay}" id="d ayColumn"/ > | |
106 | <p :tooltip f or="dayCol umn" value ="Sort by #{msg.week Day}. "/> | |
107 | </ f:facet> | |
108 | <h :outputTex t value="# {activityJ ournal.abb rWeekDay}" /> | |
109 | </p:column > | |
110 | ||
111 | <p:column headerText ="#{msg.su mmary}" so rtBy="#{ac tivityJour nal.summar y}" > | |
112 | <f :facet nam e="header" > | |
113 | <h :outputTex t value="# {msg.summa ry}" id="s ummaryColu mn"/> | |
114 | <p :tooltip f or="summar yColumn" v alue="Sort by #{msg. summary}. "/> | |
115 | </ f:facet> | |
116 | <h :outputTex t value="# {activityJ ournal.sum mary}"/> | |
117 | </p:column > | |
118 | ||
119 | <p:column headerText ="#{msg.ed it}" style Class="tex t-center"> | |
120 | <h:com mandLink a ction="#{a ctivityJou rnalContro ller.loadE ditActivit yJournalFr omSummary( activityJo urnal)}" i d="editDis play" titl e="#{msg.e dit}"> | |
121 | <h:g raphicImag e library= "img" name ="edit.gif " alt="ed it"/> | |
122 | </ h:commandL ink> | |
123 | </p:column > | |
124 | ||
125 | <p:column headerText ="#{msg.de lete}" sty leClass="t ext-center "> | |
126 | <h:co mmandLink action="#{ activityJo urnalContr oller.load DeleteActi vityJourna l(activity Journal)}" id="delet eDisplay" title="#{m sg.delete} "> | |
127 | <f :param nam e="activit yJournalRe turnPage" value="act ivityJourn alSummary" /> | |
128 | <h:g raphicImag e library= "img" name ="toDelete .gif" alt= "delete" / > | |
129 | </ h:commandL ink> | |
130 | </p:column > | |
131 | ||
132 | </p:data Table> | |
133 | ||
134 | ||
135 | <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}" styleClass ="display- block"> | |
136 | #{fn:lengt h(activity JournalCon troller.ac tivityJour nalList)} items foun d, display ing all it ems | |
137 | </h:pane lGroup> | |
138 | ||
139 | <h :panelGrou p rendere d="#{fn:le ngth(activ ityJournal Controller .activityJ ournalList ) eq 1 }" > | |
140 | One item found | |
141 | </ h:panelGro up> | |
142 | ||
143 | <d iv class=" control-gr oup"> | |
144 | <d iv class=" controls"> | |
145 | <h:command Button id= "addnewBut ton" value ="#{msg.ad dnew}" act ion="#{act ivityJourn alControll er.loadAdd NewActivit yJournal}" styleClas s="btn btn -primary"> | |
146 | <f :param nam e="activit yJournalRe turnPage" value="act ivityJourn alSummary" title="#{ msg.addnew }"/> | |
147 | </h:comman dButton> | |
148 | </ div> | |
149 | </div> | |
150 | </h: form> | |
151 | </ ui:define> | |
152 | </ui:compo sition> | |
153 | </html> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.