@@ -214,7 +214,7 @@ |
||
214 | 214 |
"160 x 100, incisões com tesoura, 2012", |
215 | 215 |
"160 x 100, incisions with scissors on paper, 2012" |
216 | 216 |
], |
217 |
- "url": "content/images/recorte.jpg" |
|
217 |
+ "url": "content/images/recorte-1.jpg" |
|
218 | 218 |
} |
219 | 219 |
] |
220 | 220 |
} |
@@ -268,7 +268,7 @@ |
||
268 | 268 |
"120 x 81, nanquim sobre papel, 2016", |
269 | 269 |
"120 x 81, ink on paper, 2016" |
270 | 270 |
], |
271 |
- "url": "content/images/tapecaria-2.jpg" |
|
271 |
+ "url": "content/images/tapete-2.jpg" |
|
272 | 272 |
} |
273 | 273 |
] |
274 | 274 |
} |
@@ -1066,7 +1066,7 @@ |
||
1066 | 1066 |
"220 x 200 x 220, tela de nylon, carvão e madeira, 1992", |
1067 | 1067 |
"220 x 200 x 220, nylon netting, charcoal, wood, 1992" |
1068 | 1068 |
], |
1069 |
- "url": "content/images/esculturas-carvao-1.jpg" |
|
1069 |
+ "url": "content/images/esculturas-carvao-3.jpg" |
|
1070 | 1070 |
} |
1071 | 1071 |
] |
1072 | 1072 |
}, |
@@ -1110,7 +1110,7 @@ |
||
1110 | 1110 |
"250 x 180 x 15, tela de nylon, pergaminho, carvão, escritos, 1993", |
1111 | 1111 |
"250 x 180 x 15, nylon netting, charcoal, parchment, writings, 1993" |
1112 | 1112 |
], |
1113 |
- "url": "content/images/esculturas-carvao-3.jpg" |
|
1113 |
+ "url": "content/images/esculturas-carvao-5.jpg" |
|
1114 | 1114 |
} |
1115 | 1115 |
] |
1116 | 1116 |
}, |
@@ -1154,7 +1154,7 @@ |
||
1154 | 1154 |
"80 x 180 x 7, nanquim sobre tela de nylon, 1993", |
1155 | 1155 |
"80 x 180 x 7, ink on nylon netting, 1993" |
1156 | 1156 |
], |
1157 |
- "url": "content/images/esculturas-carvao-5.jpg" |
|
1157 |
+ "url": "content/images/esculturas-carvao-6.jpg" |
|
1158 | 1158 |
} |
1159 | 1159 |
] |
1160 | 1160 |
}, |
@@ -1176,7 +1176,7 @@ |
||
1176 | 1176 |
"200 x 165 x 100, tela de nylon, carvão, pergaminho, escritos, 1993", |
1177 | 1177 |
"200 x 165 x 100, nylon netting, charcoal, parchment. writings, 1993" |
1178 | 1178 |
], |
1179 |
- "url": "content/images/esculturas-carvao-6.jpg" |
|
1179 |
+ "url": "content/images/esculturas-carvao-1.jpg" |
|
1180 | 1180 |
} |
1181 | 1181 |
] |
1182 | 1182 |
} |
@@ -1271,8 +1271,8 @@ |
||
1271 | 1271 |
"bibliographic piece" |
1272 | 1272 |
], |
1273 | 1273 |
"note" : [ |
1274 |
- "125 x 30 x 20, madeira, livros, 1994", |
|
1275 |
- "125 x 30 x 20, wood, books, 1994" |
|
1274 |
+ "182 x 7 x 11, madeira, livros, 1994", |
|
1275 |
+ "182 x 7 x 11, wood, books, 1994" |
|
1276 | 1276 |
], |
1277 | 1277 |
"url": "content/images/sono-08.jpg" |
1278 | 1278 |
} |
@@ -1293,8 +1293,8 @@ |
||
1293 | 1293 |
"bibliographic piece" |
1294 | 1294 |
], |
1295 | 1295 |
"note" : [ |
1296 |
- "125 x 30 x 20, madeira, livros, 1994", |
|
1297 |
- "125 x 30 x 20, wood, books, 1994" |
|
1296 |
+ "182 x 7 x 11, madeira, livros, 1994", |
|
1297 |
+ "182 x 7 x 11, wood, books, 1994" |
|
1298 | 1298 |
], |
1299 | 1299 |
"url": "content/images/sono-09.jpg" |
1300 | 1300 |
} |
@@ -1315,8 +1315,8 @@ |
||
1315 | 1315 |
"bibliographic piece" |
1316 | 1316 |
], |
1317 | 1317 |
"note" : [ |
1318 |
- "182 x 7 x 11, madeira, livro, 1994", |
|
1319 |
- "182 x 7 x 11, wood, book, 1994" |
|
1318 |
+ "125 x 30 x 20, madeira, livro, 1994", |
|
1319 |
+ "125 x 30 x 20, wood, book, 1994" |
|
1320 | 1320 |
], |
1321 | 1321 |
"url": "content/images/sono-12.jpg" |
1322 | 1322 |
} |
@@ -1360,7 +1360,7 @@ |
||
1360 | 1360 |
"Cabeça", |
1361 | 1361 |
"Head" |
1362 | 1362 |
], |
1363 |
- "link": "/slideshow/argila-1", |
|
1363 |
+ "link": "/slideshow/argila-4", |
|
1364 | 1364 |
"slides": [ |
1365 | 1365 |
{ |
1366 | 1366 |
"title": "Cabeça", |
@@ -1369,54 +1369,54 @@ |
||
1369 | 1369 |
"Head" |
1370 | 1370 |
], |
1371 | 1371 |
"note" : [ |
1372 |
- "32 x 14 x 26, argila, 1995", |
|
1373 |
- "32 x 14 x 26, clay, 1995" |
|
1372 |
+ "42 x 24 x40, argila, 1995", |
|
1373 |
+ "42 x 24 x40, clay, 1995" |
|
1374 | 1374 |
], |
1375 |
- "url": "content/images/argila-1.jpg" |
|
1375 |
+ "url": "content/images/argila-6.jpg" |
|
1376 | 1376 |
} |
1377 | 1377 |
] |
1378 | 1378 |
}, |
1379 | 1379 |
{ |
1380 |
- "title": "cabeça / perfil", |
|
1380 |
+ "title": "Cabeça", |
|
1381 | 1381 |
"i18n": [ |
1382 | 1382 |
"Cabeça", |
1383 | 1383 |
"Head" |
1384 | 1384 |
], |
1385 |
- "link": "/slideshow/argila-2", |
|
1385 |
+ "link": "/slideshow/argila-1", |
|
1386 | 1386 |
"slides": [ |
1387 | 1387 |
{ |
1388 |
- "title": "cabeça / perfil", |
|
1388 |
+ "title": "Cabeça", |
|
1389 | 1389 |
"i18n": [ |
1390 |
- "cabeça / perfil", |
|
1391 |
- "Head / profile" |
|
1390 |
+ "Cabeça", |
|
1391 |
+ "Head" |
|
1392 | 1392 |
], |
1393 | 1393 |
"note" : [ |
1394 |
- "30 x 15 x 22, argila, 1995", |
|
1395 |
- "30 x 15 x 22, clay, 1995" |
|
1394 |
+ "32 x 14 x 26, argila, 1995", |
|
1395 |
+ "32 x 14 x 26, clay, 1995" |
|
1396 | 1396 |
], |
1397 |
- "url": "content/images/argila-2.jpg" |
|
1397 |
+ "url": "content/images/argila-1.jpg" |
|
1398 | 1398 |
} |
1399 | 1399 |
] |
1400 | 1400 |
}, |
1401 | 1401 |
{ |
1402 |
- "title": "Cabeça", |
|
1402 |
+ "title": "cabeça / perfil", |
|
1403 | 1403 |
"i18n": [ |
1404 | 1404 |
"Cabeça", |
1405 | 1405 |
"Head" |
1406 | 1406 |
], |
1407 |
- "link": "/slideshow/argila-3", |
|
1407 |
+ "link": "/slideshow/argila-2", |
|
1408 | 1408 |
"slides": [ |
1409 | 1409 |
{ |
1410 |
- "title": "Cabeça", |
|
1410 |
+ "title": "cabeça / perfil", |
|
1411 | 1411 |
"i18n": [ |
1412 |
- "Cabeça", |
|
1413 |
- "Head" |
|
1412 |
+ "cabeça / perfil", |
|
1413 |
+ "Head / profile" |
|
1414 | 1414 |
], |
1415 | 1415 |
"note" : [ |
1416 | 1416 |
"30 x 15 x 22, argila, 1995", |
1417 | 1417 |
"30 x 15 x 22, clay, 1995" |
1418 | 1418 |
], |
1419 |
- "url": "content/images/argila-5.jpg" |
|
1419 |
+ "url": "content/images/argila-2.jpg" |
|
1420 | 1420 |
} |
1421 | 1421 |
] |
1422 | 1422 |
}, |
@@ -1426,7 +1426,7 @@ |
||
1426 | 1426 |
"Cabeça", |
1427 | 1427 |
"Head" |
1428 | 1428 |
], |
1429 |
- "link": "/slideshow/argila-4", |
|
1429 |
+ "link": "/slideshow/argila-3", |
|
1430 | 1430 |
"slides": [ |
1431 | 1431 |
{ |
1432 | 1432 |
"title": "Cabeça", |
@@ -1435,10 +1435,10 @@ |
||
1435 | 1435 |
"Head" |
1436 | 1436 |
], |
1437 | 1437 |
"note" : [ |
1438 |
- "42 x 24 x40, argila, 1995", |
|
1439 |
- "42 x 24 x40, clay, 1995" |
|
1438 |
+ "30 x 15 x 22, argila, 1995", |
|
1439 |
+ "30 x 15 x 22, clay, 1995" |
|
1440 | 1440 |
], |
1441 |
- "url": "content/images/argila-6.jpg" |
|
1441 |
+ "url": "content/images/argila-5.jpg" |
|
1442 | 1442 |
} |
1443 | 1443 |
] |
1444 | 1444 |
}, |
@@ -1501,8 +1501,8 @@ |
||
1501 | 1501 |
"relief (from Seurat)" |
1502 | 1502 |
], |
1503 | 1503 |
"note" : [ |
1504 |
- "188 x 60 x 40, argila, 1995", |
|
1505 |
- "188 x 60 x 40, clay, 1995" |
|
1504 |
+ "48 x 50 x 14, argila, 1995", |
|
1505 |
+ "48 x 50 x 14, clay, 1995" |
|
1506 | 1506 |
], |
1507 | 1507 |
"url": "content/images/relevos-01.jpg" |
1508 | 1508 |
} |
@@ -1514,7 +1514,7 @@ |
||
1514 | 1514 |
"relevo", |
1515 | 1515 |
"relief" |
1516 | 1516 |
], |
1517 |
- "link": "/slideshow/argila-7", |
|
1517 |
+ "link": "/slideshow/argila-8", |
|
1518 | 1518 |
"slides": [ |
1519 | 1519 |
{ |
1520 | 1520 |
"title": "relevo", |
@@ -1526,7 +1526,7 @@ |
||
1526 | 1526 |
"81 x 51 x 17, argila, 1997", |
1527 | 1527 |
"81 x 51 x 17, clay, 1997" |
1528 | 1528 |
], |
1529 |
- "url": "content/images/relevos-02.jpg" |
|
1529 |
+ "url": "content/images/relevos-06.jpg" |
|
1530 | 1530 |
} |
1531 | 1531 |
] |
1532 | 1532 |
}, |
@@ -1536,7 +1536,7 @@ |
||
1536 | 1536 |
"relevo", |
1537 | 1537 |
"relief" |
1538 | 1538 |
], |
1539 |
- "link": "/slideshow/argila-8", |
|
1539 |
+ "link": "/slideshow/argila-9", |
|
1540 | 1540 |
"slides": [ |
1541 | 1541 |
{ |
1542 | 1542 |
"title": "relevo", |
@@ -1548,7 +1548,7 @@ |
||
1548 | 1548 |
"200 x 100 x 40, edição única em gesso, 2001", |
1549 | 1549 |
"200 x 100 x 40, plaster cast, unique edition, 2001" |
1550 | 1550 |
], |
1551 |
- "url": "content/images/relevos-03.jpg" |
|
1551 |
+ "url": "content/images/relevos-08.jpg" |
|
1552 | 1552 |
} |
1553 | 1553 |
] |
1554 | 1554 |
}, |
@@ -1558,7 +1558,7 @@ |
||
1558 | 1558 |
"relevo", |
1559 | 1559 |
"relief" |
1560 | 1560 |
], |
1561 |
- "link": "/slideshow/argila-9", |
|
1561 |
+ "link": "/slideshow/argila-10", |
|
1562 | 1562 |
"slides": [ |
1563 | 1563 |
{ |
1564 | 1564 |
"title": "relevo", |
@@ -1570,7 +1570,7 @@ |
||
1570 | 1570 |
"150 x 100 x 40, edição única em gesso, 2002", |
1571 | 1571 |
"150 x 100 x 40, plaster cast, unique edition, 2002" |
1572 | 1572 |
], |
1573 |
- "url": "content/images/relevos-04.jpg" |
|
1573 |
+ "url": "content/images/relevos-09.jpg" |
|
1574 | 1574 |
} |
1575 | 1575 |
] |
1576 | 1576 |
}, |
@@ -1580,7 +1580,7 @@ |
||
1580 | 1580 |
"relevo / estudo de Rembrandt", |
1581 | 1581 |
"relief (from Rembrandt)" |
1582 | 1582 |
], |
1583 |
- "link": "/slideshow/argila-10", |
|
1583 |
+ "link": "/slideshow/argila-11", |
|
1584 | 1584 |
"slides": [ |
1585 | 1585 |
{ |
1586 | 1586 |
"title": "relevo / estudo de Rembrandt", |
@@ -1592,7 +1592,7 @@ |
||
1592 | 1592 |
"30 x 45 x 10, edição única em gesso, 2003", |
1593 | 1593 |
"30 x 45 x 10, plaster cast, unique edition, 2003" |
1594 | 1594 |
], |
1595 |
- "url": "content/images/relevos-05.jpg" |
|
1595 |
+ "url": "content/images/relevos-04.jpg" |
|
1596 | 1596 |
} |
1597 | 1597 |
] |
1598 | 1598 |
}, |
@@ -1602,7 +1602,7 @@ |
||
1602 | 1602 |
"relevo", |
1603 | 1603 |
"relief" |
1604 | 1604 |
], |
1605 |
- "link": "/slideshow/argila-11", |
|
1605 |
+ "link": "/slideshow/argila-12", |
|
1606 | 1606 |
"slides": [ |
1607 | 1607 |
{ |
1608 | 1608 |
"title": "relevo", |
@@ -1614,7 +1614,7 @@ |
||
1614 | 1614 |
"37 x 43 x 13, argila, 2003", |
1615 | 1615 |
"37 x 43 x 13, clay, 2003" |
1616 | 1616 |
], |
1617 |
- "url": "content/images/relevos-06.jpg" |
|
1617 |
+ "url": "content/images/relevos-02.jpg" |
|
1618 | 1618 |
} |
1619 | 1619 |
] |
1620 | 1620 |
} |
@@ -94,9 +94,9 @@ angular.module('goApp.background', ['famous.angular', 'goApp.data']) |
||
94 | 94 |
if($scope.current_video == $scope.last_video){ |
95 | 95 |
getVideo(); |
96 | 96 |
} |
97 |
- } |
|
97 |
+ }; |
|
98 | 98 |
|
99 |
- var wait_time = [3000, 1, 0] |
|
99 |
+ var wait_time = [3000, 1, 0]; |
|
100 | 100 |
var timer = function() { |
101 | 101 |
wait_time[2] = wait_time[2] + 1; |
102 | 102 |
if(wait_time[2] == 1) { |
@@ -106,7 +106,7 @@ angular.module('goApp.background', ['famous.angular', 'goApp.data']) |
||
106 | 106 |
wait_time = [2000, 30000, wait_time[2]]; |
107 | 107 |
} |
108 | 108 |
return wait_time; |
109 |
- } |
|
109 |
+ }; |
|
110 | 110 |
|
111 | 111 |
// Start Background Controller |
112 | 112 |
|
@@ -24,7 +24,7 @@ angular.module('goApp.contact', ['ngFx', 'ngAnimate', 'goApp.data', 'mandrill']) |
||
24 | 24 |
message : ["Mensagem", "Message"], |
25 | 25 |
error : ["Ocorreu um erro ao enviar a sua mensagem. Por favor tente novamente.", "An error ocured. Please try again."], |
26 | 26 |
success : ["Mensagem enviada com successo.", "Message sent."] |
27 |
- } |
|
27 |
+ }; |
|
28 | 28 |
|
29 | 29 |
console.log('> Loading Contact Page'); |
30 | 30 |
$mixpanel.track('Page View', { "Page": "Contact" }); |
@@ -13,7 +13,7 @@ angular.module('goApp.index', ['famous.angular', 'ngFx', 'ngAnimate']) |
||
13 | 13 |
'use strict'; |
14 | 14 |
$mixpanel.track('Page View', { "Page": "index" }); |
15 | 15 |
|
16 |
- console.log(">>> Select Language") |
|
16 |
+ console.log(">>> Select Language"); |
|
17 | 17 |
$scope.view_set_lang = false; |
18 | 18 |
if(!Data.isLangSet()) { |
19 | 19 |
$scope.view_set_lang = true; |
@@ -22,18 +22,18 @@ angular.module('goApp.index', ['famous.angular', 'ngFx', 'ngAnimate']) |
||
22 | 22 |
} |
23 | 23 |
|
24 | 24 |
$scope.btnSelectLang = function(lang){ |
25 |
- console.log('btn pressed') |
|
25 |
+ console.log('btn pressed'); |
|
26 | 26 |
switch(lang) { |
27 | 27 |
case 'pt-BR': |
28 | 28 |
Data.setLang(0); |
29 |
- console.log("> Selected Portuguese as default language") |
|
29 |
+ console.log("> Selected Portuguese as default language"); |
|
30 | 30 |
break; |
31 | 31 |
case 'en': |
32 | 32 |
Data.setLang(1); |
33 |
- console.log("> Selected English as default language") |
|
33 |
+ console.log("> Selected English as default language"); |
|
34 | 34 |
break; |
35 | 35 |
} |
36 | 36 |
$scope.view_set_lang = false; |
37 |
- } |
|
37 |
+ }; |
|
38 | 38 |
|
39 | 39 |
}]); |
@@ -34,7 +34,7 @@ angular.module('goApp.navigation', ['famous.angular', 'ngRoute', 'ngFx', 'ngAnim |
||
34 | 34 |
if(!$scope.$$phase) { |
35 | 35 |
$scope.$apply(function(){ |
36 | 36 |
$scope.navigation = filterByTranslation(Data.getNavigation()); |
37 |
- if(menu_opened == false){ |
|
37 |
+ if(menu_opened === false){ |
|
38 | 38 |
menu_opened = true; |
39 | 39 |
$scope.menu1pos = getMenuPos($scope.navigation.length); |
40 | 40 |
startRandomBgText(); |
@@ -42,13 +42,13 @@ angular.module('goApp.navigation', ['famous.angular', 'ngRoute', 'ngFx', 'ngAnim |
||
42 | 42 |
}); |
43 | 43 |
} else { |
44 | 44 |
$scope.navigation = filterByTranslation(Data.getNavigation()); |
45 |
- if(menu_opened == false){ |
|
45 |
+ if(menu_opened === false){ |
|
46 | 46 |
menu_opened = true; |
47 | 47 |
$scope.menu1pos = getMenuPos($scope.navigation.length); |
48 | 48 |
startRandomBgText(); |
49 | 49 |
} |
50 | 50 |
} |
51 |
- } |
|
51 |
+ }; |
|
52 | 52 |
|
53 | 53 |
$scope.subNavigation = []; |
54 | 54 |
$scope.sub2Navigation = []; |
@@ -111,22 +111,22 @@ angular.module('goApp.navigation', ['famous.angular', 'ngRoute', 'ngFx', 'ngAnim |
||
111 | 111 |
var getMenuPos = function(len) { |
112 | 112 |
var menu_size = len * 20; |
113 | 113 |
var max = window.innerHeight - menu_size - 25; |
114 |
- var pos = Math.floor(Math.random()*(max-15+1)+15) |
|
114 |
+ var pos = Math.floor(Math.random()*(max-15+1)+15); |
|
115 | 115 |
return {'margin-top': pos }; |
116 |
- } |
|
116 |
+ }; |
|
117 | 117 |
|
118 | 118 |
var filterByTranslation = function(nav){ |
119 |
- var new_nav = [] |
|
119 |
+ var new_nav = []; |
|
120 | 120 |
for (var i = 0; i < nav.length; i++) { |
121 |
- var obj = nav[i] |
|
122 |
- if(obj.i18n != undefined){ |
|
123 |
- if(obj.i18n[$scope.lang] != ""){ |
|
124 |
- new_nav.push(obj) |
|
121 |
+ var obj = nav[i]; |
|
122 |
+ if(obj.i18n !== undefined){ |
|
123 |
+ if(obj.i18n[$scope.lang] !== ""){ |
|
124 |
+ new_nav.push(obj); |
|
125 | 125 |
} |
126 | 126 |
} |
127 | 127 |
} |
128 | 128 |
return new_nav; |
129 |
- } |
|
129 |
+ }; |
|
130 | 130 |
|
131 | 131 |
$scope.random_text = ""; |
132 | 132 |
$scope.show_bg_text = false; |
@@ -136,27 +136,27 @@ angular.module('goApp.navigation', ['famous.angular', 'ngRoute', 'ngFx', 'ngAnim |
||
136 | 136 |
}; |
137 | 137 |
|
138 | 138 |
var startRandomBgText = function(){ |
139 |
- console.log("> Starting Random BG Text Function") |
|
139 |
+ console.log("> Starting Random BG Text Function"); |
|
140 | 140 |
$timeout(function(){ |
141 |
- console.log("> Showing BG Text") |
|
142 |
- $scope.random_text = "<p><span>Se a mão lança</span><br><span>no ar não fica</span><br><span>se a mão alcança</span><br><span>o que caiu</span></p></p>" |
|
141 |
+ console.log("> Showing BG Text"); |
|
142 |
+ $scope.random_text = "<p><span>Se a mão lança</span><br><span>no ar não fica</span><br><span>se a mão alcança</span><br><span>o que caiu</span></p></p>"; |
|
143 | 143 |
$scope.bg_text_style = randomPos(130, 50); |
144 | 144 |
$scope.show_bg_text = true; |
145 | 145 |
$timeout(function(){ |
146 |
- console.log("> Hiding BG Text") |
|
147 |
- $scope.random_text = "" |
|
146 |
+ console.log("> Hiding BG Text"); |
|
147 |
+ $scope.random_text = ""; |
|
148 | 148 |
$scope.show_bg_text = false; |
149 | 149 |
startRandomBgText(); |
150 | 150 |
}, randomIntFromInterval(8000, 15000)); |
151 |
- }, randomIntFromInterval(3000, 15000)); |
|
152 |
- } |
|
151 |
+ }, randomIntFromInterval(12000, 30000)); |
|
152 |
+ }; |
|
153 | 153 |
|
154 | 154 |
var randomPos = function(width, height){ |
155 | 155 |
var max_v = window.innerHeight - height - 50; |
156 |
- var pos_v = Math.floor(Math.random() * max_v) |
|
156 |
+ var pos_v = Math.floor(Math.random() * max_v); |
|
157 | 157 |
var max_h = window.innerWidth - width - 50; |
158 |
- var pos_h = Math.floor(randomIntFromInterval((window.innerWidth/3),max_h)) |
|
158 |
+ var pos_h = Math.floor(randomIntFromInterval((window.innerWidth/3),max_h)); |
|
159 | 159 |
return {'top': pos_v, 'left' : pos_h, 'width' : width, 'height' : height }; |
160 |
- } |
|
160 |
+ }; |
|
161 | 161 |
|
162 | 162 |
}]); |
@@ -24,15 +24,15 @@ angular.module('goApp.data', []) |
||
24 | 24 |
lang = n; |
25 | 25 |
lang_set = true; |
26 | 26 |
$rootScope.$broadcast('data:lang_set', data); |
27 |
- } |
|
27 |
+ }; |
|
28 | 28 |
|
29 | 29 |
this.getLang = function(){ |
30 | 30 |
return lang; |
31 |
- } |
|
31 |
+ }; |
|
32 | 32 |
|
33 | 33 |
this.isLangSet = function(){ |
34 | 34 |
return lang_set; |
35 |
- } |
|
35 |
+ }; |
|
36 | 36 |
|
37 | 37 |
this.get = function() { |
38 | 38 |
return data; |