biovision-base 0.11.180127 → 0.14.180326

data/lib/biovision/base/privilege_methods.rb

@@ -32,4 +32,4 @@ module Biovision
       end
     end
   end
-end
+end

data/lib/biovision/base/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Base
-    VERSION = '0.11.180127'
+    VERSION = '0.14.180326'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.11.180127
+  version: 0.14.180326
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,14 +200,15 @@ files:
 - app/assets/javascripts/biovision/base/biovision.js
 - app/assets/stylesheets/biovision/base/admin.scss
 - app/assets/stylesheets/biovision/base/biovision.scss
-- app/assets/stylesheets/biovision/base/buttons.scss
+- app/assets/stylesheets/biovision/base/buttons/buttons-common.scss
+- app/assets/stylesheets/biovision/base/buttons/buttons-rounded.scss
 - app/assets/stylesheets/biovision/base/default.scss
 - app/assets/stylesheets/biovision/base/default_admin.scss
 - app/assets/stylesheets/biovision/base/default_application.scss
 - app/assets/stylesheets/biovision/base/filters.scss
-- app/assets/stylesheets/biovision/base/layout.scss
 - app/assets/stylesheets/biovision/base/message-box.scss
 - app/assets/stylesheets/biovision/base/pagination.scss
+- app/assets/stylesheets/biovision/base/themes/simple-layout.scss
 - app/assets/stylesheets/biovision/base/toggleable.scss
 - app/assets/stylesheets/biovision/base/tootik.scss
 - app/assets/stylesheets/biovision/base/track.scss
@@ -260,6 +261,7 @@ files:
 - app/helpers/biovision_users_helper.rb
 - app/helpers/codes_helper.rb
 - app/helpers/editable_pages_helper.rb
+- app/helpers/languages_helper.rb
 - app/helpers/media_helper.rb
 - app/helpers/privileges_helper.rb
 - app/helpers/stored_values_helper.rb
@@ -305,6 +307,7 @@ files:
 - app/services/code_manager/recovery.rb
 - app/services/user_bouncer.rb
 - app/services/user_manager.rb
+- app/services/user_profile_handler.rb
 - app/uploaders/avatar_uploader.rb
 - app/uploaders/editable_page_image_uploader.rb
 - app/uploaders/media_file_uploader.rb
@@ -391,6 +394,7 @@ files:
 - app/views/admin/users/entity/_preview.jbuilder
 - app/views/admin/users/entity/_privilege.html.erb
 - app/views/admin/users/entity/_privilege_tree.html.erb
+- app/views/admin/users/entity/_profile.html.erb
 - app/views/admin/users/index.html.erb
 - app/views/admin/users/privileges.html.erb
 - app/views/admin/users/search.jbuilder
@@ -411,6 +415,7 @@ files:
 - app/views/application/unauthorized.html.erb
 - app/views/application/unauthorized.jbuilder
 - app/views/authentication/_form.html.erb
+- app/views/authentication/create.jbuilder
 - app/views/authentication/new.html.erb
 - app/views/authentication/new.jbuilder
 - app/views/browsers/_form.html.erb
@@ -425,7 +430,6 @@ files:
 - app/views/editable_pages/_form.html.erb
 - app/views/editable_pages/edit.html.erb
 - app/views/editable_pages/entity/_metadata.html.erb
-- app/views/editable_pages/form/_ckeditor.html.erb
 - app/views/editable_pages/new.html.erb
 - app/views/errors/error.html.erb
 - app/views/feedback_mailer/new_feedback_request.html.erb
@@ -433,6 +437,9 @@ files:
 - app/views/feedback_requests/_form.html.erb
 - app/views/feedback_requests/create.js.erb
 - app/views/index/index.html.erb
+- app/views/index/index/_custom_dashboard.html.erb
+- app/views/index/index/_default_dashboard.html.erb
+- app/views/index/index/_editable.html.erb
 - app/views/layouts/admin.html.erb
 - app/views/layouts/admin/_footer.html.erb
 - app/views/layouts/admin/_header.html.erb
@@ -446,6 +453,10 @@ files:
 - app/views/layouts/application/header/authentication/_plate.html.erb
 - app/views/layouts/mailer.html.erb
 - app/views/layouts/mailer.text.erb
+- app/views/layouts/profile.html.erb
+- app/views/layouts/profile/_footer.html.erb
+- app/views/layouts/profile/_header.html.erb
+- app/views/layouts/profile/header/_navigation.html.erb
 - app/views/media_files/_form.html.erb
 - app/views/media_files/ckeditor.html.erb
 - app/views/media_files/edit.html.erb
@@ -463,6 +474,8 @@ files:
 - app/views/metrics/show.jbuilder
 - app/views/my/confirmations/show.html.erb
 - app/views/my/index/index.html.erb
+- app/views/my/index/index/_dashboard.html.erb
+- app/views/my/index/index/_sidebar.html.erb
 - app/views/my/login_attempts/_list.html.erb
 - app/views/my/login_attempts/_nav_item.html.erb
 - app/views/my/login_attempts/entity/_in_list.html.erb
@@ -471,8 +484,11 @@ files:
 - app/views/my/login_attempts/index.jbuilder
 - app/views/my/profiles/_nav_item.html.erb
 - app/views/my/profiles/edit.html.erb
+- app/views/my/profiles/edit.js.erb
 - app/views/my/profiles/edit/_form.html.erb
+- app/views/my/profiles/edit/form/_profile_data.html.erb
 - app/views/my/profiles/new.html.erb
+- app/views/my/profiles/new.js.erb
 - app/views/my/profiles/new/_form.html.erb
 - app/views/my/profiles/show.html.erb
 - app/views/my/recoveries/show.html.erb
@@ -507,6 +523,8 @@ files:
 - app/views/shared/filter/_flag.html.erb
 - app/views/shared/forms/_default_ajax_handler.html.erb
 - app/views/shared/forms/_list_of_errors.js.erb
+- app/views/shared/forms/_wysiwyg.html.erb
+- app/views/shared/forms/errors.js.erb
 - app/views/stored_values/_form.html.erb
 - app/views/stored_values/edit.html.erb
 - app/views/stored_values/new.html.erb
@@ -515,7 +533,9 @@ files:
 - app/views/tokens/new.html.erb
 - app/views/user_mailer/login_attempt.html.erb
 - app/views/users/_form.html.erb
+- app/views/users/check.jbuilder
 - app/views/users/edit.html.erb
+- app/views/users/form/_profile_data.html.erb
 - app/views/users/new.html.erb
 - config/initializers/carrierwave.rb
 - config/initializers/pluralization.rb
@@ -529,6 +549,7 @@ files:
 - config/locales/media-ru.yml
 - config/locales/plurals.rb
 - config/locales/track-ru.yml
+- config/locales/users-en.yml
 - config/locales/users-ru.yml
 - config/routes.rb
 - db/migrate/20170228000000_create_languages.rb
@@ -537,7 +558,6 @@ files:
 - db/migrate/20170301000101_create_browsers.rb
 - db/migrate/20170301000102_create_agents.rb
 - db/migrate/20170302000001_create_users.rb
-- db/migrate/20170302000002_create_user_profiles.rb
 - db/migrate/20170302000003_create_tokens.rb
 - db/migrate/20170302000004_create_code_types.rb
 - db/migrate/20170302000005_create_codes.rb
@@ -558,6 +578,7 @@ files:
 - db/migrate/20171223333333_amend_foreign_keys.rb
 - db/migrate/20180117151515_add_language_to_models.rb
 - db/migrate/20180117160000_create_user_languages.rb
+- db/migrate/20180321000000_add_profile_data_to_users.rb
 - lib/biovision/base.rb
 - lib/biovision/base/base_methods.rb
 - lib/biovision/base/engine.rb

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

@@ -1,195 +0,0 @@
-$button-action-bg-a: #2e3c8e !default;
-$button-action-bg-b: #3d94f6 !default;
-$button-action-border-a: .1rem solid #2e3c8e !default;
-$button-action-border-b: .1rem solid #515da3 !default;
-$button-action-text-a: #fff !default;
-$button-action-text-b: #fff !default;
-
-$button-nav-bg-a: #fff !default;
-$button-nav-bg-b: #1e62d0 !default;
-$button-nav-border-a: .1rem solid #2e3c8e !default;
-$button-nav-border-b: .1rem solid #2e3c8e !default;
-$button-nav-text-a: #3d94f6 !default;
-$button-nav-text-b: #fff !default;
-
-$button-create-bg-a: #68a54b !default;
-$button-create-bg-b: #5ba337 !default;
-$button-create-border-a: .1rem solid #3b6e22 !default;
-$button-create-border-b: .1rem solid #3b6e22 !default;
-$button-create-text-a: #fff !default;
-$button-create-text-b: #fff !default;
-
-$button-destroy-bg-a: #a54b68 !default;
-$button-destroy-bg-b: #a3375b !default;
-$button-destroy-border-a: .1rem solid #6e223b !default;
-$button-destroy-border-b: .1rem solid #6e223b !default;
-$button-destroy-text-a: #fff !default;
-$button-destroy-text-b: #fff !default;
-
-@mixin button($bg-a, $text-a, $border-a, $bg-b, $text-b, $border-b) {
-  background: $bg-a;
-  border: $border-a;
-  border-radius: #{$font-size-normal * .375};
-  box-sizing: border-box;
-  color: $text-a;
-  cursor: pointer;
-  display: inline-block;
-  font: #{$font-size-normal}/1.5 $font-family-main;
-  padding: 0 $font-size-normal;
-  text-decoration: none;
-  transition: .125s;
-
-  &:active,
-  &:focus,
-  &:hover {
-    background: $bg-b;
-    border: $border-b;
-    color: $text-b;
-  }
-}
-
-@mixin button-action {
-  @include button(
-                  $button-action-bg-a, $button-action-text-a, $button-action-border-a,
-                  $button-action-bg-b, $button-action-text-b, $button-action-border-b
-  )
-}
-
-@mixin button-nav {
-  @include button(
-                  $button-nav-bg-a, $button-nav-text-a, $button-nav-border-a,
-                  $button-nav-bg-b, $button-nav-text-b, $button-nav-border-b
-  )
-}
-
-@mixin button-create {
-  @include button(
-                  $button-create-bg-a, $button-create-text-a, $button-create-border-a,
-                  $button-create-bg-b, $button-create-text-b, $button-create-border-b
-  )
-}
-
-@mixin button-destroy {
-  @include button(
-                  $button-destroy-bg-a, $button-destroy-text-a, $button-destroy-border-a,
-                  $button-destroy-bg-b, $button-destroy-text-b, $button-destroy-border-b
-  )
-}
-
-.button-action,
-a:link.button-action,
-a:visited.button-action {
-  @include button-action;
-}
-
-.button-nav,
-a:link.button-nav,
-a:visited.button-nav {
-  @include button-nav;
-}
-
-.button-create,
-a:link.button-create,
-a:visited.button-create {
-  @include button-create;
-}
-
-.button-destroy,
-a:link.button-destroy,
-a:visited.button-destroy {
-  @include button-destroy;
-}
-
-
-
-// То, что ниже, оставлено для обратной совместимости, но это нужно будет убрать
-
-$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-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-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-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;
-
-@mixin styled-button($bg-a, $bg-b, $bg-c, $bg-d, $border-a, $border-b, $text-a, $text-b) {
-  background: $bg-a linear-gradient(to top, $bg-a, $bg-b);
-  border: .1rem solid $border-a;
-  border-radius: .6rem;
-  box-sizing: border-box;
-  color: $text-a;
-  cursor: pointer;
-  display: inline-block;
-  font: $font-size-normal $font-family-main;
-  line-height: 1.5;
-  padding: 0 1.6rem;
-  text-decoration: none;
-
-  &:active,
-  &:hover,
-  &:focus {
-    background: $bg-c linear-gradient(to top, $bg-c, $bg-d);
-    border-color: $border-b;
-    color: $text-b;
-  }
-}
-
-@mixin action-button {
-  @include button-action;
-}
-
-@mixin nav-button {
-  @include button-nav;
-}
-
-@mixin create-button {
-  @include button-create;
-}
-
-@mixin destroy-button {
-  @include button-destroy;
-}
-
-.action-button,
-a:link.action-button,
-a:visited.action-button {
-  @include button-action;
-}
-
-.nav-button,
-a:link.nav-button,
-a:visited.nav-button {
-  @include button-nav;
-}
-
-.create-button,
-a:link.create-button,
-a:visited.create-button {
-  @include button-create;
-}
-
-.destroy-button,
-a:link.destroy-button,
-a:visited.destroy-button {
-  @include button-destroy;
-}

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

@@ -1,193 +0,0 @@
-* {
-  box-sizing: border-box;
-}
-
-html {
-  font: 10px $font-family-main;
-  margin: 0;
-  padding: 0;
-  -webkit-text-size-adjust: none;
-  -moz-text-size-adjust: none;
-  -ms-text-size-adjust: none;
-}
-
-h1, h2, h3, h4, h6, h6 {
-  color: $text-color-heading;
-  font-family: $font-family-heading;
-  font-weight: 500;
-  margin: 0;
-}
-
-h1 {
-  font-size: 3rem;
-  line-height: 4.2rem;
-}
-
-a:link {
-  color: $link-color;
-  text-decoration: none;
-  transition: color .125s;
-}
-
-a:visited {
-  color: $link-color-visited;
-}
-
-a:active,
-a:hover {
-  color: $link-color-hover;
-  text-decoration: underline;
-}
-
-figure {
-  margin: 0;
-}
-
-img {
-  max-width: 100%;
-}
-
-body {
-  background: $background-body;
-  color: $text-color-primary;
-  display: flex;
-  flex-direction: column;
-  font-size: $font-size-normal;
-  justify-content: space-between;
-  margin: 0;
-  min-height: 100vh;
-  min-width: $content-width-min;
-  padding: 0;
-
-  > footer,
-  > header {
-    padding: .4rem 0;
-
-    > div {
-      display: flex;
-      flex-wrap: wrap;
-      margin: 0 auto;
-      max-width: $content-width;
-      padding: .4rem;
-    }
-
-    .authentication {
-      > div {
-        display: flex;
-        align-items: center;
-      }
-
-      .links {
-        a:link,
-        a:visited {
-          @include button-nav;
-          margin: 0 .4rem;
-        }
-      }
-
-      .plate {
-        .logout {
-          @include button-action;
-          margin-left: 1rem;
-        }
-      }
-    }
-  }
-
-  > header {
-    background: $background-header;
-    border-bottom: $border-primary;
-
-    > div {
-      align-items: center;
-    }
-
-    .logo {
-      margin-right: auto;
-    }
-  }
-
-  > footer {
-    background: $background-footer;
-    border-top: $border-primary;
-    margin: auto 0 0 0;
-
-    > div {
-      color: $text-color-secondary;
-      font-size: $font-size-decreased;
-    }
-
-    nav {
-      margin: 0 auto;
-    }
-
-    ul {
-      margin: 0;
-      padding: 0;
-    }
-
-    li {
-      list-style: none;
-      margin: 0;
-      padding: 0;
-    }
-  }
-}
-
-#main {
-  background: $background-main;
-  flex: 1;
-  margin: 0 auto;
-  max-width: $content-width;
-  padding: .8rem;
-  width: 100%;
-}
-
-form {
-  dt {
-    font: 500 $font-size-increased $font-family-main;
-
-    &:not(:first-of-type) {
-      border-top: $border-secondary;
-      margin: .8rem 0 0 0;
-      padding: .4rem 0 0 0;
-    }
-  }
-
-  dd {
-    padding: .2rem 0;
-
-    ul {
-      margin: 0 auto;
-      padding: 0;
-
-      li {
-        list-style: none;
-        margin: 0;
-        padding: 0;
-        position: relative;
-      }
-    }
-  }
-
-  input {
-    font-size: $font-size-normal;
-  }
-
-  input:not([type=checkbox]):not([type=radio]):not([type=date]):not([size]),
-  textarea {
-    width: 100%;
-  }
-}
-
-.breadcrumbs {
-  a {
-    background: image_url('biovision/base/icons/breadcrumb.svg') no-repeat bottom .1rem right / .6rem 1.2rem;
-    padding-right: 1rem;
-    transition: background .25s;
-
-    &:hover {
-      background-image: image_url('biovision/base/icons/breadcrumb-hover.svg');
-    }
-  }
-}