Download as
Browse Code »

Commit 7a6c1af98f88bc6991dcc06e405421d11f5b8949

Authored by Adabriand Furtado
1 parent 26ff2eff
Exists in master

Add tab navigation on more elements

Showing 6 changed files with 56 additions and 42 deletions   Show diff stats
assets/css/base.css
  Diff comments   View file @7a6c1af
@@ -146,8 +146,6 @@ img { @@ -146,8 +146,6 @@ img {
146 .wl-section-title { 146 .wl-section-title {
147 position: absolute; 147 position: absolute;
148 top: -15px; 148 top: -15px;
149 - font-size: 14px;  
150 - font-weight: bold;  
151 color: #ffffff; 149 color: #ffffff;
152 text-transform: uppercase; 150 text-transform: uppercase;
153 text-align: center; 151 text-align: center;
@@ -158,6 +156,8 @@ img { @@ -158,6 +156,8 @@ img {
158 } 156 }
159 157
160 .wl-section-title .title { 158 .wl-section-title .title {
  159 + font-size: 24px;
  160 + font-weight: bold;
161 color: white; 161 color: white;
162 padding: 5px 0; 162 padding: 5px 0;
163 background-color: #0f78a7; 163 background-color: #0f78a7;
@@ -479,7 +479,12 @@ img { @@ -479,7 +479,12 @@ img {
479 border-bottom: 1px solid #bb6a1a; 479 border-bottom: 1px solid #bb6a1a;
480 } 480 }
481 481
  482 +.wl-ranking-header a {
  483 + text-decoration: none;
  484 +}
  485 +
482 .wl-ranking-header .title { 486 .wl-ranking-header .title {
  487 + color: #2d2d2d;
483 margin-bottom: 10px; 488 margin-bottom: 10px;
484 border-right: 1px solid #ccc; 489 border-right: 1px solid #ccc;
485 } 490 }
assets/js/presentation/presentation-modal.html
  Diff comments   View file @7a6c1af
1 -<div class="modal clean-modal presentation-modal fade" tabindex="-1"  
2 - role="dialog" aria-labelledby="modalUserSignal"> 1 +<div id="wl-presentation-modal" class="modal clean-modal presentation-modal fade" tabindex="-1"
  2 + role="dialog" aria-labelledby="wl-presentation-modal">
3 <div class="modal-dialog" role="document"> 3 <div class="modal-dialog" role="document">
4 <div class="modal-content"> 4 <div class="modal-content">
5 <div class="modal-body"> 5 <div class="modal-body">
assets/js/ranking/ranking.service.js
  Diff comments   View file @7a6c1af
@@ -21,10 +21,8 @@ @@ -21,10 +21,8 @@
21 return $http.get(PROJECT_CONF_URL).then(function(response) { 21 return $http.get(PROJECT_CONF_URL).then(function(response) {
22 var baseApiUrl = response.data.pybossa_url; 22 var baseApiUrl = response.data.pybossa_url;
23 return $http.get(baseApiUrl + RANKING_ENDPOINT).then(function(response) { 23 return $http.get(baseApiUrl + RANKING_ENDPOINT).then(function(response) {
24 -  
25 angular.forEach(response.data, function(obj, key) { 24 angular.forEach(response.data, function(obj, key) {
26 response.data[key] = splitToChunks(obj, NUMBER_OF_COLUMNS); 25 response.data[key] = splitToChunks(obj, NUMBER_OF_COLUMNS);
27 - console.log(response.data[key]);  
28 }); 26 });
29 console.log(response.data); 27 console.log(response.data);
30 return response.data; 28 return response.data;
assets/templates/header.html
  Diff comments   View file @7a6c1af
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <div id="main-menu" class="container-fluid container wl-nav-bar-container"> 27 <div id="main-menu" class="container-fluid container wl-nav-bar-container">
28 <div class="row wl-nav-bar-wrapper"> 28 <div class="row wl-nav-bar-wrapper">
29 <div class="col-xs-4 wl-logo-wrapper"> 29 <div class="col-xs-4 wl-logo-wrapper">
30 - <a href="#wl-presentation-video" du-smooth-scroll offset="42"> 30 + <a href="#wl-presentation-video" du-smooth-scroll offset="42">
31 <div class="wl-logo-wrapper-img"> 31 <div class="wl-logo-wrapper-img">
32 <img src="assets/img/wl-logo.png" alt="Logomarca do WikiLibras"> 32 <img src="assets/img/wl-logo.png" alt="Logomarca do WikiLibras">
33 </div> 33 </div>
assets/templates/sections.html
  Diff comments   View file @7a6c1af
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="row"> 3 <div class="row">
4 <div class="wl-video-control-wrapper"> 4 <div class="wl-video-control-wrapper">
5 <a href="#wl-presentation-video" du-smooth-scroll offset="42"> 5 <a href="#wl-presentation-video" du-smooth-scroll offset="42">
6 - <img class="wl-video-control" src="assets/img/wl-icon-play.png"> 6 + <img class="wl-video-control" src="assets/img/wl-icon-play.png" alt="Ícone de play">
7 </a> 7 </a>
8 </div> 8 </div>
9 </div> 9 </div>
@@ -17,11 +17,11 @@ @@ -17,11 +17,11 @@
17 <div class="row"> 17 <div class="row">
18 <div class="col-xs-12 wl-section-title"> 18 <div class="col-xs-12 wl-section-title">
19 <a href="#wl-overview" du-smooth-scroll> 19 <a href="#wl-overview" du-smooth-scroll>
20 - <div class="title">o 20 + <h2 class="title">o
21 que 21 que
22 já 22 já
23 produzimos 23 produzimos
24 - </div> 24 + </h2>
25 </a>> 25 </a>>
26 </div> 26 </div>
27 </div> 27 </div>
@@ -131,10 +131,10 @@ @@ -131,10 +131,10 @@
131 <div class="row"> 131 <div class="row">
132 <div class="col-xs-12 wl-section-title"> 132 <div class="col-xs-12 wl-section-title">
133 <a href="#wl-features" du-smooth-scroll> 133 <a href="#wl-features" du-smooth-scroll>
134 - <div class="title">você 134 + <h2 class="title">você
135 pode 135 pode
136 colaborar 136 colaborar
137 - </div> 137 + </h2>
138 </a> 138 </a>
139 </div> 139 </div>
140 <div class="col-xs-12 wl-features-container"> 140 <div class="col-xs-12 wl-features-container">
@@ -197,8 +197,9 @@ @@ -197,8 +197,9 @@
197 <div class="row"> 197 <div class="row">
198 <div class="col-xs-12 wl-section-title"> 198 <div class="col-xs-12 wl-section-title">
199 <a href="#wl-volunteers" du-smooth-scroll> 199 <a href="#wl-volunteers" du-smooth-scroll>
200 - <div class="title">pessoas  
201 - colaborando</div> 200 + <h2 class="title">
  201 + pessoas colaborando
  202 + </h2>
202 </a> 203 </a>
203 </div> 204 </div>
204 <div class="col-xs-12 wl-volunteers-container"> 205 <div class="col-xs-12 wl-volunteers-container">
@@ -216,9 +217,9 @@ @@ -216,9 +217,9 @@
216 <div class="wl-signs-and-ranking-wrapper" ng-controller="signsCtrl"> 217 <div class="wl-signs-and-ranking-wrapper" ng-controller="signsCtrl">
217 <div class="wl-section-title"> 218 <div class="wl-section-title">
218 <a href="#wl-signs-and-ranking" du-smooth-scroll> 219 <a href="#wl-signs-and-ranking" du-smooth-scroll>
219 - <div class="title">sinais 220 + <h2 class="title">sinais
220 construídos 221 construídos
221 - </div> 222 + </h2>
222 </a> 223 </a>
223 </div> 224 </div>
224 <div class="wl-section-description"> 225 <div class="wl-section-description">
@@ -226,16 +227,18 @@ @@ -226,16 +227,18 @@
226 </div> 227 </div>
227 <div class="wl-signs-container"> 228 <div class="wl-signs-container">
228 <div class="wl-signs-wrapper sign-video-container" ng-repeat="sign in signsData | limitTo: 9 track by $index" ng-click="showSignModal($index)"> 229 <div class="wl-signs-wrapper sign-video-container" ng-repeat="sign in signsData | limitTo: 9 track by $index" ng-click="showSignModal($index)">
229 - <video preload="metadata">  
230 - <source ng-repeat="source in sign.sources" vsrc="{{ source.path }}" type="{{ source.type }}" html5vfix>  
231 - Sem suporte a vídeos  
232 - </video> 230 + <a href="#">
  231 + <video preload="metadata">
  232 + <source ng-repeat="source in sign.sources" vsrc="{{ source.path }}" type="{{ source.type }}" html5vfix>
  233 + Sem suporte a vídeos
  234 + </video>
  235 + </a>
233 </div> 236 </div>
234 <div ng-repeat="i in [1,2,3]" ng-if="signsData.length % 3 === 0? false: i <= 3 - signsData.length % 3" class="wl-signs-wrapper"> 237 <div ng-repeat="i in [1,2,3]" ng-if="signsData.length % 3 === 0? false: i <= 3 - signsData.length % 3" class="wl-signs-wrapper">
235 </div> 238 </div>
236 </div> 239 </div>
237 - <div class="modal clean-modal sign-modal fade" tabindex="-1"  
238 - role="dialog" aria-labelledby="modalUserSignal"> 240 + <div id="wl-sign-modal" class="modal clean-modal sign-modal fade" tabindex="-1"
  241 + role="dialog" aria-labelledby="wl-sign-modal">
239 <div class="modal-dialog" role="document"> 242 <div class="modal-dialog" role="document">
240 <div class="modal-content"> 243 <div class="modal-content">
241 <div class="modal-body"> 244 <div class="modal-body">
@@ -257,45 +260,53 @@ @@ -257,45 +260,53 @@
257 <div class="wl-signs-and-ranking-wrapper" ng-controller="rankingCtrl"> 260 <div class="wl-signs-and-ranking-wrapper" ng-controller="rankingCtrl">
258 <div class="wl-section-title"> 261 <div class="wl-section-title">
259 <a href="#wl-signs-and-ranking" du-smooth-scroll> 262 <a href="#wl-signs-and-ranking" du-smooth-scroll>
260 - <div class="title">ranking  
261 - dos colaborandores  
262 - </div> 263 + <h2 class="title">
  264 + ranking dos colaborandores
  265 + </h2>
263 </a> 266 </a>
264 </div> 267 </div>
265 <div class="wl-section-description"></div> 268 <div class="wl-section-description"></div>
266 <div class="row"> 269 <div class="row">
267 <div class="col-xs-3 wl-ranking-header-wrapper" ng-click="setActiveTab(0)"> 270 <div class="col-xs-3 wl-ranking-header-wrapper" ng-click="setActiveTab(0)">
268 <div class="wl-ranking-header" ng-class="{'-active': activeTab === 0}"> 271 <div class="wl-ranking-header" ng-class="{'-active': activeTab === 0}">
269 - <div class="title">  
270 - Sinais construídos  
271 - </div> 272 + <a href="#">
  273 + <div class="title">
  274 + Sinais construídos
  275 + </div>
  276 + </a>
272 </div> 277 </div>
273 </div> 278 </div>
274 <div class="col-xs-3 wl-ranking-header-wrapper" ng-click="setActiveTab(1)"> 279 <div class="col-xs-3 wl-ranking-header-wrapper" ng-click="setActiveTab(1)">
275 <div class="wl-ranking-header" ng-class="{'-active': activeTab === 1}"> 280 <div class="wl-ranking-header" ng-class="{'-active': activeTab === 1}">
276 - <div class="title">  
277 - Sinais corrigidos  
278 - </div> 281 + <a href="#">
  282 + <div class="title">
  283 + Sinais corrigidos
  284 + </div>
  285 + </a>
279 </div> 286 </div>
280 </div> 287 </div>
281 <div class="col-xs-3 wl-ranking-header-wrapper" ng-click="setActiveTab(2)"> 288 <div class="col-xs-3 wl-ranking-header-wrapper" ng-click="setActiveTab(2)">
282 <div class="wl-ranking-header" ng-class="{'-active': activeTab === 2}"> 289 <div class="wl-ranking-header" ng-class="{'-active': activeTab === 2}">
283 - <div class="title">  
284 - Sinais avaliados  
285 - </div> 290 + <a href="#">
  291 + <div class="title">
  292 + Sinais avaliados
  293 + </div>
  294 + </a>
286 </div> 295 </div>
287 </div> 296 </div>
288 <div class="col-xs-3 wl-ranking-header-wrapper" ng-click="setActiveTab(3)"> 297 <div class="col-xs-3 wl-ranking-header-wrapper" ng-click="setActiveTab(3)">
289 <div class="wl-ranking-header" ng-class="{'-active': activeTab === 3}"> 298 <div class="wl-ranking-header" ng-class="{'-active': activeTab === 3}">
290 - <div class="title">  
291 - Vídeos enviados  
292 - </div> 299 + <a href="#">
  300 + <div class="title">
  301 + Vídeos enviados
  302 + </div>
  303 + </a>
293 </div> 304 </div>
294 </div> 305 </div>
295 </div> 306 </div>
296 <div ng-show="activeTab === 0" class="wl-ranking-container"> 307 <div ng-show="activeTab === 0" class="wl-ranking-container">
297 <div class="row" ng-repeat="row in rankingData.wikilibras"> 308 <div class="row" ng-repeat="row in rankingData.wikilibras">
298 - <div class="col-xs-6" ng-repeat="user in row"> 309 + <div class="col-xs-6" ng-repeat="user in row" ng-if="user.rank > 0">
299 <div class="wl-rank"> 310 <div class="wl-rank">
300 <div class="row"> 311 <div class="row">
301 <div class="col-xs-4"> 312 <div class="col-xs-4">
@@ -316,7 +327,7 @@ @@ -316,7 +327,7 @@
316 </div> 327 </div>
317 <div ng-show="activeTab === 1" class="wl-ranking-container"> 328 <div ng-show="activeTab === 1" class="wl-ranking-container">
318 <div class="row" ng-repeat="row in rankingData.corretor_sinais"> 329 <div class="row" ng-repeat="row in rankingData.corretor_sinais">
319 - <div class="col-xs-6" ng-repeat="user in row"> 330 + <div class="col-xs-6" ng-repeat="user in row" ng-if="user.rank > 0">
320 <div class="wl-rank"> 331 <div class="wl-rank">
321 <div class="row"> 332 <div class="row">
322 <div class="col-xs-4"> 333 <div class="col-xs-4">
@@ -337,7 +348,7 @@ @@ -337,7 +348,7 @@
337 </div> 348 </div>
338 <div ng-show="activeTab === 2" class="wl-ranking-container"> 349 <div ng-show="activeTab === 2" class="wl-ranking-container">
339 <div class="row" ng-repeat="row in rankingData.validador_sinais"> 350 <div class="row" ng-repeat="row in rankingData.validador_sinais">
340 - <div class="col-xs-6" ng-repeat="user in row"> 351 + <div class="col-xs-6" ng-repeat="user in row" ng-if="user.rank > 0">
341 <div class="wl-rank"> 352 <div class="wl-rank">
342 <div class="row"> 353 <div class="row">
343 <div class="col-xs-4"> 354 <div class="col-xs-4">
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 -<html lang="en"> 2 +<html lang="pt">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <!-- Bootstrap --> 8 <!-- Bootstrap -->
9 <link rel="stylesheet" type="text/css" href="assets/css/bootstrap.min.css"> 9 <link rel="stylesheet" type="text/css" href="assets/css/bootstrap.min.css">
10 <!-- CSS --> 10 <!-- CSS -->
11 - <link rel="stylesheet" type="text/css" href="assets/css/base.css" rel="stylesheet"> 11 + <link rel="stylesheet" type="text/css" href="assets/css/base.css">
12 <link rel='stylesheet' type='text/css' href='https://fonts.googleapis.com/css?family=Open+Sans:300'> 12 <link rel='stylesheet' type='text/css' href='https://fonts.googleapis.com/css?family=Open+Sans:300'>
13 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> 13 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
14 <!--[if lt IE 9]> 14 <!--[if lt IE 9]>