Mercurial > gemma

changeset 4774:1fd771b08ced

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
import_overview: added 'changed' column
author Thomas Junk <thomas.junk@intevation.de>
date Mon, 21 Oct 2019 12:35:46 +0200
parents af83ff003ebf
children 391cc6291ea4
files client/src/assets/application.scss client/src/components/App.vue client/src/components/Contextbox.vue client/src/components/Search.vue client/src/components/importoverview/ImportOverview.vue client/src/components/importoverview/LogEntry.vue
diffstat 6 files changed, 18 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/assets/application.scss	Mon Oct 21 11:59:14 2019 +0200
+++ b/client/src/assets/application.scss	Mon Oct 21 12:35:46 2019 +0200
@@ -20,7 +20,7 @@
 $icon-width: 2rem;
 $large-offset: 2rem;
 $offset: 1rem;
-$sidebar-width: 16rem;
+$sidebar-width: 13rem;
 $slight-transparent: 0.96;
 $small-offset: 0.5rem;
 $smaller: 0.9rem;
@@ -173,8 +173,8 @@
 }
 
 .btn-xs {
-  padding: .3rem 0.4rem;
-  font-size: .75rem;
+  padding: 0.3rem 0.4rem;
+  font-size: 0.75rem;
   line-height: 1;
 }
 
@@ -223,7 +223,7 @@
   height: 50% !important;
 }
 
-.custom-control-input:checked~.custom-control-label::before {
-    border-color: $color-info;
-    background-color: $color-info;
+.custom-control-input:checked ~ .custom-control-label::before {
+  border-color: $color-info;
+  background-color: $color-info;
 }
--- a/client/src/components/App.vue	Mon Oct 21 11:59:14 2019 +0200
+++ b/client/src/components/App.vue	Mon Oct 21 12:35:46 2019 +0200
@@ -91,7 +91,7 @@
     },
     searchContainer() {
       return [
-        "ml-2",
+        "ml-1",
         {
           wide: this.showSearchbar
         }
--- a/client/src/components/Contextbox.vue	Mon Oct 21 11:59:14 2019 +0200
+++ b/client/src/components/Contextbox.vue	Mon Oct 21 12:35:46 2019 +0200
@@ -80,7 +80,7 @@
   background: #fff;
 }
 .contextbox > div:last-child {
-  width: 668px;
+  width: 795px;
 }
 
 .contextboxcollapsed {
@@ -89,7 +89,7 @@
 }
 
 .contextboxextended {
-  max-width: 668px;
+  max-width: 795px;
 }
 
 .close-contextbox {
--- a/client/src/components/Search.vue	Mon Oct 21 11:59:14 2019 +0200
+++ b/client/src/components/Search.vue	Mon Oct 21 12:35:46 2019 +0200
@@ -85,7 +85,7 @@
 <style lang="scss" scoped>
 .searchcontainer {
   opacity: 0.96;
-  width: 668px;
+  width: 795px;
 }
 
 .searchcontainer .searchbar {
@@ -94,7 +94,7 @@
 }
 
 .searchgroup {
-  width: 635px;
+  width: 763px;
   overflow: hidden;
 }
 
--- a/client/src/components/importoverview/ImportOverview.vue	Mon Oct 21 11:59:14 2019 +0200
+++ b/client/src/components/importoverview/ImportOverview.vue	Mon Oct 21 12:35:46 2019 +0200
@@ -84,6 +84,7 @@
           { id: 'country', title: `${countryLabel}`, width: '55px' },
           { id: 'signer', title: `${signerLabel}`, width: '80px' },
           { id: 'state', title: `${statusLabel}`, width: '72px' },
+          { id: 'changed', title: `${changedLabel}`, width: '138px' },
           { id: 'warnings', icon: 'exclamation-triangle', width: '44px' }
         ]"
       />
@@ -190,6 +191,9 @@
     enqueuedLabel() {
       return this.$gettext("Enqueued");
     },
+    changedLabel() {
+      return this.$gettext("Changed");
+    },
     ownerLabel() {
       return this.$gettext("Owner");
     },
--- a/client/src/components/importoverview/LogEntry.vue	Mon Oct 21 11:59:14 2019 +0200
+++ b/client/src/components/importoverview/LogEntry.vue	Mon Oct 21 12:35:46 2019 +0200
@@ -27,6 +27,9 @@
     <div style="width: 72px;" :class="stateStyle">
       {{ entry.state }}
     </div>
+    <div style="width: 138px;" class="table-cell center">
+      {{ entry.changed | dateTime }}
+    </div>
     <div style="width: 44px;" class="table-cell center">
       <font-awesome-icon
         v-if="entry.warnings || entry.errors"