diff --git a/templates/base.html b/templates/base.html index 9556ec41..5273f284 100644 --- a/templates/base.html +++ b/templates/base.html @@ -55,4 +55,14 @@ ga('create', 'UA-41203333-1', 'vertnet.org'); ga('send', 'pageview'); + \ No newline at end of file diff --git a/www/css/vertnet.css b/www/css/vertnet.css index 82580f84..09ec6852 100644 --- a/www/css/vertnet.css +++ b/www/css/vertnet.css @@ -597,4 +597,11 @@ VNlegend { table.sortable th:not(.sorttable_sorted):not(.sorttable_sorted_reverse):not(.sorttable_nosort):after { content: " \25B4\25BE" +} + +.table-striped>tbody>tr:nth-child(odd)>td, .table-striped>tbody>tr:nth-child(odd)>th { + background-color: #efefef +} +.table-hover>tbody>tr:hover>td, .table-hover>tbody>tr:hover>th { + background-color: #e5e5e5 } \ No newline at end of file diff --git a/www/js/app/models/detail.js b/www/js/app/models/detail.js index d9c99272..0508033b 100644 --- a/www/js/app/models/detail.js +++ b/www/js/app/models/detail.js @@ -350,9 +350,9 @@ define([ { if (newtext.length == 0) { - newtext = parts[i].replace(exp,"$1"); + newtext = parts[i].replace(exp,"$1"); } else { - newtext = newtext + ", " + parts[i].replace(exp,"$1"); + newtext = newtext + ", " + parts[i].replace(exp,"$1"); } } return newtext; diff --git a/www/js/app/views/detail.html b/www/js/app/views/detail.html index 9a21cdbc..6743c429 100644 --- a/www/js/app/views/detail.html +++ b/www/js/app/views/detail.html @@ -114,17 +114,47 @@

<% var occid = this.model.getOccIdentifier() %> <%= occid %> <%= this

+ <%if (this.model.get('associatedmedia')) { var link = this.model.get('associatedmedia'); %>

+ <% } %> + + + +
-
+
+ + diff --git a/www/js/app/views/detail.js b/www/js/app/views/detail.js index 9274ca01..daa97f6f 100644 --- a/www/js/app/views/detail.js +++ b/www/js/app/views/detail.js @@ -228,7 +228,15 @@ define([ this.$('#show-error-tip').tooltip('hide'); }, this)); + //Show-hide detail map + //this.$("#occ-detail-map-toggle").click(_.bind(function(e) { + // if (this.$('#occ-detail-map-toggle').is(':checked')) { + // $("#collapseOne").collapse('show'); + // } else { + // $("#collapseOne").collapse('hide'); + // } + //}, this)); // Handler for click. this.$('#submit-issue-btn').click(_.bind(function(e) { diff --git a/www/js/app/views/header.html b/www/js/app/views/header.html index 8e69ec53..cd73cb2c 100644 --- a/www/js/app/views/header.html +++ b/www/js/app/views/header.html @@ -58,7 +58,10 @@
  • VertNet Norms -
    • + +
  • + Datasets & Tools +
  • Training Workshops
    • @@ -68,9 +71,6 @@
  • Publications & Video
    • -
  • - Developers -
  • diff --git a/www/js/app/views/publishers.html b/www/js/app/views/publishers.html index f93d34a1..8d338ac9 100644 --- a/www/js/app/views/publishers.html +++ b/www/js/app/views/publishers.html @@ -40,8 +40,8 @@

    Publishers VertNet

    • - - + + diff --git a/www/js/app/views/search.html b/www/js/app/views/search.html index 6d172798..fbd4a3d7 100644 --- a/www/js/app/views/search.html +++ b/www/js/app/views/search.html @@ -124,7 +124,7 @@

    Search VertNet

    - +
    @@ -133,7 +133,7 @@

    Search VertNet

    - +
    @@ -227,30 +227,30 @@

    Search VertNet

    - +
    - +
    to
    - +
    - +
    - +
    to
    - +
    -
    +
    diff --git a/www/js/app/views/search.js b/www/js/app/views/search.js index 8b480be5..1668dba5 100644 --- a/www/js/app/views/search.js +++ b/www/js/app/views/search.js @@ -369,6 +369,18 @@ define([ this.$('#show-recordType-tip').tooltip('hide'); }, this)); + this.$('#show-instCode-tip').tooltip({ + placement: 'top', + html: 'true', + title: 'Search will identify all records with the exact terms contained within the specified Darwin Core field(s).

    Read more...', + container: '#instCode-tip' + }); + this.$('#instCode-tip').mouseover(_.bind(function(e) { + this.$('#show-instCode-tip').tooltip('show'); + }, this)).mouseout(_.bind(function(e) { + this.$('#show-instCode-tip').tooltip('hide'); + }, this)); + this.$('#show-dcTerms-tip').tooltip({ placement: 'top', html: 'true', @@ -393,13 +405,25 @@ define([ this.$('#show-years-tip').tooltip('hide'); }, this)); + this.$('#show-months-tip').tooltip({ + placement: 'top', + html: 'true', + title: 'Search will identify all records contained within the range of months submitted.

    Read more...', + container: '#months-tip' + }); + this.$('#months-tip').mouseover(_.bind(function(e) { + this.$('#show-months-tip').tooltip('show'); + }, this)).mouseout(_.bind(function(e) { + this.$('#show-months-tip').tooltip('hide'); + }, this)); + //Get List of institutions and institutionCodes for institutionCode select - $.getJSON("http://vertnet.cartodb.com/api/v2/sql?q=SELECT icode, orgname, concat(icode,': ',orgname) AS instcombo FROM resource where ipt=TRUE AND networks LIKE %27%25VertNet%25%27 GROUP BY icode, orgname ORDER BY orgname, icode",function(institutions) { + $.getJSON("http://vertnet.cartodb.com/api/v2/sql?q=SELECT icode, orgname, concat(icode,' - ',orgname) AS instcombo FROM resource where ipt=TRUE AND networks LIKE %27%25VertNet%25%27 GROUP BY icode, orgname ORDER BY icode, orgname",function(institutions) { var listItems = ''; $.each(institutions.rows, function(key, val) { - listItems += ""; + listItems += ""; $("#inst-dropdown").html(listItems); });
    Publisher Code LocationRecordsResourcesRecordsResources