Changes for page Collabs

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