Skip to content

Commit 4c9fce9

Browse files
zdrawkuzdrawku
committed
Final changes - generating files with generator:default
1 parent 8dffd31 commit 4c9fce9

31 files changed

+726
-716
lines changed

‎samples/grid/master-detail/index.html

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<html>
33
<head>
44
<title>igGrid: Master/Detail - Ignite UI integration with AngularJS</title>
@@ -8,8 +8,8 @@
88
<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.shared.css" rel="stylesheet" />
99
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" type="text/css" />
1010
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
11-
<link rel="stylesheet" href="../../sample.css" />
12-
11+
<link rel="stylesheet" href="sample.css" />
12+
1313
<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.grid.css" rel="stylesheet" />
1414
<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.editors.css" rel="stylesheet" />
1515
<style>
@@ -40,16 +40,16 @@
4040
</div>
4141
</div>
4242
</div>
43-
43+
4444
<div ng-app="app" ng-controller="masterDetailController">
4545
<h1 class="push-down-md">igGrid Master/Detail</h1>
4646
<div class="alert alert-danger" data-ng-cloak data-ng-show="error != null">Oops! There's been a problem: {{error}}</div>
4747
<div class="alert alert-info" data-ng-cloak data-ng-show="message.length > 0" data-ng-bind="message"></div>
48-
<ig-grid id="homesGrid"
49-
data-source="homes"
50-
width="100%"
51-
primary-key="id"
52-
auto-commit="true"
48+
<ig-grid id="homesGrid"
49+
data-source="homes"
50+
width="100%"
51+
primary-key="id"
52+
auto-commit="true"
5353
auto-generate-columns="false"
5454
event-rendered="homesGridRendered">
5555
<columns>
@@ -60,9 +60,9 @@ <h1 class="push-down-md">igGrid Master/Detail</h1>
6060
<column key="id" header-text="ID" data-type="string" hidden="true"></column>
6161
</columns>
6262
<features>
63-
<feature name="Sorting"
63+
<feature name="Sorting"
6464
event-column-sorted="homesGridColumnSorted"></feature>
65-
<feature name="Selection"
65+
<feature name="Selection"
6666
event-row-selection-changed="homesGridRowSelectionChanged"></feature>
6767
<feature name="Paging"
6868
page-size="5"
@@ -78,7 +78,7 @@ <h1 class="push-down-md">igGrid Master/Detail</h1>
7878
<div class="form-group">
7979
<label for="inputEmail3" class="col-sm-2 control-label">Address</label>
8080
<div class="col-sm-10">
81-
<input id="addressBox"
81+
<input id="addressBox"
8282
type="text"
8383
class="form-control"
8484
placeholder="Address"
@@ -88,7 +88,7 @@ <h1 class="push-down-md">igGrid Master/Detail</h1>
8888
<div class="form-group">
8989
<label for="cityBox" class="col-sm-2 control-label">City</label>
9090
<div class="col-sm-10">
91-
<input id="cityBox"
91+
<input id="cityBox"
9292
type="text"
9393
class="form-control"
9494
placeholder="City"
@@ -98,7 +98,7 @@ <h1 class="push-down-md">igGrid Master/Detail</h1>
9898
<div class="form-group">
9999
<label for="bedroomsBox" class="col-sm-2 control-label">Bedrooms</label>
100100
<div class="col-sm-10">
101-
<input id="bedroomsBox"
101+
<input id="bedroomsBox"
102102
type="text"
103103
class="form-control"
104104
placeholder="Bedrooms"
@@ -108,7 +108,7 @@ <h1 class="push-down-md">igGrid Master/Detail</h1>
108108
<div class="form-group">
109109
<label for="bathroomsBox" class="col-sm-2 control-label">Bathrooms</label>
110110
<div class="col-sm-10">
111-
<input id="bathroomsBox"
111+
<input id="bathroomsBox"
112112
type="text"
113113
class="form-control"
114114
placeholder="Bathrooms"
@@ -118,7 +118,7 @@ <h1 class="push-down-md">igGrid Master/Detail</h1>
118118
<div class="form-group">
119119
<label for="sqfeetBox" class="col-sm-2 control-label">Sq. Feet</label>
120120
<div class="col-sm-10">
121-
<input id="sqfeetBox"
121+
<input id="sqfeetBox"
122122
type="text"
123123
class="form-control"
124124
placeholder="Sq. Feet"
@@ -128,7 +128,7 @@ <h1 class="push-down-md">igGrid Master/Detail</h1>
128128
<div class="form-group">
129129
<label for="priceBox" class="col-sm-2 control-label">Price</label>
130130
<div class="col-sm-10">
131-
<input id="priceBox"
131+
<input id="priceBox"
132132
type="text"
133133
class="form-control"
134134
placeholder="Price"
@@ -138,8 +138,8 @@ <h1 class="push-down-md">igGrid Master/Detail</h1>
138138
<div class="form-group">
139139
<label for="notesBox" class="col-sm-2 control-label">Notes</label>
140140
<div class="col-sm-10">
141-
<textarea id="notesBox"
142-
class="form-control"
141+
<textarea id="notesBox"
142+
class="form-control"
143143
placeholder="Notes"
144144
data-ng-model="selectedHome.notes"></textarea>
145145
</div>
@@ -168,7 +168,7 @@ <h1 class="push-down-md">igGrid Master/Detail</h1>
168168
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
169169
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
170170
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
171-
171+
172172
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-resource.min.js"></script>
173173
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-mocks.js"></script>
174174

‎samples/igCombo.html

+36-30
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<html>
33
<head>
44
<title>igCombo - Ignite UI integration with AngularJS</title>
@@ -9,7 +9,7 @@
99
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" type="text/css" />
1010
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
1111
<link rel="stylesheet" href="sample.css" />
12-
12+
1313
<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.validator.css" rel="stylesheet" />
1414
<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.combo.css" rel="stylesheet" />
1515

@@ -29,35 +29,37 @@
2929
</div>
3030
<div class="navbar-collapse collapse">
3131
<ul class="nav navbar-nav">
32-
<li><a href="../index.html">Home</a></li>
32+
<li><a href="/igniteui-angular/index.html">Home</a></li>
3333
<li><a href="https://github.com/IgniteUI/igniteui-angular">View on GitHub <i class="fa fa-github"></i></a></li>
3434
</ul>
3535
</div>
3636
</div>
3737
</div>
38-
39-
<div class="push-down-md push-down-xl" ng-app="igniteui-sample" ng-controller="comboController">
40-
<h1 class="push-down-md"><a href="http://igniteui.com/combo/overview" target="_blank">igCombo</a></h1>
41-
<div class="row description">
42-
<div class="alert alert-info col-md-5 try-it-out">
43-
<span class="h4">TRY IT OUT:</span>
44-
<hr />
45-
<ul>
46-
<li>Enter a Product ID in the textbox and see how the combos change</li>
47-
<li>Change a product's name in the group of textboxes below and see how the names change in each combo</li>
48-
</ul>
49-
</div>
50-
<div class="col-md-4">
51-
<p class="lead">This sample demonstrates how to use AngularJS directives to create igCombos.</p>
52-
<p><a href="https://github.com/IgniteUI/igniteui-angular/blob/master/samples/igCombo.html" class="btn btn-default btn-lg btn-primary" target="_blank"><i class="fa fa-code fa-lg"></i> Explore the Code</a></p>
53-
</div>
38+
39+
<div ng-app="igniteui-sample" ng-controller="comboController">
40+
<h1 class="push-down-md"><a href="http://igniteui.com/combo/overview" target="_blank">igCombo</a></h1>
41+
<div class="row description">
42+
<div class="alert alert-info col-md-5 try-it-out">
43+
<span class="h4">TRY IT OUT:</span>
44+
<hr />
45+
<ul>
46+
<li>Enter a Product ID in the textbox and see how the combos change</li>
47+
<li>Change a product's name in the group of textboxes below and see how the names change in each combo</li>
48+
</ul>
5449
</div>
50+
<div class="col-md-4">
51+
<p class="lead">This sample demonstrates how to use AngularJS directives to create igCombos.</p>
52+
<p><a href="https://github.com/IgniteUI/igniteui-angular/blob/master/samples/igCombo.html" class="btn btn-default btn-lg btn-primary" target="_blank"><i class="fa fa-code fa-lg"></i> Explore the Code</a></p>
53+
</div>
54+
</div>
55+
5556
<div class="row">
5657
<div class="col-sm-2">
5758
<input id="product-id" class="form-control" type="text" ng-model="combo.value1"/>
5859
<div class="text-sm text-muted text-right">values: 1 - 20</div>
5960
</div>
6061
<div class="col-sm-3">
62+
6163
<ig-combo id="combo1"
6264
data-source="northwind"
6365
value-key-type="number"
@@ -67,8 +69,10 @@ <h1 class="push-down-md"><a href="http://igniteui.com/combo/overview" target="_b
6769
width="100%"
6870
ng-model="combo.value1">
6971
</ig-combo>
72+
7073
</div>
7174
<div class="col-sm-3">
75+
7276
<ig-combo id="combo2"
7377
data-source="northwind"
7478
value-key-type="number"
@@ -78,23 +82,24 @@ <h1 class="push-down-md"><a href="http://igniteui.com/combo/overview" target="_b
7882
width="100%"
7983
ng-model="combo.value1">
8084
</ig-combo>
81-
</div>
85+
8286
</div>
87+
</div>
8388

84-
<hr />
85-
<h2 class="h3">Edit Product Name</h2>
86-
<div class="row">
89+
<hr />
90+
<h2 class="h3">Edit Product Name</h2>
91+
<div class="row">
8792

88-
<div class="col-sm-3" ng-repeat="record in northwind">
89-
<input class="form-control" ng-model="record.ProductName">
90-
</div>
93+
<div class="col-sm-3" ng-repeat="record in northwind">
94+
<input class="form-control" ng-model="record.ProductName">
95+
</div>
9196

92-
</div>
93-
</div>
97+
</div>
98+
</div>
9499

95100
<footer>
96101
<p>
97-
<a href="../index.html">Home</a> |
102+
<a href="/igniteui-angular/index.html">Home</a> |
98103
<a href="https://github.com/IgniteUI/igniteui-angular/issues">Feedback &amp; Questions</a> |
99104
<a href="https://github.com/IgniteUI/igniteui-angular">Clone &amp; Fork</a>
100105
</p>
@@ -105,7 +110,7 @@ <h2 class="h3">Edit Product Name</h2>
105110
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
106111
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
107112
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
108-
113+
109114
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
110115
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.jquery.js"></script>
111116
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.jquerydeferred.js"></script>
@@ -114,6 +119,7 @@ <h2 class="h3">Edit Product Name</h2>
114119
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.shared.js"></script>
115120
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.combo.js"></script>
116121
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.validator.js"></script>
122+
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.templating.js"></script>
117123
<script src="../src/igniteui-angular.js"></script>
118124
<script src="js/igniteui-sample.js"></script>
119125
<script src="js/data/northwind.js"></script>

0 commit comments

Comments
 (0)