| ... | ... | @@ -1,13 +1,12 @@ | 
              
                    | 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 |  | - | 
              
                    |  | 9 | + | 
              
                    | 11 | 11 | #macro(clbCreationForm) | 
              
                    | 12 | 12 | <div class="row"> | 
              
                    | 13 | 13 | <div class="col-md-6"> | 
                      
        | ... | ... | @@ -21,41 +21,55 @@ | 
              
                    | 21 | 21 | <clb-collab-create></clb-collab-create> | 
              
                    | 22 | 22 | </div> | 
              
                    | 23 | 23 | #end | 
              
                    | 24 |  | - | 
              
                    |  | 23 | + | 
              
                    | 25 | 25 | #macro(clbList $canCreate) | 
              
                    | 26 |  | - <div class="container"> | 
              
                    | 27 | 27 | <div class="row"> | 
              
                    | 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> | 
              
                    |  | 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 | 
              
                    | 40 | 40 | </div> | 
              
                    | 41 | 41 | <div class="row"> | 
              
                    | 42 |  | -     <div id="root"></div> | 
              
                    |  | 36 | +     <clb-current-user authenticated="$isAuthenticated"></clb-current-user> | 
              
                    |  | 37 | +     <clb-collab-list></clb-collab-list> | 
              
                    | 43 | 43 | </div> | 
              
                    | 44 |  | -</div> | 
              
                    | 45 | 45 | #end | 
              
                    | 46 | 46 | {{/velocity}} | 
              
                    | 47 |  | - | 
              
                    | 48 |  | - {{velocity}} | 
              
                    | 49 |  | - {{htmlclean="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"> | 
              
                    | 50 | 50 | #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"> | 
              
                    | 53 | 53 | #clbCreationForm() | 
              
                    | 54 | 54 | #else | 
              
                    | 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) | 
              
                    |  | 47 | +     #clbList($isAuthenticated) | 
              
                    | 58 | 58 | #end | 
              
                    | 59 |  | - | 
              
                    |  | 49 | + </div> | 
              
                    | 60 | 60 | {{/html}} | 
              
                    | 61 | 61 | {{/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 | + |