Skip to content

Commit 2fdef3b

Browse files
authored
Literal lang work (#81)
* New literal lang module * finish up literal-lang * add test option in gruntfile * fix validation error * button fixes * label fix * button fixes * fixes to use verso for startingpoints * update nodmon to build test * modfied how lang-script works, does not require script ignores latn input * fix starting points * fixes * label fixes * modfied how lang-script works, does not require script ignores latn input * fixes, table, etc. * add helper functions, reduce iterations * add helper functions, reduce iterations * removed no script text and made larger * fixes for exit buttons * template fixes * removed no script text and made larger * modify oclc scripting so the key is not persisted, fix error handling, reduce config size * final changes for pull * test.html add * config fixes
1 parent 1e13119 commit 2fdef3b

19 files changed

+1983
-1455
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ node_modules
44
builds/*
55
docs/plato/*
66

7-
*.html
87
static/js/config-*.js
98

109
.csslintrc

Gruntfile.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@ module.exports = function(grunt) {
66
stripBanners: true,
77
banner: '/* <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */',
88
},
9+
test: {
10+
files: {
11+
'builds/bfe-test.js' : ['src/lib/mini_require.js', 'src/bfe.js','src/bfestore.js','src/bfelogging.js','src/bfeusertemplates.js','src/bfeliterallang.js','src/bfelookups.js', 'src/bfeapi.js','src/lib/aceconfig.js'],
12+
'builds/bfe-test.css' : ['src/css/bootstrap.css', 'src/css/typeahead.css', 'src/css/bfeusertemplates.css', 'src/css/bfeliterallang.css'],
13+
}
14+
},
915
dist: {
1016
files: {
11-
'builds/bfe.js' : ['src/lib/mini_require.js', 'src/bfe.js','src/bfestore.js','src/bfelogging.js','src/bfeusertemplates.js','src/bfelookups.js', 'src/bfeapi.js','src/lib/aceconfig.js'],
12-
'builds/bfe.css' : ['src/css/bootstrap.css', 'src/css/typeahead.css', 'src/css/bfeusertemplates.css'],
17+
'builds/bfe.js' : ['src/lib/mini_require.js', 'src/bfe.js','src/bfestore.js','src/bfelogging.js','src/bfeusertemplates.js','src/bfeliterallang.js','src/bfelookups.js', 'src/bfeapi.js','src/lib/aceconfig.js'],
18+
'builds/bfe.css' : ['src/css/bootstrap.css', 'src/css/typeahead.css', 'src/css/bfeusertemplates.css', 'src/css/bfeliterallang.css'],
1319
}
1420
},
1521
},
@@ -52,5 +58,5 @@ module.exports = function(grunt) {
5258
grunt.loadNpmTasks('grunt-contrib-concat');
5359
grunt.loadNpmTasks('grunt-plato');
5460

55-
grunt.registerTask('default', ['concat','uglify', 'cssmin', 'plato']);
61+
grunt.registerTask('default', ['concat:dist','uglify', 'cssmin', 'plato']);
5662
};

development.html

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,11 @@
1313
<!-- Optional theme -->
1414
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
1515

16-
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
17-
<!--[if lt IE 9]>
18-
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
19-
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
20-
<![endif]-->
21-
2216
<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.2.5/polyfill.min.js"></script>
2317
<script src="https://cdnjs.cloudflare.com/ajax/libs/url-search-params/1.1.0/url-search-params.js"></script>
2418

2519
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
20+
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
2621
<script src="https://code.jquery.com/jquery-migrate-1.2.1.js"></script>
2722
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
2823

@@ -40,14 +35,10 @@
4035
<script src="static/js/tooltipster.bundle.min.js"></script>
4136
<link rel="stylesheet" type="text/css" href="static/css/tooltipster.bundle.css">
4237

43-
4438
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.9/css/jquery.dataTables.min.css">
4539

46-
4740
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script>
4841

49-
<!--static/js/lodash.min.js-->
50-
5142
<script type="text/javascript" src="static/js/n3-browser.min.js"></script>
5243

5344
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js"></script>
@@ -59,28 +50,9 @@
5950
<script type="text/javascript" src="builds/bfe.js"></script>
6051
<link rel="stylesheet" type="text/css" href="builds/bfe.css" />
6152

62-
<style>
63-
@media screen {
64-
body {
65-
padding-top: 50px;
66-
padding-bottom: 20px;
67-
}
68-
}
69-
70-
@media print {
71-
a[href]:after {
72-
content: none;
73-
}
74-
}
75-
76-
.popover {
77-
max-width: none
78-
}
79-
</style>
8053
</head>
8154

8255
<body>
83-
8456
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
8557
<div class="container-fluid">
8658
<div class="navbar-header">
@@ -90,13 +62,13 @@
9062
<span class="icon-bar"></span>
9163
<span class="icon-bar"></span>
9264
</button>
93-
<a class="navbar-brand" href="/bibliomata/bfe/development.html">BIBFRAME Editor Demo</a>
65+
<a class="navbar-brand" href="/bfe/development.html">BIBFRAME Editor</a>
9466
</div>
9567
<div class="collapse navbar-collapse visible-print" id="bs-example-navbar-collapse-1">
9668
<ul class="nav navbar-nav navbar-right">
9769
<li class="divider"></li>
9870
<li>
99-
<a href="http://www.loc.gov/bibframe/">&laquo; Back to LC BIBFRAME Site</a>
71+
<a href="http://www.loc.gov/bibframe/">&laquo; LC BIBFRAME Site</a>
10072
</li>
10173
<li class="divider"></li>
10274
</ul>
@@ -138,9 +110,11 @@
138110
<a href="http://www.loc.gov/bibframe/">www.loc.gov/bibframe</a>.</p>
139111
</div>
140112
</footer>
141-
</body>
113+
142114
<script type="text/javascript">
143115
var bfeditor = bfe.fulleditor(config, "bfeditor");
144116
</script>
145117

146-
</html>
118+
</body>
119+
120+
</html>

env.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
echo "env = {"
22
echo " RECTOBASE: '$RECTOBASE',"
3-
echo " BASEDBURI: '$BASEDBURI'"
3+
echo " BASEDBURI: '$BASEDBURI',"
4+
echo " OCLCKEY: '$OCLCKEY'"
45
echo "}"

index.html

Lines changed: 42 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,58 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<title>(Bibliographic Framework Initiative Technical Site - BIBFRAME.ORG)</title>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<link rel="shortcut icon" type="image/png" href="/static/images/favicon.ico" />
8-
<!-- Latest compiled and minified CSS -->
9-
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
103

11-
<!-- Optional theme -->
12-
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
4+
<head>
5+
<title>(Bibliographic Framework Initiative Technical Site - BIBFRAME.ORG)</title>
6+
<meta charset="utf-8">
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
9+
<link rel="shortcut icon" type="image/png" href="/static/images/favicon.ico" />
10+
<!-- Latest compiled and minified CSS -->
11+
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
1312

14-
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
15-
<!--[if lt IE 9]>
16-
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
17-
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
18-
<![endif]-->
13+
<!-- Optional theme -->
14+
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
1915

20-
<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.2.5/polyfill.min.js"></script>
21-
<script src="https://cdnjs.cloudflare.com/ajax/libs/url-search-params/1.1.0/url-search-params.js"></script>
16+
<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.2.5/polyfill.min.js"></script>
17+
<script src="https://cdnjs.cloudflare.com/ajax/libs/url-search-params/1.1.0/url-search-params.js"></script>
2218

23-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
24-
<script src="https://code.jquery.com/jquery-migrate-1.2.1.js"></script>
25-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
19+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
20+
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
21+
<script src="https://code.jquery.com/jquery-migrate-1.2.1.js"></script>
22+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
2623

27-
<script src="https://cdn.datatables.net/1.10.19/js/jquery.dataTables.js"></script>
28-
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.4/moment.js"></script>
24+
<script src="https://cdn.datatables.net/1.10.19/js/jquery.dataTables.js"></script>
25+
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.4/moment.js"></script>
2926

30-
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.9/css/jquery.dataTables.min.css">
27+
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.9/css/jquery.dataTables.min.css">
3128

32-
<script src="https://cdn.jsdelivr.net/g/[email protected]"></script>
33-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jsonld/0.4.12/jsonld.min.js"></script>
29+
<script src="https://cdn.jsdelivr.net/g/[email protected]"></script>
30+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jsonld/0.4.12/jsonld.min.js"></script>
3431

35-
<script src="static/js/short-uuid.min.js"></script>
36-
<script src="static/js/typeahead.jquery.corejavascript.fork.js"></script>
32+
<script src="static/js/short-uuid.min.js"></script>
33+
<script src="static/js/typeahead.jquery.corejavascript.fork.js"></script>
3734

38-
<script src="static/js/tooltipster.bundle.min.js"></script>
39-
<link rel="stylesheet" type="text/css" href="static/css/tooltipster.bundle.css">
35+
<script src="static/js/tooltipster.bundle.min.js"></script>
36+
<link rel="stylesheet" type="text/css" href="static/css/tooltipster.bundle.css">
4037

38+
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.9/css/jquery.dataTables.min.css">
4139

42-
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.9/css/jquery.dataTables.min.css">
40+
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script>
4341

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

45-
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script>
44+
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js"></script>
45+
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3-tip/0.6.7/d3-tip.min.js"></script>
4646

47-
<!--static/js/lodash.min.js-->
47+
<script type="text/javascript" src="static/js/jsonld-vis.js"></script>
48+
<link rel="stylesheet" type="text/css" href="static/css/jsonld-vis.css">
4849

49-
<script type="text/javascript" src="static/js/n3-browser.min.js"></script>
50-
51-
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js"></script>
52-
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3-tip/0.6.7/d3-tip.min.js"></script>
53-
54-
<script type="text/javascript" src="static/js/jsonld-vis.js"></script>
55-
<link rel="stylesheet" type="text/css" href="static/css/jsonld-vis.css">
56-
57-
<script type="text/javascript" src="builds/bfe.min.js"></script>
58-
<link rel="stylesheet" type="text/css" href="builds/bfe.css" />
59-
60-
<style>
61-
@media screen {
62-
body {
63-
padding-top: 50px;
64-
padding-bottom: 20px;
65-
}
66-
}
67-
68-
@media print {
69-
a[href]:after {
70-
content: none;
71-
}
72-
}
73-
74-
.popover {
75-
max-width: none
76-
}
77-
</style>
50+
<script type="text/javascript" src="builds/bfe.min.js"></script>
51+
<link rel="stylesheet" type="text/css" href="builds/bfe.min.css" />
7852

7953
</head>
8054

8155
<body>
82-
83-
8456
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
8557
<div class="container-fluid">
8658
<div class="navbar-header">
@@ -90,13 +62,13 @@
9062
<span class="icon-bar"></span>
9163
<span class="icon-bar"></span>
9264
</button>
93-
<a class="navbar-brand" href="bfe/development.html">BIBFRAME Editor Demo</a>
65+
<a class="navbar-brand" href="/bfe/index.html">BIBFRAME Editor</a>
9466
</div>
9567
<div class="collapse navbar-collapse visible-print" id="bs-example-navbar-collapse-1">
9668
<ul class="nav navbar-nav navbar-right">
9769
<li class="divider"></li>
9870
<li>
99-
<a href="http://www.loc.gov/bibframe/">&laquo; Back to LC BIBFRAME Site</a>
71+
<a href="http://www.loc.gov/bibframe/">&laquo; LC BIBFRAME Site</a>
10072
</li>
10173
<li class="divider"></li>
10274
</ul>
@@ -109,7 +81,7 @@
10981
<a href="../index.html">Home</a>
11082
</li>
11183
<li>
112-
<a href="bfe/index.html">Editor</a>
84+
<a href="/bfe/index.html">Editor</a>
11385
</li>
11486
</ol>
11587

@@ -138,10 +110,11 @@
138110
<a href="http://www.loc.gov/bibframe/">www.loc.gov/bibframe</a>.</p>
139111
</div>
140112
</footer>
141-
<script type="text/javascript">
142-
var bfeditor = bfe.fulleditor(config, "bfeditor");
143-
</script>
113+
114+
<script type="text/javascript">
115+
var bfeditor = bfe.fulleditor(config, "bfeditor");
116+
</script>
144117

145118
</body>
146119

147-
</html>
120+
</html>

nodemon.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"events": {
3-
"start": "grunt"
3+
"start": "grunt concat:test"
44
},
55
"ext": "js html css",
66
"watch": "src"

0 commit comments

Comments
 (0)