Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating main! #12

Merged
merged 127 commits into from
May 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
d3ca0b4
Information tooltips added for all the tags using data-toogle attribute
drashtipatoliya17 Apr 9, 2021
2efd62e
Information tooltips added for all the tags using data-toogle attribute
drashtipatoliya17 Apr 9, 2021
7927ac2
Information tooltips added for all the tags using data-toogle attribute
drashtipatoliya17 Apr 9, 2021
b2a362b
Tooltip added for Terms in Term details panel
drashtipatoliya17 Apr 14, 2021
6afca1e
Added feature to open Tree on Full Screen!
sakshi-dhamija Apr 24, 2021
3d8dcc4
Removed a semicolon!
sakshi-dhamija Apr 24, 2021
8fb1825
Removed extra space!
sakshi-dhamija Apr 26, 2021
e415e9a
Re-idented!
sakshi-dhamija Apr 26, 2021
1834d94
Removed toggle function call on startup!
sakshi-dhamija Apr 26, 2021
4e37816
Adding logo and icons
raashika03 Apr 26, 2021
1ae778c
Adding styling for logo and icons
raashika03 Apr 26, 2021
3b9e19a
Add files via upload
raashika03 Apr 26, 2021
cabddab
Updated full screen function using jquery method!
sakshi-dhamija Apr 26, 2021
f036913
Merge branch 'secrashi-patch-5' of https://github.com/secrashi/edam-b…
sakshi-dhamija Apr 26, 2021
6fe4470
Added semicolon!
sakshi-dhamija Apr 26, 2021
1bc4b19
Reverted space changes!
sakshi-dhamija Apr 26, 2021
05986d3
Reverted space changes!
sakshi-dhamija Apr 26, 2021
c88b4b0
Added space!
sakshi-dhamija Apr 26, 2021
2c1a15e
Added space!
sakshi-dhamija Apr 26, 2021
86285fc
Deleting Logo image
raashika03 Apr 26, 2021
f47891f
Updating the address of logo image
raashika03 Apr 26, 2021
923da0f
Added flex-box for the header section
raashika03 Apr 26, 2021
769a663
Update index.html
raashika03 Apr 26, 2021
e564776
Adding styling
raashika03 Apr 26, 2021
af0d87a
Update index.css
raashika03 Apr 26, 2021
dede865
removing id for search-bar
raashika03 Apr 26, 2021
5513445
Removed extra variable and spaces!
sakshi-dhamija Apr 27, 2021
b9f08b8
Changing <p> to <span>
raashika03 Apr 27, 2021
a8c455c
Removing display: inline-block
raashika03 Apr 27, 2021
c595669
use display flex for header components
bryan-brancotte Apr 27, 2021
3f9fcb4
first child doesn't grow, but shrink its long subtext
bryan-brancotte Apr 27, 2021
18a5a0d
Removing col-*-* and using d-flex
bryan-brancotte Apr 27, 2021
bec2de9
Merge branch 'raashika03-logo-and-icon' into bryan-brancotte-patch-flex
bryan-brancotte Apr 27, 2021
1745886
Fixing indentation
raashika03 Apr 27, 2021
57915d1
Reverting indentation changes
raashika03 Apr 27, 2021
8f1a952
Merge branch 'raashika03-logo-and-icon' into bryan-brancotte-patch-flex
raashika03 Apr 27, 2021
cf80645
Merge pull request #1 from bryan-brancotte/bryan-brancotte-patch-flex
raashika03 Apr 27, 2021
3d899af
remove unused arg
bryan-brancotte Apr 27, 2021
df874b9
Merge pull request #141 from secrashi/secrashi-patch-5
bryan-brancotte Apr 27, 2021
81f8c65
put the search bar on a new line with low width
bryan-brancotte Apr 27, 2021
cf48591
ensure search bar is not too small
bryan-brancotte Apr 27, 2021
38e2e3e
Removing colour styling for header in dark-theme
raashika03 Apr 27, 2021
3fe8276
use flex and aligne items to fix margin instead of h1
bryan-brancotte Apr 28, 2021
c4e175a
add margin
bryan-brancotte Apr 28, 2021
dd19780
Merge branch 'main' into raashika03-logo-and-icon
bryan-brancotte Apr 28, 2021
d1e4c31
Use the logo, hide it when missing
bryan-brancotte Apr 28, 2021
b6c7d41
fix margin
bryan-brancotte Apr 28, 2021
9b9665c
add twitter logo in the header
bryan-brancotte Apr 28, 2021
1e4d98d
Merge pull request #143 from raashika03/raashika03-logo-and-icon
bryan-brancotte Apr 28, 2021
a3e9454
Merge pull request #2 from edamontology/main
raashika03 Apr 28, 2021
58b03c2
Reverting changes
raashika03 Apr 28, 2021
9f5295e
Removing unnecessary re-definition
raashika03 Apr 28, 2021
b9ae4c2
Update dark-theme.css
raashika03 Apr 28, 2021
ec9a8ff
changes updated
drashtipatoliya17 Apr 28, 2021
65e9f2c
Merge pull request #146 from raashika03/raashika03-dm-header
bryan-brancotte Apr 28, 2021
9fcf53e
grouping button by functionality, keeping the possibility to put butt…
bryan-brancotte Apr 28, 2021
6dc25f7
enabling the tooltip
bryan-brancotte Apr 28, 2021
d189352
using default cursor
bryan-brancotte Apr 28, 2021
66a7b33
reverting removal. Consider dd844e65f6e115615dde9f497c6d7e456a129010 …
bryan-brancotte Apr 28, 2021
dac5fc8
code updated
drashtipatoliya17 Apr 28, 2021
0b3a933
changes updated
drashtipatoliya17 Apr 28, 2021
05266d4
changes updated
drashtipatoliya17 Apr 28, 2021
4266139
final code
drashtipatoliya17 Apr 28, 2021
809b1a9
Delete settings.json
bryan-brancotte Apr 28, 2021
3d7b7f5
Merge pull request #99 from drashti171299/main
bryan-brancotte Apr 28, 2021
c737106
bugfix when no translate_uri_to_text nor tootip were provided
bryan-brancotte Apr 28, 2021
cccd269
ignore .vscode/
bryan-brancotte Apr 28, 2021
4000be9
Merge pull request #150 from edamontology/grouping-tree-buttons
bryan-brancotte Apr 28, 2021
bc672ac
Merge pull request #5 from edamontology/main
raashika03 Apr 28, 2021
965b829
Changing location of theme function
raashika03 Apr 28, 2021
d284bf2
Adding bottom-border colour like main page
raashika03 Apr 28, 2021
b5ad524
Changed border colour for edit page
raashika03 Apr 29, 2021
4080b84
reverting the changes for bottom border colour
raashika03 Apr 29, 2021
ea62721
Merge pull request #160 from raashika03/raashika03-patch-5
bryan-brancotte Apr 29, 2021
e5face4
bugix: return value returned by append_row_all_opt
bryan-brancotte Apr 29, 2021
c539fd6
refactoring tree-controls :
bryan-brancotte Apr 29, 2021
f311af3
move meta info inside the tree as a tree-controls
bryan-brancotte Apr 29, 2021
d7fbe99
add a development run option that works on all platforms and IDEs
sunny775 Apr 28, 2021
b9a427d
improve theme buton
sunny775 Apr 30, 2021
b7a16b5
Merge branch 'main' into theme-button
sunny775 Apr 30, 2021
a7cb546
Merge pull request #151 from sunny775/fix-121
bryan-brancotte Apr 30, 2021
e15d67a
Removing theme button code+ adding dark-theme code
raashika03 Apr 30, 2021
d530ce8
bugfix, apply background also when hovered
bryan-brancotte Apr 30, 2021
27b6eaf
updating dependencies order as npm install is doing it anyway after a…
bryan-brancotte Apr 30, 2021
7ff6686
don't follow package-lock.json for now considering the low number of …
bryan-brancotte Apr 30, 2021
7459fd5
suggest to provide screen shot/recording
bryan-brancotte Apr 30, 2021
bc1247e
Update edit.js
raashika03 Apr 30, 2021
0ccc1c3
Changing getDarkMode to handle .btn-toggle non-availability
raashika03 Apr 30, 2021
852efcf
Merge pull request #6 from edamontology/main
raashika03 Apr 30, 2021
9982a59
Adding loader-wrapper class
raashika03 Apr 30, 2021
9f87157
calling loader-wrapper class to fadeout
raashika03 Apr 30, 2021
a95246d
Adding styling for loader-wrapper class
raashika03 Apr 30, 2021
371e411
Minor spelling mistake improved
raashika03 Apr 30, 2021
0b027d9
fix
sunny775 Apr 30, 2021
3e0b60d
pulled changes from upstream
sunny775 Apr 30, 2021
be89260
Merge pull request #1 from sunny775/main
sunny775 Apr 30, 2021
a277b6a
fix
sunny775 Apr 30, 2021
d8fafd3
fix
sunny775 Apr 30, 2021
d10845b
resize theme button
sunny775 Apr 30, 2021
d32c948
Merge pull request #165 from raashika03/minor-fix-PR-template
bryan-brancotte May 3, 2021
0d66dbd
Use font awsome moon icon
bryan-brancotte May 3, 2021
ae74589
Merge pull request #162 from sunny775/theme-button
bryan-brancotte May 3, 2021
d2c2932
Update index.html
raashika03 May 3, 2021
530c374
Update index.css
raashika03 May 3, 2021
e35e2bc
Merge pull request #164 from raashika03/loader-animation
bryan-brancotte May 3, 2021
ddd0f50
Update utils.js
raashika03 May 3, 2021
b33b74d
Update utils.js
raashika03 May 3, 2021
9816b49
No bulk reformatting
bryan-brancotte May 3, 2021
f3cef05
Merge pull request #156 from raashika03/raashika03-patch-4
bryan-brancotte May 3, 2021
6ce1bc3
cleanup
bryan-brancotte May 3, 2021
7970d62
when not in an adding use case, un-select all elements before adding …
bryan-brancotte May 3, 2021
0e233d8
not needed anymore/bugfix:
bryan-brancotte May 3, 2021
d78d7a1
Partial revert of commit 0e233d8a, do not enable yet shift_to_add
bryan-brancotte May 3, 2021
7830c9b
Merge pull request #7 from edamontology/main
raashika03 May 3, 2021
ec6c96c
Update edit.html
raashika03 May 3, 2021
76bb09a
Update edit.html
raashika03 May 4, 2021
d810f54
Merge pull request #169 from raashika03/raashika03-patch-6
bryan-brancotte May 4, 2021
8da0b2a
Using viewport, update header for low width screens
bryan-brancotte May 4, 2021
1f22191
Merge branch 'main' of github.com:edamontology/edam-browser into main
bryan-brancotte May 4, 2021
175db22
Hide loader later when tree actually loaded
bryan-brancotte May 4, 2021
4ee4585
Improve visibility of search icon
bryan-brancotte May 4, 2021
ecedd8e
Update index.html
bryan-brancotte May 4, 2021
9d211db
Merge pull request #171 from edamontology/patch-search-icon
bryan-brancotte May 4, 2021
caaf710
Merge pull request #9 from edamontology/main
raashika03 May 4, 2021
50ad3b6
bg-colour change for search icon
raashika03 May 4, 2021
c6fc07e
Merge pull request #172 from raashika03/raashika03-patch-7
bryan-brancotte May 4, 2021
106d5f9
Biugfix : unselect former elements
bryan-brancotte May 5, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ As a reminder here is a checklist
### Checklist

- [ ] I indicated which issue (if any) is closed with this PR using [closing keywords](https://help.github.com/articles/closing-issues-using-keywords)
- [ ] I only changed lines related to my PR (no bulk reformating)
- [ ] I only changed lines related to my PR (no bulk reformatting)
- [ ] I indicated the source and check the license if I re-use code, or I did not re-use code
- [ ] I made my best to solve only one issue in this PR, or explain why multi had to be solved at once.

### Issue

close/fix/resolve #???
<!-- pick on of close/fix/resolve, remove the other and then replace ??? with the issue number -->
<!-- pick one of close/fix/resolve, remove the other and then replace ??? with the issue number -->

### Details
<!-- Put any relevant information below, or remove Details section -->
<!-- If you PR is about new visual effect, screenshot or screen recording are warmly welcome, I personally recommend https://github.com/phw/peek to record as gif. -->
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,10 @@ ENV/

.idea
node_modules/
.vscode/

# don't follow it for now considering the low number of dependencies, and the
# fact that it can change when you run npm install, and thus new commiters could
# colide commit by commiting new version of it
package-lock.json
# end of file
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The recommended way for contributors to submit code to EDAM Browser is to fork t

Please make one PR per issue, solving multiple issues in the same PR make it harder to assess independently each solution and delay the moment changes can be merge.

Do not reformat code that you would not changing otherwise with you commit.
No bulk reformatting, only reformat code that is already changed by the code you wrote when solving the issue you are addressing.

The contributed code will be [**licensed under EDAM Browser's license**](https://github.com/edamontology/edam-browser/blob/main/LICENSE).
If you did not write the code yourself, please ensure that the license is compatible, or obtain a permission from the original author to relicense the contributed code.
Expand Down
20 changes: 7 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,25 @@ The EDAM Browser is a client-side web-based visualization javascript widget. Its

Go to https://edamontology.github.io/edam-browser/

---
### ... locally

1. Download/clone the repository

2. Change to working directory : `cd edam-browser`

3. Run it
##### Option 1: *You need node.js and npm*
- `npm install`
- `npm run dev`

##### Option 1:
> Run `yarn start`
> It starts a web server allowing you to browse EDAM on [localhost:20080](http://0.0.0.0:20080).

##### Option 2:
> Run `python3 -m http.server 20080`
> It starts a web server allowing you to browse EDAM on [localhost:20080](http://0.0.0.0:20080).
##### Option 2: *You need Python3*
Run `python3 -m http.server 20080` . It starts a web server allowing you to browse EDAM on localhost:20080.

##### Option 3:
> Run `start_edam_stand_alone_browser.sh`
> It starts a web server allowing you to browse EDAM on [localhost:20080](http://0.0.0.0:20080).

##### Optionally on Windows:
- Open Visual Studio Code extensions explorer, and search for [Live Server](https://marketplace.visualstudio.com/items?itemName=ritwickdey.LiveServer)
- Install the "Liver Server" extension
- With the index.html file open in the editor, right-click and select "Open with Live Server" to launch EDAM browser on [http://127.0.0.1:5500](http://127.0.0.1:5500) in your default web browser

---

### ... with a custom ontology

Expand Down
31 changes: 27 additions & 4 deletions css/dark-theme.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
/*dark theme styling for propose change page starts here*/
.dark-mode .page-header {
border-bottom-color: #252525;
}

.dark-mode textarea {
background-color: #202020;
color: #B8B8B8;
Expand Down Expand Up @@ -70,11 +74,26 @@
color: #B8B8B8;
border-color: #050505;
}
div.btn-toggle-wrapper {
position: absolute;
top: 12px;
right: 15px;
width: fit-content !important;

}
.btn-toggle {
width: 60px;
height: 24px;
outline: none;
border-radius: 30px;
border: 1px solid #bdbdbd;
}
.dark-mode .toggle-icon {
fill: #eeeeee;
}

.dark-mode .page-header {
background-color: #080808;
color: #B8B8B8;
border-bottom: none !important;
.dark-mode #page-header {
border-bottom-color: #252525;
}

.dark-mode .panel-heading {
Expand Down Expand Up @@ -214,4 +233,8 @@
.dark-mode .popover tr {
border-width: 1px;
}

.dark-mode .input-group-addon {
background-color: #A9A9A9;
}
/*styling for dark theme for main page ends here*/
117 changes: 90 additions & 27 deletions css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,58 @@
margin-bottom: 15px;
padding-top: 10px;
}
.page-header{
#page-header{
margin-top:15px;
margin-bottom:9px;
flex-wrap: wrap!important;
border-bottom: 1px solid #eee;
}
#page-header>*{
flex:1 0 auto;
align-items: center;
justify-content: center;
display: flex;
margin-bottom:9px;
}
#page-header>*:first-child{
flex:0 1 auto;
}
#page-header>*:last-child{
min-width:30em;
}
#header-desc img {
margin-right: 1em;
height: 108px;
}
#pageTitle{
margin-top:0;
}
.meta-info>*{
font-size:0;
color:white;
-webkit-transition: color 0.3s, font-size 0.3s;
-moz-transition: color 0.3s, font-size 0.3s;
-o-transition: color 0.3s, font-size 0.3s;
transition: color 0.3s, font-size 0.3s;
.header-icon>* {
margin-right:1em;
}
.meta-info .not-hidden, .meta-info .not-hidden>*{
font-size:inherit;
color:inherit;

.d-flex {
display: flex;
}
.meta-info:hover {
background-color: #f5f5f5;
border: #ddd solid 1px;
border-radius: 3px;
.flex-column{
flex-direction: column;
}
.meta-info:hover>*{
font-size:inherit;
color:inherit;
.loader-wrapper{
width: 100%;
height: 100%;
position: absolute;
display:flex;
justify-content: center;
align-items: center;
}
.tree-controls .meta-info span{
padding-left:0;
}
.tree-controls .meta-info{
padding: 6px 12px;
border-radius: 4px;
text-align: center;
white-space: nowrap;
vertical-align: middle;
}
.modal-dialog .modal-body+.modal-body {
border-top: 1px solid #e5e5e5;
Expand All @@ -51,8 +79,11 @@ input:disabled+.text-for-disabled-input{
margin-bottom:0px;
line-height:2;
}
#edamAccordion tbody.details th *[data-toggle="tooltip"]{
cursor:default;
}
#tree {
height:70vh;
height:100%;
}

#edamAccordion table .details td a{
Expand Down Expand Up @@ -91,34 +122,57 @@ a:before {
#tree-and-controls
{
position:relative;
height: 70vh !important;
}

#tree-controls{
.tree-controls{
position: absolute ;
right:0px;
top:1em;
display:flex;
flex-direction:column;
}
#tree-controls>*{
.tree-controls-right-bottom{
right:0px;
bottom:1em;
}
.tree-controls-right-top{
right:0px;
top:1em;
}
.tree-controls>*{
text-align: end;
margin-bottom: 1em;
}
#tree-controls>*>*{
.tree-controls .tree-control-element,
.tree-controls button.btn{
border-width: 0;
color: white;
background: #000000c3;
min-width:3em;
border-bottom-right-radius: 0;
border-top-right-radius: 0;
}
#tree-controls .on-controls-hover{
.tree-controls .tree-controls-group>*:not(:first-child) button.no-on-controls-hover,
.tree-controls .tree-controls-group>*:not(:first-child) button:not(:hover){
border-top-left-radius: 0;
}
.tree-controls .tree-controls-group>*:not(:last-child) button.no-on-controls-hover,
.tree-controls .tree-controls-group>*:not(:last-child) button:not(:hover){
border-bottom-left-radius: 0;
}
.tree-controls .on-controls-hover{
display:none;
padding-left: 1rem;
}
#tree-controls *:hover>.on-controls-hover{
.tree-controls *:hover>.on-controls-hover{
display:initial;
}
.tree-controls .tree-control-element a {
color: #98bfe2;
}
.tree-controls .tree-control-element a:focus,
.tree-controls .tree-control-element a:hover {
color: #5c9ad1;
}
body {
overflow-x: hidden;
}
Expand All @@ -128,3 +182,12 @@ body {
.temp:last-child {
opacity: 0;
}
@media (max-width: 768px){
#page-header>*:last-child{
min-width:90vw;
}
#logo{
display:none;
}
}
/*end of file*/
1 change: 1 addition & 0 deletions edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>EDAM ontology browser</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" type="image/png" href="favicon.ico"/>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.0/css/all.css">
<script
Expand Down
Loading