Mercurial > gemma
changeset 1360:3fee649d3d5d
add headers for licensing to some client files
| author | Fadi Abbud <fadi.abbud@intevation.de> |
|---|---|
| date | Mon, 26 Nov 2018 10:04:47 +0100 |
| parents | 5bb1e3c1f364 |
| children | ea3a89a1813a |
| files | client/src/components/Login.vue client/src/components/admin/Importqueue.vue client/src/components/map/Zoom.vue client/src/components/map/contextbox/Staging.vue |
| diffstat | 4 files changed, 144 insertions(+), 120 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/Login.vue Mon Nov 26 09:01:21 2018 +0100 +++ b/client/src/components/Login.vue Mon Nov 26 10:04:47 2018 +0100 @@ -72,6 +72,20 @@ </style> <script> +/* + * 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 + * – Österreichische Wasserstraßen-Gesellschaft mbH + * Software engineering by Intevation GmbH + * + * Author(s): + * Markus Kottländer <markus@intevation.de > + */ import { mapState } from "vuex"; import { HTTP } from "../lib/http.js"; import { displayError } from "../lib/errors.js";
--- a/client/src/components/admin/Importqueue.vue Mon Nov 26 09:01:21 2018 +0100 +++ b/client/src/components/admin/Importqueue.vue Mon Nov 26 10:04:47 2018 +0100 @@ -1,61 +1,72 @@ <template> - <div class="d-flex flex-row"> - <div :class="spacerStyle"></div> - <div class="mt-3 mx-auto"> - <div class="card importqueuecard"> - <div class="card-header shadow-sm text-white bg-info mb-3">Importqueue</div> - <div class="card-body importcardbody"> - <div class="card-body importcardbody"> - <div class="searchandfilter d-flex flex-row"> - <div class="searchgroup input-group"> - <div class="input-group-prepend"> - <span class="input-group-text" id="search"> - <font-awesome-icon icon="search"></font-awesome-icon> - </span> - </div> - <input - type="text" - class="form-control" - placeholder="" - aria-label="Search" - aria-describedby="search" - > - </div> - <div class="filters"> - <button - @click="setFilter('successful')" - :class="successfulStyle" - >Successful</button> - <button @click="setFilter('failed')" :class="failedStyle">Failed</button> - <button @click="setFilter('pending')" :class="pendingStyle">Pending</button> - </div> - </div> - <table class="table"> - <thead> - <tr> - <th>Enqueued</th> - <th>Kind</th> - <th>User</th> - <th>State</th> - </tr> - </thead> - <tbody> - <tr v-for="job in imports" :key="job.id"> - <td>{{job.enqueued}}</td> - <td>{{job.kind}}</td> - <td>{{job.user}}</td> - <td>{{job.state}}</td> - </tr> - </tbody> - </table> - </div> + <div class="d-flex flex-row"> + <div :class="spacerStyle"></div> + <div class="mt-3 mx-auto"> + <div class="card importqueuecard"> + <div class="card-header shadow-sm text-white bg-info mb-3">Importqueue</div> + <div class="card-body importcardbody"> + <div class="card-body importcardbody"> + <div class="searchandfilter d-flex flex-row"> + <div class="searchgroup input-group"> + <div class="input-group-prepend"> + <span class="input-group-text" id="search"> + <font-awesome-icon icon="search"></font-awesome-icon> + </span> </div> + <input + type="text" + class="form-control" + placeholder + aria-label="Search" + aria-describedby="search" + > + </div> + <div class="filters"> + <button @click="setFilter('successful')" :class="successfulStyle">Successful</button> + <button @click="setFilter('failed')" :class="failedStyle">Failed</button> + <button @click="setFilter('pending')" :class="pendingStyle">Pending</button> + </div> </div> + <table class="table"> + <thead> + <tr> + <th>Enqueued</th> + <th>Kind</th> + <th>User</th> + <th>State</th> + </tr> + </thead> + <tbody> + <tr v-for="job in imports" :key="job.id"> + <td>{{job.enqueued}}</td> + <td>{{job.kind}}</td> + <td>{{job.user}}</td> + <td>{{job.state}}</td> + </tr> + </tbody> + </table> + </div> </div> + </div> </div> + </div> </template> <script> +/* + * 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 + * – Österreichische Wasserstraßen-Gesellschaft mbH + * Software engineering by Intevation GmbH + * + * Author(s): + * Markus Kottländer <markus@intevation.de> + */ import { displayError } from "../../lib/errors.js"; import { mapState } from "vuex";
--- a/client/src/components/map/Zoom.vue Mon Nov 26 09:01:21 2018 +0100 +++ b/client/src/components/map/Zoom.vue Mon Nov 26 10:04:47 2018 +0100 @@ -1,21 +1,18 @@ <template> - <div - class="d-flex buttoncontainer shadow-xs mb-3 position-absolute" - :style="showSplitscreen ? 'margin-bottom: 51vh !important' : ''" + <div + class="d-flex buttoncontainer shadow-xs mb-3 position-absolute" + :style="showSplitscreen ? 'margin-bottom: 51vh !important' : ''" + > + <button class="zoomButton border-0 bg-white rounded-left ui-element" @click="zoomOut"> + <font-awesome-icon icon="minus"></font-awesome-icon> + </button> + <button + class="zoomButton border-0 bg-white rounded-right ui-element border-right" + @click="zoomIn" > - <button - class="zoomButton border-0 bg-white rounded-left ui-element" - @click="zoomOut" - > - <font-awesome-icon icon="minus"></font-awesome-icon> - </button> - <button - class="zoomButton border-0 bg-white rounded-right ui-element border-right" - @click="zoomIn" - > - <font-awesome-icon icon="plus"></font-awesome-icon> - </button> - </div> + <font-awesome-icon icon="plus"></font-awesome-icon> + </button> + </div> </template> <style lang="sass" scoped> @@ -38,11 +35,12 @@ * 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 * * Author(s): + * Markus Kottländer <markus@intevation.de> * Thomas Junk <thomas.junk@intevation.de> */ import { mapState } from "vuex";
--- a/client/src/components/map/contextbox/Staging.vue Mon Nov 26 09:01:21 2018 +0100 +++ b/client/src/components/map/contextbox/Staging.vue Mon Nov 26 10:04:47 2018 +0100 @@ -1,55 +1,55 @@ <template> - <div class="w-90"> - <h6 class="mb-0 py-2 px-3 border-bottom d-flex align-items-center"> - <font-awesome-icon icon="clipboard-check" class="mr-2"></font-awesome-icon>Staging Area - </h6> - <table class="table mb-0"> - <thead> - <tr> - <th>Name</th> - <th>Datatype</th> - <th>Importdate</th> - <th>ImportID</th> - <th> </th> - <th> </th> - </tr> - </thead> - <tbody v-if="filteredData.length"> - <tr v-for="data in filteredData" :key="data.id"> - <td> - <a @click="zoomTo(data.location)" href="#">{{ data.name }}</a> - </td> - <td>{{ data.type }}</td> - <td>{{ data.date }}</td> - <td>{{ data.importID }}</td> - <td> - <button - @click="toggleApproval(data.id, $options.STATES.APPROVED)" - :class="{btn:true, 'btn-sm':true, 'btn-outline-success':needsApproval(data) || isRejected(data), 'btn-success':isApproved(data)}" - > - <font-awesome-icon icon="check"></font-awesome-icon> - </button> - </td> - <td> - <button - @click="toggleApproval(data.id, $options.STATES.REJECTED)" - :class="{btn:true, 'btn-sm':true, 'btn-outline-danger':needsApproval(data) || isApproved(data), 'btn-danger':isRejected(data)}" - > - <font-awesome-icon icon="times"></font-awesome-icon> - </button> - </td> - </tr> - </tbody> - <tbody v-else> - <tr> - <td class="text-center" colspan="6">No results.</td> - </tr> - </tbody> - </table> - <div class="p-3" v-if="filteredData.length"> - <button @click="confirmReview" class="btn btn-info">Confirm</button> - </div> + <div class="w-90"> + <h6 class="mb-0 py-2 px-3 border-bottom d-flex align-items-center"> + <font-awesome-icon icon="clipboard-check" class="mr-2"></font-awesome-icon>Staging Area + </h6> + <table class="table mb-0"> + <thead> + <tr> + <th>Name</th> + <th>Datatype</th> + <th>Importdate</th> + <th>ImportID</th> + <th> </th> + <th> </th> + </tr> + </thead> + <tbody v-if="filteredData.length"> + <tr v-for="data in filteredData" :key="data.id"> + <td> + <a @click="zoomTo(data.location)" href="#">{{ data.name }}</a> + </td> + <td>{{ data.type }}</td> + <td>{{ data.date }}</td> + <td>{{ data.importID }}</td> + <td> + <button + @click="toggleApproval(data.id, $options.STATES.APPROVED)" + :class="{btn:true, 'btn-sm':true, 'btn-outline-success':needsApproval(data) || isRejected(data), 'btn-success':isApproved(data)}" + > + <font-awesome-icon icon="check"></font-awesome-icon> + </button> + </td> + <td> + <button + @click="toggleApproval(data.id, $options.STATES.REJECTED)" + :class="{btn:true, 'btn-sm':true, 'btn-outline-danger':needsApproval(data) || isApproved(data), 'btn-danger':isRejected(data)}" + > + <font-awesome-icon icon="times"></font-awesome-icon> + </button> + </td> + </tr> + </tbody> + <tbody v-else> + <tr> + <td class="text-center" colspan="6">No results.</td> + </tr> + </tbody> + </table> + <div class="p-3" v-if="filteredData.length"> + <button @click="confirmReview" class="btn btn-info">Confirm</button> </div> + </div> </template> <script> @@ -59,12 +59,13 @@ * 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 * * Author(s): * Thomas Junk <thomas.junk@intevation.de> + * Markus Kottländer <markus@intevation.de> */ import { mapState } from "vuex"; @@ -206,8 +207,8 @@ }; </script> -<style lang="sass" scoped> - +<style lang="sass" scoped> + .table th, td font-size: 0.9rem