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. messines1 +XWiki.bougault - Content
-
... ... @@ -5,119 +5,59 @@ 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> 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" /> 12 + </div> 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> 16 + </div> 20 20 </div> 21 21 </div> 22 - </div> 23 - <div class="col-md-3"> 24 - <div class="card reproductible"> 25 - <div class="card-header"></div> 26 - <div class="card-content"> 27 - <h3 class="card-title">Reproducible</h3> 28 - <p> 29 - initiate environments, install libraries, find and access datasets to create the stable fertile ground for your experiments 30 - </p> 31 - </div> 19 + <div class="container-fluid search__row"> 20 + <div class="container"> 21 + <form role="search" class="clb-search-bar" action="/bin/view/Main/Search" method="GET"> 22 + <div class="col-md-5 col-md-offset-3"> 23 + <div class="form-input"> 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 + </div> 28 + <div class="col-md-1"> 29 + <button class="btn clb-btn-default" type="submit">Search</button> 30 + </div> 31 + </form> 32 + </div> 32 32 </div> 33 - </div> 34 - <div class="col-md-3"> 35 - <div class="card science"> 36 - <div class="card-header"></div> 37 - <div class="card-content"> 38 - <h3 class="card-title">Science</h3> 39 - <p> 40 - develop code, visualise results, generate data and collaborate on your research 41 - </p> 42 - </div> 43 - </div> 44 - </div> 45 - <div class="col-md-3"> 46 - <div class="card anywhere"> 47 - <div class="card-header"></div> 48 - <div class="card-content"> 49 - <h3 class="card-title">Anywhere</h3> 50 - <p> 51 - upload or generate your data and access it anywhere anytime, from your local machine to the most powerful high performance computers 52 - </p> 53 - </div> 54 - </div> 55 - </div> 56 - </div> 57 -</div> 58 - <div class="row"> 59 -<div class="col-md-12"> 34 +{{/html}} 60 60 61 -<p class="alert-info"> 62 -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> 63 - </div> 64 - </div> 36 +(% class="container highlighted"%)((( 65 65 66 - <div class="row"> 67 - <div class="col-md-6 col-md-offset-3"> 68 - <form role="search" class="clb-search-bar" action="/bin/view/Main/Search" method="GET"> 69 - <div> 70 - <input type="text" class="form-control" name="text"> 71 - <i class="glyphicon glyphicon-search"></i> 72 - </div> 73 - <button class="btn clb-btn-default" type="submit">Search</button> 74 - </form> 75 - </div> 76 - </div> 38 +(% class="highlighted__title" %) 39 +==== Highlighted collabs ==== 40 +{{html clean="false"}} 41 +<div class="container centered"> 42 +<a href="/bin/view/Collabs/the-collaboratory/Highlights" class="highlighted_view_all">View all</a> 77 77 </div> 78 - <div class="container-fluid clb-actions">79 - <divclass="container">80 - <div class="row">44 +{{/html}} 45 +(% class="row highlighted_row" %) 46 +((( 81 81 82 - <div class="col-md-4"> 83 - <div class="row"> 84 - <div class="col-md-10 text-center clb-box-container"> 85 - <a class="clb-box" href="/bin/view/Collabs/"> 86 - <h3 class="clb-box-title">Browse Collabs</h3> 87 - <p> 88 - Find a collab, or create yours. 89 - </p> 90 - </a> 91 - </div> 92 - </div> 93 - </div><!-- /.col-md-4 --> 48 +{{HighlightedCollabs featured="true" slider="true" /}} 94 94 95 - <div class="col-md-4"> 96 - <div class="row"> 97 - <div class="col-md-10 col-md-offset-1 text-center clb-box-container"> 98 - <a class="clb-box" target="_blank" href="https://ebrains.eu/support/"> 99 - <h3 class="clb-box-title">Support</h3> 100 - <p> 101 - Open and track support tickets on our support site. 102 - </p> 103 - </a> 104 - </div> 105 - </div> 106 - </div><!-- /.col-md-4 --> 50 +))) 51 +))) 107 107 108 - <div class="col-md-4"> 109 - <div class="row"> 110 - <div class="col-md-10 col-md-offset-2 text-center clb-box-container"> 111 - <a class="clb-box" href="/bin/view/Feedback/"> 112 - <h3 class="clb-box-title">Feedback</h3> 113 - <p> 114 - Please, give us a feedback about the new collaboratory. 115 - </p> 116 - </a> 117 - </div> 118 - </div> 119 - </div><!-- /.col-md-4 --> 120 - </div> 121 - </div> 122 -</div> 123 -{{/html}} 53 +(% class="container" %) 54 +((( 55 +(% class="row explore-all" %) 56 +((( 57 + (% class="col-md-12" %) 58 +((( 59 +Explore all the [[Collabs]] 60 +))) 61 +))) 62 +))) 63 +
- XWiki.StyleSheetExtension[0]
-
- Code
-
... ... @@ -1,129 +6,30 @@ 1 -.teasing .collaborate {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/collaborate.jpg');} 2 -.teasing .reproductible {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/reproducible.jpg');} 3 -.teasing .science {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/science.jpg');} 4 -.teasing .anywhere {background-image: url('/bin/skin/Collaboratory/UX/HbpSkin/anywhere.jpg');} 5 - 6 6 #mainContentArea{ 7 7 padding:0; 8 8 padding-top:1.25rem 9 9 } 5 +.document-header, 10 10 #mainContentArea #hierarchy, 11 11 #mainContentArea .xcontent>hr, 12 12 #mainContentArea .xdocLastModification{ 13 13 display:none 14 14 } 11 + 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; 29 - p.alert-info{ 30 - padding:2rem 31 - } 32 - .teasing{ 33 - margin-bottom:50px 34 - } 35 - .teasing .card{ 36 - text-align:center; 37 - position:relative; 38 - height:100%; 39 - background-size:cover; 40 - background-repeat:no-repeat; 41 - background-position:50% 50%; 42 - padding-bottom:20px; 43 - margin-bottom:20px 44 - } 45 - .teasing .card::before{ 46 - position:absolute; 47 - top:0; 48 - right:0; 49 - bottom:0; 50 - left:0; 51 - display:block; 52 - background-image:linear-gradient(to top,rgba(0,0,0,.9),transparent 85%); 53 - content:'' 54 - } 55 - .teasing .card-header{ 56 - position:relative; 57 - height:150px 58 - } 59 - .teasing .coming-soon{ 60 - position:absolute; 61 - z-index:10; 62 - left:0; 63 - right:0; 64 - padding:.5rem; 65 - border-radius:.25rem; 66 - font-weight:700; 67 - top:50% 68 - } 69 - .teasing .coming-soon span{ 70 - font-size:1.25rem; 71 - line-height:2; 72 - padding:.5rem; 73 - border-radius:.25rem; 74 - font-weight:700; 75 - margin-top:-17px; 76 - background:rgba(255,255,255,.8); 77 - } 78 - .teasing .card-content { 79 - position:relative; 80 - overflow:hidden; 81 - margin-top:0; 82 - padding-top:0; 83 - padding-bottom:0; 84 - padding-left:.5rem; 85 - padding-right:.5rem; 86 - color: @color-white; 87 - font-size:1rem; 88 - .card-title { 89 - color:@color-white; 90 - } 91 - } 92 - .teasing .card-title{ 93 - margin-top:1.5rem; 94 - margin-right:0; 95 - margin-bottom:1rem; 96 - margin-left:0; 97 - font-weight:700 98 - } 99 - .clb-actions { 100 - background-color:#f0f3f1; 101 - padding-top:5rem; 102 - padding-left:0; 103 - padding-right:0; 104 - padding-bottom:0 105 - } 106 - .clb-actions .clb-box{ 107 - margin-bottom:5rem; 108 - font-size:1.125rem; 109 - display: block 110 - } 111 - .clb-actions>.row{ 112 - margin-left:0; 113 - margin-right:0 114 - } 115 - .clb-actions .clb-box:hover{ 116 - text-decoration:none 117 - } 118 - .clb-content>.row{ 119 - margin-bottom:5rem 120 - } 21 + 121 121 .clb-search-bar{ 122 122 display:flex; 123 123 align-items:stretch; 124 124 position:relative 125 125 } 126 - .clb-search-bar >div{27 + .clb-search-bar .form-input { 127 127 flex:1; 128 128 margin:2px 10px 2px 0 129 129 } ... ... @@ -150,6 +150,7 @@ 150 150 .clb-search-bar input[type=text]:focus~i{ 151 151 color: @color-brand-primary; 152 152 } 54 + /* 153 153 @media screen and (min-width:992px){ 154 154 .teasing .row{ 155 155 display:flex ... ... @@ -175,6 +175,7 @@ 175 175 display:block 176 176 } 177 177 } 80 + */ 178 178 } 179 179 180 180 .clb-box{ ... ... @@ -209,3 +209,138 @@ 209 209 background-color: darken(@color-brand-primary, 15%); 210 210 } 211 211 } 115 + 116 +#xwikicontent .get-started__row__title { 117 + margin: 1rem 0; 118 + font-weight: 400; 119 + color: var(@color-brand-primary); 120 +} 121 + 122 +.hero-text h3 { 123 + line-height:1.3em; 124 +} 125 + 126 +.search__row { 127 + padding:2rem; 128 + margin: 2rem 0; 129 + background: @color-xwiki-gray; 130 +} 131 +.get-started__row__text { 132 + color: #4a5568; 133 +} 134 +.get-started__title, .highlighted__title{ 135 + text-align: center; 136 + color: #aaa; 137 + padding:2rem 0 0.5rem 0; 138 + font-size: 2rem; 139 +} 140 +.get-started__row { 141 + margin-top: 3rem; 142 +} 143 + 144 +.pre-footer, .explore-all { 145 + font-size: 32px; 146 + line-height: 42px; 147 + text-align: center; 148 +} 149 + 150 +.explore-all{ 151 + padding-top: 5rem; 152 + padding-bottom: 5rem; 153 +} 154 + 155 +@media screen and (min-width: 992px) { 156 + .get-started__row { 157 + display: flex; 158 + align-items: center; 159 + } 160 + #xwikicontent .get-started__row__title { 161 + margin: 0; 162 + margin-bottom: 1rem; 163 + } 164 +} 165 + 166 +.glider-contain { 167 + min-height: 502px; 168 +} 169 +.glider { 170 + .highlighted-collab { 171 + position:relative; 172 + border: 1px solid #CCC; 173 + margin: 0 1rem; 174 + height: 100%; 175 + border-radius: @border-radius-default; 176 + > p, 177 + > h3 { 178 + padding-left: 1rem; 179 + padding-right: 1rem; 180 + } 181 + } 182 +} 183 +.highlighted-image{ 184 + /*height: 250px;*/ 185 + background-size: cover; 186 +} 187 +.stretched-link { 188 + &::after { 189 + position: absolute; 190 + top: 0; 191 + right: 0; 192 + bottom: 0; 193 + left: 0; 194 + z-index: 1; 195 + // Just in case `pointer-events: none` is set on a parent 196 + pointer-events: auto; 197 + content: ""; 198 + // IE10 bugfix, see https://stackoverflow.com/questions/16947967/ie10-hover-pseudo-class-doesnt-work-without-background-color 199 + background-color: rgba(0, 0, 0, 0); 200 + } 201 +} 202 + 203 +.pre-footer { 204 + margin: 8rem 0 2rem; 205 + padding: 5rem 0; 206 + border-top: 1px solid #ccc; 207 + /*border-bottom: 1px solid #ccc;*/ 208 +} 209 + 210 +.tags__title, .tags__text { 211 + text-align: center; 212 +} 213 + 214 +.tags__title--collaborate, 215 +.tags__title--science, 216 +.tags__title--reproducible, 217 +.tags__title--anywhere { 218 + padding-top: 4rem; 219 + position: relative; 220 +} 221 + 222 +.tags__title--collaborate::before, 223 +.tags__title--science::before, 224 +.tags__title--reproducible::before, 225 +.tags__title--anywhere::before { 226 + position: absolute; 227 + width: 50px; 228 + height: 50px; 229 + background-repeat: none; 230 + top: 0; 231 + margin-left: 50%; 232 + left: -25px; 233 + content: " "; 234 + display: table; 235 +} 236 + 237 +.tags__title--collaborate::before { 238 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Collaborate.svg"); 239 +} 240 +.tags__title--science::before { 241 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Science.svg"); 242 +} 243 +.tags__title--reproducible::before { 244 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Reproducible.svg"); 245 +} 246 +.tags__title--anywhere::before { 247 + background-image: url("/bin/skin/Collaboratory/UX/HbpSkin/Anywhere.svg"); 248 +} 249 +
- XWiki.DocumentSheetBinding[0]
-