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