Changes for page Per Sort

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -1,18 +1,9 @@
1	1	{{velocity}}
2		-{{html wiki="true" clean="false"}}
3		-## GET PARAMETERS / START
4		-## inline display
5		-#set( $inlinePar = $request.inline.trim().toLowerCase() )
	2	+{{html clean="false" wiki="true"}}
	3	+#template('apice_boolean.vm')
	4	+## BIBTEX / START
6	6	## show BibTeX
7	7	#set( $bibtexPar = $request.bibtex.trim().toLowerCase() )
8		-## who
9		-#set( $userNamePar = $request.user.trim() )
10		-#set( $firstNamePar = $request.name.trim() )
11		-#set( $lastNamePar = $request.surname.trim() )
12		-## GET PARAMETERS / END
13		-##
14		-#template('apice_boolean.vm')
15		-## HANDLE BIBTEX / START
16	16	## default: false
17	17	#set( $showBibtex = false )
18	18	## check $bibtexPar
...	...	@@ -19,9 +19,11 @@
19	19	#if( $bibtexPar != "" && $trueStringList.contains($bibtexPar.toLowerCase()) )
20	20	#set( $showBibtex = true )
21	21	#end
22		-## HANDLE BIBTEX / END
	13	+## BIBTEX / END
23	23	##
24		-## HANDLE INLINE / START
	15	+## INLINE / START
	16	+## inline display
	17	+#set( $inlinePar = $request.inline.trim().toLowerCase() )
25	25	## default: true
26	26	#set( $showInline = true )
27	27	## check $inlinePar
...	...	@@ -28,13 +28,12 @@
28	28	#if( $inlinePar != "" && $falseStringList.contains($inlinePar) )
29	29	#set( $showInline = false )
30	30	#end
31		-## HANDLE INLINE / END
32		-##
33		-## HANDLE SORT / START
	24	+## INLINE / END
	25	+#template('apice_publications.vm')
	26	+#template('apice_user_param.vm')
	27	+## SORT / START
34	34	## $sortList gets the list of sorts to be shown
35	35	## $oneSort true if just one sort to be shown
36		-#template('apice_publications.vm')
37		-## default: all sorts
38	38	#set( $sortList = $publicationSorts )
39	39	#set( $oneSort = false )
40	40	##
...	...	@@ -51,61 +51,9 @@
51	51	#end
52	52	#end
53	53	## INVARIANT: $oneSort and $sortList are correctly and coherently initialised
54		-## HANDLE SORT / END
	46	+## SORT / END
55	55	##
56		-## HANDLE WHO / START
57		-#template('apice_macros.vm')
58		-#isuserspace()
59		-#if( $isUserSpace )
60		- #userspace()
61		-## from a personal page
62		- #set( $apiceUser = true )
63		- #set( $oneUser = true )
64		-#elseif( $userNamePar )
65		-## from the URL, "user=$userNamePar" parameter
66		- #if( $userNamePar.contains('XWiki.') )
67		- #set( $userName = "$userNamePar" )
68		- #else
69		- #set( $userName = "XWiki.$userNamePar" )
70		- #end
71		- #if( !$xwiki.exists( $userName ) )
72		- #if( $services.localization.currentLocale == 'it' )
73		-{{warning}}L'utente “$userNamePar” non esiste{{/warning}}
74		- #else
75		-{{warning}}User “$userNamePar” does not exist{{/warning}}
76		- #end
77		- #stop
78		- #end
79		- #set( $apiceUser = true )
80		- #set( $oneUser = true)
81		- #set( $userdoc = $xwiki.getDocument($userName) )
82		- #set( $userFirstName = $userdoc.display("first_name") )
83		- #set( $userLastName = $userdoc.display("last_name") )
84		-#elseif( $firstNamePar && $lastNamePar )
85		-## from the URL, "name=Firstname&surname=Lastname" parameter
86		- #set( $apiceUser = false )
87		- #set( $oneUser = true )
88		- #set( $userFirstName = $firstNamePar )
89		- #set( $userLastName = $lastNamePar )
90		-#else
91		- #set( $apiceUser = false )
92		- #set( $oneUser = false )
93		- #set( $userFirstName = "" )
94		- #set( $userLastName = "" )
95		-#end
96		-#if( $oneUser )
97		- #if( $apiceUser )
98		- #set( $userString = "%$userName%" )
99		- #else
100		- #set( $userString = "%$userFirstName $userLastName%" )
101		- #end
102		-#else
103		- #set( $userString = "%%" )
104		-#end
105		-## HANDLE WHO / END
106		-##
107		-### query to structures
108		-## map & counter initialisation
	48	+## DATA STRUCTURES / START
109	109	#set( $itemMap = {} )
110	110	#set( $itemNo = 0 )
111	111	## cycle over sorts
...	...	@@ -122,8 +122,9 @@
122	122	#set( $itemNo = $itemNo + $itemSortNo )
123	123	#end
124	124	#end
	65	+## DATA STRUCTURES / END
125	125	##
126		-### output results
	67	+## DISPLAY / START
127	127	## page subtitle
128	128	<div style="display: flex">
129	129	<div class="mainheader">
...	...	@@ -148,7 +148,7 @@
148	148	</div>
149	149	<div style="flex-grow: 1">
150	150	</div>
151		- <div">
	92	+ <div>
152	152	<a class="basebutton" style="padding: .5em" href='$doc.getURL("view","bibtex=$showBibtex&inline=#if( $showInline )false#{else}true#end#if( $oneSort )&sort=${sortList[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>
153	153	<a class="basebutton" style="padding: .5em" href='$doc.getURL("view","inline=$showInline&bibtex=#if( $showBibtex )false#{else}true#end#if( $oneSort )&sort=${sortList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )text#{else}bib#end</a>
154	154	</div>
...	...	@@ -218,5 +218,6 @@
218	218	</div>
219	219	## sort bottom / end
220	220	#end
	162	+## DISPLAY / END
221	221	{{/html}}
222	222	{{/velocity}}{{pageDisplay sort="objectservice"/}}