Mercurial > gemma
changeset 1362:ca33ad696594
remove the first empyty lines
* remove the first empyty line in the license hearders to client files
line wrap: on
line diff
--- a/client/src/assets/application.sass Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/assets/application.sass Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/assets/tooltip.sass Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/assets/tooltip.sass Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/App.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/App.vue Mon Nov 26 11:42:47 2018 +0100 @@ -58,8 +58,7 @@ </style> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/Login.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/Login.vue Mon Nov 26 11:42:47 2018 +0100 @@ -97,8 +97,7 @@ </style> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/Sidebar.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/Sidebar.vue Mon Nov 26 11:42:47 2018 +0100 @@ -59,8 +59,7 @@ </template> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/admin/Importqueue.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/admin/Importqueue.vue Mon Nov 26 11:42:47 2018 +0100 @@ -53,8 +53,7 @@ </template> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/admin/Logs.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/admin/Logs.vue Mon Nov 26 11:42:47 2018 +0100 @@ -76,8 +76,7 @@ </style> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/admin/Systemconfiguration.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/admin/Systemconfiguration.vue Mon Nov 26 11:42:47 2018 +0100 @@ -41,8 +41,7 @@ </style> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/admin/usermanagement/Passwordfield.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/admin/usermanagement/Passwordfield.vue Mon Nov 26 11:42:47 2018 +0100 @@ -30,8 +30,7 @@ </style> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/admin/usermanagement/Userdetail.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/admin/usermanagement/Userdetail.vue Mon Nov 26 11:42:47 2018 +0100 @@ -138,8 +138,7 @@ </style> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/admin/usermanagement/Usermanagement.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/admin/usermanagement/Usermanagement.vue Mon Nov 26 11:42:47 2018 +0100 @@ -143,8 +143,7 @@ </style> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/map/Main.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/Main.vue Mon Nov 26 11:42:47 2018 +0100 @@ -12,8 +12,7 @@ </template> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/map/Maplayer.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/Maplayer.vue Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,5 @@ <template> - <div id="map" :class="mapStyle"></div> + <div id="map" :class="mapStyle"></div> </template> <style lang="sass" scoped> @@ -16,21 +16,20 @@ .mapfull width: 2000px height: 2828px - + .mapsplit width: 2000px height: 2828px </style> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later * License-Filename: LICENSES/AGPL-3.0.txt * - * Copyright (C) 2018 by via donau + * Copyright (C) 2018 by via donau * – Österreichische Wasserstraßen-Gesellschaft mbH * Software engineering by Intevation GmbH *
--- a/client/src/components/map/Pdftool.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/Pdftool.vue Mon Nov 26 11:42:47 2018 +0100 @@ -43,8 +43,7 @@ </template> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/map/Search.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/Search.vue Mon Nov 26 11:42:47 2018 +0100 @@ -72,8 +72,7 @@ </style> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/map/contextbox/Bottlenecks.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/contextbox/Bottlenecks.vue Mon Nov 26 11:42:47 2018 +0100 @@ -1,88 +1,68 @@ <template> - <div> - <h6 class="mb-0 py-2 px-3 border-bottom d-flex align-items-center"> - <font-awesome-icon icon="ship" class="mr-2"></font-awesome-icon> - Bottlenecks - </h6> - <div class="row p-2 text-left small"> - <div class="col-5"> - <a href="#" @click="sortBy('name')" class="sort-link">Name</a> - <font-awesome-icon - :icon="sortIcon" - class="ml-1" - v-if="sortColumn === 'name'" - ></font-awesome-icon> - </div> - <div class="col-2"> - <a - href="#" - @click="sortBy('latestMeasurement')" - class="sort-link" - >Latest<br>Measurement</a> - <font-awesome-icon - :icon="sortIcon" - class="ml-1" - v-if="sortColumn === 'latestMeasurement'" - ></font-awesome-icon> - </div> - <div class="col-3"> - <a href="#" @click="sortBy('chainage')" class="sort-link">Chainage</a> - <font-awesome-icon - :icon="sortIcon" - class="ml-1" - v-if="sortColumn === 'chainage'" - ></font-awesome-icon> - </div> - <div class="col-2"></div> + <div> + <h6 class="mb-0 py-2 px-3 border-bottom d-flex align-items-center"> + <font-awesome-icon icon="ship" class="mr-2"></font-awesome-icon>Bottlenecks + </h6> + <div class="row p-2 text-left small"> + <div class="col-5"> + <a href="#" @click="sortBy('name')" class="sort-link">Name</a> + <font-awesome-icon :icon="sortIcon" class="ml-1" v-if="sortColumn === 'name'"></font-awesome-icon> + </div> + <div class="col-2"> + <a href="#" @click="sortBy('latestMeasurement')" class="sort-link">Latest + <br>Measurement + </a> + <font-awesome-icon :icon="sortIcon" class="ml-1" v-if="sortColumn === 'latestMeasurement'"></font-awesome-icon> + </div> + <div class="col-3"> + <a href="#" @click="sortBy('chainage')" class="sort-link">Chainage</a> + <font-awesome-icon :icon="sortIcon" class="ml-1" v-if="sortColumn === 'chainage'"></font-awesome-icon> + </div> + <div class="col-2"></div> + </div> + <div class="bottleneck-list small text-left" v-if="filteredAndSortedBottlenecks().length"> + <div + v-for="bottleneck in filteredAndSortedBottlenecks()" + :key="bottleneck.properties.name" + class="border-top row mx-0 py-2" + > + <div class="col-5 text-left"> + <a + href="#" + class="d-block" + @click="moveToBottleneck(bottleneck)" + >{{ bottleneck.properties.name }}</a> </div> - <div class="bottleneck-list small text-left" v-if="filteredAndSortedBottlenecks().length"> - <div - v-for="bottleneck in filteredAndSortedBottlenecks()" - :key="bottleneck.properties.name" - class="border-top row mx-0 py-2" - > - <div class="col-5 text-left"> - <a - href="#" - class="d-block" - @click="moveToBottleneck(bottleneck)" - >{{ bottleneck.properties.name }}</a> - </div> - <div class="col-2">{{ displayCurrentSurvey(bottleneck.properties.current) }}</div> - <div - class="col-3" - >{{ displayCurrentChainage(bottleneck.properties.from, bottleneck.properties.from) }}</div> - <div class="col-2 text-right"> - <button - type="button" - class="btn btn-sm btn-outline-secondary" - @click="toggleBottleneck(bottleneck.properties.name)" - > - <font-awesome-icon icon="angle-down"></font-awesome-icon> - </button> - </div> - <div - :class="['col-12', 'surveys', {open: openBottleneck === bottleneck.properties.name}]" - > - <a - href="#" - class="d-block p-2" - v-for="(survey, index) in openBottleneckSurveys" - :key="index" - @click="selectSurvey(survey, bottleneck)" - >{{ survey.date_info }}</a> - </div> - </div> + <div class="col-2">{{ displayCurrentSurvey(bottleneck.properties.current) }}</div> + <div + class="col-3" + >{{ displayCurrentChainage(bottleneck.properties.from, bottleneck.properties.from) }}</div> + <div class="col-2 text-right"> + <button + type="button" + class="btn btn-sm btn-outline-secondary" + @click="toggleBottleneck(bottleneck.properties.name)" + > + <font-awesome-icon icon="angle-down"></font-awesome-icon> + </button> </div> - <div v-else class="small text-center py-3 border-top"> - No results. + <div :class="['col-12', 'surveys', {open: openBottleneck === bottleneck.properties.name}]"> + <a + href="#" + class="d-block p-2" + v-for="(survey, index) in openBottleneckSurveys" + :key="index" + @click="selectSurvey(survey, bottleneck)" + >{{ survey.date_info }}</a> </div> + </div> </div> + <div v-else class="small text-center py-3 border-top">No results.</div> + </div> </template> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/map/contextbox/Contextbox.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/contextbox/Contextbox.vue Mon Nov 26 11:42:47 2018 +0100 @@ -1,17 +1,16 @@ <template> - <div :class="style"> - <div @click="close" class="ui-element close-contextbox text-muted"> - <font-awesome-icon icon="times"></font-awesome-icon> - </div> - <Bottlenecks v-if="contextBoxContent === 'bottlenecks'"></Bottlenecks> - <Importsounding v-if="contextBoxContent === 'imports'"></Importsounding> - <Staging v-if="contextBoxContent === 'staging'"></Staging> + <div :class="style"> + <div @click="close" class="ui-element close-contextbox text-muted"> + <font-awesome-icon icon="times"></font-awesome-icon> </div> + <Bottlenecks v-if="contextBoxContent === 'bottlenecks'"></Bottlenecks> + <Importsounding v-if="contextBoxContent === 'imports'"></Importsounding> + <Staging v-if="contextBoxContent === 'staging'"></Staging> + </div> </template> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/map/fairway/Fairwayprofile.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/fairway/Fairwayprofile.vue Mon Nov 26 11:42:47 2018 +0100 @@ -161,8 +161,7 @@ </style> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/map/fairway/Infobar.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/fairway/Infobar.vue Mon Nov 26 11:42:47 2018 +0100 @@ -35,8 +35,7 @@ </style> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/map/fairway/Surveys.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/fairway/Surveys.vue Mon Nov 26 11:42:47 2018 +0100 @@ -27,8 +27,7 @@ </template> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/map/layers/Layers.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/layers/Layers.vue Mon Nov 26 11:42:47 2018 +0100 @@ -24,8 +24,7 @@ </template> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/map/layers/Layerselect.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/layers/Layerselect.vue Mon Nov 26 11:42:47 2018 +0100 @@ -27,8 +27,7 @@ <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/components/map/layers/LegendElement.vue Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/components/map/layers/LegendElement.vue Mon Nov 26 11:42:47 2018 +0100 @@ -3,8 +3,7 @@ </template> <script> -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/lib/errors.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/lib/errors.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/lib/geo.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/lib/geo.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/lib/http.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/lib/http.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/lib/session.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/lib/session.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/router.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/router.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/store/bottlenecks.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/store/bottlenecks.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/store/fairway.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/store/fairway.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/store/imports.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/store/imports.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/store/index.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/store/index.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/store/map.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/store/map.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/store/user.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/store/user.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later
--- a/client/src/store/usermanagement.js Mon Nov 26 11:11:13 2018 +0100 +++ b/client/src/store/usermanagement.js Mon Nov 26 11:42:47 2018 +0100 @@ -1,5 +1,4 @@ -/* - * This is Free Software under GNU Affero General Public License v >= 3.0 +/* This is Free Software under GNU Affero General Public License v >= 3.0 * without warranty, see README.md and license for details. * * SPDX-License-Identifier: AGPL-3.0-or-later