persistent modals persist interface hotfix

parent 022be556
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<h4 class="modal-title" id="myModalLabel" translate ng-show="!onlyOwn">add_picto</h4> <h4 class="modal-title" id="myModalLabel" translate ng-show="!onlyOwn">add_picto</h4>
<h4 class="modal-title" id="myModalLabel" translate ng-show="onlyOwn">own_pictos</h4> <h4 class="modal-title" id="myModalLabel" translate ng-show="onlyOwn">own_pictos</h4>
<hr> <hr ng-show="!onlyOwn">
<div class="btn-group" ng-show="!onlyOwn"> <div class="btn-group" ng-show="!onlyOwn">
<button class="btn btn-default" btn-radio="'symbolstx'" ng-model="source" ng-click="open_category_from_bc('0')"> <button class="btn btn-default" btn-radio="'symbolstx'" ng-model="source" ng-click="open_category_from_bc('0')">
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div ng-show="source == 'symbolstx' && !onlyOwn" class="panel panel-default" id="bread_and_categories">
<div id="bread_and_categories" ng-show="source == 'symbolstx' && !onlyOwn" class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<div class="pull-left" ng-repeat="b in breadcrumbs"> <div class="pull-left" ng-repeat="b in breadcrumbs">
<a ng-click="open_category_from_bc(b.id)"> <a ng-click="open_category_from_bc(b.id)">
...@@ -38,31 +39,36 @@ ...@@ -38,31 +39,36 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div><!-- /bread_and_categories -->
<div> <div>
<alert ng-show="alert.show" ng-model="alert" type="{{alert.type}}" close="closeAlert()">{{alert.msg | translate}}</alert> <alert ng-show="alert.show" ng-model="alert" type="{{alert.type}}" close="closeAlert()">{{alert.msg | translate}}</alert>
</div> </div>
<div class="row">
<div id="collections" class="col-md-12 category-collection" <div id="collections" class="col-md-12 category-collection"
ng-class="{ 'category-collection-loading': loadingCatPictos }" ng-class="{ 'category-collection-loading': loadingCatPictos }"
data-loading="{{ 'loading_pictos' | translate }}"> data-loading="{{ 'loading_pictos' | translate }}">
<form ng-submit="search()" ng-show="!onlyOwn"> <form ng-submit="search()" ng-show="!onlyOwn">
<div class="input-group" id="search_pictos_box"> <div class="input-group" id="search_pictos_box">
<input type="text" class="form-control" placeholder="{{ 'filter' | translate }}" <input type="text" class="form-control" placeholder="{{ 'filter' | translate }}"
id="srch_term_picto" name="srch_term_picto" ng-model="srch_term_picto"> id="srch_term_picto" name="srch_term_picto" ng-model="srch_term_picto">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="submit" class="btn btn-primary"> <button type="submit" class="btn btn-default">
<i class="fa fa-search" aria-hidden="true"> {{ 'search' | translate }}</i> <i class="fa fa-search" aria-hidden="true"></i>
</button> </button>
</span> </span>
</div> </div>
</form> </form>
<div ng-show="source == 'ownpictos'" class="input-group"> <div ng-show="source == 'ownpictos'" class="input-group">
<button class="btn btn-success" ngf-select ng-model="picFile" accept="image/*" ngf-change="addOwnPicto()"> <button class="btn btn-success" ngf-select ng-model="picFile" accept="image/*" ngf-change="addOwnPicto()">
<span class="glyphicon glyphicon-folder-open"></span> {{ 'new_img' | translate }} <span class="glyphicon glyphicon-folder-open"></span> {{ 'new_img' | translate }}
</label> </button>
</div> </div>
<!-- Galería de pictos --> <!-- Galería de pictos -->
<div id="clearfix-infiniteScroll-parent" infinite-scroll="scroll()" <div id="clearfix-infiniteScroll-parent" infinite-scroll="scroll()"
infinite-scroll-container="'#collections'"> infinite-scroll-container="'#collections'">
...@@ -76,7 +82,7 @@ ...@@ -76,7 +82,7 @@
<span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span> <span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span>
</a> </a>
</div> </div>
<div class="picto_options"> <div class="picto_options" ng-show="!onlyOwn">
<a ng-click="remove_own_picto(p.id)" class="picto_remove" title="{{ 'delete' | translate}}"> <a ng-click="remove_own_picto(p.id)" class="picto_remove" title="{{ 'delete' | translate}}">
<a <a
ng-click="close(p.id)" ng-click="close(p.id)"
...@@ -88,12 +94,17 @@ ...@@ -88,12 +94,17 @@
</div> </div>
</div> </div>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div>
</div><!-- /collections -->
</div><!-- /row -->
</div> <!-- /modal-body --> </div> <!-- /modal-body -->
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-primary" ng-click="cancel()">{{ 'close' | translate }}</button> <button class="btn btn-primary" ng-click="cancel()">{{ 'close' | translate }}</button>
</div> </div>
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment