From b8f5c87e823d0b68d5e30f8de453ba90dcadc241 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 2 Apr 2019 14:38:27 +0200 Subject: sidebar from spreadsheet --- .../datasets/50_people_one_question/index.html | 4 ++-- site/public/datasets/brainwash/index.html | 24 ++++++++++++++++++++-- site/public/datasets/celeba/index.html | 4 ++-- site/public/datasets/cofw/index.html | 4 ++-- site/public/datasets/duke_mtmc/index.html | 4 ++-- site/public/datasets/facebook/index.html | 3 ++- site/public/datasets/hrt_transgender/index.html | 4 ++-- site/public/datasets/lfw/index.html | 4 ++-- site/public/datasets/market_1501/index.html | 4 ++-- site/public/datasets/msceleb/index.html | 4 ++-- site/public/datasets/pipa/index.html | 4 ++-- site/public/datasets/uccs/index.html | 4 ++-- site/public/datasets/viper/index.html | 4 ++-- 13 files changed, 46 insertions(+), 25 deletions(-) (limited to 'site/public/datasets') diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html index 540e2d0d..1b03fc7e 100644 --- a/site/public/datasets/50_people_one_question/index.html +++ b/site/public/datasets/50_people_one_question/index.html @@ -27,7 +27,8 @@
People One Question is a dataset of people from an online video series on YouTube and Vimeo used for building facial recogntion algorithms
People One Question dataset includes ... -

50 People 1 Question

+

50 People 1 Question

(PAGE UNDER DEVELOPMENT)

At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.

Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat

@@ -71,7 +72,6 @@
-->
-
diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html index 5e8f3a4c..c0830a96 100644 --- a/site/public/datasets/brainwash/index.html +++ b/site/public/datasets/brainwash/index.html @@ -27,7 +27,28 @@
Brainwash is a dataset of webcam images taken from the Brainwash Cafe in San Francisco in 2014
The Brainwash dataset includes 11,918 images of "everyday life of a busy downtown cafe" and is used for training head detection surveillance algorithms -

Brainwash Dataset

+

Brainwash Dataset

Brainwash is a head detection dataset created from San Francisco's Brainwash Cafe livecam footage. It includes 11,918 images of "everyday life of a busy downtown cafe" 1 captured at 100 second intervals throught the entire day. Brainwash dataset was captured during 3 days in 2014: October 27, November 13, and November 24. According the author's reserach paper introducing the dataset, the images were acquired with the help of Angelcam.com [cite orig paper].

Brainwash is not a widely used dataset but since its publication by Stanford University in 2015, it has notably appeared in several research papers from the National University of Defense Technology in Changsha, China. In 2016 and in 2017 researchers there conducted studies on detecting people's heads in crowded scenes for the purpose of surveillance 2 3.

If you happen to have been at Brainwash cafe in San Franscisco at any time on October 26, November 13, or November 24 in 2014 you are most likely included in the Brainwash dataset.

@@ -94,7 +115,6 @@
-
diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html index f1ee0c22..ef7a3b27 100644 --- a/site/public/datasets/celeba/index.html +++ b/site/public/datasets/celeba/index.html @@ -27,7 +27,8 @@
CelebA is a dataset of people...
CelebA includes... -

CelebA

+

CelebA

(PAGE UNDER DEVELOPMENT)

At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.

Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat

@@ -71,7 +72,6 @@
-->
-
diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html index 1f5aa315..3520aaa2 100644 --- a/site/public/datasets/cofw/index.html +++ b/site/public/datasets/cofw/index.html @@ -26,7 +26,8 @@
-

Caltech Occluded Faces in the Wild

+

Caltech Occluded Faces in the Wild

(PAGE UNDER DEVELOPMENT)

COFW is "is designed to benchmark face landmark algorithms in realistic conditions, which include heavy occlusions and large shape variations" [Robust face landmark estimation under occlusion].

RESEARCH below this line

@@ -81,7 +82,6 @@ To increase the number of training images, and since COFW has the exact same la
-->
-
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html index 83050506..c3e84053 100644 --- a/site/public/datasets/duke_mtmc/index.html +++ b/site/public/datasets/duke_mtmc/index.html @@ -27,7 +27,8 @@
Duke MTMC is a dataset of surveillance camera footage of students on Duke University campus
Duke MTMC contains over 2 million video frames and 2,000 unique identities collected from 8 HD cameras at Duke University campus in March 2014 -

Duke Multi-Target, Multi-Camera Tracking Dataset (Duke MTMC)

+

Duke Multi-Target, Multi-Camera Tracking Dataset (Duke MTMC)

[ PAGE UNDER DEVELOPMENT ]

Duke MTMC is a dataset of video recorded on Duke University campus during for the purpose of training, evaluating, and improving multi-target multi-camera tracking. The videos were recorded during February and March 2014 and cinclude

Includes a total of 888.8 minutes of video (ind. verified)

@@ -89,7 +90,6 @@
-
diff --git a/site/public/datasets/facebook/index.html b/site/public/datasets/facebook/index.html index 7fb1901a..e9adb3f2 100644 --- a/site/public/datasets/facebook/index.html +++ b/site/public/datasets/facebook/index.html @@ -27,7 +27,8 @@
TBD
TBD -
TBD

Statistics

+
TBD

{% include 'sidebar.html' %}

+

Statistics

Years
2002-2004
Images
13,233
Identities
5,749
Origin
Yahoo News Images
Funding
(Possibly, partially CIA)

Ignore content below these lines

  • Tool to create face datasets from Facebook https://github.com/ankitaggarwal011/FaceGrab
  • diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html index 528d1c3d..3215fb5d 100644 --- a/site/public/datasets/hrt_transgender/index.html +++ b/site/public/datasets/hrt_transgender/index.html @@ -27,7 +27,8 @@
    TBD
    TBD -

    HRT Transgender Dataset

    +

HRT Transgender Dataset

Who used HRT Transgender?

@@ -83,7 +84,6 @@
-->
-
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html index 5f076fc7..562169e4 100644 --- a/site/public/datasets/lfw/index.html +++ b/site/public/datasets/lfw/index.html @@ -27,7 +27,8 @@
Labeled Faces in The Wild (LFW) is the first facial recognition dataset created entirely from online photos
It includes 13,456 images of 4,432 people's images copied from the Internet during 2002-2004 and is the most frequently used dataset in the world for benchmarking face recognition algorithms. -
-
diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html index 951646e3..7d9f87f6 100644 --- a/site/public/datasets/market_1501/index.html +++ b/site/public/datasets/market_1501/index.html @@ -27,7 +27,8 @@
Market-1501 is a dataset is collection of CCTV footage from ...
The Market-1501 dataset includes ... -

Market-1501 ...

+

Market-1501 ...

(PAGE UNDER DEVELOPMENT)

@@ -69,7 +70,6 @@
-->
-
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html index 9a671c8e..ecab4c3a 100644 --- a/site/public/datasets/msceleb/index.html +++ b/site/public/datasets/msceleb/index.html @@ -27,7 +27,8 @@
MS Celeb is a dataset of web images used for training and evaluating face recognition algorithms
The MS Celeb dataset includes over 10,000,000 images and 93,000 identities of semi-public figures collected using the Bing search engine -

Microsoft Celeb Dataset (MS Celeb)

+

Microsoft Celeb Dataset (MS Celeb)

(PAGE UNDER DEVELOPMENT)

At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio.

Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat

@@ -87,7 +88,6 @@ -->

Add more analysis here

-
diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html index fe6a4742..ff4302eb 100644 --- a/site/public/datasets/pipa/index.html +++ b/site/public/datasets/pipa/index.html @@ -27,7 +27,8 @@
is a dataset...
PIPA subdescription -

Dataset Title TBD

+

Dataset Title TBD

(PAGE UNDER DEVELOPMENT)

@@ -69,7 +70,6 @@
-->
-
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html index 10b7603e..0925763b 100644 --- a/site/public/datasets/uccs/index.html +++ b/site/public/datasets/uccs/index.html @@ -27,7 +27,8 @@
Unconstrained College Students (UCCS) is a dataset of long-range surveillance photos of students taken without their knowledge
The UCCS dataset includes 16,149 images and 1,732 identities of students at University of Colorado Colorado Springs campus and is used for face recognition and face detection -

Unconstrained College Students ...

+

Unconstrained College Students ...

(PAGE UNDER DEVELOPMENT)

 The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey
The pixel-average of all Uconstrained College Students images is shown with all 51,838 face annotations. (c) Adam Harvey
@@ -84,7 +85,6 @@
-
diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html index cc4272c8..b838c2b9 100644 --- a/site/public/datasets/viper/index.html +++ b/site/public/datasets/viper/index.html @@ -27,7 +27,8 @@
VIPeR is a person re-identification dataset of images captured at UC Santa Cruz in 2007
VIPeR contains 1,264 images and 632 persons on the UC Santa Cruz campus and is used to train person re-identification algorithms for surveillance -

VIPeR Dataset

+

VIPeR Dataset

(PAGE UNDER DEVELOPMENT)

VIPeR (Viewpoint Invariant Pedestrian Recognition) is a dataset of pedestrian images captured at University of California Santa Cruz in 2007. Accoriding to the reserachers 2 "cameras were placed in different locations in an academic setting and subjects were notified of the presence of cameras, but were not coached or instructed in any way."

VIPeR is amongst the most widely used publicly available person re-identification datasets. In 2017 the VIPeR dataset was combined into a larger person re-identification created by the Chinese University of Hong Kong called PETA (PEdesTrian Attribute).

@@ -86,7 +87,6 @@
-->
-
-- cgit v1.2.3-70-g09d2 From 087cf70c944c09c4d03f2fbcaf7c74718ccb5f8f Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 2 Apr 2019 14:47:34 +0200 Subject: cursor --- client/table/tabulator.css | 3 ++- site/public/about/faq/index.html | 1 - site/public/about/index.html | 1 - site/public/about/legal/index.html | 1 - site/public/about/press/index.html | 1 - site/public/datasets/50_people_one_question/index.html | 1 - site/public/datasets/afad/index.html | 1 - site/public/datasets/aflw/index.html | 1 - site/public/datasets/brainwash/index.html | 1 - site/public/datasets/caltech_10k/index.html | 1 - site/public/datasets/celeba/index.html | 1 - site/public/datasets/cofw/index.html | 1 - site/public/datasets/duke_mtmc/index.html | 1 - site/public/datasets/facebook/index.html | 1 - site/public/datasets/feret/index.html | 1 - site/public/datasets/hrt_transgender/index.html | 1 - site/public/datasets/index.html | 1 - site/public/datasets/lfpw/index.html | 1 - site/public/datasets/lfw/index.html | 1 - site/public/datasets/market_1501/index.html | 1 - site/public/datasets/msceleb/index.html | 1 - site/public/datasets/pipa/index.html | 1 - site/public/datasets/uccs/index.html | 1 - site/public/datasets/vgg_face2/index.html | 1 - site/public/datasets/viper/index.html | 1 - site/public/datasets/youtube_celebrities/index.html | 1 - site/public/info/index.html | 1 - site/public/research/00_introduction/index.html | 1 - site/public/research/01_from_1_to_100_pixels/index.html | 1 - site/public/research/02_what_computers_can_see/index.html | 1 - site/public/research/index.html | 1 - site/public/test/chart/index.html | 1 - site/public/test/citations/index.html | 1 - site/public/test/csv/index.html | 1 - site/public/test/datasets/index.html | 1 - site/public/test/face_search/index.html | 1 - site/public/test/gallery/index.html | 1 - site/public/test/index.html | 1 - site/public/test/map/index.html | 1 - site/public/test/name_search/index.html | 1 - site/public/test/pie_chart/index.html | 1 - site/templates/layout.html | 1 - 42 files changed, 2 insertions(+), 42 deletions(-) (limited to 'site/public/datasets') diff --git a/client/table/tabulator.css b/client/table/tabulator.css index 17dad62a..9a7ca00e 100644 --- a/client/table/tabulator.css +++ b/client/table/tabulator.css @@ -9,6 +9,7 @@ background-color: #333; } .desktop .tabulator-row.tabulator-selectable:hover { + cursor: text; background-color: #555; } .tabulator-row .tabulator-cell { @@ -35,7 +36,7 @@ max-width: 400px; margin-bottom: 10px; background-image: url(/assets/img/icon-search.png); - background-position: 390px center; + background-position: 380px center; background-repeat: no-repeat; box-shadow: 0px 2px 4px rgba(0,0,0,0.2); border: 0; diff --git a/site/public/about/faq/index.html b/site/public/about/faq/index.html index b86dac22..00e5d719 100644 --- a/site/public/about/faq/index.html +++ b/site/public/about/faq/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/about/index.html b/site/public/about/index.html index 18ad797a..d5d72b04 100644 --- a/site/public/about/index.html +++ b/site/public/about/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/about/legal/index.html b/site/public/about/legal/index.html index 331712ba..b27e9188 100644 --- a/site/public/about/legal/index.html +++ b/site/public/about/legal/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html index 3fc33969..e09bf732 100644 --- a/site/public/about/press/index.html +++ b/site/public/about/press/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html index 8afe69e3..e3006385 100644 --- a/site/public/datasets/50_people_one_question/index.html +++ b/site/public/datasets/50_people_one_question/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/afad/index.html b/site/public/datasets/afad/index.html index a0aea1a6..8254d4fa 100644 --- a/site/public/datasets/afad/index.html +++ b/site/public/datasets/afad/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/aflw/index.html b/site/public/datasets/aflw/index.html index 7aaa9af0..6c7b2397 100644 --- a/site/public/datasets/aflw/index.html +++ b/site/public/datasets/aflw/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html index c0830a96..2a839a24 100644 --- a/site/public/datasets/brainwash/index.html +++ b/site/public/datasets/brainwash/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/caltech_10k/index.html b/site/public/datasets/caltech_10k/index.html index 6615bb1a..9692fb2b 100644 --- a/site/public/datasets/caltech_10k/index.html +++ b/site/public/datasets/caltech_10k/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html index b8300dbf..5e8c5fce 100644 --- a/site/public/datasets/celeba/index.html +++ b/site/public/datasets/celeba/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html index 84d38f1f..2da951ee 100644 --- a/site/public/datasets/cofw/index.html +++ b/site/public/datasets/cofw/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html index dcd01308..f5c94620 100644 --- a/site/public/datasets/duke_mtmc/index.html +++ b/site/public/datasets/duke_mtmc/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/facebook/index.html b/site/public/datasets/facebook/index.html index 7fb1901a..bdfb658f 100644 --- a/site/public/datasets/facebook/index.html +++ b/site/public/datasets/facebook/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/feret/index.html b/site/public/datasets/feret/index.html index ce60f3de..4cd57413 100644 --- a/site/public/datasets/feret/index.html +++ b/site/public/datasets/feret/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html index 05a49b9b..8d472c3b 100644 --- a/site/public/datasets/hrt_transgender/index.html +++ b/site/public/datasets/hrt_transgender/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html index 3a2dbd52..c43b2097 100644 --- a/site/public/datasets/index.html +++ b/site/public/datasets/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/lfpw/index.html b/site/public/datasets/lfpw/index.html index 087d8b1d..fae3cc93 100644 --- a/site/public/datasets/lfpw/index.html +++ b/site/public/datasets/lfpw/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html index 22c8c1ad..4b22fdf4 100644 --- a/site/public/datasets/lfw/index.html +++ b/site/public/datasets/lfw/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html index 2761a7c7..bacc5b16 100644 --- a/site/public/datasets/market_1501/index.html +++ b/site/public/datasets/market_1501/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html index 21a14129..7a3d2bab 100644 --- a/site/public/datasets/msceleb/index.html +++ b/site/public/datasets/msceleb/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html index d74ae49e..89d42a0b 100644 --- a/site/public/datasets/pipa/index.html +++ b/site/public/datasets/pipa/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html index 4de64ebc..56c3a7c5 100644 --- a/site/public/datasets/uccs/index.html +++ b/site/public/datasets/uccs/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/vgg_face2/index.html b/site/public/datasets/vgg_face2/index.html index 42e3b961..dc8f1ebc 100644 --- a/site/public/datasets/vgg_face2/index.html +++ b/site/public/datasets/vgg_face2/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html index 2610d1a1..29638ed7 100644 --- a/site/public/datasets/viper/index.html +++ b/site/public/datasets/viper/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/datasets/youtube_celebrities/index.html b/site/public/datasets/youtube_celebrities/index.html index dd230926..d7030588 100644 --- a/site/public/datasets/youtube_celebrities/index.html +++ b/site/public/datasets/youtube_celebrities/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/info/index.html b/site/public/info/index.html index ef7dc8db..d535b672 100644 --- a/site/public/info/index.html +++ b/site/public/info/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/research/00_introduction/index.html b/site/public/research/00_introduction/index.html index 5c536dc4..89ca3bb5 100644 --- a/site/public/research/00_introduction/index.html +++ b/site/public/research/00_introduction/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/research/01_from_1_to_100_pixels/index.html b/site/public/research/01_from_1_to_100_pixels/index.html index 37fc367f..f60df65e 100644 --- a/site/public/research/01_from_1_to_100_pixels/index.html +++ b/site/public/research/01_from_1_to_100_pixels/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/research/02_what_computers_can_see/index.html b/site/public/research/02_what_computers_can_see/index.html index 0fce1373..2a9b9c23 100644 --- a/site/public/research/02_what_computers_can_see/index.html +++ b/site/public/research/02_what_computers_can_see/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/research/index.html b/site/public/research/index.html index 303732f8..dc49e849 100644 --- a/site/public/research/index.html +++ b/site/public/research/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/test/chart/index.html b/site/public/test/chart/index.html index 93e12b3c..4968224f 100644 --- a/site/public/test/chart/index.html +++ b/site/public/test/chart/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/test/citations/index.html b/site/public/test/citations/index.html index 70b3fe55..3bc07693 100644 --- a/site/public/test/citations/index.html +++ b/site/public/test/citations/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/test/csv/index.html b/site/public/test/csv/index.html index 70a7d257..8683b4a1 100644 --- a/site/public/test/csv/index.html +++ b/site/public/test/csv/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/test/datasets/index.html b/site/public/test/datasets/index.html index 15edf039..f0dda184 100644 --- a/site/public/test/datasets/index.html +++ b/site/public/test/datasets/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/test/face_search/index.html b/site/public/test/face_search/index.html index 93dc2bc6..ad1f59c0 100644 --- a/site/public/test/face_search/index.html +++ b/site/public/test/face_search/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/test/gallery/index.html b/site/public/test/gallery/index.html index 9e2c54f6..354baa24 100644 --- a/site/public/test/gallery/index.html +++ b/site/public/test/gallery/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/test/index.html b/site/public/test/index.html index 0fc839d0..ab06c922 100644 --- a/site/public/test/index.html +++ b/site/public/test/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/test/map/index.html b/site/public/test/map/index.html index 4f4e7093..bde62f4f 100644 --- a/site/public/test/map/index.html +++ b/site/public/test/map/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/test/name_search/index.html b/site/public/test/name_search/index.html index 4e3ef428..1cc71731 100644 --- a/site/public/test/name_search/index.html +++ b/site/public/test/name_search/index.html @@ -8,7 +8,6 @@ - diff --git a/site/public/test/pie_chart/index.html b/site/public/test/pie_chart/index.html index 7dd159a3..169a6d6a 100644 --- a/site/public/test/pie_chart/index.html +++ b/site/public/test/pie_chart/index.html @@ -8,7 +8,6 @@ - diff --git a/site/templates/layout.html b/site/templates/layout.html index b5b7880c..d51e4b6a 100644 --- a/site/templates/layout.html +++ b/site/templates/layout.html @@ -8,7 +8,6 @@ - -- cgit v1.2.3-70-g09d2 From 9280b2ad356b7f0cda38f9e14eb91b89f076e9c1 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 2 Apr 2019 15:50:01 +0200 Subject: clamp citations height. add waypoint --- client/index.js | 20 ++++++++++++++++++++ client/table/citations.table.js | 2 +- client/table/file.table.js | 2 +- package-lock.json | 20 ++++++++++++++++++++ package.json | 4 +++- site/assets/css/css.css | 14 ++++++++++---- site/public/datasets/brainwash/index.html | 1 + site/templates/layout.html | 1 + 8 files changed, 57 insertions(+), 7 deletions(-) (limited to 'site/public/datasets') diff --git a/client/index.js b/client/index.js index 5e36d341..c09aece7 100644 --- a/client/index.js +++ b/client/index.js @@ -2,6 +2,7 @@ import React from 'react' import ReactDOM from 'react-dom' import { AppContainer } from 'react-hot-loader' import { Provider } from 'react-redux' +import 'waypoints/lib/noframework.waypoints.min.js'; import { toArray } from './util' import Applet from './applet' @@ -112,6 +113,24 @@ function runApplets() { } } +function buildWaypoints() { + const element = document.querySelector('.content section:nth-child(2)') + if (element) { + var waypoint = new Waypoint({ + element, + handler: function(direction) { + if (direction === 'down') { + document.body.classList.add('scrolled') + } else { + document.body.classList.remove('scrolled') + } + // console.log(direction) + // console.log('Scrolled to waypoint!') + } + }) + } +} + function main() { const paras = document.querySelectorAll('section p') // if (paras.length) { @@ -123,6 +142,7 @@ function main() { } }) runApplets() + buildWaypoints() } main() diff --git a/client/table/citations.table.js b/client/table/citations.table.js index bbc55047..178cc65b 100644 --- a/client/table/citations.table.js +++ b/client/table/citations.table.js @@ -117,7 +117,7 @@ class CitationsTable extends Component { columns={citationsColumns} data={filteredCitations} options={{ - height: 311, + height: Math.max(104, Math.min(37 * formattedCitations.length + 29, 311)), layout: 'fitColumns', placeholder: formattedCitations.length ? '' : 'Nothing matches your query', }} diff --git a/client/table/file.table.js b/client/table/file.table.js index 82c01ac5..db53243a 100644 --- a/client/table/file.table.js +++ b/client/table/file.table.js @@ -71,7 +71,7 @@ class FileTable extends Component { columns={this.state.columns} data={this.state.data} options={{ - height: 311, + height: Math.min(37 * this.state.data.length + 29, 311), layout: 'fitColumns', placeholder: 'No Data Set', }} diff --git a/package-lock.json b/package-lock.json index 43ee0cbf..54e60fad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2061,6 +2061,11 @@ "date-now": "^0.1.4" } }, + "consolidated-events": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/consolidated-events/-/consolidated-events-2.0.2.tgz", + "integrity": "sha512-2/uRVMdRypf5z/TW/ncD/66l75P5hH2vM/GR8Jf8HLc2xnfJtmina6F6du8+v4Z2vTrMo7jC+W1tmEEuuELgkQ==" + }, "constants-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", @@ -7351,6 +7356,16 @@ "resolved": "https://registry.npmjs.org/react-tag-autocomplete/-/react-tag-autocomplete-5.8.2.tgz", "integrity": "sha512-GkOQrSLjvWo98IeqRuGgc77zaxSMyMjy+b2Rc+m9jMKTWopF9h5Lf2F/X1oK9hcnUCeUmJ5QVpc/dx9MgOA2Iw==" }, + "react-waypoint": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/react-waypoint/-/react-waypoint-9.0.1.tgz", + "integrity": "sha512-AdP1EhU5fOFne1aEfZPv2AhVC+cGJ3TxITOnZM9tBBlXOOhz3lXtTSHdicRCY+2VBqerT6zD1tAtp89Mng+Chg==", + "requires": { + "consolidated-events": "^1.1.0 || ^2.0.0", + "prop-types": "^15.0.0", + "react-is": "^16.6.3" + } + }, "read-pkg": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", @@ -9874,6 +9889,11 @@ } } }, + "waypoints": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/waypoints/-/waypoints-4.0.1.tgz", + "integrity": "sha1-CZeaBXOBCylifLpDZqKEoGLsacg=" + }, "wbuf": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", diff --git a/package.json b/package.json index 75fbebb7..bbd3d763 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "react-router-dom": "^4.3.1", "react-spin": "^0.6.2", "react-tabulator": "^0.9.1", + "react-waypoint": "^9.0.1", "redux": "^4.0.0", "redux-thunk": "^2.3.0", "snapsvg": "^0.5.1", @@ -65,7 +66,8 @@ "three": "^0.100.0", "three-orbitcontrols": "^2.99.1", "three.meshline": "^1.1.0", - "three.textsprite": "^18.10.24" + "three.textsprite": "^18.10.24", + "waypoints": "^4.0.1" }, "devDependencies": { "babel-cli": "^6.26.0", diff --git a/site/assets/css/css.css b/site/assets/css/css.css index a09234d3..824819a9 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -64,10 +64,16 @@ header .site_name { line-height: 11px; letter-spacing: 3px; } -header .site_name.splash{ - font-size: 20px; - line-height: 20px; - font-weight: 400; +header .splash{ + font-size: 15px; + font-weight: 400; + color: #888; + padding-left: 8px; + opacity: 0; + transition: 0.3s opacity cubic-bezier(0,0,1,1); +} +.scrolled header .splash { + opacity: 1; } header .links{ font-size: 18px; diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html index 2a839a24..ec5ee434 100644 --- a/site/public/datasets/brainwash/index.html +++ b/site/public/datasets/brainwash/index.html @@ -17,6 +17,7 @@
MegaPixels
+
Brainwash