From 2a7c2ee11da714bb43ba124cd904a6a1d364b741 Mon Sep 17 00:00:00 2001 From: Armand Bahi <armand.bahi@veremes.com> Date: Mon, 19 Nov 2018 15:13:59 +0100 Subject: [PATCH] Ajout onglets (visu uniquement) --- src/module_vmap/module/css/vmap.less | 10 ++++++++++ .../module/template/layers/layertree.html | 6 ++++++ .../module/template/layers/maplegend.html | 14 +++++++++----- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/module_vmap/module/css/vmap.less b/src/module_vmap/module/css/vmap.less index b1a22a83..45c84806 100644 --- a/src/module_vmap/module/css/vmap.less +++ b/src/module_vmap/module/css/vmap.less @@ -2443,3 +2443,13 @@ div.vmap-select-scale-alert{ font-size: 16px; line-height: 0; } + +.layerstree-nav { + margin-left: 40px; +} + +.layerstree-nav>li>a { + padding: 0px 15px; + border: 1px solid #8a8a8a !important; + color: #333; +} diff --git a/src/module_vmap/module/template/layers/layertree.html b/src/module_vmap/module/template/layers/layertree.html index 5002135b..0bf938a1 100644 --- a/src/module_vmap/module/template/layers/layertree.html +++ b/src/module_vmap/module/template/layers/layertree.html @@ -12,9 +12,15 @@ </div> <div id="layertree" class="layers-tool" collapse="{{ctrl.layerstree_collapsed === true ? 'out' : 'in'}}"> + + <ul class="nav nav-tabs layerstree-nav left"> + <li class="active"><a data-toggle="tab" href="#map1">Carte 1</a></li> + <li><a data-toggle="tab" href="#map1">Carte 2</a></li> + </ul> <div class="indicators"> <span class="text-info icon-eye" style="font-size: 18px;line-height: 0" title="Définit si la couche est visible"></span> </div> + <ul class="tree"> <div ng-repeat="node in tree.children| orderBy : 'name'" ng-if="node.view === undefined"> diff --git a/src/module_vmap/module/template/layers/maplegend.html b/src/module_vmap/module/template/layers/maplegend.html index a82570aa..907476a5 100755 --- a/src/module_vmap/module/template/layers/maplegend.html +++ b/src/module_vmap/module/template/layers/maplegend.html @@ -1,9 +1,9 @@ <div class="maplegendtool"> <div ng-if="!$root.is_mobile" id="maplegendcontainer-button"> - <div class="list-group-item active pointer maplegend-button-content" - title="Légende de la carte" + <div class="list-group-item active pointer maplegend-button-content" + title="Légende de la carte" collapse="{{ctrl.legend_collapsed === true ? 'out' : 'in'}}" - data-target="#maplegendcontainer" + data-target="#maplegendcontainer" onclick="oVmap.getMapManager().collapseElement(this)"> <span class="icon-info list-group-icon"></span> <span>Légende</span> @@ -12,6 +12,10 @@ </div> </div> <div id="maplegendcontainer" class="layers-tool legend" collapse="{{ctrl.legend_collapsed === true ? 'out' : 'in'}}"> + <ul class="nav nav-tabs layerstree-nav"> + <li class="active"><a data-toggle="tab" href="#map1">Carte 1</a></li> + <li><a data-toggle="tab" href="#map1">Carte 2</a></li> + </ul> <div id="maplegend" class="tree legend"> <div ng-repeat="(sLayerName, layer) in ctrl.oUrls" class="layer-legend" ng-show="ctrl.areLegendsLoaded(layer)"> @@ -23,7 +27,7 @@ <div id="legend_element_{{$index}}" class="collapse in"> <ul class="list-group-item auto-height"> <div ng-repeat="node in layer" - ng-show="node.legendBlobURL"> + ng-show="node.legendBlobURL"> <img ng-src="{{node.legendBlobURL}}" class="legend-img" legend-image-node> </div> </ul> @@ -31,4 +35,4 @@ </div> </div> </div> -</div> \ No newline at end of file +</div> -- GitLab