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