Fixed demo file structure
diff --git a/Gruntfile.js b/Gruntfile.js
index b7cf080..5a7ac89 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -53,7 +53,8 @@
style: 'compressed'
},
files: {
- 'public/css/kalamar-<%= pkg.version %>.css' : 'dev/scss/kalamar.scss'
+ 'public/css/kalamar-<%= pkg.version %>.css' : 'dev/scss/kalamar.scss',
+ 'dev/css/kalamar.css' : 'dev/scss/kalamar.scss'
}
}
},
@@ -70,6 +71,12 @@
}
}
},
+ copy : {
+ src: 'dev/font/**',
+ dest: 'public/font/',
+ nonull: true,
+ timestamp: true
+ },
watch: {
/*
options: {
@@ -99,6 +106,10 @@
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-jasmine');
+ grunt.loadNpmTasks('grunt-contrib-copy');
grunt.registerTask('css', ['sass']);
- grunt.registerTask('default', ['concat', 'uglify', 'imagemin', 'sass']);
+ grunt.registerTask(
+ 'default',
+ ['copy', 'concat', 'uglify', 'imagemin', 'sass']
+ );
};
diff --git a/dev/js/demo/about.html b/dev/demo/about.html
similarity index 97%
rename from dev/js/demo/about.html
rename to dev/demo/about.html
index 39afb46..9dd3c29 100644
--- a/dev/js/demo/about.html
+++ b/dev/demo/about.html
@@ -2,9 +2,9 @@
<html>
<head>
<title>Tutorial demo</title>
- <link type="text/css" rel="stylesheet" href="../../css/build/kalamar.css" />
- <script src="../src/session.js"></script>
- <script src="../src/tutorial.js"></script>
+ <link type="text/css" rel="stylesheet" href="../css/kalamar.css" />
+ <script src="../js/src/session.js"></script>
+ <script src="../js/src/tutorial.js"></script>
</head>
<body class="embedded">
<div id="sidebar" tabindex="0" class="active">
diff --git a/dev/js/demo/all.html b/dev/demo/all.html
similarity index 93%
rename from dev/js/demo/all.html
rename to dev/demo/all.html
index ec6d017..c1e10d5 100644
--- a/dev/js/demo/all.html
+++ b/dev/demo/all.html
@@ -3,7 +3,7 @@
<head>
<title>CSS demo</title>
<meta charset="utf-8" />
- <link type="text/css" rel="stylesheet" href="../../css/build/kalamar.css" />
+ <link type="text/css" rel="stylesheet" href="../css/kalamar.css" />
</head>
<body>
<div id="kalamar-bg"></div>
@@ -139,15 +139,15 @@
</div>
</div>
</main>
- <script src="../lib/dagre/dagre.min.js"></script>
- <script src="../src/api.js"></script>
- <script src="../src/hint.js"></script>
- <script src="../src/match.js"></script>
- <script src="../src/menu.js"></script>
- <script src="../src/vc.js"></script>
- <script src="../src/session.js"></script>
- <script src="../src/tutorial.js"></script>
- <script src="../src/util.js"></script>
+ <script src="../js/lib/dagre/dagre.min.js"></script>
+ <script src="../js/src/api.js"></script>
+ <script src="../js/src/hint.js"></script>
+ <script src="../js/src/match.js"></script>
+ <script src="../js/src/menu.js"></script>
+ <script src="../js/src/vc.js"></script>
+ <script src="../js/src/session.js"></script>
+ <script src="../js/src/tutorial.js"></script>
+ <script src="../js/src/util.js"></script>
<script>
KorAP.URL = 'http://localhost:3000';
</script>
diff --git a/dev/js/demo/all.js b/dev/demo/all.js
similarity index 100%
rename from dev/js/demo/all.js
rename to dev/demo/all.js
diff --git a/dev/js/demo/hint.html b/dev/demo/hint.html
similarity index 97%
rename from dev/js/demo/hint.html
rename to dev/demo/hint.html
index 154bcaf..240f370 100644
--- a/dev/js/demo/hint.html
+++ b/dev/demo/hint.html
@@ -3,9 +3,9 @@
<head>
<title>Hint demo</title>
<meta charset="utf-8" />
- <script src="../src/menu.js"></script>
- <script src="../src/hint.js"></script>
- <link type="text/css" rel="stylesheet" href="../../css/build/kalamar.css" />
+ <script src="../js/src/menu.js"></script>
+ <script src="../js/src/hint.js"></script>
+ <link type="text/css" rel="stylesheet" href="../css/kalamar.css" />
<script>
// http://www.nlpado.de/~sebastian/software/ner_german.shtml
// http://www.cnts.ua.ac.be/conll2003/ner/
diff --git a/dev/js/demo/match.html b/dev/demo/match.html
similarity index 94%
rename from dev/js/demo/match.html
rename to dev/demo/match.html
index 7b51996..19014ba 100644
--- a/dev/js/demo/match.html
+++ b/dev/demo/match.html
@@ -3,16 +3,11 @@
<head>
<title>Match demo</title>
<meta charset="utf-8" />
- <script src="../lib/dagre/dagre.min.js"></script>
- <script src="../src/util.js"></script>
- <script src="../src/menu.js"></script>
- <script src="../src/match.js"></script>
- <link type="text/css"
- rel="stylesheet"
- href="../../css/font-awesome.min.css"></link>
- <link type="text/css"
- rel="stylesheet"
- href="../../css/build/kalamar.css"></link>
+ <script src="../js/lib/dagre/dagre.min.js"></script>
+ <script src="../js/src/util.js"></script>
+ <script src="../js/src/menu.js"></script>
+ <script src="../js/src/match.js"></script>
+ <link type="text/css" rel="stylesheet" href="../css/kalamar.css" />
<style type="text/css"
rel="stylesheet">
diff --git a/dev/js/demo/matchSort.html b/dev/demo/matchSort.html
similarity index 96%
rename from dev/js/demo/matchSort.html
rename to dev/demo/matchSort.html
index 860560e..2f7e5c5 100644
--- a/dev/js/demo/matchSort.html
+++ b/dev/demo/matchSort.html
@@ -3,9 +3,7 @@
<head>
<title>Match demo</title>
<meta charset="utf-8" />
- <link type="text/css"
- rel="stylesheet"
- href="../../css/build/kalamar.css"></link>
+ <link type="text/css" rel="stylesheet" href="../css/kalamar.css" />
<style type="text/css"
rel="stylesheet">
body {
diff --git a/dev/js/demo/menu.html b/dev/demo/menu.html
similarity index 92%
rename from dev/js/demo/menu.html
rename to dev/demo/menu.html
index 985be65..13f7ae9 100644
--- a/dev/js/demo/menu.html
+++ b/dev/demo/menu.html
@@ -3,11 +3,8 @@
<head>
<title>Menu demo</title>
<meta charset="utf-8" />
- <script src="../src/menu.js"></script>
-<!--
- <link href="../../css/vc.css" rel="stylesheet" type="text/css"></link>
--->
- <link href="../../css/build/kalamar.css" rel="stylesheet" type="text/css"></link>
+ <script src="../js/src/menu.js"></script>
+ <link type="text/css" rel="stylesheet" href="../css/kalamar.css" />
<style type="text/css" rel="stylesheet">
.info {
background-color: #ddd;
diff --git a/dev/js/demo/session.html b/dev/demo/session.html
similarity index 88%
rename from dev/js/demo/session.html
rename to dev/demo/session.html
index 59cfe4f..034771c 100644
--- a/dev/js/demo/session.html
+++ b/dev/demo/session.html
@@ -2,7 +2,8 @@
<html>
<head>
<title>Cookie demo</title>
- <script src="../src/session.js"></script>
+ <link type="text/css" rel="stylesheet" href="../css/kalamar.css" />
+ <script src="../js/src/session.js"></script>
<script>
var cookey;
diff --git a/dev/js/demo/vc.html b/dev/demo/vc.html
similarity index 92%
rename from dev/js/demo/vc.html
rename to dev/demo/vc.html
index ae6aef1..353b309 100644
--- a/dev/js/demo/vc.html
+++ b/dev/demo/vc.html
@@ -3,13 +3,13 @@
<head>
<title>Virtual Collection demo</title>
<meta charset="utf-8" />
- <script src="../src/menu.js"></script>
- <script src="../src/vc.js"></script>
- <link href="../../css/build/kalamar.css" rel="stylesheet" type="text/css"></link>
+ <script src="../js/src/menu.js"></script>
+ <script src="../js/src/vc.js"></script>
+ <link type="text/css" rel="stylesheet" href="../css/kalamar.css" />
<style type="text/css" rel="stylesheet">
body {
- background-color: #7ba400;
+ background-color: #9bad0b;
color: white;
font-family: tahoma, verdana, arial;
font-size: 10pt;
diff --git a/dev/font/FontAwesome.otf b/dev/font/FontAwesome.otf
new file mode 100644
index 0000000..f7936cc
--- /dev/null
+++ b/dev/font/FontAwesome.otf
Binary files differ
diff --git a/public/font/fontawesome-webfont.eot b/dev/font/fontawesome-webfont.eot
similarity index 100%
rename from public/font/fontawesome-webfont.eot
rename to dev/font/fontawesome-webfont.eot
Binary files differ
diff --git a/public/font/fontawesome-webfont.svg b/dev/font/fontawesome-webfont.svg
similarity index 100%
rename from public/font/fontawesome-webfont.svg
rename to dev/font/fontawesome-webfont.svg
diff --git a/public/font/fontawesome-webfont.ttf b/dev/font/fontawesome-webfont.ttf
similarity index 100%
rename from public/font/fontawesome-webfont.ttf
rename to dev/font/fontawesome-webfont.ttf
Binary files differ
diff --git a/public/font/fontawesome-webfont.woff b/dev/font/fontawesome-webfont.woff
similarity index 100%
rename from public/font/fontawesome-webfont.woff
rename to dev/font/fontawesome-webfont.woff
Binary files differ
diff --git a/dev/font/fontawesome-webfont.woff2 b/dev/font/fontawesome-webfont.woff2
new file mode 100644
index 0000000..3311d58
--- /dev/null
+++ b/dev/font/fontawesome-webfont.woff2
Binary files differ
diff --git a/dev/scss/util.scss b/dev/scss/util.scss
index a4971c4..ee2eec5 100644
--- a/dev/scss/util.scss
+++ b/dev/scss/util.scss
@@ -83,8 +83,8 @@
/**
* Path information
*/
-$img-path: '../../img/build';
-$font-path: '../../font';
+$img-path: '../img';
+$font-path: '../font';
/**
* Margins
diff --git a/package.json b/package.json
index b21011c..f8ece68 100755
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-concat": "^0.5.1",
+ "grunt-contrib-copy": "^0.8.0",
"grunt-contrib-imagemin": "^0.9.4",
"grunt-contrib-jasmine": "^0.8.2",
"grunt-contrib-sass": "^0.9.2",
