Skip to content

Commit 140b5b3

Browse files
daviortegadaviortega
committed
multiple mior text updates
1 parent 8c39efa commit 140b5b3

File tree

4 files changed

+27
-33
lines changed

4 files changed

+27
-33
lines changed

‎src/assets/data/featured.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module.exports = {
3333
"lab": "Jensen Lab",
3434
"sid": "ms2012-05-07-13"
3535
},
36-
"detailOne": "All cells are separated from their environment by at least one selectively permeable membrane. To buttress this membrane against turgor pressure, most bacteria use a cell wall made of carbohydrate – long glycan strands crosslinked by short peptides to form a rigid peptidoglycan sacculus. Monoderms have one membrane and a thick multi-layered sacculus. Diderms have two membranes, an inner and an outer, with a thin sacculus sandwiched in between. Here are some examples of these different architectures:",
36+
"detailOne": "All cells are separated from their environment by at least one selectively permeable membrane. To buttress this membrane against turgor pressure, most bacteria use a cell wall made of carbohydrate – long glycan strands crosslinked by short peptides to form a rigid peptidoglycan (PG) sacculus. Monoderms have one membrane and a thick multi-layered sacculus. Diderms have two membranes, an inner and an outer, with a thin sacculus sandwiched in between. Here are some examples of these different architectures:",
3737
"detailTwo": "",
3838
"artifacts": [
3939
{

‎src/components/about.js‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class About extends Component {
1111
<Header />
1212
<div className="row" id="featured-2">
1313
<div className="col-sm-8">
14-
<h2>Welcome to the Caltech ETDB, the blockchain-based Web 3.0 database of 10,000+ electron tomograms. </h2>
14+
<h2>Welcome to the Caltech ETDB, the blockchain-based Web 3.0 database of thousands of electron tomograms. </h2>
1515
</div>
1616
</div>
1717
<div id="space50"></div>
@@ -33,46 +33,44 @@ class About extends Component {
3333
<h3>By making this data available, we hope others will use it to fuel their own discoveries. </h3>
3434
<div id="reddiv"></div>
3535
<p>In addition to its value for cell biologists, the ETDB offers a massive dataset for software developers to develop, test and improve image processing algorithms. We have some ideas for areas particularly ripe for improvement; check them out on the Scientific Challenges page.</p>
36-
<a className="browse" href="/challenges">View challenges <i className="fa fa-arrow-right" aria-hidden="true"></i></a>
36+
<a className="browse" href="/challenges">View challenges <i className="fa fa-arrow-right" aria-hidden="true"></i></a>
3737
</div>
3838
</div>
39-
<div className="col-sm-6">
40-
<img src="/src/assets/img/challenges.png"/>
41-
</div>
42-
39+
<div className="col-sm-6">
40+
<img src="/src/assets/img/challenges.png"/>
41+
</div>
4342
</div>
4443
<div className="row aboutintro" id="about">
45-
4644
<div className="col-sm-6">
4745
<h3>Built with Blockchain</h3>
4846
<div id="reddiv"></div>
49-
<p> A blockchain uses peer-to-peer networking to achieve network consensus without central points of failure, making it a public digital ledger which anyone can contribute to or audit, and no one can alter. The <a target="blank" href="https://ipfs.io/">Inter Planetary File System (IPFS)</a> is a file transport protocol and network designed to create a content-addressable, peer-to-peer method of storing and sharing content in a distributed file system.</p>
47+
<p>ETDB is an experiment in distributing large scientific datasets using the OIP specification. The addresses of the tomograms, and their corresponding metadata, are stored in the public FLO blockchain and the tomogram files are stored in the IPFS network. While etdb.caltech.edu offers one way to access the database, users are free to create their own applications to retrieve and interact with the data.</p>
48+
49+
<p> A blockchain uses peer-to-peer networking to achieve network consensus without central points of failure, making it a public digital ledger which anyone can contribute to or audit, and no one can alter.</p>
5050
</div>
5151
<div className="col-sm-6">
5252
<div>
53-
<p>The <a target="blank" href="https://oip.wiki/Main_Page">Open Index Protocol (OIP)</a> specification defines standard use of these technologies; it uses the <a target="blank" href="https://flo.cash">FLO blockchain</a> to index metadata and IPFS to store files. The OIP system includes a transparent index, persistent file storage and permissionless access. The result is a robust, decentralized database open to anyone through open-source software.</p>
53+
<p>The <a target="blank" href="https://ipfs.io/">Inter Planetary File System (IPFS)</a> is a file transport protocol and network designed to create a content-addressable, peer-to-peer method of storing and sharing content in a distributed file system.</p>
5454

55-
<p>ETDB is an experiment in distributing large scientific datasets using the OIP specification. The addresses of the tomograms, and their corresponding metadata, are stored in the public FLO blockchain and the tomogram files are stored in the IPFS network. While etdb.caltech.edu offers one way to access the database, users are free to create their own applications to retrieve and interact with the data.</p>
55+
<p>The <a target="blank" href="https://oip.wiki/Main_Page">Open Index Protocol (OIP)</a> specification defines standard use of these technologies; it uses the <a target="blank" href="https://flo.cash">FLO blockchain</a> to index metadata and IPFS to store files. The OIP system includes a transparent index, persistent file storage and permissionless access. The result is a robust, decentralized database open to anyone through open-source software.</p>
5656
</div>
5757
</div>
5858
</div>
5959
<div className="row" id="about">
6060
<div className="col-sm-6">
61-
<img src="/src/assets/img/labshot.png"/>
61+
<img src="/src/assets/img/labshot.png"/>
6262
</div>
63-
64-
<div className="col-sm-6"> <div>
65-
<h3>Learning more</h3>
66-
<div id="reddiv"></div>
67-
<p>If you are interested in learning more about tomograms, this database and other research conducted by the Jensen Lab please <a href="/contact">get in touch</a></p>
68-
<p>Many of these datasets have been used in studies resulting in scientific publications. You can view a list of these publications on the <a target="blank" href="/src/assets/img/learn-more.png">Jensen Lab</a> website.
69-
</p>
70-
<a className="browse" href="http://www.jensenlab.caltech.edu">Jensen Lab <i className="fa fa-arrow-right" aria-hidden="true"></i></a>
71-
</div>
72-
</div>
63+
<div className="col-sm-6"> <div>
64+
<h3>Learning more</h3>
65+
<div id="reddiv"></div>
66+
<p>If you are interested in learning more about tomograms, this database and other research conducted by the Jensen Lab please <a href="/contact">get in touch</a></p>
67+
<p>Many of these datasets have been used in studies resulting in scientific publications. You can view a list of these publications on the <a target="blank" href="http://www.jensenlab.caltech.edu/publications">Jensen Lab</a> website.</p>
68+
<a className="browse" href="http://www.jensenlab.caltech.edu">Jensen Lab <i className="fa fa-arrow-right" aria-hidden="true"></i></a>
69+
</div>
70+
</div>
7371
</div>
7472
<a name="FAQ"></a>
75-
<FAQ Core={this.props.Core} />
73+
<FAQ Core={this.props.Core} />
7674
<Footer />
7775
</div>
7876
)

‎src/components/faq.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class FAQ extends Component {
5151
<a name="faq"></a>
5252

5353
<div id="faq">
54-
<h3>Facts & Questions</h3>
54+
<h3>FAQs</h3>
5555
<PanelGroup accordion activeKey={this.state.activeKey} id="faqPanel">
5656
<Panel eventKey='1'>
5757
<Button onClick={() => this.handleSelect('1')} className="accordion">What is this database?</Button>
@@ -88,9 +88,7 @@ class FAQ extends Component {
8888
<Panel eventKey='6'>
8989
<Button onClick={() => this.handleSelect('6')} className="accordion">How do I cite data in this database?</Button>
9090
<Panel.Body collapsible>
91-
<p>These tomograms helped reveal the existence and variety of prokaryotic cytoskeletons and many of the macromolecular machines that power motility, warfare, and other complex behaviors of bacterial and archaeal cells. </p>
92-
93-
<p>By making these tomograms publicly available, we hope to encourage the scientific community to use them for further discovery. Check out our Scientific Challenges page here for what we think are particularly ripe areas for advancement.</p>
91+
<p>Please cite Ortega et al. (manuscript in preparation, check back soon) </p>
9492
</Panel.Body>
9593
</Panel>
9694
</PanelGroup>

‎src/components/termsAndConditions.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,17 @@ class termsAndConditions extends Component {
1010
<Header />
1111
<div id="featured-2" className="row">
1212
<div className="col-sm-8">
13-
<h2>Terms and Condititions</h2>
13+
<h2>Terms and Conditions</h2>
1414
</div>
1515
<div className="col-sm-4">
1616
</div>
1717
</div>
1818
<div className="row contact" id="featured-3">
1919
<div className="col-sm-12 tandc">
2020
<div id="reddiv"></div>
21-
<p>These images and data have been provided free to the public in hopes of advancing science. All parties are free to use them for research purposes without restriction. Publications benefiting from the data should reference Ortega et al. (in preparation). Users may also choose to directly acknowledge the individual, individuals, lab, or institution who collected particular images as well.</p>
22-
23-
<p>Publications benefiting from the data should reference Ortega et al. (name of paper we are writing now). Users may also choose to directly acknowledge the individual, individuals, lab, or institution who collected particular images as well. </p>
24-
25-
<p> If any party wishes to use the images or data for commercial purposes, please contact Prof. Grant Jensen at [email protected]. The California Institute of Technology (Caltech) claims copyright to the data and images contained herein under <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" src="https://i.creativecommons.org/l/by-nc-sa/4.0/80x15.png"/></a>.</p>
21+
<p>These images and data have been provided free to the public in hopes of advancing science. All parties are free to use them for research purposes without restriction. Publications benefiting from the data should reference Ortega et al. (in preparation). Users may also choose to directly acknowledge the individual, individuals, lab, or institution who collected particular images as well.</p>
22+
23+
<p> If any party wishes to use the images or data for commercial purposes, please contact Prof. Grant Jensen at jensen(at)caltech.edu. The California Institute of Technology (Caltech) claims copyright to the data and images contained herein under <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" src="https://i.creativecommons.org/l/by-nc-sa/4.0/80x15.png"/></a>.</p>
2624

2725
<p>Images and data are provided “as is,” with no warranties of any kind, including that the use of the images and data infringe any third party intellectual property rights. Note some representations of a small fraction of the data have been published in scientific journals. Some of these journals claim copyright on those particular representations that were shown in the paper as figures, but it is highly unlikely that any new representation would exactly match that already copyrighted.</p>
2826
</div>

0 commit comments

Comments
 (0)