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

Commit 3768433

Browse files
bekospkozlowski-opensource
authored andcommitted
feat(datepicker): update to Bootstrap 3
1 parent eadf934 commit 3768433

File tree

4 files changed

+32
-24
lines changed

4 files changed

+32
-24
lines changed

src/datepicker/docs/demo.html

+19-11
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,26 @@ <h4>Inline</h4>
99
</div>
1010

1111
<h4>Popup</h4>
12-
<div class="form-horizontal">
13-
<p>
14-
<input type="text" datepicker-popup="{{format}}" ng-model="dt" is-open="opened" min="minDate" max="'2015-06-22'" datepicker-options="dateOptions" date-disabled="disabled(date, mode)" ng-required="true" close-text="Close" />
15-
<button class="btn" ng-click="open($event)"><i class="icon-calendar"></i></button>
16-
</p>
17-
<p><i>Format options:</i> <select ng-model="format" ng-options="f for f in formats"><option></option></select></p>
12+
<div class="row">
13+
<div class="col-md-6">
14+
<p class="input-group">
15+
<input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt" is-open="opened" min="minDate" max="'2015-06-22'" datepicker-options="dateOptions" date-disabled="disabled(date, mode)" ng-required="true" close-text="Close" />
16+
<span class="input-group-btn">
17+
<button class="btn btn-default" ng-click="open($event)"><i class="glyphicon glyphicon-calendar"></i></button>
18+
</span>
19+
</p>
20+
</div>
21+
</div>
22+
<div class="row">
23+
<div class="col-md-6">
24+
<label>Format:</label> <select class="form-control" ng-model="format" ng-options="f for f in formats"><option></option></select>
25+
</div>
1826
</div>
1927

2028
<hr />
21-
<button class="btn btn-small btn-inverse" ng-click="today()">Today</button>
22-
<button class="btn btn-small btn-inverse" ng-click="dt = '2009-08-24'">2009-08-24</button>
23-
<button class="btn btn-small btn-success" ng-click="toggleWeeks()" tooltip="For inline datepicker">Toggle Weeks</button>
24-
<button class="btn btn-small btn-danger" ng-click="clear()">Clear</button>
25-
<button class="btn btn-small" ng-click="toggleMin()" tooltip="After today restriction">Min date</button>
29+
<button class="btn btn-sm btn-info" ng-click="today()">Today</button>
30+
<button class="btn btn-sm btn-default" ng-click="dt = '2009-08-24'">2009-08-24</button>
31+
<button class="btn btn-sm btn-success" ng-click="toggleWeeks()" tooltip="For inline datepicker">Toggle Weeks</button>
32+
<button class="btn btn-sm btn-danger" ng-click="clear()">Clear</button>
33+
<button class="btn btn-sm btn-default" ng-click="toggleMin()" tooltip="After today restriction">Min date</button>
2634
</div>

src/datepicker/test/datepicker.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ describe('datepicker directive', function () {
164164
var options = getAllOptionsEl();
165165
for (var i = 0; i < 5; i ++) {
166166
for (var j = 0; j < 7; j ++) {
167-
expect(options[i][j].find('button').find('span').hasClass('muted')).toBe( ((i === 0 && j < 3) || (i === 4 && j > 4)) );
167+
expect(options[i][j].find('button').find('span').hasClass('text-muted')).toBe( ((i === 0 && j < 3) || (i === 4 && j > 4)) );
168168
}
169169
}
170170
});

template/datepicker/datepicker.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<table>
22
<thead>
3-
<tr class="text-center">
4-
<th><button type="button" class="btn pull-left" ng-click="move(-1)"><i class="icon-chevron-left"></i></button></th>
5-
<th colspan="{{rows[0].length - 2 + showWeekNumbers}}"><button type="button" class="btn btn-block" ng-click="toggleMode()"><strong>{{title}}</strong></button></th>
6-
<th><button type="button" class="btn pull-right" ng-click="move(1)"><i class="icon-chevron-right"></i></button></th>
3+
<tr>
4+
<th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)"><i class="glyphicon glyphicon-chevron-left"></i></button></th>
5+
<th colspan="{{rows[0].length - 2 + showWeekNumbers}}"><button type="button" class="btn btn-default btn-sm btn-block" ng-click="toggleMode()"><strong>{{title}}</strong></button></th>
6+
<th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)"><i class="glyphicon glyphicon-chevron-right"></i></button></th>
77
</tr>
8-
<tr class="text-center" ng-show="labels.length > 0">
9-
<th ng-show="showWeekNumbers">#</th>
10-
<th ng-repeat="label in labels">{{label}}</th>
8+
<tr ng-show="labels.length > 0" class="h6">
9+
<th ng-show="showWeekNumbers" class="text-center">#</th>
10+
<th ng-repeat="label in labels" class="text-center">{{label}}</th>
1111
</tr>
1212
</thead>
1313
<tbody>
1414
<tr ng-repeat="row in rows">
1515
<td ng-show="showWeekNumbers" class="text-center"><em>{{ getWeekNumber(row) }}</em></td>
1616
<td ng-repeat="dt in row" class="text-center">
17-
<button type="button" style="width:100%;" class="btn" ng-class="{'btn-info': dt.selected}" ng-click="select(dt.date)" ng-disabled="dt.disabled"><span ng-class="{muted: dt.secondary}">{{dt.label}}</span></button>
17+
<button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{'btn-info': dt.selected}" ng-click="select(dt.date)" ng-disabled="dt.disabled"><span ng-class="{'text-muted': dt.secondary}">{{dt.label}}</span></button>
1818
</td>
1919
</tr>
2020
</tbody>

template/datepicker/popup.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<li ng-transclude></li>
33
<li ng-show="showButtonBar" style="padding:10px 9px 2px">
44
<span class="btn-group">
5-
<button type="button" class="btn btn-small btn-inverse" ng-click="today()">{{currentText}}</button>
6-
<button type="button" class="btn btn-small btn-info" ng-click="showWeeks = ! showWeeks" ng-class="{active: showWeeks}">{{toggleWeeksText}}</button>
7-
<button type="button" class="btn btn-small btn-danger" ng-click="clear()">{{clearText}}</button>
5+
<button type="button" class="btn btn-sm btn-info" ng-click="today()">{{currentText}}</button>
6+
<button type="button" class="btn btn-sm btn-default" ng-click="showWeeks = ! showWeeks" ng-class="{active: showWeeks}">{{toggleWeeksText}}</button>
7+
<button type="button" class="btn btn-sm btn-danger" ng-click="clear()">{{clearText}}</button>
88
</span>
9-
<button type="button" class="btn btn-small btn-success pull-right" ng-click="isOpen = false">{{closeText}}</button>
9+
<button type="button" class="btn btn-sm btn-success pull-right" ng-click="isOpen = false">{{closeText}}</button>
1010
</li>
1111
</ul>

0 commit comments

Comments
 (0)