Skip to content

Commit 83618e1

Browse files
onokumusonokumus
committed
version 2.1.4
1 parent 824efc3 commit 83618e1

73 files changed

Lines changed: 3520 additions & 8061 deletions

Some content is hidden

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

‎Gruntfile.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,13 @@ module.exports = function (grunt) {
209209
cwd: 'node_modules/epiceditor/epiceditor',
210210
src: ['./**/*.*'],
211211
dest: 'dist/assets/lib/epiceditor'
212-
}
212+
},
213+
{
214+
expand: true,
215+
cwd: 'node_modules/screenfull/dist/',
216+
src: ['./**/*.*'],
217+
dest: 'dist/assets/lib/screenfull/'
218+
}
213219
]
214220
}
215221
},

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Metis Admin Template with Twitter Bootstrap [![Build Status](https://travis-ci.o
55
Bootstrap 2.3.2 [V.1.2](https://github.com/onokumus/Bootstrap-Admin-Template/archive/v1.2.zip)
66
ready for use
77

8-
Bootstrap 3.0.3 [V2.1.3](https://github.com/onokumus/Bootstrap-Admin-Template/archive/master.zip)
8+
Bootstrap 3.1.1 [V2.1.4](https://github.com/onokumus/Bootstrap-Admin-Template/archive/master.zip)
99
ready `dist` folder your use
1010

1111

@@ -34,14 +34,15 @@ required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](htt
3434

3535
### Demo
3636

37-
#### For 2.1.3 version
37+
#### For 2.1.4 version
3838
http://demo.onokumus.com/metis/
3939

4040
#### For 1.2 version
4141
(not development)
4242
http://demo.onokumus.com/metis/v12
4343

4444
### Release History
45+
* 2014-02-16 v2.1.4 update bootsrap 3.1.1 && add screenfull.js && fixed #menu
4546
* 2014-01-19 v2.1.3 add suitcss 's flex-embed component
4647
* 2013-11-30 v2.1.2 create menu plugin, rewrite menu.less
4748
* 2013-10-28 v2.1.1 add bower
@@ -95,6 +96,7 @@ http://demo.onokumus.com/metis/v12
9596
* [jquery.validVal](http://validval.frebsite.nl/)
9697
* [bootstrap-wysihtml5](http://jhollingworth.github.io/bootstrap-wysihtml5/)
9798
* [Suitcss Flex-Embed](https://github.com/suitcss/flex-embed)
99+
* [screenfull.js](https://github.com/sindresorhus/screenfull.js)
98100

99101
### Licensing
100102

‎bower.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Bootstrap-Admin-Template",
3-
"version": "2.1.2",
3+
"version": "2.1.4",
44
"author": {
55
"name": "Osman Nuri Okumuş",
66
"email": "onokumus@gmail.com",
@@ -20,7 +20,7 @@
2020
"url": "https://github.com/onokumus/Bootstrap-Admin-Template/blob/master/README.md"
2121
},
2222
"dependencies": {
23-
"bootstrap": "~3.0.2",
23+
"bootstrap": "~3.1.1",
2424
"font-awesome": "~4.0.3",
2525
"gmaps": "~0.4.8",
2626
"html5shiv": "~3.7.0",

‎dist/alterne.html‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@
5656
</header>
5757
<div class="topnav">
5858
<div class="btn-toolbar">
59+
<div class="btn-group">
60+
<a data-placement="bottom" data-original-title="Fullscreen" data-toggle="tooltip" class="btn btn-default btn-sm" id="toggleFullScreen">
61+
<i class="glyphicon glyphicon-fullscreen"></i>
62+
</a>
63+
</div>
5964
<div class="btn-group">
6065
<a data-placement="bottom" data-original-title="Show / Hide Sidebar" data-toggle="tooltip" class="btn btn-success btn-sm" id="changeSidebarPos">
6166
<i class="fa fa-expand"></i>
@@ -610,19 +615,22 @@ <h4 class="modal-title">Modal title</h4>
610615
</div><!-- /.modal --><!-- /#helpModal -->
611616
<script src="assets/lib/jquery.min.js"></script>
612617
<script src="assets/lib/bootstrap/js/bootstrap.min.js"></script>
613-
<script type="text/javascript" src="assets/js/style-switcher.js"></script>
614618
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
615619
<script src="assets/lib/fullcalendar-1.6.2/fullcalendar/fullcalendar.min.js"></script>
616620
<script src="assets/lib/tablesorter/js/jquery.tablesorter.min.js"></script>
617621
<script src="assets/lib/sparkline/jquery.sparkline.min.js"></script>
618622
<script src="assets/lib/flot/jquery.flot.js"></script>
619623
<script src="assets/lib/flot/jquery.flot.selection.js"></script>
620624
<script src="assets/lib/flot/jquery.flot.resize.js"></script>
621-
<script src="assets/js/main.min.js"></script>
622625
<script>
623626
$(function() {
624627
dashboard();
625628
});
626629
</script>
630+
<script src="assets/lib/screenfull/screenfull.js"></script>
631+
<script src="assets/js/main.min.js"></script>
632+
633+
<!--For Demo Only. Not required -->
634+
<script type="text/javascript" src="assets/js/style-switcher.js"></script>
627635
</body>
628636
</html>

‎dist/assets/css/main.css‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Bootstrap-Admin-Template v2.1.3
2+
* Bootstrap-Admin-Template v2.1.4
33
* Author : [object Object]
44
* Copyright 2014
55
* Licensed under ,, (,,)
@@ -402,7 +402,6 @@ body.padTop53 {
402402
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.05);
403403
background-color: #333;
404404
position: relative;
405-
overflow: hidden;
406405
}
407406
#menu,
408407
#menu ul {
@@ -887,11 +886,16 @@ body.padTop53 {
887886
padding: 10px;
888887
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
889888
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
889+
width: 100%;
890+
background-color: #fff;
890891
}
891892
.box .body hr {
892893
margin-left: -10px;
893894
margin-right: -10px;
894895
}
896+
.box .body.full-screen-box {
897+
height: 100% !important;
898+
}
895899
.body.collapse:not(.in) {
896900
padding: 0;
897901
}
@@ -940,7 +944,7 @@ fieldset[disabled] .btn-metis-1.active {
940944
}
941945
.btn-metis-1 .badge {
942946
color: #ee465a;
943-
background-color: #fff;
947+
background-color: #ffffff;
944948
}
945949
.btn-metis-2 {
946950
color: #ffffff;
@@ -981,7 +985,7 @@ fieldset[disabled] .btn-metis-2.active {
981985
}
982986
.btn-metis-2 .badge {
983987
color: #9fd256;
984-
background-color: #fff;
988+
background-color: #ffffff;
985989
}
986990
.btn-metis-3 {
987991
color: #ffffff;
@@ -1022,7 +1026,7 @@ fieldset[disabled] .btn-metis-3.active {
10221026
}
10231027
.btn-metis-3 .badge {
10241028
color: #fbb450;
1025-
background-color: #fff;
1029+
background-color: #ffffff;
10261030
}
10271031
.btn-metis-4 {
10281032
color: #ffffff;
@@ -1063,7 +1067,7 @@ fieldset[disabled] .btn-metis-4.active {
10631067
}
10641068
.btn-metis-4 .badge {
10651069
color: #a264e7;
1066-
background-color: #fff;
1070+
background-color: #ffffff;
10671071
}
10681072
.btn-metis-5 {
10691073
color: #ffffff;
@@ -1104,7 +1108,7 @@ fieldset[disabled] .btn-metis-5.active {
11041108
}
11051109
.btn-metis-5 .badge {
11061110
color: #777777;
1107-
background-color: #fff;
1111+
background-color: #ffffff;
11081112
}
11091113
.btn-metis-6 {
11101114
color: #ffffff;
@@ -1145,7 +1149,7 @@ fieldset[disabled] .btn-metis-6.active {
11451149
}
11461150
.btn-metis-6 .badge {
11471151
color: #00b4f5;
1148-
background-color: #fff;
1152+
background-color: #ffffff;
11491153
}
11501154
.btn-grad.btn-default,
11511155
.btn-grad.btn-primary,
@@ -1891,9 +1895,9 @@ fieldset[disabled] .btn-line.btn-metis-6.active {
18911895
}
18921896
@media (min-width: 768px) {
18931897
.pricing-table > li.active {
1894-
-webkit-transform: scale(1.03);
1895-
-ms-transform: scale(1.03);
1896-
transform: scale(1.03);
1898+
-webkit-transform: scale(1.03, );
1899+
-ms-transform: scale(1.03, );
1900+
transform: scale(1.03, );
18971901
}
18981902
}
18991903
.pricing-table > li.active.primary {

‎dist/assets/css/main.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/assets/js/app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Bootstrap-Admin-Template v2.1.3
2+
* Bootstrap-Admin-Template v2.1.4
33
* Author : [object Object]
44
* Copyright 2014
55
* Licensed under ,, (,,)

‎dist/assets/js/countdown.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Bootstrap-Admin-Template v2.1.3
2+
* Bootstrap-Admin-Template v2.1.4
33
* Author : [object Object]
44
* Copyright 2014
55
* Licensed under ,, (,,)

‎dist/assets/js/main.js‎

Lines changed: 99 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Bootstrap-Admin-Template v2.1.3
2+
* Bootstrap-Admin-Template v2.1.4
33
* Author : [object Object]
44
* Copyright 2014
55
* Licensed under ,, (,,)
@@ -419,20 +419,20 @@ function formGeneral() {
419419
/*----------- END chosen CODE -------------------------*/
420420

421421
/*----------- BEGIN spinner CODE -------------------------*/
422-
423-
$('#spin1').spinner();
424-
$("#spin2").spinner({
425-
step: 0.01,
426-
numberFormat: "n"
427-
});
428-
$("#spin3").spinner({
429-
culture: 'en-US',
430-
min: 5,
431-
max: 2500,
432-
step: 25,
433-
start: 1000,
434-
numberFormat: "C"
435-
});
422+
// DEPRECATED
423+
// $('#spin1').spinner();
424+
// $("#spin2").spinner({
425+
// step: 0.01,
426+
// numberFormat: "n"
427+
// });
428+
// $("#spin3").spinner({
429+
// culture: 'en-US',
430+
// min: 5,
431+
// max: 2500,
432+
// step: 25,
433+
// start: 1000,
434+
// numberFormat: "C"
435+
// });
436436
/*----------- END spinner CODE -------------------------*/
437437

438438
/*----------- BEGIN uniform CODE -------------------------*/
@@ -465,8 +465,8 @@ function formGeneral() {
465465
$('#dpMonths').datepicker();
466466

467467

468-
var startDate = new Date(2012, 1, 20);
469-
var endDate = new Date(2012, 1, 25);
468+
var startDate = new Date(2014, 1, 20);
469+
var endDate = new Date(2014, 1, 25);
470470
$('#dp4').datepicker()
471471
.on('changeDate', function(ev) {
472472
if (ev.date.valueOf() > endDate.valueOf()) {
@@ -756,6 +756,88 @@ function formWysiwyg() {
756756
var editor = new EpicEditor(opts).load();
757757
/*----------- END epiceditor CODE -------------------------*/
758758
}
759+
// Define toggleFullScreen
760+
var toggleFullScreen = {
761+
init: function() {
762+
if ((window.screenfull !== undefined) && screenfull.enabled) {
763+
$('#toggleFullScreen').on('click', function(e) {
764+
screenfull.toggle(window.document[0]);
765+
$('body').toggleClass('fullScreen');
766+
e.preventDefault();
767+
});
768+
} else {
769+
$('#toggleFullScreen').addClass('hidden');
770+
}
771+
}
772+
};
773+
// toggleFullScreen init
774+
toggleFullScreen.init();
775+
776+
var boxFullScreen = {
777+
init: function() {
778+
if ((window.screenfull !== undefined) && screenfull.enabled) {
779+
var $toggleButton = $('.full-box'),
780+
$toggledPanel = $toggleButton.parents('.box')[0],
781+
$toggledPanelBody = $toggleButton.parents('.box').children('.body'),
782+
$toggleButtonImage = $toggleButton.children('i');
783+
784+
$toggleButton.on('click', function(e) {
785+
screenfull.toggle($toggledPanel);
786+
$toggledPanelBody.toggleClass('full-screen-box');
787+
$toggleButtonImage.toggleClass('fa-compress');
788+
e.preventDefault();
789+
});
790+
} else {
791+
$('.full-box').addClass('hidden');
792+
}
793+
}
794+
};
795+
// boxFullScreen init
796+
boxFullScreen.init();
797+
798+
var panelBodyCollapse = {
799+
init: function() {
800+
var $collapseButton = $('.collapse-box'),
801+
$collapsedPanelBody = $collapseButton.closest('.box').children('.body');
802+
803+
$collapsedPanelBody.collapse('show');
804+
805+
$collapseButton.on('click', function (e) {
806+
var $collapsePanelBody = $(this).closest('.box').children('.body'),
807+
$toggleButtonImage = $(this).children('i');
808+
$collapsePanelBody.on('show.bs.collapse', function () {
809+
$toggleButtonImage.removeClass('fa-minus fa-plus').addClass('fa-spinner fa-spin');
810+
});
811+
$collapsePanelBody.on('shown.bs.collapse', function () {
812+
$toggleButtonImage.removeClass('fa-spinner fa-spin').addClass('fa-minus');
813+
});
814+
815+
$collapsePanelBody.on('hide.bs.collapse', function () {
816+
$toggleButtonImage.removeClass('fa-minus fa-plus').addClass('fa-spinner fa-spin');
817+
});
818+
819+
$collapsePanelBody.on('hidden.bs.collapse', function () {
820+
$toggleButtonImage.removeClass('fa-spinner fa-spin').addClass('fa-plus');
821+
});
822+
823+
$collapsePanelBody.collapse('toggle');
824+
825+
e.preventDefault();
826+
});
827+
}
828+
};
829+
// panelBodyCollapse init
830+
panelBodyCollapse.init();
831+
832+
833+
var boxHiding = {
834+
init: function () {
835+
$('.close-box').click(function () {
836+
$(this).closest('.box').hide('slow');
837+
});
838+
}
839+
};
840+
boxHiding.init();
759841
function metisCalendar() {
760842
"use strict";
761843

‎dist/assets/js/main.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)