Skip to content

Commit 3e8e063

Browse files
committed
v.2.1.1
1 parent 13070d0 commit 3e8e063

811 files changed

Lines changed: 400 additions & 142438 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
node_modules/
22
nbproject/
3-
.idea/
3+
.idea/
4+
bower_components/

.gitmodules

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010
[submodule "src/assets/submodule/tablesorter"]
1111
path = src/assets/submodule/tablesorter
1212
url = https://github.com/Mottie/tablesorter.git
13-
[submodule "src/assets/submodule/gmaps"]
14-
path = src/assets/submodule/gmaps
15-
url = https://github.com/HPNeo/gmaps.git
16-
[submodule "src/assets/submodule/Font-Awesome"]
17-
path = src/assets/submodule/Font-Awesome
18-
url = https://github.com/FortAwesome/Font-Awesome.git
1913
[submodule "src/assets/submodule/countdown"]
2014
path = src/assets/submodule/countdown
2115
url = https://github.com/kbwood/countdown.git

Gruntfile.js

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,41 @@ module.exports = function (grunt) {
134134
cwd: 'src/ember',
135135
src: ['*.html'],
136136
dest: 'dist'
137-
}
137+
},
138+
{
139+
expand: true,
140+
cwd: 'node_modules/less/dist/',
141+
src: ['less-1.5.0.min.js'],
142+
dest: 'dist/assets/lib'
143+
},
144+
{
145+
expand: true,
146+
cwd: 'bower_components/jquery/',
147+
src: ['./**/jquery*.min.*'],
148+
dest: 'dist/assets/lib'
149+
},
150+
{
151+
expand: true,
152+
cwd: 'bower_components/bootstrap/dist/',
153+
src: ['./**/*.*'],
154+
dest: 'dist/assets/lib/bootstrap'
155+
},
156+
{
157+
expand: true,
158+
cwd: 'bower_components/font-awesome/',
159+
src: ['./css/*.*','./fonts/*.*'],
160+
dest: 'dist/assets/lib/Font-Awesome'
161+
}
162+
,
163+
{
164+
expand: true,
165+
cwd: 'bower_components/gmaps/',
166+
src: ['./**/gmaps.js'],
167+
dest: 'dist/assets/lib/gmaps'
168+
}
138169
]
139170
}
171+
140172
},
141173

142174
watch: {

README.md

Lines changed: 53 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
Free Admin Template with Twitter Bootstrap [![Build Status](https://travis-ci.org/onokumus/Bootstrap-Admin-Template.png)](http://travis-ci.org/onokumus/Bootstrap-Admin-Template)
1+
Metis Admin Template with Twitter Bootstrap [![Build Status](https://travis-ci.org/onokumus/Bootstrap-Admin-Template.png)](http://travis-ci.org/onokumus/Bootstrap-Admin-Template)
22
------------------------------------------
33

44
### Installation
55

6-
#### 2.0 Version
7-
required [node.js](http://nodejs.org/) & [grunt](http://gruntjs.com/getting-started)
6+
#### 2.1.1 Version
7+
required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](http://gruntjs.com/getting-started)
88

99
$ git clone https://github.com/onokumus/Bootstrap-Admin-Template.git yourfoldername
1010
$ cd yourfoldername
1111
$ git submodule init
1212
$ git submodule update
1313
$ npm install
14-
$ grunt
14+
$ bower install (./node_modules/bower/bin/bower install)
15+
$ grunt (./node_modules/grunt-cli/bin/grunt)
1516
$ cd dist/
1617
$ open index.html
1718

@@ -24,23 +25,65 @@ required [node.js](http://nodejs.org/) & [grunt](http://gruntjs.com/getting-star
2425

2526
### Demo
2627

27-
#### For 2.0.0 version
28+
#### For 2.1.1 version
2829
http://demo.onokumus.com/metis/
2930

3031
#### For 1.2 version
3132
(not development)
3233
http://demo.onokumus.com/metis/v12
3334

3435
### Release History
35-
36+
* 2013-10-28 v2.1.1 add bower
37+
* 2013-10-28 v2.1.1 remove bootsrap, font awesome, gmaps submodule.
3638
* 2013-10-23   v2.1.1 Adds `bgimage.html` and `bgcolor.html` pages.
3739
* 2013 [02-15, 10-22] v1.0 - v2.1 I don't remember. Whatever I did.
3840
* 2013-02-14   v1.0   First Commit.
3941

40-
42+
### Credits
43+
* [node.js](http://nodejs.org/)
44+
* [bower](http://bower.io/)
45+
* [Grunt](http://gruntjs.com/)
46+
* [Assemble](http://assemble.io/)
47+
* [jQuery](http://jquery.com/)
48+
* [Bootstrap](http://getbootstrap.com/)
49+
* [LESS](http://lesscss.org/)
50+
* [Modernizr](http://modernizr.com/)
51+
* [SubtlePatterns](https://github.com/subtlepatterns/SubtlePatterns)
52+
* [FullCalendar](http://arshaw.com/fullcalendar/)
53+
* [Chosen](https://github.com/harvesthq/chosen)
54+
* [CLEditor](http://premiumsoftware.net/CLEditor)
55+
* [Colorpicker for Bootstrap](http://www.eyecon.ro/bootstrap-colorpicker/)
56+
* [Data Tables](http://www.datatables.net)
57+
* [Datepicker for Bootstrap](http://www.eyecon.ro/bootstrap-datepicker)
58+
* [elFinder](http://elfinder.org)
59+
* [Input Limiter](http://rustyjeans.com/jquery-plugins/input-limiter)
60+
* [Jasny Bootstrap](http://jasny.github.com/bootstrap)
61+
* [jQuery Validation](http://jqueryvalidation.org/)
62+
* [Dual Listbox](http://www.meadmiracle.com/dlb/DLBDocumentation.aspx)
63+
* [jQuery Sparklines](http://omnipotent.net/jquery.sparkline)
64+
* [Animate](https://daneden.me/animate/)
65+
* [Autosize](http://www.jacklmoore.com/autosize)
66+
* [Countdown](http://keith-wood.name/countdown.html)
67+
* [CSS Beautify](http://cssbeautify.com)
68+
* [Date range picker](https://github.com/dangrossman/bootstrap-daterangepicker)
69+
* [Flot](http://www.flotcharts.org)
70+
* [jQuery Form](http://jquery.malsup.com/form/)
71+
* [Form Wizard](http://thecodemine.org)
72+
* [Gritter](http://boedesign.com/blog/2009/07/11/growl-for-jquery-gritter/)
73+
* [Magic](http://www.minimamente.com/magic-css3-animations)
74+
* [Mouse Wheel](https://github.com/brandonaaron/jquery-mousewheel)
75+
* [PageDown-Bootstrap](https://github.com/samwillis/pagedown-bootstrap)
76+
* [Plupload](https://github.com/moxiecode/plupload)
77+
* [Bootstrap Switch](http://www.larentis.eu/switch/)
78+
* [tablesorter](http://tablesorter.com/)
79+
* [tagsinput](http://xoxco.com/projects/code/tagsinput/)
80+
* [Bootstrap Timepicker](http://jdewit.github.io/bootstrap-timepicker/)
81+
* [Touch Punch](http://touchpunch.furf.com/)
82+
* [Uniform](http://uniformjs.com/)
83+
* [Validation Engine](http://www.position-relative.net/)
84+
* [jquery.validVal](http://validval.frebsite.nl/)
85+
* [bootstrap-wysihtml5](http://jhollingworth.github.io/bootstrap-wysihtml5/)
4186

4287
### Licensing
4388

44-
Bootstrap Admin template is open-sourced software licensed under the [MIT License](http://opensource.org/licenses/MIT)
45-
46-
[Donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EYSUBWWDTCYKU)
89+
Bootstrap Admin template is open-sourced software licensed under the [MIT License](http://opensource.org/licenses/MIT)

bower.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"name": "Bootstrap-Admin-Template",
3+
"version": "2.1.0",
4+
"author": {
5+
"name": "Osman Nuri Okumuş",
6+
"email": "onokumus@gmail.com",
7+
"url": "https://github.com/onokumus"
8+
},
9+
"description": "Twitter Bootstrap Admin Template",
10+
"license": "MIT",
11+
"repository": {
12+
"type": "git",
13+
"url": "https://github.com/onokumus/Bootstrap-Admin-Template"
14+
},
15+
"bugs": {
16+
"url": "https://github.com/onokumus/Bootstrap-Admin-Template/issues"
17+
},
18+
"licenses": {
19+
"type": "MIT",
20+
"url": "https://github.com/onokumus/Bootstrap-Admin-Template/blob/master/README.md"
21+
},
22+
"dependencies": {
23+
"bootstrap": "~3.0.0",
24+
"font-awesome": "~4.0.1",
25+
"gmaps": "~0.4.6"
26+
}
27+
}

dist/alterne.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ <h4 class="modal-title">Modal title</h4>
513513
<!-- /#helpModal -->
514514

515515
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
516-
<script>window.jQuery || document.write('<script src="assets/lib/jquery-2.0.3.min.js"><\/script>')</script>
516+
<script>window.jQuery || document.write('<script src="assets/lib/jquery.min.js"><\/script>')</script>
517517

518518

519519

0 commit comments

Comments
 (0)