Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
kirkhess committed Mar 21, 2018
2 parents c707ae5 + 48ac3ba commit c632ee0
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 8 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,11 @@ v0.2.x
* Dryice build has been replaced with Grunt.

v0.3.x
* Document config.js
* Refactor bfelookups.js into more generic component.
* Implement BF 2.0 Ontology
* LC Bibframe Pilot 2.0 support.
* Implement save/load api

v0.4.x
* Implement v2.0 of vocabulary.
* Rewrite editor using Angular.js.
* Implement automated testing.

Expand Down
36 changes: 31 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,28 @@
<script src="https://code.jquery.com/jquery-migrate-1.2.1.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>

<script type="text/javascript" src="builds/bfe.min.js"></script>
<link rel="stylesheet" href="builds/bfe.min.css" />
<script src="https://cdn.datatables.net/1.10.9/js/jquery.dataTables.js"></script>
<link rel="stylesheet" href="//cdn.datatables.net/1.10.9/css/jquery.dataTables.min.css">

<script src="https://cdn.jsdelivr.net/g/[email protected]"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jsonld/0.3.15/jsonld.js"></script>

<script src="static/js/short-uuid.min.js"></script>
<script src="static/js/twitter-typeahead-0.10.2.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script>

<!--static/js/lodash.min.js-->

<script type="text/javascript" src="static/js/n3-browser.min.js"></script>

<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3-tip/0.6.7/d3-tip.min.js"></script>

<script type="text/javascript" src="static/js/jsonld-vis.js"></script>
<link rel="stylesheet" href="static/css/jsonld-vis.css">

<script type="text/javascript" src="builds/bfe.dev.js"></script>
<link rel="stylesheet" href="builds/bfe.css" />

<style>
@media screen {
Expand All @@ -40,7 +60,6 @@
}
</style>


</head>

<body>
Expand All @@ -59,7 +78,7 @@
<div class="collapse navbar-collapse visible-print" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li class="divider"></li>
<li><a href="http://www.loc.gov/bibframe/">&laquo; LC BIBFRAME Site</a></li>
<li><a href="http://www.loc.gov/bibframe/">&laquo; Back to LC BIBFRAME Site</a></li>
<li class="divider"></li>
</ul>
</div>
Expand All @@ -75,7 +94,14 @@
<div id="iealert"></div>
</div>

<script type="text/javascript" src="static/js/config.js"></script>
<script type="text/javascript">
function reloadJs(src) {
src = $('script[src$="' + src + '"]').attr("src");
$('script[src$="' + src + '"]').remove();
$('<script/>').attr('src', src).appendTo('body');
}
</script>
<script type="text/javascript" src="static/js/config-dev.js"></script>

<br/><br/><br/>

Expand Down

0 comments on commit c632ee0

Please sign in to comment.