Changes for page Collabs

Last modified by hbpadmin on 2022/03/23 19:34
From version 2.1
edited by hbpadmin
on 2019/05/20 14:17
Change comment: Rollback to version 1.1
To version 4.1
edited by hbpadmin
on 2021/05/11 18:10
Change comment: Install extension [eu.hbp.wiki:xwiki-awm-collabs/0.28.0]

Summary

Details

Page properties
Default language
... ... @@ -1,0 +1,1 @@
1 +en
Content
... ... @@ -3,11 +3,11 @@
3 3   #set($displayDocExtra=false)
4 4   #set($displayContentMenu=false)
5 5   $xwiki.ssx.use('Collaboratory.UX.SSX.noheader')
6 -
6 +
7 7   #set ($clbaction = $request.getParameter("clbaction"))
8 8   #set ($isAuthenticated = ($xcontext.user != 'XWiki.XWikiGuest'))
9 9   #set ($isCreationForm = $clbaction.equals('create'))
10 -
10 +
11 11   #macro(clbCreationForm)
12 12   <div class="row">
13 13   <div class="col-md-6">
... ... @@ -21,34 +21,41 @@
21 21   <clb-collab-create></clb-collab-create>
22 22   </div>
23 23   #end
24 -
24 +
25 25   #macro(clbList $canCreate)
26 + <div class="container">
26 26   <div class="row">
27 - <div class="col-md-6">
28 - <h1>Collabs</h1>
29 - </div>
30 - #if($canCreate)
31 - <div class="col-md-6">
32 - <a href="/bin/view/Collabs?clbaction=create" class="btn btn-primary pull-right">Create a collab</a>
33 - </div>
34 - #end
28 + <div class="col-md-8">
29 + <h1>Collab Search</h1>
30 + <p class="help-block">
31 + Find available collabs searching for terms in title and/or description.<br />
32 + You can refine the results using the filters.
33 + </p>
34 + </div>
35 + <div class="col-md-4 pull-right">
36 + #if($canCreate)
37 + <a href="/bin/view/Collabs?clbaction=create" class="btn btn-primary pull-right">Create a collab</a>
38 + #end
39 + </div>
35 35   </div>
36 36   <div class="row">
37 - <clb-current-user authenticated="$isAuthenticated"></clb-current-user>
38 - <clb-collab-list></clb-collab-list>
42 + <div id="root"></div>
39 39   </div>
44 +</div>
40 40   #end
41 41   {{/velocity}}
42 42  
43 43   {{velocity}}
44 44   {{html clean="false"}}
45 - <script src="$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', 'collab.js')" type="text/javascript"></script>
46 - <div class="container clb-content">
47 47   #if($isCreationForm)
51 + <script type="module" src="$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', 'collab.esm.js')"></script>
52 + <div class="container clb-content">
48 48   #clbCreationForm()
49 49   #else
50 - #clbList($isAuthenticated)
55 + <link rel="stylesheet" type="text/css" href="$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', 'collab-search.css')" />
56 + <script type="module" src="$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', 'collab-search.js')"></script>
57 + #clbList($isAuthenticated)
51 51   #end
52 - </div>
59 +
53 53   {{/html}}
54 54   {{/velocity}}