Changes for page Collabs

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

Summary

Details

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