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.

Sign up for GitHub

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

Jump to bottom

Layer search descriptions #368

Merged
merged 51 commits into from
Jul 5, 2017
Merged

Layer search descriptions #368

Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
90bb799
Started addressing issue #65
ZachTRice Jun 1, 2017
c6cbf9f
Started styling active layer sidebar description toggle.
ZachTRice Jun 1, 2017
bcf8bbc
Add wv.layers.info utility, calling it in layers.active, added css
ZachTRice Jun 2, 2017
646cc67
Added open function to ensure content loads from top
ZachTRice Jun 5, 2017
088fbcc
Get dynamic data using layer.metadata
ZachTRice Jun 5, 2017
7874b69
Began looping through measurements to match layer.id to category
ZachTRice Jun 5, 2017
427d86b
Check if layer id is in measruements, render description if true
ZachTRice Jun 7, 2017
bdb093a
Checked if there's a description, only output info button if there is
ZachTRice Jun 7, 2017
7867c14
Close desc box if icon is clicked twice
ZachTRice Jun 7, 2017
fa904d5
Beginning to add in more info button to search modal
ZachTRice Jun 7, 2017
9a41b33
Removed click function & style from row
ZachTRice Jun 7, 2017
cfdb1ed
Tweaked icon
ZachTRice Jun 7, 2017
62c46d7
Added/styled pulldown for more description field in the search
ZachTRice Jun 7, 2017
097e5eb
Looping through each measurement on search
ZachTRice Jun 8, 2017
7e3923a
Created model for getting descriptions
ZachTRice Jun 8, 2017
e02727c
Map descriptions on init to layers so not to do it when searching
ZachTRice Jun 8, 2017
823584c
Added descriptions to layers object on init, called when opening info
ZachTRice Jun 8, 2017
84ace83
Changed descriptions to be added on reset, which is called on init
ZachTRice Jun 8, 2017
b2a8137
Changed descriptions to be added on reset, which is called on init
ZachTRice Jun 8, 2017
c668058
Removed unneeded variable declaration
ZachTRice Jun 8, 2017
7b51009
Removed unneeded variable definitions; only shown button if more info
ZachTRice Jun 8, 2017
5a953e5
Updated css, moved metasource above more info button
ZachTRice Jun 8, 2017
3fd16df
Removed metadata functionalty for no longer updated metadata dataset
ZachTRice Jun 8, 2017
301e36a
Removed metadata functionalty for no longer updated metadata dataset
ZachTRice Jun 8, 2017
e4bfd0b
Added "i" icon to open, added ellipsis btn for closing
ZachTRice Jun 8, 2017
a93b2d4
Fixed double-click on search description open/close
ZachTRice Jun 9, 2017
8506790
Added disabled btn & styled. Optimize output if description available
ZachTRice Jun 9, 2017
7f112e1
Added layer info css file to build
ZachTRice Jun 15, 2017
d274ece
Removed excess lines, declared var at top of scope, css tweak
ZachTRice Jun 16, 2017
4ae56c0
Brought back full-row click to check checkbox
ZachTRice Jun 22, 2017
84d4eb3
Fixed adding a layer in artic/antarctic if no description
ZachTRice Jun 26, 2017
156a746
Updated sidebar modal fonts to be consistent with Add Layer modal fonts
ZachTRice Jun 26, 2017
d6315d0
Added padding around "i" icon in search descriptions
ZachTRice Jun 26, 2017
875adcb
CSS tweaks
ZachTRice Jun 26, 2017
7fab99d
Tightened up search header width
ZachTRice Jun 26, 2017
6a36213
Merge remote-tracking branch 'origin' into layer-descriptions
ZachTRice Jun 28, 2017
788cc55
Merge remote-tracking branch 'origin' into search-descriptions
ZachTRice Jun 28, 2017
3fd4949
Fixed css change causing merge issues
ZachTRice Jun 29, 2017
2b006a8
Merge branch 'master' into search-descriptions
ZachTRice Jun 29, 2017
9592b2f
Merge branch 'master' into layer-descriptions
ZachTRice Jun 29, 2017
62ffbb0
Changed links within info dialog to open in a new window
ZachTRice Jun 29, 2017
09dd12b
Changed links within search description to open in a new window
ZachTRice Jun 29, 2017
b95ad06
Updated icon to use non-circle "i" and added a 1px circle border
ZachTRice Jun 29, 2017
f13706d
Increased width of info dialog to 450 from 300
ZachTRice Jun 29, 2017
1168749
Merged search and layer descriptions
ZachTRice Jun 30, 2017
b174fee
Made fonts between layer and search consistent
ZachTRice Jun 30, 2017
c2aac0b
Broke up drawAllLayers into smaller functions
ZachTRice Jul 4, 2017
18ee27d
Split functions, ordered logically, commented major functions with jsdoc
ZachTRice Jul 4, 2017
d7b2aa8
Further breakdown and documentation of functions
ZachTRice Jul 5, 2017
a81c40f
Resolved merge conflicts with development
ZachTRice Jul 5, 2017
c3e05f4
Merge branch 'development' into layer-search-descriptions
ZachTRice Jul 5, 2017
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
Prev Previous commit
Next Next commit
Fixed css change causing merge issues
  • Loading branch information
@ZachTRice
ZachTRice committed Jun 29, 2017
commit 3fd4949efe709888fd26783fb4edeacfb2017966
2 changes: 2 additions & 0 deletions web/css/wv.layers.modal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,15 @@
.layer-category h3 {
font-size:20px;
line-height:20px;

}
.layer-category h3 a{
display:block;
width:100%;
line-height:20px;
padding:10px;
color:#fff;

}
.layer-category h3 a:hover{
background:rgba(255,255,255,0.6);
Expand Down