| ... |
... |
@@ -1,12 +1,13 @@ |
| 1 |
|
-{{velocity output="false"}} #set($displayContentFooter=false) |
|
1 |
+{{velocity output="false"}} |
|
2 |
+ #set($displayContentFooter=false) |
| 2 |
2 |
#set($displayDocExtra=false) |
| 3 |
3 |
#set($displayContentMenu=false) |
| 4 |
4 |
$xwiki.ssx.use('Collaboratory.UX.SSX.noheader') |
| 5 |
|
- |
|
6 |
+ |
| 6 |
6 |
#set ($clbaction = $request.getParameter("clbaction")) |
| 7 |
7 |
#set ($isAuthenticated = ($xcontext.user != 'XWiki.XWikiGuest')) |
| 8 |
8 |
#set ($isCreationForm = $clbaction.equals('create')) |
| 9 |
|
- |
|
10 |
+ |
| 10 |
10 |
#macro(clbCreationForm) |
| 11 |
11 |
<div class="row"> |
| 12 |
12 |
<div class="col-md-6"> |
| ... |
... |
@@ -20,55 +20,41 @@ |
| 20 |
20 |
<clb-collab-create></clb-collab-create> |
| 21 |
21 |
</div> |
| 22 |
22 |
#end |
| 23 |
|
- |
|
24 |
+ |
| 24 |
24 |
#macro(clbList $canCreate) |
|
26 |
+ <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 |
|
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> |
| 34 |
34 |
</div> |
| 35 |
35 |
<div class="row"> |
| 36 |
|
- <clb-current-user authenticated="$isAuthenticated"></clb-current-user> |
| 37 |
|
- <clb-collab-list></clb-collab-list> |
|
42 |
+ <div id="root"></div> |
| 38 |
38 |
</div> |
|
44 |
+</div> |
| 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"> |
|
47 |
+ |
|
48 |
+ {{velocity}} |
|
49 |
+ {{html clean="false"}} |
| 44 |
44 |
#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"> |
| 45 |
45 |
#clbCreationForm() |
| 46 |
46 |
#else |
| 47 |
|
- #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) |
| 48 |
48 |
#end |
| 49 |
|
- </div> |
|
59 |
+ |
| 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 |
|
- |
