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

Fixing Many UI Issues #206

Merged
merged 35 commits into from
Jun 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c47cad2
method no longer throws any exceptions. wrapped parsing of log line i…
May 25, 2017
04ea9ea
ISSUE-65 Integrate ESIP Semantic Portal into MUDROD Relevancy Ranking…
lewismc May 26, 2017
2893e13
Update README.md
fgreg May 30, 2017
40ab62e
ISSUE-186 Implement parsing of root classes for aggregate/collection …
lewismc May 31, 2017
e3ade04
Merge pull request #182 from mudrod/mudrod-181
fgreg May 31, 2017
1993aa6
code cleanup
Jun 12, 2017
46756c5
css cleanup
Jun 12, 2017
e25d8a8
removed JPL specific configuration and added empty placeholders where…
Jun 12, 2017
fe31ee3
background is now fixed on search results page and scroll on search page
Jun 13, 2017
a8280d0
extra padding on the results pages
Jun 13, 2017
e68d3b6
updated paging styling and header text on results page
Jun 13, 2017
fe1f67d
increased size of search box in navbar and fixed the autocomplete dro…
Jun 13, 2017
8eef565
autocomplete hide is working now
Jun 13, 2017
3969115
fixed bug where sort list had undefined element
Jun 13, 2017
0a33454
no matches found is not necessary
Jun 13, 2017
18d2b34
search options are black on white
Jun 13, 2017
9e6682f
changed default search operator to Or and made it first
Jun 13, 2017
a02d942
updated links
Jun 13, 2017
53dffcd
fixed text overflow in sidenav boxes
Jun 13, 2017
8bb5ca6
added learn more links
Jun 13, 2017
fb38a70
Merge branch 'master' of https://github.com/mudrod/mudrod into ui-cle…
Jun 13, 2017
ce0ba37
removed unused code
Jun 13, 2017
3a4832d
fixed error when opening dataset view in new tab
Jun 13, 2017
0e1e3df
unified navbar between search page and results list
Jun 13, 2017
a7257a4
fixed overflow in panel body
Jun 13, 2017
c60ff4f
fix bug when rootScope does not contain searchOptions
Jun 13, 2017
e79fbfa
fix bug when rootScope does not contain searchOptions
Jun 13, 2017
d829702
added loading spinner while search is happening
Jun 13, 2017
a5c3b95
added loading spinner while search is happening
Jun 13, 2017
6188a36
better handling of server errors
Jun 14, 2017
1e1b664
autocomplete needs to be black
Jun 14, 2017
48f387e
fixed bug where controller was being called twice
Jun 14, 2017
62b4c90
fixed typo
Jun 14, 2017
2d6ba84
fixed title
Jun 14, 2017
a0b0160
MUDROD-151 new searches from dataset detail page
Jun 14, 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
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ The REST API documentation can also be seen at [https://mudrod.github.io/miredot
* David Moroni - [Jet Propulsion Laboratory](http://www.jpl.nasa.gov/), [NASA](http://www.nasa.gov)
* Chris Finch - [Jet Propulsion Laboratory](http://www.jpl.nasa.gov/), [NASA](http://www.nasa.gov)
* [Lewis John Mcgibbney](https://www.linkedin.com/in/lmcgibbney) - [Jet Propulsion Laboratory](http://www.jpl.nasa.gov/), [NASA](http://www.nasa.gov)

* [Frank Greguska](https://www.linkedin.com/in/frankgreguska/) - [Jet Propulsion Laboratory](http://www.jpl.nasa.gov/), [NASA](http://www.nasa.gov)

# License
This source code is licensed under the [Apache License v2.0](http://www.apache.org/licenses/LICENSE-2.0), a
copy of which is shipped with this project.
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private InputStream locateConfig() {
InputStream configStream = MudrodEngine.class.getClassLoader().getResourceAsStream("config.xml");

if (configStream != null) {
LOG.info("Loaded config file from " + MudrodEngine.class.getClassLoader().getResource("config.xml").getPath());
LOG.info("Loaded config file from {}", MudrodEngine.class.getClassLoader().getResource("config.xml").getPath());
}

return configStream;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/gov/nasa/jpl/mudrod/ontology/Ontology.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
public interface Ontology {

/**
* Loading an array URIs which resolve to ontology resources.
* Load an array URIs which resolve to ontology resources.
*
* @param urls a {@link java.lang.String} containing ontology URIs.
*/
public void load(String[] urls);

/**
* Load a collection of default ontological resources.
* Load a collection of default ontology resources.
*/
public void load();
public void load() ;

/**
* merge relevant ontology subgraphs into a new subgraph which can
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public Ontology getOntology() {

String ontologyImpl = this.props.getProperty(MudrodConstants.ONTOLOGY_IMPL, "Local");

LOG.info("Using ontology extension: " + ontologyImpl);
LOG.info("Using ontology extension: {}", ontologyImpl);
Ontology ontImpl;
switch (ontologyImpl) {
case "EsipCOR":
Expand All @@ -77,7 +77,6 @@ public Ontology getOntology() {
ontImpl = new LocalOntology();
break;
}
ontImpl.load();
return ontImpl;
}

Expand Down
Loading