Changes for page Collabs

Last modified by hbpadmin on 2022/03/23 19:34
From version 1.2
edited by hbpadmin
on 2019/05/20 14:15
Change comment: Change last author with hbpadmin
To version 6.1
edited by hbpadmin
on 2022/03/22 18:10
Change comment: Install extension [eu.hbp.wiki:xwiki-awm-collabs/0.38.5]

Summary

Details

Page properties
Default language
... ... @@ -1,0 +1,1 @@
1 +en
Content
... ... @@ -1,16 +1,21 @@
1 -{{velocity output="false"}} #set($displayContentFooter=false)
1 +{{velocity output="false"}}
2 + #set($annotationsActivated=false)
3 + #set($displayContentFooter=false)
2 2   #set($displayDocExtra=false)
3 3   #set($displayContentMenu=false)
4 4   $xwiki.ssx.use('Collaboratory.UX.SSX.noheader')
5 -
7 +
6 6   #set ($clbaction = $request.getParameter("clbaction"))
7 7   #set ($isAuthenticated = ($xcontext.user != 'XWiki.XWikiGuest'))
8 8   #set ($isCreationForm = $clbaction.equals('create'))
9 -
10 - #macro(clbCreationForm)
11 +
12 + #macro(clbCreationForm) <div class="container">
11 11   <div class="row">
12 12   <div class="col-md-6">
13 - <h1>Collabs</h1>
15 + <h1>Create a Collab</h1>
16 + <p class="help-block">
17 + This page is used to create a new collab in the Collaboratory Wiki. Please plan your collab names in advance to avoid having many collabs with few pages and files. Thank you.
18 + </p>
14 14   </div>
15 15   <div class="col-md-6">
16 16   <a href="/bin/view/Collabs" class="btn btn-primary pull-right">Back to list</a>
... ... @@ -17,58 +17,43 @@
17 17   </div>
18 18   </div>
19 19   <div class="row">
20 - <clb-collab-create></clb-collab-create>
25 + <div id="root"></div>
21 21   </div>
27 + <link rel="stylesheet" type="text/css" href="$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', 'style.css')" />
28 + <script type="module" src="$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', 'collab-settings.js')"></script>
29 +</div>
22 22   #end
23 -
24 - #macro(clbList $canCreate)
31 +
32 + #macro(clbList $canCreate) <div class="container">
25 25   <div class="row">
26 - <div class="col-md-6">
27 - <h1>Collabs</h1>
28 - </div>
29 - #if($canCreate)
30 - <div class="col-md-6">
31 - <a href="/bin/view/Collabs?clbaction=create" class="btn btn-primary pull-right">Create a collab</a>
32 - </div>
33 - #end
34 + <div class="col-md-8">
35 + <h1>Collab Search</h1>
36 + <p class="help-block">
37 + Find available collabs searching for words in title and description.<br />
38 + You can refine the results using the filters.
39 + </p>
40 + </div>
41 + <div class="col-md-4 pull-right">
42 + #if($canCreate)
43 + <a href="/bin/view/Collabs?clbaction=create" class="btn btn-primary pull-right">Create a collab</a>
44 + #end
45 + </div>
34 34   </div>
35 35   <div class="row">
36 - <clb-current-user authenticated="$isAuthenticated"></clb-current-user>
37 - <clb-collab-list></clb-collab-list>
48 + <div id="root"></div>
38 38   </div>
50 +</div>
51 +<link rel="stylesheet" type="text/css" href="$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', 'style.css')" />
52 +<script type="module" src="$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', 'collab-search.js')"></script>
39 39   #end
40 40   {{/velocity}}
41 -\\{{velocity}} {{html clean="false"}}
42 - <script src="$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', 'collab.js')" type="text/javascript"></script>
43 - <div class="container clb-content">
55 +
56 + {{velocity}}
57 + {{html clean="false"}}
44 44   #if($isCreationForm)
45 45   #clbCreationForm()
46 46   #else
47 47   #clbList($isAuthenticated)
48 48   #end
49 - </div>
50 50   {{/html}}
51 51   {{/velocity}}
52 -
53 -(% class="container clb-content" %)
54 -(((
55 -(% class="row" %)
56 -(((
57 -(% class="col-md-6" %)
58 -(((
59 -= Collabs =
60 -)))
61 -
62 -(% class="col-md-6" %)
63 -(((
64 -[[Create a collab>>path:/bin/view/Collabs?clbaction=create||class="btn btn-primary pull-right"]]
65 -)))
66 -)))
67 -
68 -(% class="row" %)
69 -(((
70 -
71 -)))
72 -)))
73 -
74 -