biovision-base 0.5.170614 → 0.7.170709

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d8a79ca16ebacf8a7493c6d4872c948cfc3f660
-  data.tar.gz: 345524dff04e3097ae8c17e07ab344c9e62521d1
+  metadata.gz: 9442305845e4868b36e06500f26e8bdd681de387
+  data.tar.gz: dc47d68e9fe96816f24508f26acec9fcdcaaa8e7
 SHA512:
-  metadata.gz: 0340d94647484785175eaa0387230966abc14911cc1313669ee00857eeff212c7102c886ab35999226b771e2cf13f3656083eaa169e7115158f7fadb7b24c32a
-  data.tar.gz: '0191aa35066ee9bed242cef57187bec07bdfb192e5298dd5c99c14faab41a9df3e3fe53b751f6f64312c20cef86a76fee4c13a8a399964ac6feaed9f63f69753'
+  metadata.gz: 0a512829d7c58e3e3b53dd88ad0372a2966c799e8317b4285f42ac6eb065262c141693447bbb57cce3879276c7cfbd9d5dd5232b69955459a4c0fcf77fa8257e
+  data.tar.gz: 6ae25499bc961b8818d6bf5968619dcbc421f45095f51468bc957e1ae5a18e041a635a57c6c32c1518a2574957349728bdf5ba038f592b07d68d3f41c1ddb310

data/README.md

@@ -18,6 +18,18 @@ ToDo
 
 Описание необходимых и рекомендуемых действий находится в `biovision/snippets`
 
+Очистка устаревших сессий
+-------------------------
+
+Чтобы устаревшие жетоны пользователей очищались, нужно добавить задачу 
+`tokens:clean` в крон. Например (заменить `example.com` на актуальный домен):
+
+```
+0 4 * * * cd /var/www/example.com/current && /home/developer/.rbenv/shims/bundle exec rake RAILS_ENV=production tokens:clean
+```
+
+Каждый день в 4 часа ночи будут очищаться старые жетоны.
+
 ## Installation
 Add this line to your application's Gemfile:
 

data/app/assets/images/biovision/base/placeholders/image.svg

@@ -15,5 +15,5 @@
 	C215.302,139.781,208.852,139.781,204.877,135.809z M76.174-28.173c-23.049,0-41.74-18.689-41.74-41.74
 	c0-23.05,18.691-41.739,41.74-41.739c23.052,0,41.74,18.689,41.74,41.739C117.914-46.862,99.226-28.173,76.174-28.173z
 	 M76.174-90.783c-11.514,0-20.87,9.351-20.87,20.87c0,11.521,9.356,20.87,20.87,20.87s20.871-9.349,20.871-20.87
-	C97.045-81.432,87.688-90.783,76.174-90.783z"/>
+	C97.045-81.432,87.688-90.783,76.174-90.783z" fill="#aaa" />
 </svg>

data/app/assets/images/biovision/base/placeholders/region_image.svg

@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg height="24" version="1.1" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><g transform="translate(0 -1028.4)"><path d="m3 1031.4v10c0 4.2 3.6322 8 9 10 5.368-2 9-5.8 9-10v-10h-18z" fill="#7f8c8d"/><path d="m3 1030.4v10c0 4.2 3.6322 8 9 10 5.368-2 9-5.8 9-10v-10h-18z" fill="#bdc3c7"/><path d="m3 1030.4v10c0 4.2 3.6322 8 9 10v-20h-9z" fill="#95a5a6"/><path d="m5 1032.4v8c0 3.4 2.8251 6.4 7 8 4.175-1.6 7-4.6 7-8v-8h-14z" fill="#ecf0f1"/><path d="m5 1040.4c0 3.4 2.8251 6.4 7 8v-8h-7z" fill="#2980b9"/><rect fill="#3498db" height="8" transform="translate(0 1028.4)" width="7" x="12" y="4"/><rect fill="#bdc3c7" height="8" transform="translate(0 1028.4)" width="7" x="5" y="4"/></g></svg>

data/app/assets/stylesheets/biovision/base/admin.scss

@@ -1,58 +1,253 @@
-.entity-page {
-  figure.preview {
-    margin: 0;
+$toggleable-active: #34c749 !default;
+$toggleable-inactive: #fc605c !default;
+$toggleable-switch: #fdbc40 !default;
+$toggleable-unknown: #c0c0c0 !default;
+$toggleable-background: #fff !default;
 
-    img {
-      max-width: 32rem;
+html {
+  background-image: linear-gradient(#dedfe3 2%, #aeb3b9 95%), radial-gradient(33% 100%, rgba(255, 255, 255, 0.50) 0%, rgba(0, 0, 0, 0.50) 100%);
+  background-blend-mode: screen;
+  background-attachment: fixed;
+  font: 10px $font-family-main;
+  margin: 0;
+  padding: 0;
+  -webkit-text-size-adjust: none;
+  -moz-text-size-adjust: none;
+  -ms-text-size-adjust: none;
+}
+
+a:link,
+a:visited {
+  color: $link-color;
+  text-decoration: none;
+}
+
+a:hover {
+  color: $link-color-hover;
+}
+
+img {
+  max-width: 100%;
+}
+
+body {
+  background: #fff;
+  color: $text-color-primary;
+  display: flex;
+  flex-direction: column;
+  font-size: $font-size-normal;
+  margin: 0 auto;
+  max-width: $content-width;
+  min-height: 100vh;
+
+  > header {
+    align-items: center;
+    border-bottom: $border-primary;
+    display: flex;
+    flex-wrap: wrap;
+    padding: 1rem;
+
+    .logo {
+      margin: 0 auto 0 0;
+    }
+
+    nav {
+      ul {
+        align-items: center;
+        display: flex;
+        flex-wrap: wrap;
+        margin: 0;
+        padding: 0;
+
+        li {
+          display: inline-block;
+          list-style: none;
+          margin: 0 .25rem;
+          text-align: center;
+
+          a:link,
+          a:visited {
+            @include nav-button;
+          }
+        }
+      }
     }
   }
 
-  dl {
-    margin: 0 0 1.6rem 0;
-    padding: 0;
+  > footer {
+    margin: auto 0 0 0;
+    padding: .8rem 0;
+  }
+
+  > footer {
+    align-items: center;
+    border-top: $border-primary;
+    color: $text-color-secondary;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    font-size: $font-size-decreased;
+    justify-content: space-between;
+    margin: auto 0 0 0;
+    max-width: $content-width;
+    padding: .8rem;
+  }
+}
 
-    dt {
-      border-top: .1rem solid #f0f0f0;
-      margin: 1rem 0 0 0;
-      padding: 0;
+#main {
+  padding: 1rem;
+
+  article {
+    position: relative;
+
+    figure {
+      margin: 0;
+
+      &.preview {
+        img {
+          max-width: 32rem;
+        }
+      }
     }
 
-    dd {
-      margin: 0 0 0 .8rem;
+    dl {
+      margin: 0 0 1.6rem 0;
       padding: 0;
 
-      input,
-      textarea {
-        font-size: $normal-font-size;
+      dt {
+        border-top: .1rem solid #f0f0f0;
+        margin: 1rem 0 0 0;
+        padding: 0;
       }
 
-      input:not([type=checkbox]):not([type=radio]):not([size]):not([max]),
-      textarea {
-        width: calc(100% - 1rem);
+      dd {
+        margin: 0 0 0 .8rem;
+        padding: 0;
+
+        input,
+        textarea {
+          font-size: $font-size-normal;
+        }
+
+        input:not([type=checkbox]):not([type=radio]):not([size]):not([max]),
+        textarea {
+          width: calc(100% - 1rem);
+        }
+
+        input,
+        textarea {
+          max-width: calc(100% - 1rem);
+        }
       }
     }
-  }
-
-  ul.flags {
-    margin: 1.6rem 0;
-    padding: 0;
 
-    > li {
-      list-style: none;
-      margin: 0;
+    ul.flags {
+      margin: 1.6rem 0;
       padding: 0;
 
-      label {
-        font-weight: normal;
+      > li {
+        list-style: none;
+        margin: 0;
+        padding: 0;
+
+        label {
+          font-weight: normal;
+        }
       }
     }
   }
 }
 
 nav.admin-breadcrumbs {
+  background: linear-gradient(to right, rgba(192, 230, 192, .125), rgba(255, 255, 255, 0));
+  border-left: .2rem solid rgba(80, 230, 80, .5);
+  margin-bottom: .8rem;
+  padding: .4rem;
+
   a::after {
-    color: $primary-text-color;
+    color: $text-color-primary;
     content: ' / ';
     text-decoration: none;
   }
 }
+
+.toggleable {
+  font-size: $font-size-decreased;
+  margin: .8rem;
+
+  > span {
+    background-color: $toggleable-background;
+    border: .1rem solid;
+    border-radius: .8rem;
+    cursor: pointer;
+    display: inline-block;
+    line-height: #{$font-size-decreased * 2};
+    margin: .4rem;
+    padding: 0 .8rem 0 0;
+
+    &::before {
+      border-radius: .6rem 0 0 .6rem;
+      display: inline-block;
+      line-height: #{$font-size-decreased * 2};
+      margin: 0 .4rem 0 0;
+      text-align: center;
+      width: 2.2rem;
+    }
+  }
+
+  .active {
+    border-color: $toggleable-active;
+
+    &::before {
+      background-color: $toggleable-active;
+      content: '\2611';
+    }
+  }
+
+  .inactive {
+    border-color: $toggleable-inactive;
+
+    &::before {
+      background-color: $toggleable-inactive;
+      content: '\2610';
+    }
+  }
+
+  .switch {
+    border-color: $toggleable-switch;
+    cursor: not-allowed;
+
+    &::before {
+      background-color: $toggleable-switch;
+      content: '\231B';
+    }
+  }
+
+  .unknown {
+    border-color: $toggleable-unknown;
+
+    &::before {
+      background-color: $toggleable-unknown;
+      content: '\26A0';
+    }
+  }
+}
+
+.privileges {
+  ul {
+    border-left: $border-primary;
+    margin: .8rem 0 0 2.4rem;
+
+    &.regions {
+      margin: 0 0 0 1.2rem;
+      padding: 0;
+      border: none;
+
+      > li {
+        list-style: none;
+        margin: 0;
+        padding: 0;
+      }
+    }
+  }
+}

data/app/assets/stylesheets/biovision/base/biovision.scss

@@ -1,69 +1,11 @@
-$toggleable-active: #34c749;
-$toggleable-inactive: #fc605c;
-$toggleable-switch: #fdbc40;
-$toggleable-unknown: #c0c0c0;
-$toggleable-background: #fff;
-
-.toggleable {
-  font-size: $small-font-size;
-  margin: .8rem;
-
-  > span {
-    background-color: $toggleable-background;
-    border: .1rem solid;
-    border-radius: .8rem;
-    cursor: pointer;
-    display: inline-block;
-    line-height: calc(#{$small-font-size} * 2);
-    margin: .4rem;
-    padding: 0 .8rem 0 0;
-
-    &::before {
-      border-radius: .6rem 0 0 .6rem;
-      display: inline-block;
-      line-height: calc(#{$small-font-size} * 2);
-      margin: 0 .4rem 0 0;
-      text-align: center;
-      width: 2.2rem;
-    }
-  }
-
-  .active {
-    border-color: $toggleable-active;
-
-    &::before {
-      background-color: $toggleable-active;
-      content: '\2611';
-    }
-  }
-
-  .inactive {
-    border-color: $toggleable-inactive;
-
-    &::before {
-      background-color: $toggleable-inactive;
-      content: '\2610';
-    }
-  }
-
-  .switch {
-    border-color: $toggleable-switch;
-    cursor: not-allowed;
-
-    &::before {
-      background-color: $toggleable-switch;
-      content: '\231B';
-    }
-  }
-
-  .unknown {
-    border-color: $toggleable-unknown;
+article {
+  position: relative;
+}
 
-    &::before {
-      background-color: $toggleable-unknown;
-      content: '\26A0';
-    }
-  }
+button,
+input,
+textarea {
+  font-size: $font-size-normal;
 }
 
 article.entity-page {
@@ -87,11 +29,11 @@ article.entity-page {
   }
 
   > section {
-    border-top: .1rem solid $secondary-text-color;
+    border-top: .1rem solid $text-color-secondary;
     padding: .8rem 0 0 0;
 
     > h2 {
-      font-size: $increased-font-size;
+      font-size: $font-size-large;
     }
   }
 
@@ -147,7 +89,7 @@ article.entity-page {
         vertical-align: top;
 
         &[colspan] {
-          border-top: .1rem solid $secondary-text-color;
+          border-top: .1rem solid $text-color-secondary;
           font-weight: bold;
           padding-top: 1.6rem;
           text-align: center;
@@ -355,11 +297,11 @@ ul.actions {
       position: relative;
 
       .info {
-        font-size: $small-font-size;
+        font-size: $font-size-decreased;
       }
 
       .secondary {
-        color: $secondary-text-color;
+        color: $text-color-secondary;
       }
 
       .truncate {
@@ -412,8 +354,8 @@ ul.actions {
         }
 
         .description {
-          color: $secondary-text-color;
-          font-size: $decreased-font-size;
+          color: $text-color-secondary;
+          font-size: $font-size-decreased;
         }
       }
     }
@@ -421,9 +363,12 @@ ul.actions {
 }
 
 form {
+  margin: 0;
+  padding: 0;
+
   .guideline {
-    color: $secondary-text-color;
-    font-size: $decreased-font-size;
+    color: $text-color-secondary;
+    font-size: $font-size-decreased;
     margin: 0;
 
     &::before {
@@ -432,6 +377,32 @@ form {
     }
   }
 
+  dl {
+    margin: 0;
+    padding: 0;
+
+    dd,
+    dt {
+      margin: 0;
+      padding: 0;
+    }
+
+    dt:not(:first-of-type) {
+      margin-top: .8rem;
+    }
+  }
+
+  ul.flags {
+    margin: .8rem 0;
+    padding: 0;
+
+    li {
+      list-style: none;
+      margin: 0;
+      padding: 0;
+    }
+  }
+
   button {
     @include action-button;
   }
@@ -440,33 +411,3 @@ form {
 .hidden {
   display: none !important;
 }
-
-div.user-search {
-  .message-box-warning {
-    background-position: left .4rem center;
-    font-weight: 400;
-    margin: .4rem;
-    padding: .4rem .4rem .4rem 2.4rem;
-  }
-
-  .results {
-    ul {
-      margin: .4rem;
-      padding: 0;
-
-      li {
-        cursor: pointer;
-        font-size: 1.4rem;
-        font-weight: 400;
-        line-height: 2rem;
-        list-style: none;
-        margin: 0;
-        padding: 0 .4rem;
-
-        &:hover {
-          outline: .1rem solid #070;
-        }
-      }
-    }
-  }
-}

data/app/assets/stylesheets/biovision/base/buttons.scss

@@ -6,11 +6,12 @@
   color: $text-a;
   cursor: pointer;
   display: inline-block;
-  font: $decreased-font-size $main-font-family;
-  line-height: calc(#{$normal-font-size} * 1.5);
+  font: $font-size-decreased $font-family-main;
+  line-height: calc(#{$font-size-normal} * 1.5);
   margin: 0;
   padding: 0 1.6rem;
   text-decoration: none;
+  //transition: .25s;
 
   &:active,
   &:hover,

data/app/assets/stylesheets/biovision/base/default.scss

@@ -1,45 +1,66 @@
-$main-font-family: "PT Sans", sans-serif;
-
-$row_background_even: #f0f0f0;
-$row_background_odd: #fafafa;
-
-$primary-text-color: #000;
-$secondary-text-color: #777;
-
-$block-shadow: 0 0 .2rem .2rem rgba(0, 0, 0, .25);
-
-$button-action-bg-a: #2e3c8e;
-$button-action-bg-b: #515da3;
-$button-action-bg-c: #3d94f6;
-$button-action-bg-d: #1e62d0;
-$button-action-border-color-a: #2e3c8e;
-$button-action-border-color-b: #515da3;
-$button-action-text-color-a: #fff;
-$button-action-text-color-b: #fff;
-
-$button-nav-bg-a: #fff;
-$button-nav-bg-b: #fafafa;
-$button-nav-bg-c: #1e62d0;
-$button-nav-bg-d: #3d94f6;
-$button-nav-border-color-a: #2e3c8e;
-$button-nav-border-color-b: #2e3c8e;
-$button-nav-text-color-a: #3d94f6;
-$button-nav-text-color-b: #fff;
-
-$button-create-bg-a: #68a54b;
-$button-create-bg-b: #74ad5a;
-$button-create-bg-c: #5ba337;
-$button-create-bg-d: #59ab33;
-$button-create-border-color-a: #3b6e22;
-$button-create-border-color-b: #3b6e22;
-$button-create-text-color-a: #fff;
-$button-create-text-color-b: #fff;
-
-$button-destroy-bg-a: #a54b68;
-$button-destroy-bg-b: #ad5a74;
-$button-destroy-bg-c: #a3375b;
-$button-destroy-bg-d: #ab3359;
-$button-destroy-border-color-a: #6e223b;
-$button-destroy-border-color-b: #6e223b;
-$button-destroy-text-color-a: #fff;
-$button-destroy-text-color-b: #fff;
+$font-family-heading: "Cormorant Garamond", serif !default;
+$font-family-main: "PT Sans", sans-serif !default;
+
+$font-size-large: 2rem !default;
+$font-size-increased: 1.6rem !default;
+$font-size-normal: 1.4rem !default;
+$font-size-decreased: 1.2rem !default;
+$font-size-small: 1rem !default;
+
+$content-width: 100rem !default;
+$content-width-min: 32rem !default;
+
+$row_background_even: #f0f0f0 !default;
+$row_background_odd: #fafafa !default;
+
+$text-color-heading: #000 !default;
+$text-color-primary: rgb(28, 28, 28) !default;
+$text-color-secondary: #777 !default;
+
+$block-shadow: 0 0 .2rem .2rem rgba(0, 0, 0, .25) !default;
+
+$border-primary: .1rem solid rgb(192, 192, 192) !default;
+
+$background-header: #fff !default;
+$background-main: #fff !default;
+$background-footer: #fff !default;
+
+$link-color: rgb(20, 127, 255) !default;
+$link-color-visited: rgb(20, 77, 250) !default;
+$link-color-hover: rgb(255, 77, 20) !default;
+
+$button-action-bg-a: #2e3c8e !default;
+$button-action-bg-b: #515da3 !default;
+$button-action-bg-c: #3d94f6 !default;
+$button-action-bg-d: #1e62d0 !default;
+$button-action-border-color-a: #2e3c8e !default;
+$button-action-border-color-b: #515da3 !default;
+$button-action-text-color-a: #fff !default;
+$button-action-text-color-b: #fff !default;
+
+$button-nav-bg-a: #fff !default;
+$button-nav-bg-b: #fafafa !default;
+$button-nav-bg-c: #1e62d0 !default;
+$button-nav-bg-d: #3d94f6 !default;
+$button-nav-border-color-a: #2e3c8e !default;
+$button-nav-border-color-b: #2e3c8e !default;
+$button-nav-text-color-a: #3d94f6 !default;
+$button-nav-text-color-b: #fff !default;
+
+$button-create-bg-a: #68a54b !default;
+$button-create-bg-b: #74ad5a !default;
+$button-create-bg-c: #5ba337 !default;
+$button-create-bg-d: #59ab33 !default;
+$button-create-border-color-a: #3b6e22 !default;
+$button-create-border-color-b: #3b6e22 !default;
+$button-create-text-color-a: #fff !default;
+$button-create-text-color-b: #fff !default;
+
+$button-destroy-bg-a: #a54b68 !default;
+$button-destroy-bg-b: #ad5a74 !default;
+$button-destroy-bg-c: #a3375b !default;
+$button-destroy-bg-d: #ab3359 !default;
+$button-destroy-border-color-a: #6e223b !default;
+$button-destroy-border-color-b: #6e223b !default;
+$button-destroy-text-color-a: #fff !default;
+$button-destroy-text-color-b: #fff !default;

data/app/assets/stylesheets/biovision/base/default_admin.scss

@@ -0,0 +1,10 @@
+@import "biovision/base/buttons";
+@import "biovision/base/biovision";
+@import "biovision/base/admin";
+@import "biovision/base/regions";
+@import "biovision/base/tootik";
+@import "biovision/base/message-box";
+@import "biovision/base/pagination";
+@import "biovision/base/filters";
+@import "biovision/base/track";
+@import "biovision/base/users";

data/app/assets/stylesheets/biovision/base/default_application.scss

@@ -0,0 +1,8 @@
+@import "biovision/base/buttons";
+@import "biovision/base/biovision";
+@import "biovision/base/tootik";
+@import "biovision/base/message-box";
+@import "biovision/base/pagination";
+@import "biovision/base/filters";
+@import "biovision/base/track";
+@import "biovision/base/users";