Skip to content

Commit

Permalink
Update modal mod-layerNew mviewer#135
Browse files Browse the repository at this point in the history
  • Loading branch information
@Agath21
Agath21 committed Nov 28, 2022
1 parent a3a898f commit d5b48a1
Show file tree
Hide file tree
Showing 5 changed files with 178 additions and 132 deletions.
194 changes: 117 additions & 77 deletions css/mviewerstudio.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
color: var(--info);
}

.layer-move,
.theme-move {
cursor: move;
cursor: -webkit-grabbing;
Expand Down Expand Up @@ -65,96 +66,40 @@
border-color: rgba(0, 0, 0, 0.125);
}

/* Modal iconPicker */

.icon-picker-list a:hover, .icon-picker-list a.active {
background-color: var(--info)!important;
}

.btn-layer-new {
float: right;
margin-right: 20px;
}

/* Paramétrage de la thématique sélectionnée */

/* Thème de l'application */


#opt-style option {
color: #FFFFFF;
}

.alizarin {
background-color: #E64B3B;
}

.blue {
background-color: #F6F7F8;
}

.default {
background-color: #34495D;
}

.nephritis {
background-color: #26AE60;
}

.ripe_lemon {
background-color: #F6CA17;
}

.amethyst {
background-color: #9A59B6;
}

.carrot {
background-color: #E67E21;
}

.green {
background-color: #70BA50;
.layers-list-item {
display: flex;
align-items: center;
justify-content: space-between;
}

.peter_river {
background-color: #3497DB;
.layer-options-btn .btn {
margin: 0 5px;
}

.black {
background-color: #000000;
.selected-icon {
margin: .2em .5em;
padding: 0.1em .5em;
border: 1px solid #337ab7;
background-color: #d9edf7;
color: #337ab7;
}

.chambray {
background-color: #3A529A;
}

.green_sea {
background-color: #1ABC9C;
}
/* Modal iconPicker */

.pink {
background-color: #F62359;
.icon-picker-list a:hover, .icon-picker-list a.active {
background-color: var(--info)!important;
}

.wet_asphalt {
background-color: #34495D;
.btn-layer-new {
float: right;
margin-right: 20px;
}

.row.fld.selected {
background-color: #9E9E9E;
}
/* Inconnu */

#map {
height: 25em;
}

.selected-icon {
margin: .2em .5em;
padding: 0.1em .5em;
border: 1px solid #337ab7;
background-color: #d9edf7;
color: #337ab7;
}

div#map_filter {
height: 300px !important;
Expand Down Expand Up @@ -224,12 +169,32 @@ select#opt-style {
}


/* Import des thématiques */
/* Modal - Import des thématiques */

#importedThemes .list-group-item:hover {
background-color: var(--light);
}

/* Modal - Ajout d'une couche */

#mod-layerNew h6 {
font-size: 16px;
font-weight: 500;
}

.ogc-results .list-group-item {
margin: 5px 0px;
border-radius: 14px;
}

.ogc-results .list-group-item:hover {
background-color: var(--light);
}

.ogc-results .list-group-item .custom-checkbox {
display: flex;
align-items: center;
}


/**
Expand Down Expand Up @@ -267,6 +232,10 @@ a {
border: none;
}

.noborderradius {
border-radius: 0!important;
}

.strong {
font-weight: 600;
font-size: 1.1em;
Expand Down Expand Up @@ -719,6 +688,77 @@ button i {
border-top: none;
}

/* Thème de l'application */


#opt-style option {
color: #FFFFFF;
}

.alizarin {
background-color: #E64B3B;
}

.blue {
background-color: #F6F7F8;
}

.default {
background-color: #34495D;
}

.nephritis {
background-color: #26AE60;
}

.ripe_lemon {
background-color: #F6CA17;
}

.amethyst {
background-color: #9A59B6;
}

.carrot {
background-color: #E67E21;
}

.green {
background-color: #70BA50;
}

.peter_river {
background-color: #3497DB;
}

.black {
background-color: #000000;
}

.chambray {
background-color: #3A529A;
}

.green_sea {
background-color: #1ABC9C;
}

.pink {
background-color: #F62359;
}

.wet_asphalt {
background-color: #34495D;
}

.row.fld.selected {
background-color: #9E9E9E;
}

#map {
height: 25em;
}


/*
-- MOBILE
Expand Down
76 changes: 39 additions & 37 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1227,57 +1227,59 @@ <h5 class="modal-title">Importer une thématique externe</h5>
</div>

<!-- Modal new Layer-->
<div class="modal fade" id="mod-layerNew" role="dialog">
<div class="modal fade" id="mod-layerNew" role="dialog" tabindex="-1" aria-labelledby="mod-layerNew" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title" i18n="modal.layer.new.searchdata">Rechercher des données</h4>
<h5 class="modal-title" i18n="modal.layer.new.searchdata">Ajouter une couche</h5>
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
<div class="row">
<div class="col-md-12">
<div class="input-group">
<input type="text" id="input-ogc-filter" class="form-control" aria-label="..."
placeholder="Rechercher..." i18n="modal.layer.new.searchdata.ph">
<div class="input-group-btn">
<button id="providers_dropdown" type="button" class="btn btn-warning dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" i18n="modal.layer.new.provider">
Fournisseurs de données<span class="caret"/></button>
<ul class="dropdown-menu dropdown-menu-right" id="providers_list">
</ul>
<button id="provider_search_btn" type="button" class="btn btn-primary" disabled="enabled" onclick="mv.search()"><span class="glyphicon glyphicon-search"/>
</button>
</div><!-- /btn-group -->
</div><!-- /input-group -->
</div><!-- /.col-md-12 -->
</div><!-- /.row -->
<div class="row text-center text-warning" style="padding: 1rem;" id="search-message" i18n="modal.layer.new.provider.noneselected">
Aucun fournisseur sélectionné. Veuillez en choisir un.
<h6>Rechercher une données</h6>
<div class="input-group my-3">
<input type="text" id="input-ogc-filter" class="form-control" aria-label="..." placeholder="Rechercher..." i18n="modal.layer.new.searchdata.ph">
<div class="input-group-append">
<button id="providers_dropdown" class="btn btn-outline-info dropdown-toggle noborderradius" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" i18n="modal.layer.new.provider">Catalogue de données</button>
<ul class="dropdown-menu dropdown-menu-end" id="providers_list"></ul>
<button class="btn btn-info" id="provider_search_btn" type="button" disabled="enabled" onclick="mv.search()"><i class="bi bi-search"></i></button>

</div>
</div>
</div>
</div>
<div class="row" style="padding: 1rem;" id="search-message" i18n="modal.layer.new.provider.noneselected">
Veuillez sélectionner un catalogue de données
</div>
<div class="row ogc-results" id="csw-results" style="display: none;"></div>
<div class="row ogc-results" id="wms-results" style="display: none;"></div>
<div class="row ogc-results" id="wfs-results" style="display: none;"></div>
</div>
<div class="modal-footer">
<div class="pull-left">
<div class="form form-inline">
<div class="form-group">
<input class="form-control custom-url" type="text" i18n="modal.layer.new.provider.ph"
placeholder="URL du fournisseur..." oninput="updateAddProviderButtonState(this);"> </input>
<select class="form-control">
<option value="csw" i18n="modal.layer.new.provider.csw">CSW</option>
<option value="wms" i18n="modal.layer.new.provider.wms">WMS</option>
</select>
<input class="form-control custom-title" type="text" placeholder="Nom..." oninput="updateAddProviderButtonState(this);"> </input>
<button id="add_provider_btn" type="button" class="btn btn-primary" disabled onclick="addNewProvider(this);" i18n="modal.layer.new.provider.add">
Ajouter un fournisseur
</button>

<div class="advanced" style="display:none;">
<hr>
<div class="row">
<div class="col-md-12">
<h6>Ajouter un catalogue de données</h6>
<div class="input-group my-3" id="addCatalogData">
<input type="text" class="form-control custom-title" aria-label="..." placeholder="Nom" oninput="updateAddProviderButtonState(this);">
<input type="text" class="form-control custom-url" aria-label="..." i18n="modal.layer.new.provider.ph" placeholder="URL du fournisseur" oninput="updateAddProviderButtonState(this);" >
<select class="form-control">
<option value="csw" i18n="modal.layer.new.provider.csw">CSW</option>
<option value="wms" i18n="modal.layer.new.provider.wms">WMS</option>
</select>
<div class="input-group-append">
<button class="btn btn-info" type="button" id="add_provider_btn" disabled onclick="addNewProvider(this);"><i class="bi bi-plus-lg"></i> Ajouter</button>
</div>
</div>
</div>
</div>
</div>
<button type="button" class="btn btn-success" onclick="mv.getConfLayers();" i18n="select">Sélectionner</button>
<button type="button" class="btn btn-default" data-dismiss="modal" i18n="close">Fermer</button>

</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" onclick="mv.getConfLayers();" i18n="select">Sélectionner</button>
<button type="button" class="btn btn-outline-primary" data-bs-dismiss="modal" i18n="close">Fermer</button>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit d5b48a1

Please sign in to comment.