Changes for page Per Status

From version 89.1
edited by Andrea Omicini
on 22/06/2023 13:00
Change comment: There is no comment for this version
To version 86.11
edited by Andrea Omicini
on 22/06/2023 12:53
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -105,7 +105,7 @@
105 105  ## map & counter initialisation
106 106  #set( $itemMap = {} )
107 107  #set( $itemNo = 0 )
108 -## cycle over statuses
108 +## cycle over sorts
109 109  #foreach( $status in $statusList )
110 110   #set( $query = ", BaseObject as obj, #if( $oneUser ) LargeStringProperty as propAuthor, LargeStringProperty as propEditor, #end StringProperty as propStatus #if( !$hasEdit ), StringProperty as propAccess #end
111 111   where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectPool}.${objectTemplate}' #if( $oneUser ) and propAuthor.id.id = obj.id and propEditor.id.id = obj.id and propAuthor.name = 'author' and propEditor.name = 'editor' and ( propAuthor.value like '$userString' or ( propAuthor.value = '' and propEditor.value like '$userString' ) ) #end and propStatus.id.id = obj.id and propStatus.name = 'status' and propStatus.value = '$status' #if( !$hasEdit ) and propAccess.id.id = obj.id and propAccess.name = 'access' and propAccess.value <> 'hidden' #end" )
... ... @@ -117,7 +117,6 @@
117 117   #set( $itemNo = $itemNo + $itemStatusNo )
118 118   #end
119 119  #end
120 -$itemStatusNo
121 121  ##
122 122  ## output results
123 123  ## page subtitle
... ... @@ -144,8 +144,8 @@
144 144   <div style="flex-grow: 1">
145 145   </div>
146 146   <div">
147 - <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","bibtex=$showBibtex&inline=#if( $showInline )false#{else}true#end#if( $oneStatus )&status=${statusList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )#if( $showInline )formatted#{else}plain#end#else#if( $showInline )long#{else}short#end#end</a>
148 - <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","inline=$showInline&bibtex=#if( $showBibtex )false#{else}true#end#if( $oneStatus )&status=${statusList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )text#{else}bib#end</a>
146 + <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","bibtex=$showBibtex&inline=#if( $showInline )false#{else}true#end#if( $oneSort )&status=${statusList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )#if( $showInline )formatted#{else}plain#end#else#if( $showInline )long#{else}short#end#end</a>
147 + <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","inline=$showInline&bibtex=#if( $showBibtex )false#{else}true#end#if( $oneSort )&status=${statusList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )text#{else}bib#end</a>
149 149   </div>
150 150  </div>
151 151  ## stop if no pubs are found
... ... @@ -156,7 +156,7 @@
156 156  ## some pubs found
157 157  ## page index
158 158  #if( $itemMap.keySet().size() > 1 )
159 -## found more than one status
158 +## found more than one sort
160 160  <div class="mainselectbar" id="index">
161 161   #foreach( $status in $itemMap.keySet() )
162 162   #if( !$foreach.first )
... ... @@ -167,51 +167,14 @@
167 167  </div>
168 168  #end
169 169  ##
170 -#template('apice_publication_macros.vm')
171 -##
172 -#foreach( $status in $itemMap.keySet() )
173 -## status top / start
174 -<div class="mainselectseparator">
175 - <a class="mainselectseparatorlink" id="$status" href=$xwiki.getURL($doc,"view","status=$status#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")>
176 - $services.localization.render("${objectSpace}.${objectClass}_status_${status}_plural").toLowerCase()
177 - </a>
178 -</div>
179 -## status top / end
180 -##
181 -## status display / start
182 -<div>
183 - #if( $showInline && !$showBibtex )
184 - <ul>
185 - #foreach( $item in $itemMap[$status] )
186 - <li>#publinked($item)</li>
187 -## <li>#pubperstatus($item)</li>
188 - #end
189 - </ul>
190 - #else
191 - #foreach( $item in $itemMap[$sort] )
192 - #if( $showBibtex)
193 - #if( $showInline )
194 - ((({{{ $xwiki.getDocument($item).getValue('bibtex') }}})))
195 - #else
196 - ((({{code language="bibtex"}}$xwiki.getDocument($item).getValue('bibtex'){{/code}})))
197 - #end
198 - #else
199 - <div style="border-style:hidden hidden hidden hidden; font-size:smaller; line-height: 1.25em; margin-bottom: .5em">
200 - #pubauthed($item)<br/>
201 - #pubtitle($item)<br/>
202 - <span class="textsecondary">(#pubstatus($item))</span> {{pubVenue linked="false"}}$item{{/pubVenue}}
203 - </div>
204 - #end
205 - #end
169 +## pubs displayed per year
170 +#foreach( $status in $pubMap.keySet() )
171 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$status'/}}[[{{pubStatus uppercase='false' plural='true'}}$status{{/pubStatus}}>>$doc.name||queryString='status=$status#if( $oneUser )#if( $apiceUser )&user=$userName#{else}&name=$userFirstName&surname=$userLastName#end#end']]
172 + #foreach( $pub in $pubMap[$status] )
173 +(% style="border-style:hidden hidden hidden hidden" %)|{{pub inline='false' linked='title'}}$pub{{/pub}}
206 206   #end
207 -</div>
208 -## status display / end
209 -##
210 -## status bottom / start
211 -<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
212 - #set( $itemStatusNo = $itemMap[$status].size() )
213 -$itemStatusNo #if( $itemStatusNo == 1 )$services.localization.render("${objectSpace}.${objectClass}_status_${status}").toLowerCase()#{else}$services.localization.render("${objectSpace}.${objectClass}_status_${status}_plural").toLowerCase()#end &bull; [[{{stringEngIta eng='top' ita='in cima'/}}>>||anchor="top"]] &bull; [[{{stringEngIta eng='index' ita='indice'/}}>>||anchor="index"]] &bull; [[{{stringEngIta eng='bottom' ita='in fondo'/}}>>||anchor="bottom"]]
214 -</div>
175 + #set( $pubStatusNo = $pubMap[$status].size() )
176 +(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($pubStatusNo #if( $pubStatusNo == 1 ){{stringEngIta eng='publication' ita='pubblicazione'/}} {{pubStatus uppercase='false' plural='false'}}$status{{/pubStatus}}#{else}{{stringEngIta eng='publications' ita='pubblicazioni'/}} {{pubStatus uppercase='false' plural='true'}}$status{{/pubStatus}}#end) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
215 215  ## status bottom / end
216 216  #end
217 217  {{/html}}