Skip to content

Commit 8eaae48

Browse files
kdinevkdinev
authored
Merge pull request #112 from zdrawku/fix-broken-samples
Add references and change style path
2 parents 8a1364a + 4c9fce9 commit 8eaae48

39 files changed

+791
-743
lines changed

‎index.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
color:#999;
1919
margin:.75em .75em 0 0;
2020
}
21-
21+
2222
.billboard {
23-
background: url(images/home-background.jpg) no-repeat center center;
23+
background: url(images/home-background.jpg) no-repeat center center;
2424
-webkit-background-size: cover;
2525
-moz-background-size: cover;
2626
-o-background-size: cover;
@@ -29,31 +29,31 @@
2929
background-color: #aa8c68;
3030
border-bottom: 10px solid #d16717;
3131
}
32-
32+
3333
.billboard .row {
3434
margin: 1em;
3535
}
36-
36+
3737
.lead {
3838
margin-top:1em;
3939
}
40-
40+
4141
@media only screen and (min-width:641px){
42-
42+
4343
.lead {
4444
margin-top:0;
4545
}
46-
46+
4747
.billboard {
4848
min-height: 600px;
4949
}
50-
50+
5151

5252
.billboard .lead {
5353
font-size: 1.2em;
5454
text-transform: uppercase;
5555
}
56-
56+
5757
.billboard .row {
5858
margin:0;
5959
margin-top: 4em;
@@ -90,9 +90,9 @@ <h2>AngularJS Directives</h2>
9090
<h2>Try it out...</h2>
9191
<div class="row">
9292
<div class="col-sm-8">
93-
<ig-grid id="employees-grid"
94-
data-source="employees"
95-
primary-key="EmployeeID"
93+
<ig-grid id="employees-grid"
94+
data-source="employees"
95+
primary-key="EmployeeID"
9696
auto-generate-columns="false">
9797
<columns>
9898
<column key="EmployeeID" header-text="ID" data-type="number"></column>
@@ -103,9 +103,9 @@ <h2>Try it out...</h2>
103103
</ig-grid>
104104
<div class="hidden-xs hidden-sm">
105105
<h4>Code</h4>
106-
<pre>&lt;ig-grid id=&quot;employees-grid&quot;
107-
data-source=&quot;employees&quot;
108-
primary-key=&quot;employeeID&quot;
106+
<pre>&lt;ig-grid id=&quot;employees-grid&quot;
107+
data-source=&quot;employees&quot;
108+
primary-key=&quot;employeeID&quot;
109109
auto-generate-columns=&quot;false&quot;&gt;
110110
&lt;columns&gt;
111111
&lt;column key=&quot;employeeID&quot; header-text=&quot;ID&quot; width=&quot;65px&quot; data-type=&quot;number&quot;&gt;&lt;/column&gt;
@@ -130,7 +130,7 @@ <h4>Code</h4>
130130
</div>
131131
</div>
132132
<hr />
133-
133+
134134
<h2>Samples</h2>
135135
<div class="links">
136136
<div class="btn-group">
@@ -182,7 +182,7 @@ <h2>Samples</h2>
182182
</div>
183183
</div>
184184
</footer>
185-
185+
186186
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
187187
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
188188
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
@@ -191,7 +191,7 @@ <h2>Samples</h2>
191191

192192
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js"></script>
193193
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.lob.js"></script>
194-
194+
195195
<script src="src/igniteui-angular.js"></script>
196196
<script>var app = angular.module('app', ['ngRoute','igniteui-directives']);</script>
197197
<script src="samples/js/data/northwind-employees.js"></script>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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="/igniteui-angular/samples/sample.css" />
11+
<link rel="stylesheet" href="sample.css" />
1212

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" />
@@ -30,7 +30,7 @@
3030
<span class="icon-bar"></span>
3131
<span class="icon-bar"></span>
3232
</button>
33-
<a class="navbar-brand" href="/">Ignite UI AngularJS Directives</a>
33+
<a class="navbar-brand" href="/">Ignite UI AngularJS Directives</a>
3434
</div>
3535
<div class="navbar-collapse collapse">
3636
<ul class="nav navbar-nav">

‎samples/igCombo.html‎

Lines changed: 37 additions & 29 deletions
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>
@@ -8,7 +8,7 @@
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="/igniteui-angular/samples/sample.css" />
11+
<link rel="stylesheet" href="sample.css" />
1212

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" />
@@ -25,39 +25,41 @@
2525
<span class="icon-bar"></span>
2626
<span class="icon-bar"></span>
2727
</button>
28-
<a class="navbar-brand" href="/">Ignite UI AngularJS Directives</a>
28+
<a class="navbar-brand" href="/">Ignite UI AngularJS Directives</a>
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>
3838

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>
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>
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>
5453
</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>
@@ -107,11 +112,14 @@ <h2 class="h3">Edit Product Name</h2>
107112
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
108113

109114
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
115+
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.jquery.js"></script>
116+
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.jquerydeferred.js"></script>
110117
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.templating.js"></script>
111118
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.datasource.js"></script>
112119
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.shared.js"></script>
113120
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.combo.js"></script>
114121
<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>
115123
<script src="../src/igniteui-angular.js"></script>
116124
<script src="js/igniteui-sample.js"></script>
117125
<script src="js/data/northwind.js"></script>

0 commit comments

Comments
 (0)