Skip to content

Commit

Permalink
Fixed #155 Updated samples
Browse files Browse the repository at this point in the history
  • Loading branch information
niemyjski committed Dec 7, 2015
1 parent 89a5743 commit 77adabe
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 36 deletions.
1 change: 0 additions & 1 deletion example/css/dialogs.min.css

This file was deleted.

16 changes: 8 additions & 8 deletions example/faChk.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<html ng-app="modalTest">
<head>
<title>Angular-Dialogs-Service Demo v5.2.1 (Font-Awesome)</title>
<script src="//code.angularjs.org/1.2.25/angular.min.js"></script>
<script src="//code.angularjs.org/1.2.25/angular-sanitize.min.js"></script>
<script src="js/ui-bootstrap-tpls-0.11.2.min.js"></script>
<script src="js/dialogs.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.8/angular.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-sanitize/1.4.8/angular-sanitize.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.14.3/ui-bootstrap-tpls.js"></script>
<script src="js/dialogs.js"></script>
<script src="js/dialogTest2.js"></script>

<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<link rel="stylesheet" href="css/dialogs.css">

<style>
Expand All @@ -25,8 +25,8 @@
<body ng-controller="dialogServiceTest">
<div class="row">
<div class="col-md-12">
<h1>Dialog Service Demo (v5.2.1) <span class="text-muted"><small>Font-Awesome Compatible</small></span></h1>
<p class="text-info">(Using: Bootstrap 3.2.0, AngularJS 1.2.25, Angular UI Bootstrap 0.11.0, Font-Awesome 4.2)</p>
<h1>Dialog Service Demo (v5.3) <span class="text-muted"><small>Font-Awesome Compatible</small></span></h1>
<p class="text-info">(Using: Bootstrap 3.3.6, AngularJS 1.4.8, Angular UI Bootstrap 0.14.3, Font-Awesome 4.5)</p>
<p>This Demo of Angular-Dialog-Service is the same as the demo for using the service without <em>Angular-Translate</em>. Except now the service checks to see if <em>Font-Awesome</em> has been loaded and will automatically use Font-Awesome icons instead of the Bootstrap "glyphicons," in the header of the predefined dialogs.</p><p>Previously glyphicons were hard wired in, if you didn't include the Bootstrap version with the glyphicons because you were using Font-Awesome instead, then nothing appeared in the dialog headers. Now the service will automatically detect that you're using Font-Awesome and include the equivalent icons for each predefined dialog.<br>
</div>
</div>
Expand Down
17 changes: 9 additions & 8 deletions example/index.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!DOCTYPE html>
<html ng-app="modalTest">
<head>
<script src="//code.angularjs.org/1.3.0/angular.min.js"></script>
<script src="//code.angularjs.org/1.3.0/angular-sanitize.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/bower-angular-translate/2.0.1/angular-translate.min.js"></script>
<script src="js/ui-bootstrap-tpls-0.11.2.min.js"></script>
<script src="js/dialogs-default-translations.min.js"></script>
<script src="js/dialogs.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.8/angular.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-sanitize/1.4.8/angular-sanitize.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-translate/2.8.1/angular-translate.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.14.3/ui-bootstrap-tpls.js"></script>
<script src="js/dialogs-default-translations.js"></script>
<script src="js/dialogs.js"></script>
<script src="js/dialogTest.js"></script>

<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
<link rel="stylesheet" href="css/dialogs.css">

<style>
Expand All @@ -25,7 +25,8 @@
<body ng-controller="dialogServiceTest">
<div class="row">
<div class="col-md-12">
<h1>Dialog Service Demo <span class="text-muted"><small>(Bootstrap 3.2.0, AngularJS 1.3.0, Angular UI Bootstrap 0.11.2, Angular-Translate)</small></span></h1>
<h1>Dialog Service Demo (v5.3)</h1>
<p class="text-info">(Using: Bootstrap 3.3.6, AngularJS 1.4.8, Angular UI Bootstrap 0.14.3, Angular-Translate 2.8,1)</p>
<p>Demo of Angular dialog service using Bootstrap 3 with Angular and Angular UI Bootstrap's modal service.</p>
<p>As well as the use of <a href="https://github.com/angular-translate">Angular-Translate (https://github.com/angular-translate)</a></p><br>
</div>
Expand Down
14 changes: 7 additions & 7 deletions example/index2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<html ng-app="modalTest">
<head>
<title>Angular-Dialogs-Service Demo v5.2.0 (without Angular-Translate option)</title>
<script src="//code.angularjs.org/1.2.25/angular.min.js"></script>
<script src="//code.angularjs.org/1.2.25/angular-sanitize.min.js"></script>
<script src="js/ui-bootstrap-tpls-0.11.2.min.js"></script>
<script src="js/dialogs.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.8/angular.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-sanitize/1.4.8/angular-sanitize.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.14.3/ui-bootstrap-tpls.js"></script>
<script src="js/dialogs.js"></script>
<script src="js/dialogTest2.js"></script>

<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
<link rel="stylesheet" href="css/dialogs.css">

<style>
Expand All @@ -24,8 +24,8 @@
<body ng-controller="dialogServiceTest">
<div class="row">
<div class="col-md-12">
<h1>Dialog Service Demo (v5.2.0) <span class="text-muted"><small>Sans Angular-Translate</small></span></h1>
<p class="text-info">(Using: Bootstrap 3.2.0, AngularJS 1.2.25, Angular UI Bootstrap 0.11.0)</p>
<h1>Dialog Service Demo (v5.3) <span class="text-muted"><small>Sans Angular-Translate</small></span></h1>
<p class="text-info">(Using: Bootstrap 3.3.6, AngularJS 1.4.8, Angular UI Bootstrap 0.14.3)</p>
<p>This Demo of Angular-Dialog-Service <strong>features an automatic substitution for Angular-Translate</strong>. It will detect whether or not Angular-Translate is loaded; if not it will use the included translate substitute (translate.sub) module. The translate substitution is small and modeled after Angular-Translate so that if in the future you wish to use Angular-Translate all you need to do is load the module (pascalprecht.translate) before this dialogs module.</p>
<p>The result, <a href="https://github.com/angular-translate">Angular-Translate (https://github.com/angular-translate)</a> <strong>is now optional</strong>, its no longer an absolute dependency. If your application does not need a translation module then there is no need to include Angular-Translate anymore. You can however still set default modal button, header and message text via <em>$translateProvider</em> in your module's <em>config</em> function.</p><br>
</div>
Expand Down
2 changes: 1 addition & 1 deletion example/js/dialogs-default-translations.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* angular-dialog-service - A service to handle common dialog types in a web application. Built on top of Angular-Bootstrap's modal
* @version v5.2.9
* @version v5.2.10
* @author Michael Conroy, [email protected]
* @license MIT, http://www.opensource.org/licenses/MIT
*/
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion example/js/dialogs.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* angular-dialog-service - A service to handle common dialog types in a web application. Built on top of Angular-Bootstrap's modal
* @version v5.2.9
* @version v5.2.10
* @author Michael Conroy, [email protected]
* @license MIT, http://www.opensource.org/licenses/MIT
*/
Expand Down
10 changes: 0 additions & 10 deletions example/js/ui-bootstrap-tpls-0.11.2.min.js

This file was deleted.

0 comments on commit 77adabe

Please sign in to comment.