Changes for page Collaborate on reproducible science, anywhere
Summary
-
Page properties (2 modified, 0 added, 0 removed)
-
Objects (1 modified, 1 added, 0 removed)
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. bougault1 +XWiki.superadmin - Content
-
... ... @@ -5,131 +5,57 @@ 5 5 {{/velocity}} 6 6 7 7 {{html clean="false"}} 8 -<div class="container clb-content"> 9 - 10 -<div class="teasing"> 11 - <div class="row"> 12 - <div class="col-md-3"> 13 - <div class="card collaborate"> 14 - <div class="card-header"></div> 15 - <div class="card-content"> 16 - <h3 class="card-title">Collaborate</h3> 17 - <p> 18 - create projects and documents, invite collaborators, co-produce articles and release your team work for the community 19 - </p> 20 - </div> 21 - </div> 22 - </div> 23 - <div class="col-md-3"> 24 - <div class="card reproductible disabled"> 25 - <div class="card-header"> 26 - <div class="coming-soon"> 27 - <span>Coming Soon</span> 8 + <div class="container"> 9 + <div class="row"> 10 + <div class="col-md-7 col-md-push-5"> 11 + <img class="img-responsive" src="/bin/skin/Collaboratory/UX/HbpSkin/wiki_home_graphic.svg" /> 28 28 </div> 29 - </div> 30 - <div class="card-content"> 31 - <h3 class="card-title">Reproducible</h3> 32 - <p> 33 - initiate environments, install libraries, find and access datasets to create the stable fertile ground for your experiments 34 - </p> 35 - </div> 36 - </div> 37 - </div> 38 - <div class="col-md-3"> 39 - <div class="card science disabled"> 40 - <div class="card-header"> 41 - <div class="coming-soon"> 42 - <span>Coming Soon</span> 13 + <div class="col-md-5 col-md-pull-7 hero-text"> 14 + <h3>Collaborate.<br/>Create reproducible science.<br/>Discover EBRAINS services at work.<br/>From anywhere.</h3> 15 + <a class="btn btn-primary btn-lg" href="/bin/view/Collabs/the-collaboratory/Getting%20Started/">Getting started</a> 43 43 </div> 44 44 </div> 45 - <div class="card-content"> 46 - <h3 class="card-title">Science</h3> 47 - <p> 48 - develop code, visualise results, generate data and collaborate on your research 49 - </p> 50 - </div> 51 51 </div> 52 - </div> 53 - <div class="col-md-3"> 54 - <div class="card anywhere disabled"> 55 - <div class="card-header"> 56 - <div class="coming-soon"> 57 - <span>Coming Soon</span> 58 - </div> 59 - </div> 60 - <div class="card-content"> 61 - <h3 class="card-title">Anywhere</h3> 62 - <p> 63 - upload or generate your data and access it anywhere anytime, from your local machine to the most powerful high performance computers 64 - </p> 65 - </div> 19 + <div class="container-fluid search__row"> 20 + <div class="container"> 21 + <div class="col-md-6 col-md-offset-3"> 22 + <form role="search" class="clb-search-bar" action="/bin/view/Main/Search" method="GET"> 23 + <div> 24 + <input type="text" class="form-control" name="text" placeholder="Search word in all wiki pages"> 25 + <i class="glyphicon glyphicon-search"></i> 26 + </div> 27 + <button class="btn clb-btn-default" type="submit">Search</button> 28 + </form> 29 + </div> 30 + </div> 66 66 </div> 67 - </div> 68 - </div> 69 -</div> 70 - <div class="row"> 71 -<div class="col-md-12"> 32 +{{/html}} 72 72 73 -<p class="alert-info"> 74 -This is the first release of the revamped Collaboratory. It does not yet have feature parity with the previous version. Until we reach that point and give users time to migrate, both versions will coexist.</p> 75 - </div> 76 - </div> 34 +(% class="container highlighted"%)((( 77 77 78 - <div class="row"> 79 - <div class="col-md-6 col-md-offset-3"> 80 - <form role="search" class="clb-search-bar" action="/bin/view/Main/Search" method="GET"> 81 - <div> 82 - <input type="text" class="form-control" name="text"> 83 - <i class="glyphicon glyphicon-search"></i> 84 - </div> 85 - <button class="btn clb-btn-default" type="submit">Search</button> 86 - </form> 87 - </div> 88 - </div> 36 +(% class="highlighted__title" %) 37 +==== Highlighted collabs ==== 38 +{{html clean="false"}} 39 +<div class="container centered"> 40 +<a href="/bin/view/Collabs/the-collaboratory/Highlights" class="highlighted_view_all">View all</a> 89 89 </div> 90 - <div class="container-fluid clb-actions">91 - <divclass="container">92 - <div class="row">42 +{{/html}} 43 +(% class="row highlighted_row" %) 44 +((( 93 93 94 - <div class="col-md-4"> 95 - <div class="row"> 96 - <div class="col-md-10 text-center clb-box-container"> 97 - <a class="clb-box" href="/bin/view/Collabs/"> 98 - <h3 class="clb-box-title">Browse Collabs</h3> 99 - <p> 100 - Find a collab, or create yours. 101 - </p> 102 - </a> 103 - </div> 104 - </div> 105 - </div><!-- /.col-md-4 --> 46 +{{HighlightedCollabs featured="true" slider="true" /}} 106 106 107 - <div class="col-md-4"> 108 - <div class="row"> 109 - <div class="col-md-10 col-md-offset-1 text-center clb-box-container"> 110 - <a class="clb-box" href="https://www.humanbrainproject.eu/en/hbp-platforms/support/"> 111 - <h3 class="clb-box-title">Support</h3> 112 - <p> 113 - Open and track support tickets on our support site. 114 - </p> 115 - </a> 116 - </div> 117 - </div> 118 - </div><!-- /.col-md-4 --> 48 +))) 49 +))) 119 119 120 - <div class="col-md-4"> 121 - <div class="row"> 122 - <div class="col-md-10 col-md-offset-2 text-center clb-box-container"> 123 - <a class="clb-box" href="/bin/view/Feedback/"> 124 - <h3 class="clb-box-title">Feedback</h3> 125 - <p> 126 - Please, give us a feedback about the new collaboratory. 127 - </p> 128 - </a> 129 - </div> 130 - </div> 131 - </div><!-- /.col-md-4 --> 132 - </div> 133 - </div> 134 -</div> 135 -{{/html}} 51 +(% class="container" %) 52 +((( 53 +(% class="row explore-all" %) 54 +((( 55 + (% class="col-md-12" %) 56 +((( 57 +Explore all the [[Collabs]] 58 +))) 59 +))) 60 +))) 61 +
- XWiki.StyleSheetExtension[0]
-
- Code
-
... ... @@ -1,31 +1,30 @@ 1 +/* 1 1 .teasing .collaborate {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/collaborate.jpg');} 2 2 .teasing .reproductible {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/reproducible.jpg');} 3 3 .teasing .science {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/science.jpg');} 4 4 .teasing .anywhere {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/anywhere.jpg');} 5 - 6 +*/ 6 6 #mainContentArea{ 7 7 padding:0; 8 8 padding-top:1.25rem 9 9 } 11 +.document-header, 10 10 #mainContentArea #hierarchy, 11 11 #mainContentArea .xcontent>hr, 12 12 #mainContentArea .xdocLastModification{ 13 13 display:none 14 14 } 17 + 15 15 #mainContentArea .xcontent>.row{ 16 16 margin-left:0; 17 17 margin-right:0 18 18 } 19 19 20 -.document-header .document-info{ 21 - width:100%; 22 - text-align:center; 23 - margin-top:3rem 24 -} 25 25 #xwikicontent{ 26 26 padding-left:0; 27 27 padding-right:0; 28 28 min-height:300px; 27 +/* 29 29 p.alert-info{ 30 30 padding:2rem 31 31 } ... ... @@ -89,13 +89,6 @@ 89 89 color:@color-white; 90 90 } 91 91 } 92 - .teasing .disabled{ 93 - -webkit-filter:grayscale(70%); 94 - filter:grayscale(70%) 95 - } 96 - .teasing .disabled .card-content{ 97 - opacity:.9 98 - } 99 99 .teasing .card-title{ 100 100 margin-top:1.5rem; 101 101 margin-right:0; ... ... @@ -113,8 +113,7 @@ 113 113 .clb-actions .clb-box{ 114 114 margin-bottom:5rem; 115 115 font-size:1.125rem; 116 - display: block; 117 - 108 + display: block 118 118 } 119 119 .clb-actions>.row{ 120 120 margin-left:0; ... ... @@ -126,6 +126,7 @@ 126 126 .clb-content>.row{ 127 127 margin-bottom:5rem 128 128 } 120 +*/ 129 129 .clb-search-bar{ 130 130 display:flex; 131 131 align-items:stretch; ... ... @@ -158,6 +158,7 @@ 158 158 .clb-search-bar input[type=text]:focus~i{ 159 159 color: @color-brand-primary; 160 160 } 153 + /* 161 161 @media screen and (min-width:992px){ 162 162 .teasing .row{ 163 163 display:flex ... ... @@ -183,6 +183,7 @@ 183 183 display:block 184 184 } 185 185 } 179 + */ 186 186 } 187 187 188 188 .clb-box{ ... ... @@ -217,3 +217,138 @@ 217 217 background-color: darken(@color-brand-primary, 15%); 218 218 } 219 219 } 214 + 215 +#xwikicontent .get-started__row__title { 216 + margin: 1rem 0; 217 + font-weight: 400; 218 + color: var(@color-brand-primary); 219 +} 220 + 221 +.hero-text h3 { 222 + line-height:1.3em; 223 +} 224 + 225 +.search__row { 226 + padding:2rem; 227 + margin: 2rem 0; 228 + background: @color-xwiki-gray; 229 +} 230 +.get-started__row__text { 231 + color: #4a5568; 232 +} 233 +.get-started__title, .highlighted__title{ 234 + text-align: center; 235 + color: #aaa; 236 + padding:2rem 0 0.5rem 0; 237 + font-size: 2rem; 238 +} 239 +.get-started__row { 240 + margin-top: 3rem; 241 +} 242 + 243 +.pre-footer, .explore-all { 244 + font-size: 32px; 245 + line-height: 42px; 246 + text-align: center; 247 +} 248 + 249 +.explore-all{ 250 + padding-top: 5rem; 251 + padding-bottom: 5rem; 252 +} 253 + 254 +@media screen and (min-width: 992px) { 255 + .get-started__row { 256 + display: flex; 257 + align-items: center; 258 + } 259 + #xwikicontent .get-started__row__title { 260 + margin: 0; 261 + margin-bottom: 1rem; 262 + } 263 +} 264 + 265 +.glider-contain { 266 + min-height: 502px; 267 +} 268 +.glider { 269 + .highlighted-collab { 270 + position:relative; 271 + border: 1px solid #CCC; 272 + margin: 0 1rem; 273 + height: 100%; 274 + border-radius: @border-radius-default; 275 + > p, 276 + > h3 { 277 + padding-left: 1rem; 278 + padding-right: 1rem; 279 + } 280 + } 281 +} 282 +.highlighted-image{ 283 + /*height: 250px;*/ 284 + background-size: cover; 285 +} 286 +.stretched-link { 287 + &::after { 288 + position: absolute; 289 + top: 0; 290 + right: 0; 291 + bottom: 0; 292 + left: 0; 293 + z-index: 1; 294 + // Just in case `pointer-events: none` is set on a parent 295 + pointer-events: auto; 296 + content: ""; 297 + // IE10 bugfix, see https://stackoverflow.com/questions/16947967/ie10-hover-pseudo-class-doesnt-work-without-background-color 298 + background-color: rgba(0, 0, 0, 0); 299 + } 300 +} 301 + 302 +.pre-footer { 303 + margin: 8rem 0 2rem; 304 + padding: 5rem 0; 305 + border-top: 1px solid #ccc; 306 + /*border-bottom: 1px solid #ccc;*/ 307 +} 308 + 309 +.tags__title, .tags__text { 310 + text-align: center; 311 +} 312 + 313 +.tags__title--collaborate, 314 +.tags__title--science, 315 +.tags__title--reproducible, 316 +.tags__title--anywhere { 317 + padding-top: 4rem; 318 + position: relative; 319 +} 320 + 321 +.tags__title--collaborate::before, 322 +.tags__title--science::before, 323 +.tags__title--reproducible::before, 324 +.tags__title--anywhere::before { 325 + position: absolute; 326 + width: 50px; 327 + height: 50px; 328 + background-repeat: none; 329 + top: 0; 330 + margin-left: 50%; 331 + left: -25px; 332 + content: " "; 333 + display: table; 334 +} 335 + 336 +.tags__title--collaborate::before { 337 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Collaborate.svg"); 338 +} 339 +.tags__title--science::before { 340 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Science.svg"); 341 +} 342 +.tags__title--reproducible::before { 343 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Reproducible.svg"); 344 +} 345 +.tags__title--anywhere::before { 346 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Anywhere.svg"); 347 +} 348 +
- XWiki.DocumentSheetBinding[0]
-