--- a/client/app/auth/login_modal.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/auth/login_modal.html Wed May 27 18:58:39 2015 +0200
@@ -1,16 +1,16 @@
<div class="modal-header ng-scope">
- <h3 class="modal-title">Authentication Page</h3>
+ <h3 class="modal-title">Authentication Page</h3>
</div>
<form ng-submit="login()">
- <div class="modal-body ng-scope">
- <input type="text" class="form-control" ng-model='username' placeholder="Username">
- <input type="password" class="form-control" ng-model='password' placeholder="Password">
- </div>
+ <div class="modal-body ng-scope">
+ <input type="text" class="form-control" ng-model='username' placeholder="Username">
+ <input type="password" class="form-control" ng-model='password' placeholder="Password">
+ </div>
- <div class="modal-footer ng-scope">
- <a href='' ng-click="register()">Creer un compte</a>
- <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
- <button type="submit" ng-disabled="userForm.$invalid" class="btn btn-primary">Login</button>
- </div>
+ <div class="modal-footer ng-scope">
+ <a href='' ng-click="register()">Creer un compte</a>
+ <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
+ <button type="submit" ng-disabled="userForm.$invalid" class="btn btn-primary">Login</button>
+ </div>
</form>
\ No newline at end of file
--- a/client/app/auth/logout_modal.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/auth/logout_modal.html Wed May 27 18:58:39 2015 +0200
@@ -1,11 +1,11 @@
<div class="modal-header ng-scope">
- <h3 class="modal-title">Deconnection</h3>
+ <h3 class="modal-title">Deconnection</h3>
</div>
<div class="modal-body ng-scope">
- <p>Vous n'est plus connecté</p>
+ <p>Vous n'est plus connecté</p>
</div>
<div class="modal-footer ng-scope">
- <button ng-click="cancel()" class="btn btn-warning">Acceuil</button>
+ <button ng-click="cancel()" class="btn btn-warning">Acceuil</button>
</div>
\ No newline at end of file
--- a/client/app/auth/register_modal.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/auth/register_modal.html Wed May 27 18:58:39 2015 +0200
@@ -1,17 +1,17 @@
<div class="modal-header ng-scope">
- <h3 class="modal-title">Créer un Compte</h3>
+ <h3 class="modal-title">Créer un Compte</h3>
</div>
<form ng-submit="register()">
- <div class="modal-body ng-scope">
- <input type="text" class="form-control" ng-model='username' placeholder="Nom d'utilisateur"></input>
- <input type="text" class="form-control" ng-model='email' placeholder="Email"></input>
- <input type="password" class="form-control" ng-model='password' placeholder="Mot de passe"></input>
- <input type="password" class="form-control" ng-model='password2' placeholder="Confirmer le mot de pass"></input>
- </div>
-
- <div class="modal-footer ng-scope">
- <button type="button" ng-click="back()" class="btn btn-warning">Retour</button>
- <button type="submit" class="btn btn-primary">Créer</button>
- </div>
+ <div class="modal-body ng-scope">
+ <input type="text" class="form-control" ng-model='username' placeholder="Nom d'utilisateur"></input>
+ <input type="text" class="form-control" ng-model='email' placeholder="Email"></input>
+ <input type="password" class="form-control" ng-model='password' placeholder="Mot de passe"></input>
+ <input type="password" class="form-control" ng-model='password2' placeholder="Confirmer le mot de pass"></input>
+ </div>
+
+ <div class="modal-footer ng-scope">
+ <button type="button" ng-click="back()" class="btn btn-warning">Retour</button>
+ <button type="submit" class="btn btn-primary">Créer</button>
+ </div>
</form>
\ No newline at end of file
--- a/client/app/books/add_book_modal.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/books/add_book_modal.html Wed May 27 18:58:39 2015 +0200
@@ -1,24 +1,24 @@
<div class="modal-header ng-scope">
- <h3 class="modal-title">Vous voulez partager ce book ? </h3>
+ <h3 class="modal-title">Vous voulez partager ce book ? </h3>
</div>
<div class="modal-body ng-scope">
- <ul class="row ">
- Les books de vos visites:
- <li class="" ng-repeat="i in books | filter:{parent_visit:'!null'}:filter:{ parent_visit: 'null', idArticle: 'null' }">
- <div>
- <a ng-click="addToBook(i.id)">{{ i.title }}</a>
- </div>
- </li>
- Autres Books:
- <li class="" ng-repeat="i in books | filter:{ parent_visit: 'null', idArticle: 'null' }">
- <div>
- <a ng-click="addToBook(i.id)">{{ i.title }}</a>
- </div>
- </li>
- </ul>
+ <ul class="row ">
+ Les books de vos visites:
+ <li class="" ng-repeat="i in books | filter:{parent_visit:'!null'}:filter:{ parent_visit: 'null', idArticle: 'null' }">
+ <div>
+ <a ng-click="addToBook(i.id)">{{ i.title }}</a>
+ </div>
+ </li>
+ Autres Books:
+ <li class="" ng-repeat="i in books | filter:{ parent_visit: 'null', idArticle: 'null' }">
+ <div>
+ <a ng-click="addToBook(i.id)">{{ i.title }}</a>
+ </div>
+ </li>
+ </ul>
</div>
<div class="modal-footer ng-scope">
- <button ng-click="cancel()" class="btn btn-warning">Cancel</button>
+ <button ng-click="cancel()" class="btn btn-warning">Cancel</button>
</div>
\ No newline at end of file
--- a/client/app/home/home.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/home/home.html Wed May 27 18:58:39 2015 +0200
@@ -1,12 +1,12 @@
<h1>Ammico Application</h1>
<p>
- Le Lorem Ipsum est simplement du faux texte employé dans la composition
- et la mise en page avant impression. Le Lorem Ipsum est le faux texte standard de
- l'imprimerie depuis les années 1500, quand un peintre anonyme assembla ensemble des
- morceaux de texte pour réaliser un livre spécimen de polices de texte. Il n'a pas fait
- que survivre cinq siècles, mais s'est aussi adapté à la bureautique informatique, sans
- que son contenu n'en soit modifié. Il a été popularisé dans les années 1960 grâce à la
- vente de feuilles Letraset contenant des passages du Lorem Ipsum, et, plus récemment,
- par son inclusion dans des applications de mise en page de texte, comme Aldus PageMaker.
+ Le Lorem Ipsum est simplement du faux texte employé dans la composition
+ et la mise en page avant impression. Le Lorem Ipsum est le faux texte standard de
+ l'imprimerie depuis les années 1500, quand un peintre anonyme assembla ensemble des
+ morceaux de texte pour réaliser un livre spécimen de polices de texte. Il n'a pas fait
+ que survivre cinq siècles, mais s'est aussi adapté à la bureautique informatique, sans
+ que son contenu n'en soit modifié. Il a été popularisé dans les années 1960 grâce à la
+ vente de feuilles Letraset contenant des passages du Lorem Ipsum, et, plus récemment,
+ par son inclusion dans des applications de mise en page de texte, comme Aldus PageMaker.
</p>
\ No newline at end of file
--- a/client/app/index.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/index.html Wed May 27 18:58:39 2015 +0200
@@ -24,9 +24,9 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" id="logo" href="#/">
- <!-- build:imgLogo -->
- <img src="img/ammico_logo_small.png">
- <!-- endbuild -->
+ <!-- build:imgLogo -->
+ <img src="img/ammico_logo_small.png">
+ <!-- endbuild -->
</a>
</div>
<div class="collapse navbar-collapse">
@@ -49,17 +49,15 @@
</div>
</div>
</div>
- <div class="container">
- <div class="ammico-content">
+ <div class="container ammico-content">
<div ng-view></div>
- </div>
<footer>
<div class="row">
<div class="footer-img col-md-6">
<a href="http://www.iri.centrepompidou.fr" target="_blank">
- <!-- build:imgFooter -->
- <img src="img/logo_IRI_footer.png" alt="Logo IRI" />
- <!-- endbuild -->
+ <!-- build:imgFooter -->
+ <img src="img/logo_IRI_footer.png" alt="Logo IRI" />
+ <!-- endbuild -->
</a>
</div>
<div class="col-md-6 text-right">
--- a/client/app/my_visit/add_modal_my_visit.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/my_visit/add_modal_my_visit.html Wed May 27 18:58:39 2015 +0200
@@ -1,14 +1,14 @@
<div class="modal-header ng-scope">
- <h3 class="modal-title">Ajouter un nouveau Book</h3>
+ <h3 class="modal-title">Ajouter un nouveau Book</h3>
</div>
<form ng-submit="add()" novalidate>
- <div class="modal-body ng-scope">
- <input type="text" class="form-control" ng-model='title' placeholder="Titre"></input>
- </div>
-
- <div class="modal-footer ng-scope">
- <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
- <button type="submit" class="btn btn-primary">Create</button>
- </div>
+ <div class="modal-body ng-scope">
+ <input type="text" class="form-control" ng-model='title' placeholder="Titre"></input>
+ </div>
+
+ <div class="modal-footer ng-scope">
+ <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
+ <button type="submit" class="btn btn-primary">Create</button>
+ </div>
</form>
\ No newline at end of file
--- a/client/app/my_visit/share_modal_my_visit.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/my_visit/share_modal_my_visit.html Wed May 27 18:58:39 2015 +0200
@@ -1,16 +1,16 @@
<div class="modal-header ng-scope">
- <h3 class="modal-title">Où souhaitez-vous partager ce book ?</h3>
+ <h3 class="modal-title">Où souhaitez-vous partager ce book ?</h3>
</div>
<form ng-submit="share()" novalidate>
- <div class="modal-body ng-scope">
+ <div class="modal-body ng-scope">
<a class="btn btn-social-icon btn-twitter">
<i class="fa fa-twitter"></i>
</a>
- <div class="modal-footer ng-scope">
- <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
- <button type="submit" class="btn btn-primary">Create</button>
- </div>
+ <div class="modal-footer ng-scope">
+ <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
+ <button type="submit" class="btn btn-primary">Create</button>
+ </div>
</form>
\ No newline at end of file
--- a/client/app/search/search.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/search/search.html Wed May 27 18:58:39 2015 +0200
@@ -1,45 +1,45 @@
<h1>
- Recherche <span ng-if="q !='' "> : {{ q }}</span>
+ Recherche <span ng-if="q !='' "> : {{ q }}</span>
</h1>
<h4 class="subtitle" ng-if="results.nhits>0">{{ results.nhits }} résultat(s)</h4>
<div ng-if="results.nhits>0">
- <div class="row search-item" ng-repeat="h in results.hits"
- ng-init="h.imgbig=false">
- <div ng-class="{'col-md-5': h.imgbig, 'col-md-3': !h.imgbig}">
- <img ng-src="{{ h.metas_dict.images }}" ng-class="{'search-img-max': !h.imgbig}" ng-click="h.imgbig=!h.imgbig" />
- </div>
- <div ng-class="{'col-md-5': h.imgbig, 'col-md-7': !h.imgbig}">
- <p>
- <strong>Nom :</strong> {{ h.metas_dict.name }}
- </p>
- <p>
- <strong>Description :</strong> {{ h.metas_dict.description }}
- </p>
- <div ng-show="h.imgbig">
- <p>
- <small><strong>Classification :</strong> {{ h.metas_dict.classification }}</small>
- </p>
- <p>
- <small><strong>Propriétaire actuel :</strong> {{ h.metas_dict.currentcustody }}</small>
- </p>
- <p>
- <small><strong>Ancien propriétaire :</strong> {{ h.metas_dict.formercustody }}</small>
- </p>
- <p>
- <small><strong>Mesures :</strong> {{ h.metas_dict.measures }}</small>
- </p>
- <p>
- <small><strong>Acteurs :</strong> {{ h.metas_dict.actors }}</small>
- </p>
- <p>
- <small><strong>Lieux :</strong> {{ h.metas_dict.places }}</small>
- </p>
- </div>
- </div>
- <div class="col-md-1">
- <a class="btn btn-default" ng-click="toggleModal($index)"><span class="glyphicon glyphicon-plus"></span></a>
- <a class="btn btn-default" ng-click="h.imgbig=!h.imgbig"><span class="glyphicon glyphicon-eye-open"></span></a>
- </div>
- </div>
+ <div class="row search-item" ng-repeat="h in results.hits"
+ ng-init="h.imgbig=false">
+ <div ng-class="{'col-md-5': h.imgbig, 'col-md-3': !h.imgbig}">
+ <img ng-src="{{ h.metas_dict.images }}" ng-class="{'search-img-max': !h.imgbig}" ng-click="h.imgbig=!h.imgbig" />
+ </div>
+ <div ng-class="{'col-md-5': h.imgbig, 'col-md-7': !h.imgbig}">
+ <p>
+ <strong>Nom :</strong> {{ h.metas_dict.name }}
+ </p>
+ <p>
+ <strong>Description :</strong> {{ h.metas_dict.description }}
+ </p>
+ <div ng-show="h.imgbig">
+ <p>
+ <small><strong>Classification :</strong> {{ h.metas_dict.classification }}</small>
+ </p>
+ <p>
+ <small><strong>Propriétaire actuel :</strong> {{ h.metas_dict.currentcustody }}</small>
+ </p>
+ <p>
+ <small><strong>Ancien propriétaire :</strong> {{ h.metas_dict.formercustody }}</small>
+ </p>
+ <p>
+ <small><strong>Mesures :</strong> {{ h.metas_dict.measures }}</small>
+ </p>
+ <p>
+ <small><strong>Acteurs :</strong> {{ h.metas_dict.actors }}</small>
+ </p>
+ <p>
+ <small><strong>Lieux :</strong> {{ h.metas_dict.places }}</small>
+ </p>
+ </div>
+ </div>
+ <div class="col-md-1">
+ <a class="btn btn-default" ng-click="toggleModal($index)"><span class="glyphicon glyphicon-plus"></span></a>
+ <a class="btn btn-default" ng-click="h.imgbig=!h.imgbig"><span class="glyphicon glyphicon-eye-open"></span></a>
+ </div>
+ </div>
</div>
--- a/client/app/slides/data_editor.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/slides/data_editor.html Wed May 27 18:58:39 2015 +0200
@@ -1,17 +1,17 @@
<div class="user-details">
- <div ng-hide="slide.editMode">
- <h4 ng-dblClick="doubleClick()">{{slide.title}}</h4>
- <p ng-dblClick="doubleClick()" class="description">{{slide.description}}</p>
- <p ng-dblClick="doubleClick()">{{slide.comment}}</p>
- <p ng-dblClick="doubleClick()"><em>{{slide.tags.join(', ')}}</em></p>
- <div class="text-right"><button id="btn-search-annotations" class="btn" ng-click="slide.editMode=true"><span class="glyphicon glyphicon-pencil"></span></button></div>
- </div>
+ <div ng-hide="slide.editMode">
+ <h4 ng-dblClick="doubleClick()">{{slide.title}}</h4>
+ <p ng-dblClick="doubleClick()" class="description">{{slide.description}}</p>
+ <p ng-dblClick="doubleClick()">{{slide.comment}}</p>
+ <p ng-dblClick="doubleClick()"><em>{{slide.tags.join(', ')}}</em></p>
+ <div class="text-right"><button id="btn-search-annotations" class="btn" ng-click="slide.editMode=true"><span class="glyphicon glyphicon-pencil"></span></button></div>
+ </div>
- <div ng-show="slide.editMode">
- <input type="text" class="form-control" ng-model='slide.title' placeholder="Titre"></input>
- <textarea class="form-control editor-textarea" ng-model='slide.description' placeholder="Description"></textarea>
- <input type="text" class="form-control" ng-model='slide.comment' placeholder="Commentaire"></input>
- <input type="text" class="form-control" ng-model='slide.tags' placeholder="Tags"></input>
- <div class="text-right"><button id="btn-search-annotations" class="btn" ng-click="slidesave()"><span class="glyphicon glyphicon-ok"></span></button></div>
- </div>
+ <div ng-show="slide.editMode">
+ <input type="text" class="form-control" ng-model='slide.title' placeholder="Titre"></input>
+ <textarea class="form-control editor-textarea" ng-model='slide.description' placeholder="Description"></textarea>
+ <input type="text" class="form-control" ng-model='slide.comment' placeholder="Commentaire"></input>
+ <input type="text" class="form-control" ng-model='slide.tags' placeholder="Tags"></input>
+ <div class="text-right"><button id="btn-search-annotations" class="btn" ng-click="slidesave()"><span class="glyphicon glyphicon-ok"></span></button></div>
+ </div>
</div>
\ No newline at end of file
--- a/client/app/slideshow/slideshow.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/slideshow/slideshow.html Wed May 27 18:58:39 2015 +0200
@@ -1,45 +1,45 @@
<div class="slideshow">
- <div class="slide-title">
- <h1>Diaporama - {{book.title}}</h1>
- </div>
- <div class="carousel-holder row">
- <carousel>
- <slide ng-repeat="slide in slideshow" active="slide.active">
- <div class="container slide-content">
- <div class="col-md-7 media">
- <img ng-if="slide.details.images[0]" ng-src="{{ slide.details.images[0] }}" style="margin: auto;">
- <audio ng-if="slide.details.audio" ng-src="{{ slide.details.audio }}" style="margin: auto; controls loop"></audio>
- <video ng-if="slide.details.video" ng-src="{{ slide.details.video }}" style="margin: auto;" controls></video>
- </div>
- <div class="col-md-5 caption">
- <div class="user-details">
- <h4>{{slide.title}}</h4>
- <p>{{slide.description}}</p>
- <p>{{slide.comment}}</p>
- <p>
- <em>{{slide.tags.join(', ')}}</em>
- </p>
- </div>
- <hr />
- <div class="details">
- <p>
- <strong>Titre : </strong><small>{{slide.details.title}}</small>
- </p>
- <p>
- <strong>Description : </strong><small>{{slide.details.captionImg}}</small>
- </p>
- </div>
- </div>
- </div>
- </slide>
- </carousel>
- <ul class="list-unstyled list-inline row insight" >
- <li class="col-md-2 item" ng-repeat="slide in slideshow">
- <div class="img-ctn" ng-click="showSlide($index)">
- <img class="img img-responsive image" ng-src="{{ slide.details.images[0] }}" />
- <p>{{ slide.details.title }}</p>
- </div>
- </li>
- </ul>
- </div>
+ <div class="slide-title">
+ <h1>Diaporama - {{book.title}}</h1>
+ </div>
+ <div class="carousel-holder row">
+ <carousel>
+ <slide ng-repeat="slide in slideshow" active="slide.active">
+ <div class="container slide-content">
+ <div class="col-md-7 media">
+ <img ng-if="slide.details.images[0]" ng-src="{{ slide.details.images[0] }}" style="margin: auto;">
+ <audio ng-if="slide.details.audio" ng-src="{{ slide.details.audio }}" style="margin: auto; controls loop"></audio>
+ <video ng-if="slide.details.video" ng-src="{{ slide.details.video }}" style="margin: auto;" controls></video>
+ </div>
+ <div class="col-md-5 caption">
+ <div class="user-details">
+ <h4>{{slide.title}}</h4>
+ <p>{{slide.description}}</p>
+ <p>{{slide.comment}}</p>
+ <p>
+ <em>{{slide.tags.join(', ')}}</em>
+ </p>
+ </div>
+ <hr />
+ <div class="details">
+ <p>
+ <strong>Titre : </strong><small>{{slide.details.title}}</small>
+ </p>
+ <p>
+ <strong>Description : </strong><small>{{slide.details.captionImg}}</small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </slide>
+ </carousel>
+ <ul class="list-unstyled list-inline row insight" >
+ <li class="col-md-2 item" ng-repeat="slide in slideshow">
+ <div class="img-ctn" ng-click="showSlide($index)">
+ <img class="img img-responsive image" ng-src="{{ slide.details.images[0] }}" />
+ <p>{{ slide.details.title }}</p>
+ </div>
+ </li>
+ </ul>
+ </div>
</div>
--- a/client/app/visites/add_book_modal.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/visites/add_book_modal.html Wed May 27 18:58:39 2015 +0200
@@ -1,24 +1,24 @@
<div class="modal-header ng-scope">
- <h3 class="modal-title">A quel Book ajouter cet element ?</h3>
+ <h3 class="modal-title">A quel Book ajouter cet element ?</h3>
</div>
<div class="modal-body ng-scope">
- <ul class="row ">
- Les books de vos visites:
- <li class="" ng-repeat="i in books | filter:{parent_visit:'!null'}:filter:{ parent_visit: 'null', idArticle: 'null' }">
- <div>
- <a ng-click="addToBook(i.id)">{{ i.title }}</a>
- </div>
- </li>
- Autres Books:
- <li class="" ng-repeat="i in books | filter:{ parent_visit: 'null', idArticle: 'null' }">
- <div>
- <a ng-click="addToBook(i.id)">{{ i.title }}</a>
- </div>
- </li>
- </ul>
+ <ul class="row ">
+ Les books de vos visites:
+ <li class="" ng-repeat="i in books | filter:{parent_visit:'!null'}:filter:{ parent_visit: 'null', idArticle: 'null' }">
+ <div>
+ <a ng-click="addToBook(i.id)">{{ i.title }}</a>
+ </div>
+ </li>
+ Autres Books:
+ <li class="" ng-repeat="i in books | filter:{ parent_visit: 'null', idArticle: 'null' }">
+ <div>
+ <a ng-click="addToBook(i.id)">{{ i.title }}</a>
+ </div>
+ </li>
+ </ul>
</div>
<div class="modal-footer ng-scope">
- <button ng-click="cancel()" class="btn btn-warning">Cancel</button>
+ <button ng-click="cancel()" class="btn btn-warning">Cancel</button>
</div>
\ No newline at end of file
--- a/client/app/visites/add_modal_visites.html Wed May 27 18:57:03 2015 +0200
+++ b/client/app/visites/add_modal_visites.html Wed May 27 18:58:39 2015 +0200
@@ -1,14 +1,14 @@
<div class="modal-header ng-scope">
- <h3 class="modal-title">Ajouter un nouveau Book</h3>
+ <h3 class="modal-title">Ajouter un nouveau Book</h3>
</div>
<form ng-submit="add()" novalidate>
- <div class="modal-body ng-scope">
- <input type="text" class="form-control" ng-model='title' placeholder="Titre"></input>
- </div>
-
- <div class="modal-footer ng-scope">
- <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
- <button type="submit" class="btn btn-primary">Create</button>
- </div>
+ <div class="modal-body ng-scope">
+ <input type="text" class="form-control" ng-model='title' placeholder="Titre"></input>
+ </div>
+
+ <div class="modal-footer ng-scope">
+ <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
+ <button type="submit" class="btn btn-primary">Create</button>
+ </div>
</form>
\ No newline at end of file
--- a/client/app/visites/share_modal_visites Wed May 27 18:57:03 2015 +0200
+++ b/client/app/visites/share_modal_visites Wed May 27 18:58:39 2015 +0200
@@ -1,14 +1,14 @@
<div class="modal-header ng-scope">
- <h3 class="modal-title">Où souhaitez-vous partager ce book ?</h3>
+ <h3 class="modal-title">Où souhaitez-vous partager ce book ?</h3>
</div>
<form ng-submit="share()" novalidate>
- <div class="modal-body ng-scope">
+ <div class="modal-body ng-scope">
- <div class="modal-footer ng-scope">
- <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
- <button type="submit" class="btn btn-primary">Create</button>
- </div>
+ <div class="modal-footer ng-scope">
+ <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
+ <button type="submit" class="btn btn-primary">Create</button>
+ </div>
</form>
\ No newline at end of file
--- a/client/app/visites/visites_controller_test.js Wed May 27 18:57:03 2015 +0200
+++ b/client/app/visites/visites_controller_test.js Wed May 27 18:58:39 2015 +0200
@@ -4,5 +4,5 @@
it("should assert something",function(){
expect(true).toBe(true);
- })
+ })
})
\ No newline at end of file