Changes for page Collaborate on reproducible science, anywhere
on 2022/06/07 15:23
Summary
-
Page properties (3 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 - Default language
-
... ... @@ -1,0 +1,1 @@ 1 +en - Content
-
... ... @@ -1,7 +1,6 @@ 1 -{{velocity}} 1 +{{velocity output="false"}} 2 2 #set($displayContentFooter=false) 3 3 #set($displayDocExtra=false) 4 -#set($displayContentMenu=false) 5 5 {{/velocity}} 6 6 7 7 {{html clean="false"}} ... ... @@ -8,242 +8,58 @@ 8 8 <div class="container"> 9 9 <div class="row"> 10 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" /> 10 + <img class="img-responsive" src="/bin/skin/Collaboratory/UX/HbpSkin/WebHome/wiki_home_graphic.svg" /> 12 12 </div> 13 - <div class="col-md-5 col-md-pull-7"> 14 - <h2>Collaborate to create reproducible science. Anywhere.</h2> 15 - <a class="btn btn-primary btn-lg">Get started</a> 16 - <a class="btn btn-primary btn-lg">Learn more</a> 12 + <div class="col-md-5 col-md-pull-7 hero-text"> 13 + <h3>Collaborate.<br/>Create reproducible science.<br/>Discover EBRAINS services at work.<br/>From anywhere.</h3> 14 + <a class="btn btn-primary btn-lg" href="/bin/view/Collabs/the-collaboratory/Getting%20Started/">Getting started</a> 17 17 </div> 18 18 </div> 19 19 </div> 20 20 <div class="container-fluid search__row"> 21 - <div class="container"> 22 - <div class="col-md-6 col-md-offset-3"> 23 - <form role="search" class="clb-search-bar" action="/bin/view/Main/Search" method="GET"> 24 - <div> 25 - <input type="text" class="form-control" name="text"> 26 - <i class="glyphicon glyphicon-search"></i> 27 - </div> 28 - <button class="btn clb-btn-default" type="submit">Search</button> 29 - </form> 30 - </div> 31 - 32 - </div> 19 + <div class="container"> 20 + <div class="col-sm-12 col-md-6 col-md-offset-3"> 21 + <form role="search" action="/bin/view/Main/Search" method="GET"> 22 + <div class="input-group"> 23 + <input type="search" name="text" class="form-control input-lg" title="Search word in all wiki pages" placeholder="Search word in all wiki pages"> 24 + <span class="input-group-btn"> 25 + <button type="submit" class="btn btn-primary input-lg"> 26 + <span class="fa fa-search"></span> 27 + <span class="sr-only">Search</span> 28 + </button> 29 + </span> 30 + </div> 31 + </form> 32 + </div> 33 + </div> 33 33 </div> 34 - <div class="container"> 35 - <div class="row tags"> 36 - <div class="col-md-3"> 37 - <h3 class="tags__title tags__title--collaborate"> 38 - Collaborate 39 - </h3> 40 - <p class="tags__text"> 41 - Create projects and documents, invite collaborators, co-produce 42 - articles and release your team work for the community 43 - </p> 44 - </div> 45 - <div class="col-md-3"> 46 - <h3 class="tags__title tags__title--reproducible"> 47 - Reproducible 48 - </h3> 49 - <p class="tags__text"> 50 - Initiate environments, install libraries, find and access datasets 51 - to create the stable fertile ground for your experiments 52 - </p> 53 - </div> 54 - <div class="col-md-3"> 55 - <h3 class="tags__title tags__title--science">Science</h3> 56 - <p class="tags__text"> 57 - Develop code, visualise results, generate data and collaborate on 58 - your re-search 59 - </p> 60 - </div> 61 - <div class="col-md-3"> 62 - <h3 class="tags__title tags__title--anywhere">Anywhere</h3> 63 - <p class="tags__text"> 64 - Upload or generate your data and access it any-where anytime, from 65 - your local machine to the most powerful high perfor-mance 66 - computers 67 - </p> 68 - </div> 69 - </div> 70 - </div> 35 +{{/html}} 71 71 37 +(% class="container highlighted"%)((( 72 72 73 -<div class="container get-started"> 74 - <h4 class="get-started__title">GET STARTED</h4> 75 - <div class="row get-started__row"> 76 - <div class="col-xs-12 col-md-6"> 77 - <img 78 - class="img-responsive" 79 - src="https://via.placeholder.com/600x300" 80 - /> 81 - </div> 82 - <div class="col-xs-12 col-md-6"> 83 - <a href="#"> 84 - <h2 class="get-started__row__title">Create a collab</h2> 85 - <p class="get-started__row__text"> 86 - Discover how to create Collabs, a space which enables you to 87 - collaborate. 88 - </p> 89 - </a> 90 - </div> 91 - </div> 92 - <div class="row get-started__row"> 93 - <div class="col-md-6"> 94 - <img 95 - class="img-responsive" 96 - src="https://via.placeholder.com/600x300" 97 - /> 98 - </div> 99 - <div class="col-md-6"> 100 - <a href="#"> 101 - <h2 class="get-started__row__title">Team</h2> 102 - <p class="get-started__row__text"> 103 - Add members to your team in the collab. 104 - </p> 105 - </a> 106 - </div> 107 - </div> 108 - <div class="row get-started__row"> 109 - <div class="col-md-6"> 110 - <img 111 - class="img-responsive" 112 - src="https://via.placeholder.com/600x300" 113 - /> 114 - </div> 115 - <div class="col-md-6"> 116 - <a href="#"> 117 - <h2 class="get-started__row__title">Jupyter Notebook</h2> 118 - <p class="get-started__row__text"> 119 - Run your Jupyter notebook. Share it with colleagues. 120 - </p> 121 - </a> 122 - </div> 123 - </div> 39 +(% class="highlighted__title" %) 40 +==== Highlighted collabs ==== 41 +{{html clean="false"}} 42 +<div class="container centered"> 43 +<a href="/bin/view/Collabs/the-collaboratory/Highlights" class="highlighted_view_all">View all</a> 124 124 </div> 125 -<div class="container"> 126 - <div class="row pre-footer"> 127 - <div class="col-md-12"> 128 - The Collaboratory is part of EBRAINS.<br /> 129 - Discover the other 130 - <a href="https://ebrains.eu" rel="noopener" target="_blank">EBRAINS services</a>. 131 - </div> 132 - </div> 133 -</div> 134 -<!--div class="container clb-content"> 45 +{{/html}} 46 +(% class="row highlighted_row" %) 47 +((( 135 135 136 -<div class="teasing"> 137 - <div class="row"> 138 - <div class="col-md-3"> 139 - <div class="card collaborate"> 140 - <div class="card-header"></div> 141 - <div class="card-content"> 142 - <h3 class="card-title">Collaborate</h3> 143 - <p> 144 - create projects and documents, invite collaborators, co-produce articles and release your team work for the community 145 - </p> 146 - </div> 147 - </div> 148 - </div> 149 - <div class="col-md-3"> 150 - <div class="card reproductible"> 151 - <div class="card-header"></div> 152 - <div class="card-content"> 153 - <h3 class="card-title">Reproducible</h3> 154 - <p> 155 - initiate environments, install libraries, find and access datasets to create the stable fertile ground for your experiments 156 - </p> 157 - </div> 158 - </div> 159 - </div> 160 - <div class="col-md-3"> 161 - <div class="card science"> 162 - <div class="card-header"></div> 163 - <div class="card-content"> 164 - <h3 class="card-title">Science</h3> 165 - <p> 166 - develop code, visualise results, generate data and collaborate on your research 167 - </p> 168 - </div> 169 - </div> 170 - </div> 171 - <div class="col-md-3"> 172 - <div class="card anywhere"> 173 - <div class="card-header"></div> 174 - <div class="card-content"> 175 - <h3 class="card-title">Anywhere</h3> 176 - <p> 177 - upload or generate your data and access it anywhere anytime, from your local machine to the most powerful high performance computers 178 - </p> 179 - </div> 180 - </div> 181 - </div> 182 - </div> 183 -</div> 184 - <div class="row"> 185 -<div class="col-md-12"> 49 +{{HighlightedCollabs featured="true" slider="true" /}} 186 186 187 -<p class="alert-info"> 188 -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> 189 - </div> 190 - </div> 51 +))) 52 +))) 191 191 192 - <div class="row"> 193 - <div class="col-md-6 col-md-offset-3"> 194 - <form role="search" class="clb-search-bar" action="/bin/view/Main/Search" method="GET"> 195 - <div> 196 - <input type="text" class="form-control" name="text"> 197 - <i class="glyphicon glyphicon-search"></i> 198 - </div> 199 - <button class="btn clb-btn-default" type="submit">Search</button> 200 - </form> 201 - </div> 202 - </div> 203 -</div> 204 -<div class="container-fluid clb-actions"> 205 - <div class="container"> 206 - <div class="row"> 54 +(% class="container" %) 55 +((( 56 +(% class="row explore-all" %) 57 +((( 58 + (% class="col-md-12" %) 59 +((( 60 +Explore all the [[Collabs]] 61 +))) 62 +))) 63 +))) 207 207 208 - <div class="col-md-4"> 209 - <div class="row"> 210 - <div class="col-md-10 text-center clb-box-container"> 211 - <a class="clb-box" href="/bin/view/Collabs/"> 212 - <h3 class="clb-box-title">Browse Collabs</h3> 213 - <p> 214 - Find a collab, or create yours. 215 - </p> 216 - </a> 217 - </div> 218 - </div> 219 - </div> 220 - 221 - <div class="col-md-4"> 222 - <div class="row"> 223 - <div class="col-md-10 col-md-offset-1 text-center clb-box-container"> 224 - <a class="clb-box" target="_blank" href="https://ebrains.eu/support/"> 225 - <h3 class="clb-box-title">Support</h3> 226 - <p> 227 - Open and track support tickets on our support site. 228 - </p> 229 - </a> 230 - </div> 231 - </div> 232 - </div> 233 - 234 - <div class="col-md-4"> 235 - <div class="row"> 236 - <div class="col-md-10 col-md-offset-2 text-center clb-box-container"> 237 - <a class="clb-box" href="/bin/view/Feedback/"> 238 - <h3 class="clb-box-title">Feedback</h3> 239 - <p> 240 - Please, give us a feedback about the new collaboratory. 241 - </p> 242 - </a> 243 - </div> 244 - </div> 245 - </div> 246 - </div> 247 - </div> 248 -</div --> 249 -{{/html}}
- XWiki.StyleSheetExtension[0]
-
- Code
-
... ... @@ -1,9 +7,3 @@ 1 -/* 2 -.teasing .collaborate {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/collaborate.jpg');} 3 -.teasing .reproductible {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/reproducible.jpg');} 4 -.teasing .science {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/science.jpg');} 5 -.teasing .anywhere {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/anywhere.jpg');} 6 -*/ 7 7 #mainContentArea{ 8 8 padding:0; 9 9 padding-top:1.25rem ... ... @@ -24,194 +24,11 @@ 24 24 padding-left:0; 25 25 padding-right:0; 26 26 min-height:300px; 27 - /*28 - p.alert-info{29 - padding:2rem21 + .search__row input[type="search"] { 22 + font-size: 16px; 23 + height: 54px; 30 30 } 31 - .teasing{ 32 - margin-bottom:50px 33 - } 34 - .teasing .card{ 35 - text-align:center; 36 - position:relative; 37 - height:100%; 38 - background-size:cover; 39 - background-repeat:no-repeat; 40 - background-position:50% 50%; 41 - padding-bottom:20px; 42 - margin-bottom:20px 43 - } 44 - .teasing .card::before{ 45 - position:absolute; 46 - top:0; 47 - right:0; 48 - bottom:0; 49 - left:0; 50 - display:block; 51 - background-image:linear-gradient(to top,rgba(0,0,0,.9),transparent 85%); 52 - content:'' 53 - } 54 - .teasing .card-header{ 55 - position:relative; 56 - height:150px 57 - } 58 - .teasing .coming-soon{ 59 - position:absolute; 60 - z-index:10; 61 - left:0; 62 - right:0; 63 - padding:.5rem; 64 - border-radius:.25rem; 65 - font-weight:700; 66 - top:50% 67 - } 68 - .teasing .coming-soon span{ 69 - font-size:1.25rem; 70 - line-height:2; 71 - padding:.5rem; 72 - border-radius:.25rem; 73 - font-weight:700; 74 - margin-top:-17px; 75 - background:rgba(255,255,255,.8); 76 - } 77 - .teasing .card-content { 78 - position:relative; 79 - overflow:hidden; 80 - margin-top:0; 81 - padding-top:0; 82 - padding-bottom:0; 83 - padding-left:.5rem; 84 - padding-right:.5rem; 85 - color: @color-white; 86 - font-size:1rem; 87 - .card-title { 88 - color:@color-white; 89 - } 90 - } 91 - .teasing .card-title{ 92 - margin-top:1.5rem; 93 - margin-right:0; 94 - margin-bottom:1rem; 95 - margin-left:0; 96 - font-weight:700 97 - } 98 - .clb-actions { 99 - background-color:#f0f3f1; 100 - padding-top:5rem; 101 - padding-left:0; 102 - padding-right:0; 103 - padding-bottom:0 104 - } 105 - .clb-actions .clb-box{ 106 - margin-bottom:5rem; 107 - font-size:1.125rem; 108 - display: block 109 - } 110 - .clb-actions>.row{ 111 - margin-left:0; 112 - margin-right:0 113 - } 114 - .clb-actions .clb-box:hover{ 115 - text-decoration:none 116 - } 117 - .clb-content>.row{ 118 - margin-bottom:5rem 119 - } 120 -*/ 121 - .clb-search-bar{ 122 - display:flex; 123 - align-items:stretch; 124 - position:relative 125 - } 126 - .clb-search-bar>div{ 127 - flex:1; 128 - margin:2px 10px 2px 0 129 - } 130 - .clb-search-bar input[type=text]{ 131 - width:100%; 132 - padding:1.5rem; 133 - padding-left:2.5rem; 134 - border-radius: @border-radius-default; 135 - background-color: @color-white; 136 - box-shadow:none 137 - } 138 - .clb-search-bar input[type=text]:focus{ 139 - border-color: @color-brand-primary; 140 - background-color:@color-white; 141 - box-shadow:none 142 - } 143 - .clb-search-bar i{ 144 - position:absolute; 145 - margin-top:-.5rem; 146 - color: @color-gray-200; 147 - top:50%; 148 - left:1em 149 - } 150 - .clb-search-bar input[type=text]:focus~i{ 151 - color: @color-brand-primary; 152 - } 153 - /* 154 - @media screen and (min-width:992px){ 155 - .teasing .row{ 156 - display:flex 157 - } 158 - .teasing .row>[class*=col-]{ 159 - display:flex; 160 - flex-direction:column 161 - } 162 - .clb-actions{ 163 - padding-bottom:5rem 164 - } 165 - .clb-actions .clb-box{ 166 - margin-bottom:0 167 - } 168 - .clb-actions .container, 169 - .clb-actions .container>.row{ 170 - display:flex 171 - } 172 - .clb-actions .clb-box-container, 173 - .clb-actions .clb-box-container a, 174 - .clb-actions .container>.row>[class*=col-]>.row{ 175 - height:100%; 176 - display:block 177 - } 178 - } 179 - */ 180 180 } 181 - 182 -.clb-box{ 183 - background-color:#fff; 184 - box-shadow:0 1px 2px 0 rgba(0,0,0,.1); 185 - padding:2rem; 186 - padding-bottom:5rem; 187 - color: @color-brand-primary; 188 - display:block 189 - .clb-box-title { 190 - color:#45b07c; 191 - font-weight:600; 192 - margin-bottom:5rem; 193 - } 194 -} 195 - 196 -.clb-btn-default,button { 197 - background-image:none; 198 - box-shadow:none; 199 - border:0; 200 - border-radius: @border-radius-default; 201 - padding-top:.5rem; 202 - padding-bottom:.5rem; 203 - padding-left:1rem; 204 - padding-right:1rem; 205 - background-color:@color-brand-primary; 206 - color: @color-white; 207 - &:hover { 208 - background-color: darken(@color-brand-primary, 10%); 209 - } 210 - &:active { 211 - background-color: darken(@color-brand-primary, 15%); 212 - } 213 -} 214 - 215 215 #xwikicontent .get-started__row__title { 216 216 margin: 1rem 0; 217 217 font-weight: 400; ... ... @@ -218,8 +218,12 @@ 218 218 color: var(@color-brand-primary); 219 219 } 220 220 32 +.hero-text h3 { 33 + line-height:1.3em; 34 +} 35 + 221 221 .search__row { 222 - padding: 1rem;37 + padding:2rem; 223 223 margin: 2rem 0; 224 224 background: @color-xwiki-gray; 225 225 } ... ... @@ -226,20 +226,27 @@ 226 226 .get-started__row__text { 227 227 color: #4a5568; 228 228 } 229 -.get-started__title { 44 +.get-started__title, .highlighted__title{ 230 230 text-align: center; 231 231 color: #aaa; 232 - /*padding: 10rem 0;*/ 233 - padding:4rem 0; 47 + padding:2rem 0 0.5rem 0; 234 234 font-size: 2rem; 235 - border-top: 1px solid #ccc; 236 - /*margin-top: 10rem;*/ 237 - margin-top: 5rem; 238 238 } 239 239 .get-started__row { 240 240 margin-top: 3rem; 241 241 } 242 242 54 +.pre-footer, .explore-all { 55 + font-size: 32px; 56 + line-height: 42px; 57 + text-align: center; 58 +} 59 + 60 +.explore-all{ 61 + padding-top: 5rem; 62 + padding-bottom: 5rem; 63 +} 64 + 243 243 @media screen and (min-width: 992px) { 244 244 .get-started__row { 245 245 display: flex; ... ... @@ -250,51 +250,47 @@ 250 250 margin-bottom: 1rem; 251 251 } 252 252 } 253 -.pre-footer { 254 - margin: 10rem 0; 255 - padding: 10rem 0; 256 - text-align: center; 257 - border-top: 1px solid #ccc; 258 - border-bottom: 1px solid #ccc; 259 -} 260 260 261 -. tags__title, .tags__text{262 - text-align:center;76 +.glider-contain { 77 + min-height: 502px; 263 263 } 264 - 265 -.tags__title--collaborate, 266 -.tags__title--science, 267 -.tags__title--reproducible, 268 -.tags__title--anywhere { 269 - padding-top: 4rem; 270 - position: relative; 79 +.glider { 80 + .highlighted-collab { 81 + position:relative; 82 + border: 1px solid #CCC; 83 + margin: 0 1rem; 84 + height: 100%; 85 + border-radius: @border-radius-default; 86 + > p, 87 + > h3 { 88 + padding-left: 1rem; 89 + padding-right: 1rem; 90 + } 91 + } 271 271 } 272 - 273 -.tags__title--collaborate::before, 274 -.tags__title--science::before, 275 -.tags__title--reproducible::before, 276 -.tags__title--anywhere::before { 277 - position: absolute; 278 - width: 50px; 279 - height: 50px; 280 - background-repeat: none; 281 - top: 0; 282 - margin-left: 50%; 283 - left: -25px; 284 - content: " "; 285 - display: table; 93 +.highlighted-image{ 94 + /*height: 250px;*/ 95 + background-size: cover; 286 286 } 287 - 288 -.tags__title--collaborate::before { 289 - background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Collaborate.svg"); 97 +.stretched-link { 98 + &::after { 99 + position: absolute; 100 + top: 0; 101 + right: 0; 102 + bottom: 0; 103 + left: 0; 104 + z-index: 1; 105 + // Just in case `pointer-events: none` is set on a parent 106 + pointer-events: auto; 107 + content: ""; 108 + // IE10 bugfix, see https://stackoverflow.com/questions/16947967/ie10-hover-pseudo-class-doesnt-work-without-background-color 109 + background-color: rgba(0, 0, 0, 0); 110 + } 290 290 } 291 -.tags__title--science::before { 292 - background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Science.svg"); 293 -} 294 -.tags__title--reproducible::before { 295 - background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Reproducible.svg"); 296 -} 297 -.tags__title--anywhere::before { 298 - background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Anywhere.svg"); 299 -} 300 300 113 +.pre-footer { 114 + margin: 8rem 0 2rem; 115 + padding: 5rem 0; 116 + border-top: 1px solid #ccc; 117 + /*border-bottom: 1px solid #ccc;*/ 118 +}
- XWiki.DocumentSheetBinding[0]
-