Skip to content
This repository was archived by the owner on Sep 20, 2019. It is now read-only.

Commit 637382d

Browse files
committed
docs(website): save off website progress from merging gh-pages with master
1 parent 67e9dc2 commit 637382d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3752
-8
lines changed

.npmignore

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# OS
2+
# ===========
3+
.DS_Store
4+
Thumbs.db
5+
6+
# Project
7+
# ===========
8+
dist/ui-leaflet.pre.js
9+
js/angular-leaflet-directive-webpage.ngmin.js
10+
11+
# Related ecosystem
12+
# ===========
13+
node_modules
14+
bower_components
15+
coverage
16+
saucelabs.json
17+
18+
# General
19+
# ===========
20+
temp
21+
*.log
22+
*.swp
23+
.*.swp
24+
*~
25+
*.iml
26+
.idea
27+
.project
28+
core
29+
lib
30+
tags
31+
.tags
32+
TAGS
33+
.TAGS
34+
35+
#BOWER (as dependency) ignore
36+
website/
37+
src
38+
doc
39+
examples
40+
test
41+
*.md
42+
Gruntfile.js
43+
package.json
44+
bower.json

bower.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@
5050
"leaflet-minimap": "~2.2.0",
5151
"esri-leaflet-clustered-feature-layer": "~1.0.x",
5252
"esri-leaflet-heatmap-feature-layer": "~1.0.x",
53-
"leaflet-search": "~1.5.8"
53+
"leaflet-search": "~1.5.8",
54+
"highlightjs": "~8.8.0",
55+
"angular-highlightjs": "~0.4.3"
5456
},
5557
"ignore": [
58+
"website/",
5659
"**/.*",
5760
"src",
5861
"doc",

grunt/aliases.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,12 @@ bump-@-major:
104104
- 'graph'
105105
- 'bump-commit'
106106

107-
examples:
108-
- 'shell:examples'
109-
- 'concat:examples'
107+
# examples:
108+
# - 'shell:examples'
109+
# - 'concat:examples'
110110

111111
graph:
112112
- 'angular_architecture_graph'
113+
114+
website:
115+
- 'concurrent:website'

grunt/concat.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ module.exports = function(grunt, options) {
4141
},
4242
src: ['examples/js/controllers/*.js'],
4343
dest: 'examples/js/controllers.js'
44+
},
45+
website:{
46+
options: {
47+
//separator: ';',
48+
banner: '(function (angular) {\n',
49+
footer: '})(window.angular);'
50+
},
51+
src: ['website/src/js/app.js', 'website/src/js/**/*.js'],
52+
dest: 'website/distJs/<%= pkg.name %>-webpage.js',
4453
}
4554
};
4655
};

grunt/concurrent.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ module.exports = function (grunt, options) {
2525
options: {
2626
logConcurrentOutput: true
2727
}
28+
},
29+
website: {
30+
tasks: ['concat:website', 'watch:website', 'connect:webserver'],
31+
options: {
32+
logConcurrentOutput: true
33+
}
2834
}
2935
};
3036
};

grunt/jshint.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = function (grunt, options) {
55
return {
66
options: JSON.parse(fs.readFileSync('.jshintrc')),
77
source: {
8-
src: ['src/directives/*.js', 'src/services/*.js']
8+
src: ['src/directives/*.js', 'src/services/*.js', 'website/js/**/*.js']
99
},
1010
tests: {
1111
src: ['test/unit/*.js', 'test/e2e/*.js']

grunt/shell.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ module.exports = function(grunt, options) {
1717
},
1818
npm_install: {
1919
command: 'npm install'
20-
},
21-
examples: {
22-
command: 'node generate-examples.js'
2320
}
21+
// ,
22+
// examples: {
23+
// command: 'node generate-examples.js'
24+
// }
2425
};
2526
};

grunt/watch.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ module.exports = function(grunt, options) {
5252
tasks: [
5353
'examples'
5454
]
55+
},
56+
website: {
57+
files: ['website/src/js/app.js', 'website/src/js/**/*.js'],
58+
tasks: ['jshint', 'concat:website', 'uglify'] //'ngmin'
5559
}
5660
};
5761
};

index.html

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<!DOCTYPE html>
2+
<html ng-app="mainPage" lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<!--<meta name="fragment" content="!">-->
6+
<meta name="keywords" content="angularjs,leaflet,openstreetmap,javascript,directive,plugin,google maps">
7+
<meta name="description" content="Leaflet directive for AngularJS">
8+
<title>Leaflet directive for AngularJS</title>
9+
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="bower_components/leaflet/dist/leaflet.css" />
11+
<link rel="stylesheet" href="bower_components/highlightjs/styles/github.css" />
12+
<link rel="stylesheet" type="text/css" href="http://cloud.github.com/downloads/lafeber/world-flags-sprite/flags32.css" />
13+
<link rel="stylesheet" href="website/css/style.css" />
14+
</head>
15+
16+
<body ng-cloak ng-controller="MainController">
17+
<div class="container" ng-controller="HeaderController">
18+
<header class="navbar navbar-default" role="navigation">
19+
<div class="navbar-header">
20+
<a href="#!/" class="navbar-brand">ui-leaflet</a>
21+
</div>
22+
<ul class="nav navbar-nav navbar-right">
23+
<li ng-class="{ active: activeTab == 'getting-started' || activeTab == '' }"><a href="#!/getting-started">Getting started</a></li>
24+
<li ng-class="{ active: activeTab == 'examples' }"><a ng-href="#!/examples/simple-map">Examples</a></li>
25+
<li ng-class="{ active: activeTab == 'howto-extend' }"><a ng-href="#!/howto-extend">How to extend</a></li>
26+
<li><a href="http://github.com/angular-ui/ui-leaflet">Github repository</a></li>
27+
</ul>
28+
</header>
29+
<div class="banner">
30+
<a class="forkme" href="https://github.com/angular-ui/ui-leaflet" rel="external">
31+
<img src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub">
32+
</a>
33+
<leaflet center="center" defaults="defaults" events="events" id="header"></leaflet>
34+
</div>
35+
<div class="bottom-banner">
36+
<div class="container">
37+
Simple to use directive for easy embedding and interacting with a map managed with the <a href="http://leafletjs.com/">leaflet map library</a> on an <a href="http://angularjs.org">AngularJS</a> application.
38+
</div>
39+
</div>
40+
</div>
41+
42+
<div class="container content">
43+
<ng-view></ng-view>
44+
</div>
45+
46+
<div class="container footer">
47+
<footer role="contentinfo">
48+
<p class="pull-right">Page built with <a href="http://leafletjs.com">LeafletJS</a>, <a href="http://angularjs.org/">AngularJS</a> and <a href="http://getbootstrap.com/">Bootstrap</a></p>
49+
</footer>
50+
</div>
51+
52+
<script src="https://maps.googleapis.com/maps/api/js?libraries=geometry&sensor=false"></script>
53+
<script src="bower_components/jquery/dist/jquery.min.js"></script>
54+
<script src="bower_components/leaflet/dist/leaflet.js"></script>
55+
<script src="bower_components/leaflet-plugins/layer/tile/Google.js"></script>
56+
<script src="bower_components/highlightjs/highlight.pack.js"></script>
57+
<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
58+
<script src="bower_components/angular/angular.js"></script>
59+
<script src="bower_components/angular-route/angular-route.min.js"></script>
60+
<script src="bower_components/angular-highlightjs/angular-highlightjs.min.js"></script>
61+
<script src="bower_components/angular-simple-logger/dist/angular-simple-logger.js"></script>
62+
<script src="dist/ui-leaflet.js"></script>
63+
<script src="website/distJs/ui-leaflet-webpage.js"></script>
64+
</body>
65+
66+
</html>

website/css.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.1/leaflet.css">

0 commit comments

Comments
 (0)