Skip to content

Commit

Permalink
Merge branch 'dev-2.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
@laurenwalker
laurenwalker committed Apr 30, 2019
2 parents 5c2248a + c075265 commit bbf14f7
Show file tree
Hide file tree
Showing 39 changed files with 17,455 additions and 473 deletions.
16,421 changes: 16,421 additions & 0 deletions src/components/citation.js
View file

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions src/components/citation.min.js
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/components/showdown/extensions/showdown-citation/citation-0.4.0-9.min.js
View file

This file was deleted.

8 changes: 4 additions & 4 deletions src/components/showdown/extensions/showdown-citation/showdown-citation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ define(['showdown', 'citation'], function (showdown, citation) {

return showdown.extension('showdown-citation', function() {

const Cite = require('citation-js');
const Cite = citationRequire('citation-js');

var allCites = new Cite();

Expand Down Expand Up @@ -797,7 +797,7 @@ define(['showdown', 'citation'], function (showdown, citation) {

var read_bibli = {
// This sub-extension will look for bibtex, wrapped in <bibtex></bibtex> tags.
// When found, they'll be added to the cite object.
// When found, they'll be added to the cite object.
type: "lang",
filter: function (text, converter, options) {
var left = '<bibtex>',
Expand Down Expand Up @@ -849,7 +849,7 @@ define(['showdown', 'citation'], function (showdown, citation) {

}
};

var print_inline_cites = {
type: "lang",
filter: function(text) {
Expand All @@ -875,7 +875,7 @@ define(['showdown', 'citation'], function (showdown, citation) {
// At least one of the keys found a match, but not all keys
// We'll insert the not found keys into the citation
let nope = not_in_bib(allCites, keys).join("; ").replace(/_/g, "\\_");
citestring = citestring.replace(/([^)]*)\)/g, "$1; " + nope + ")");
citestring = citestring.replace(/([^)]*)\)/g, "$1; " + nope + ")");
}

// Now we have to deal with a hacky work around to get links to the bibliography
Expand Down
161 changes: 133 additions & 28 deletions src/css/metacatui-common.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2373,7 +2373,7 @@ a.btn.metrics-button-disabled {
********************************************/
.thumbnail{
height: auto;
width: 350px;
max-width: 90%;
padding: 20px;
margin-bottom: 20px;
}
Expand Down Expand Up @@ -2470,19 +2470,54 @@ img[src*="googleapis.com/"].georegion-map{
padding-left: 0;
list-style: none;
}
/******************************************
* EML Party display
********************************************/
.eml-party .name{
font-weight: bold;
}

/******************************************
* Projects
********************************************/
.projectHeader {
border-spacing: 10px;
border-collapse: separate;
.project-view{
width: calc(100% + 80px);
margin-left: -40px;
margin-top: -20px;
}
.projectHeader td{
vertical-align: middle;
#project-header-container{
margin-bottom: 20px;
padding-left: 40px;
box-sizing: border-box;
}
.top-buffer {
margin-top:5px;
margin-bottom:8px;
#project-section-tabs{
margin-bottom: 0px;
}
#project-section-tabs li a {
background-color: transparent;
border-radius: 0px;
border: 0px;
}
#project-section-tabs a{
text-align: center;
}
.project-section-content{
padding: 20px;
margin-top: 40px;
}
.project-display-image{
background-repeat: no-repeat;
background-position-x: 50%;
background-position-y: 50%;
background-size: cover;
min-height: 500px;
padding-top: 60px;
color: #FFF;
}
.project-display-text{
box-sizing: border-box;
background-color: var(--project-primary-color-transparent);
padding: 20px;
}
.logo-container{
height: 100px;
Expand All @@ -2498,7 +2533,9 @@ img[src*="googleapis.com/"].georegion-map{
}
.project-view .project-logo{
max-width: 100%;
max-height: 120px;
max-height: 70px;
display: inline-block;
margin-right: 20px;
}
.project-view #results-container{
width: 100%;
Expand All @@ -2508,35 +2545,67 @@ img[src*="googleapis.com/"].georegion-map{
.project-view .mapMode #map-container{
width: 50%;
}
#project-search-results #clear-all{
.project-view .data-catalog #clear-all{
display: none;
}
#project-description-container{
border-top: 1px solid #DDD;
margin-top: 20px;
padding-top: 10px;
}
#project-description-container img{
margin: 20px;
max-width: 80%;
width: auto;
.project-view .project-title{
font-weight: 100;
line-height: 70px;
margin: 0px;
font-size: 2em;
display: inline-block;
}
.project-logos-view{
border-top: 1px solid #DDD;
padding-top: 40px;
padding-left: 20px;
padding-right: 20px;
}
.project-logos-view .img-logo{
max-width: 120px;
margin: auto;
display: flex;
justify-content: center;
align-items: center;
}
.well.awards-info {
background: inherit;
margin-top: 20px;
margin: 20px;
}
#project-toc-container{
.project-view .toc-ul{
position: sticky;
position: -webkit-sticky;
top: 20px;
margin-top: 58px;
background-color: var(--project-primary-color);
margin-left: -20px;
padding: 0px;
}
.project-view .toc-ul > li > a{
padding-left: 20px;
padding-right: 20px;
margin: 0px;
}
.project-view .toc-ul a{
line-height: 2em;
font-weight: lighter;
}
.project-view .toc-ul > li > ul{
margin-left: 0px;
list-style: none;
}
.project-view .toc-ul > li > ul > li > a{
padding-left: 40px;
}
.project-view .toc-ul li,
.project-view .toc-ul a{
background-color: transparent;
color: #FFF;
border:0px;
border-radius: 0px;
text-shadow: none;
}
.project-view .toc-ul a:hover{
color: #FFF;
background-color: transparent;
}
.toc a{
color: #555;
Expand All @@ -2550,6 +2619,23 @@ i.toc-sub-item{
}
.project-view .logo-row{
margin-bottom: 40px;
display: flex;
justify-content: center;
align-items: center;
}
.project-view .profile .profile-title,
.project-view .profile .charts-container > p{
padding-left: 20px;
}
.project-view .profile .profile-title{
font-size: 1.5em;
}
.project-view #members .row-fluid{
padding: 20px;
box-sizing: border-box;
}
.project-view #members .row-fluid:nth-child(odd) {
background-color: #EEE;
}

/*** Colors used in the Project View ***/
Expand All @@ -2559,11 +2645,24 @@ i.toc-sub-item{
.project-view a:hover{
color: var(--project-secondary-color);
}
.project-view #project-section-tabs li{
background-color: var(--project-primary-color);
}
.project-view #project-section-tabs a:hover{
background-color: var(--project-secondary-color);
color: #FFF;
}
.project-view #project-section-tabs li.active{
background-color: var(--project-secondary-color);
}
.project-view #project-section-tabs a{
color: var(--project-primary-color);
color: #FFF;
}
.project-view #project-section-tabs .active a{
color: #555;
color: #FFF;
}
.project-view .toc-ul li > a:hover{
background-color: var(--project-secondary-color);
}
.project-view .result-row .citation .title{
color: var(--project-primary-color);
Expand Down Expand Up @@ -3673,6 +3772,9 @@ a.disabled {
}

/********* Filter Views ***********/
.project-view .filter-group{
padding: 0px 20px;
}
.filter-group .filter {
display: inline-block;
margin-right: 20px;
Expand All @@ -3684,6 +3786,9 @@ a.disabled {
.filter-group .filter input{
box-shadow: none;
}
.filter-group-links{
border-top: 1px solid #DDD;
}
.filter-group-link a,
.nav-tabs .filter-group-link a,
.nav-tabs .filter-group-link.active a {
Expand Down Expand Up @@ -4824,7 +4929,7 @@ textarea.xlarge{
}

/* ---- People / Parties ---- */
.eml-party{
.Editor .eml-party{
position: relative;
}
.controls-well > .party{
Expand All @@ -4841,7 +4946,7 @@ textarea.xlarge{
margin-top: 2em;
margin-bottom: 1em;
}
.eml-party .phone{
.Editor .eml-party .phone{
font-size: .8em;
padding: 5px;
height: 3em;
Expand Down
2 changes: 1 addition & 1 deletion src/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


<!-- Pull in correct theme configuration, then use Require.js to manage dependencies -->
<script id="loader" type="text/javascript" src="/metacatui/loader.js?v=2.6.1"
<script id="loader" type="text/javascript" src="/metacatui/loader.js?v=2.6.2"
data-theme="default"
data-metacat-context="metacat"
data-map-key="YOUR-GOOGLE-MAPS-API-KEY"
Expand Down
6 changes: 3 additions & 3 deletions src/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ require.config({
map: MetacatUI.themeMap,
urlArgs: "v=" + MetacatUI.metacatUIVersion,
paths: {
jquery: '/components/jquery-1.9.1.min',
jquery: MetacatUI.root + '/components/jquery-1.9.1.min',
jqueryui: MetacatUI.root + '/components/jquery-ui.min',
jqueryform: MetacatUI.root + '/components/jquery.form',
underscore: MetacatUI.root + '/components/underscore-min',
Expand All @@ -55,6 +55,7 @@ require.config({
rdflib: MetacatUI.root + '/components/rdflib.min',
x2js: MetacatUI.root + '/components/xml2json',
he: MetacatUI.root + '/components/he',
citation: MetacatUI.root + '/components/citation.min',
// showdown + extensions (used in the markdownView to convert markdown to html)
showdown: MetacatUI.root + '/components/showdown/showdown.min',
showdownHighlight: MetacatUI.root + '/components/showdown/extensions/showdown-highlight/showdown-highlight',
Expand All @@ -63,7 +64,6 @@ require.config({
showdownBootstrap: MetacatUI.root + '/components/showdown/extensions/showdown-bootstrap',
showdownDocbook: MetacatUI.root + '/components/showdown/extensions/showdown-docbook',
showdownKatex: MetacatUI.root + '/components/showdown/extensions/showdown-katex/showdown-katex.min',
citation: MetacatUI.root + '/components/showdown/extensions/showdown-citation/citation-0.4.0-9.min',
showdownCitation: MetacatUI.root + '/components/showdown/extensions/showdown-citation/showdown-citation',
showdownImages: MetacatUI.root + '/components/showdown/extensions/showdown-images',
showdownXssFilter: MetacatUI.root + '/components/showdown/extensions/showdown-xss-filter/showdown-xss-filter',
Expand Down Expand Up @@ -115,7 +115,7 @@ require.config({
exports: 'filterXSS'
},
citation: {
exports: 'Cite'
exports: 'citationRequire'
}
}
});
Expand Down
4 changes: 2 additions & 2 deletions src/js/models/AppModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ define(['jquery', 'underscore', 'backbone'],

defaultAccessPolicy: [],

baseUrl: "https://dev.nceas.ucsb.edu",//window.location.origin || (window.location.protocol + "//" + window.location.host),
baseUrl: window.location.origin || (window.location.protocol + "//" + window.location.host),
allowAccessPolicyChanges: true,
// the most likely item to change is the Metacat deployment context
context: '/metacat',
d1Service: '/d1/mn/v2',
d1CNBaseUrl: "https://cn-stage-2.test.dataone.org/",
d1CNBaseUrl: "https://cn.dataone.org/",
d1CNService: "cn/v2",
d1LogServiceUrl: null,
nodeServiceUrl: null,
Expand Down
2 changes: 1 addition & 1 deletion src/js/models/filters/Filter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ define(['jquery', 'underscore', 'backbone'],

//Add the value to the query string. Wrap in wildcards, if specified
if( value.indexOf(" ") > -1 ){
valuesQueryString += '"' + value + '"';
valuesQueryString += '*"' + value + '"*';
}
else if( this.get("matchSubstring") ){

Expand Down
Loading

0 comments on commit bbf14f7

Please sign in to comment.