Commit ab1b6a66 authored by Tomas Pettersson's avatar Tomas Pettersson 🏸

removed points from graph

parent defda5ef
**/node_modules/
/bower_components/
app/src/bowerlib.*
padmauth.properties
\ No newline at end of file
/bower_components/
\ No newline at end of file
......@@ -13,16 +13,7 @@ module.exports = function(grunt) {
},
src: 'dist/<%= pkg.name %>.js',
dest: 'dist/<%= pkg.name %>.min.js'
},
app: {
options: {
banner: '/*! lib.map <%= grunt.template.today("yyyy-mm-dd") %> */\n',
sourceMap: true,
sourceMapName: 'app/src/lib.map'
},
src: 'app/src/lib.js',
dest: 'app/src/lib.min.js'
}
},
concat: {
dist: {
......@@ -30,13 +21,7 @@ module.exports = function(grunt) {
'dist/<%= pkg.name %>.js': 'src/*.js',
'dist/<%= pkg.name %>.css': 'src/*.css',
}
},
app: {
files: {
'app/src/lib.js': ['app/src/bowerlib.js', 'dist/<%= pkg.name %>.js'],
'app/src/lib.css': ['app/src/bowerlib.css','dist/<%= pkg.name %>.css'],
}
}
}
},
cssmin: {
options: {
......@@ -47,11 +32,6 @@ module.exports = function(grunt) {
files: {
'dist/<%= pkg.name %>.min.css': 'dist/<%= pkg.name %>.css'
}
},
app: {
files: {
'app/src/lib.min.css': 'app/src/lib.css'
}
}
},
......@@ -65,79 +45,11 @@ module.exports = function(grunt) {
"js/uikit.js", "js/components/notify.min.js",
"css/uikit.almost-flat.min.css", "css/components/notify.almost-flat.min.css"
]
},
"DataTables" : {
"main" : ["media/js/jquery.dataTables.min.js", "media/js/dataTables.uikit.min.js", "media/css/jquery.dataTables.min.css", "media/css/dataTables.uikit.min.css"]
}
}
}
},
bower_concat: {
app: {
dest: {
'js': 'app/src/bowerlib.js',
'css': 'app/src/bowerlib.css'
},
bowerOptions: {
relative: false
},
includeDev: true,
mainFiles: {
'jquery' : 'dist/jquery.min.js',
'DataTables': ['media/js/jquery.dataTables.min.js', 'media/js/dataTables.uikit.min.js', 'media/css/jquery.dataTables.min.css', 'media/css/dataTables.uikit.min.css'],
'datatables.net-select': 'js/dataTables.select.min.js',
'uikit': [
'js/uikit.min.js', 'js/components/notify.min.js',
'css/uikit.almost-flat.min.css', 'css/components/notify.almost-flat.min.css'
]
},
dependencies: {
'DataTables': 'jquery',
'datatables.net-select': 'DataTables',
'uikit': 'jquery',
'jquery-file-upload': 'jquery'
}
}
},
copy: {
app: {
files: [
{
expand: true,
flatten: true,
src: 'bower_components/**/images/*',
dest: 'app/images/'
},
{
expand: true,
flatten: true,
src: ['bower_components/**/img/*', '!bower_components/leaflet-navigation/src/help/classic/img/**'],
dest: 'app/img/'
},
{
expand: true,
flatten: true,
src: 'bower_components/**/fonts/*',
dest: 'app/fonts/'
},
{
expand: true,
flatten: true,
src: 'src/images/*',
dest: 'app/images/'
}
]
}
},
clean: [
'app/fonts',
'app/images',
'app/help',
'app/img',
'app/src'
]
}
});
......@@ -150,6 +62,5 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-wiredep');
grunt.registerTask('dist', ['concat:dist', 'uglify:dist', 'cssmin:dist']);
grunt.registerTask('default', ['clean', 'dist', 'bower_concat:app', 'concat:app', 'uglify:app', 'cssmin:app','copy:app' ]);
// grunt.registerTask('dist', ['concat:dist', 'uglify:dist', 'cssmin:dist']);
};
......@@ -30,66 +30,28 @@ Open browser on http://localhost:8080/demo
## Usage example
var map = L.map('map').setView([ 58.5, 19.0 ], 5);
L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
maxZoom : 18,
attribution : '&copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors</a>'
}).addTo(map);
var hash = new L.Hash(map);
var language = 'en';
var navLangData = {
"tTitle": "Navigation",
"tLogin" : "Login",
"tLogout" : "Logout"
};
var navControl = new Navigation("navigation", {
"user" : {
"url" : "/demo",
"access" : "test"
},
"navigation": {
"Link1" : "path",
"Link2" : "path",
"Link3" : "path"
},
"position": {
"map" : map
},
"title" : {true,
"search" : {
"url" : "search"
},
"help" : {
"classic" : {
"id" : "introduction"
},
"guide" : false,
"indepth" : {
"id" : "kde"
}
},
"language" : true,
"lang" : language,
"langdata" : navLangData
});;
var graphDiv = document.createElement("DIV");
var graphbutton = document.createElement("BUTTON");
var t = document.createTextNode("Graph");
document.body.appendChild(graphbutton);
var id = '39e8929d-8d9d-4b0f-b95b-61361bd7446e';
var targetid = "graph" + id;
graphbutton.setAttribute('data-uk-modal', "{target:'#" + targetid + "'}");
graphbutton.appendChild(t);
var language = "en";
var langData = {
"tTitle" : "Graph"
};
var graph = new Graph(targetid, id, {
"lang" : language,
"langdata" : langData
});
### Options
| Option | Default | Description |
| -------------|------------|-------------|
| `user` | false | activates the user link |
| `help` | false | activates the help link |
| `title` | true | shows a title |
| `language` | false | activates the language link |
| `search` | null | activates the search link |
| `position` | null | activates the position link |
| `navigation` | null | activates the navigation link |
## Copyright and License
## Contact information
......
......@@ -183,6 +183,7 @@ var Graph = (function () {
}
function configItem(label, color) {
return {
radius: 0,
fill: false,
borderColor: color,
label: label,
......
This diff is collapsed.
......@@ -203,6 +203,7 @@ class Graph {
}
function configItem(label: string, color: any) {
return {
radius: 0,
fill: false,
borderColor: color,
label: label,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment