hancock_cms 1.0.2.3 → 2.0.0

data/app/assets/stylesheets/hancock/rails_admin/cms.theming.sass

@@ -1,13 +1,9 @@
 @import 'jquery.mCustomScrollbar'
 
-@import "./fieldsets"
-
-.btn
-  +transition(all 0.3s)
-
-a, a:focus, button, .btn:focus, .btn:active:focus, .btn.active:focus
+a
   outline: none
-  outline: 0px
+  &:focus
+    outline: none
 
 html, body.rails_admin
   padding: 0
@@ -22,7 +18,7 @@ body.rails_admin
 
 .admin-navbar
   position: relative
-  height: 50px
+  height: 60px
   width: 100%
   +box-shadow( 0px 5px 10px -5px rgba(0,0,0,0.5))
 
@@ -32,46 +28,6 @@ body.rails_admin
   left: 0px
   z-index: 1500
 
-.navigation_filter_field
-  margin-left: 0px
-  height: 30px
-  width: 200px
-  padding: 0px 10px
-  border: 0px solid
-  background: #414141
-  color: #e1e1e1
-  &:focus
-    background: #616161
-
-.clear_navigation_filter_field
-  height: 30px
-  width: 30px
-  display: block
-  float: right
-  text-align: center
-  line-height: 30px
-  cursor: pointer
-  color: #c1c1c1
-  background: #21292e
-  +transition(background, 0.3s)
-  i
-    +transition(all, 0.3s)
-    color: #c1c1c1
-    transform-origin: center center
-    -webkit-transform-origin: center center
-    -o-transform-origin: center center
-    -moz-transform-origin: center center
-    +transform(rotate(0deg))
-  &:hover
-    background: darken(#e53935, 15%)
-    i
-      color: #e1e1e1
-      +transform(rotate(-360deg))
-      transform-origin: center center
-      -webkit-transform-origin: center center
-      -o-transform-origin: center center
-      -moz-transform-origin: center center
-
 .bg-red
   background-color: #e53935 !important
 
@@ -114,8 +70,7 @@ body.rails_admin
 
 .admin-menubar
   width: 230px
-  padding: 50px 0px 80px
-  z-index: 2
+  padding: 60px 0px
 
 .admin-menubar-fixed
   position: fixed
@@ -127,11 +82,10 @@ body.rails_admin
   background: #212121
 
 .admin-content
-  padding: 50px 0px 0px 230px
+  padding: 60px 0px 0px 230px
   background: #f3f4f5
   margin: 0px auto -30px
   min-height: 100%
-  position: relative
   &:after
     content: ""
     display: block
@@ -141,7 +95,7 @@ body.rails_admin
   padding: 15px
   width: 100%
   .content
-    padding: 15px
+    padding: 25px
     background: #fff
     border: 1px solid transparent
     border-radius: 4px
@@ -149,7 +103,6 @@ body.rails_admin
 
 .toolbar
   max-height: 100%
-  height: 100%
   display: block
   width: 100%
   overflow: auto
@@ -185,7 +138,7 @@ body.rails_admin
         margin-top: -15px
         font-size: 26px
         font-family: "FontAwesome"
-      &:hover, &.current_selected
+      &:hover
         background: #646464
         a
           color: #fff
@@ -197,10 +150,6 @@ body.rails_admin
       background: rgba(0,0,0,0.32)
       +transition(all 0.3s)
       a
-        overflow: hidden
-        text-overflow: ellipsis
-        white-space: nowrap
-        max-width: 100%
         text-decoration: none
         background-color: transparent
         color: #c1c1c1
@@ -240,7 +189,7 @@ body.rails_admin
         font-weight: 100
         &:before
           content: "\f0da"
-      &:hover, &.current_selected
+      &:hover
         //background: rgba(0,0,0,0.32)
         background: #4b4b4b
         a
@@ -263,7 +212,7 @@ body.rails_admin
         content: "\f078"
         box-sizing: border-box
         margin-left: 12px
-      &:hover, &.current_selected
+      &:hover
         //background: rgba(0,0,0,0.32)
         background: #4b4b4b
         color: #fff
@@ -273,7 +222,7 @@ body.rails_admin
         border-top: 2px solid rgba(255,255,255,0.25)
         &::after
           content: "\f077"
-        &:hover, &.current_selected
+        &:hover
           //background: rgba(0,0,0,0.32)
           background: #4b4b4b
 
@@ -307,7 +256,7 @@ body.rails_admin
   display: block
   z-index: 1400
   width: 230px
-  height: 50px
+  height: 60px
   background: #21292e
   text-align: right
   ul
@@ -317,7 +266,7 @@ body.rails_admin
     height: 100%
 
 .footer-nav-link
-  width: 20%
+  width: 25%
   height: 100%
   display: inline-block
   vertical-align: top
@@ -335,6 +284,19 @@ body.rails_admin
     &:active
       background: rgba(0,0,0,0.3)
 
+.footer-nav-link.sitemap
+  a
+    font-size: 0
+    &:before
+      display: inline-block
+      font-family: FontAwesome
+      font-size: 18px
+      text-rendering: auto
+      -webkit-font-smoothing: antialiased
+      -moz-osx-font-smoothing: grayscale
+      content: "\f0e8"
+      box-sizing: border-box
+
 .admin-footer
   height: 30px
   width: 100%
@@ -344,7 +306,6 @@ body.rails_admin
   line-height: 30px
   font-size: 12px
   background: #1f1f1f
-  position: relative
   a
     color: #ff2b58
     text-decoration: none
@@ -362,7 +323,6 @@ body.rails_admin
 
 .breadcrumb
   margin-top: 0px
-  font-size: 13px
 
 .control-group
   clear: both
@@ -378,6 +338,9 @@ body.rails_admin
     padding: 3px
     font-size: 20px
 
+.remove_nested_fields
+  opacity: 1 !important
+
 body.rails_admin .modal
   margin: 0 auto !important
   .modal-dialog
@@ -420,8 +383,8 @@ body.rails_admin .table td.paperclip_type, body.rails_admin .table td.carrierwav
 .current_user
   float: right
   display: block
-  width: 50px
-  height: 50px
+  width: 60px
+  height: 60px
   &:hover
     .user_info
       +transform(scale(1))
@@ -430,8 +393,8 @@ body.rails_admin .table td.paperclip_type, body.rails_admin .table td.carrierwav
       background: #eee
 
 .user_icon
-  width: 50px
-  height: 50px
+  width: 60px
+  height: 60px
   +display-flex-center
   +transition(all 0.3s)
   i
@@ -482,6 +445,60 @@ body.rails_admin .table td.paperclip_type, body.rails_admin .table td.carrierwav
     text-align: center
     margin-bottom: 7px
 
+
+//.sitemap_root_link
+//  box-sizing: border-box
+//  width: 50px
+//  overflow: inherit !important
+//  a
+//    color: #fff
+//    text-decoration: none
+//    height: 50px
+//    display: block
+//    width: 50px
+//    font-size: 0
+//    &::before
+//      display: inline-block
+//      font-family: FontAwesome
+//      font-size: 24px
+//      text-rendering: auto
+//      -webkit-font-smoothing: antialiased
+//      -moz-osx-font-smoothing: grayscale
+//      content: "\f277"
+//      box-sizing: border-box
+//      line-height: 50px
+//      color: #fff
+//    span
+//      display: inline-block
+//      height: 50px
+//      margin: 0
+//      padding: 0
+//      position: relative
+//      top: -4px
+//      color: #fff
+//      font-size: 14px
+//      font-weight: bold
+//
+//.sitemap_root_link
+//  &::after
+//    content: "Перегенерировать карту сайта"
+//    opacity: 0
+//    font-size: 11px
+//    height: 20px
+//    line-height: 20px
+//    position: absolute
+//    left: 0
+//    width: 170px
+//    color: #000
+//    border: 1px solid #000
+//    background: #fff
+//
+//.sitemap_root_link
+//  &:hover
+//    &::after
+//      opacity: 1
+//
+
 tr.rails_admin_settings_setting_row
   td.raw_field
     img
@@ -560,6 +577,60 @@ a
   background-color: #c73800
   border-color: #bd3700
 
+#bulk_form
+  min-height: 20px
+  //background-color: #f5f5f5
+  border: 1px solid #e3e3e3
+  +border-radius(4px)
+  //+box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.05))
+
+  thead
+    tr:first-child
+      padding: 6px 2px 6px 2px
+    tr
+      th
+        position: relative
+        vertical-align: middle
+        padding: 6px 30px 6px 4px
+        &:after
+          margin-left: 10px
+          margin-right: 10px
+          position: absolute
+          right: 0
+          top: 50%
+          margin-top: -2px
+      th:first-child
+        max-width: 40px
+  tbody
+    tr
+      td:first-child
+        padding: 6px 2px 6px 2px
+      td
+        position: relative
+        vertical-align: middle
+        text-align: center
+        padding: 3px 4px 3px 4px
+      td.other.right, td.last.links
+        padding: 6px 10px 6px 0px
+        max-width: 140px
+      .last.links
+        a
+          font-size: 16px
+      td.state_type
+        .label
+          margin-top: 10px
+          padding: 1px 5px
+          font-size: 12px
+          line-height: 1.5
+          border-radius: 3px
+          display: inline-block
+        .btn.btn-mini
+          margin-bottom: 10px !important
+        .btn.btn-mini.label-default
+          color: #fff
+      td:first-child
+        max-width: 40px
+
 .pagination
   margin: 10px 0px 20px 20px
 
@@ -590,13 +661,15 @@ body.rails_admin .form-horizontal.denser legend
   &:hover
     color: #e53935
 
-.btn-info.disabled, .btn-info.disabled:hover, .btn-info.disabled:focus, .btn-info.disabled:active, .btn-info.disabled.active, .btn-info[disabled], .btn-info[disabled]:hover, .btn-info[disabled]:focus, .btn-info[disabled]:active, .btn-info[disabled].active
+.btn-info.disabled, .btn-info.disabled:hover, .btn-info.disabled:focus, .btn-info.disabled:active, .btn-info.disabled.active, .btn-info[disabled], .btn-info[disabled]:hover, .btn-info[disabled]:focus, .btn-info[disabled]:active, .btn-info[disabled].active, fieldset[disabled] .btn-info, fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:focus, fieldset[disabled] .btn-info:active, fieldset[disabled] .btn-info.active
   background-color: #ef3b36
   border-color: #e53a36
 
 body.rails_admin .form-horizontal .tab-content .tab-pane
-  border-left: 0px solid #e53935
+  border-left: 5px solid #e53935
   position: relative
+  legend
+    display: none
 
 .label-info
   background-color: #e53935
@@ -626,295 +699,5 @@ body.rails_admin .form-horizontal .tab-content .tab-pane
     +box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075))
     +transform(border-color ease-in-out 0.15s box-shadow ease-in-out 0.15s)
 
-#bulk_form tbody tr td.other.right, #bulk_form tbody tr td.last.links
-  max-width: none
-
-table.table.table-condensed.table-striped
-  min-width: 100%
-
-body.rails_admin
-  .modal
-    z-index: 9999
-
-.modal-header
-  padding: 25px
-
-.modal-body
-  padding: 25px
-
-.rails_admin_multiple_file_upload_block
-  button[type="submit"]
-    display: inline-block
-    margin-bottom: 0
-    font-weight: normal
-    text-align: center
-    vertical-align: middle
-    cursor: pointer
-    background-image: none
-    border: 1px solid transparent
-
-    white-space: nowrap
-    padding: 6px 12px
-    font-size: 14px
-    line-height: 1.42857
-    border-radius: 4px
-    -webkit-user-select: none
-    -moz-user-select: none
-    -ms-user-select: none
-    user-select: none
-    margin-top: 15px
-    color: #fff
-    background-color: #e53935
-    border-color: #db3a35
-    &:hover
-      background-color: #c73800
-      border-color: #bd3700
-
-#form_controls_fixed
-  position: fixed
-  top: 55px
-  right: 5px
-  text-align: right
-  display: block
-  background: #fff
-  border: 1px solid #e3e3e3
-  +border-radius(4px)
-  padding: 5px
-  z-index: 999
-  +box-shadow(0px 5px 10px -5px rgba(0, 0, 0, 0.5))
-  a
-    display: inline-block
-    color: #fff
-    background-color: #e53935
-    border-color: #db3a35
-    margin-bottom: 0
-    font-weight: normal
-    text-align: center
-    vertical-align: middle
-    cursor: pointer
-    background-image: none
-    border: 1px solid
-    white-space: nowrap
-    padding: 6px 12px
-    font-size: 14px
-    line-height: 1.42857
-    +border-radius(4px)
-    -webkit-user-select: none
-    -moz-user-select: none
-    -ms-user-select: none
-    user-select: none
-    +transition(all 0.3s)
-    margin-right: 3px
-  a:last-child
-    margin-right: 0px
-  a:hover
-    background-color: #c73800
-    border-color: #bd3700
-
-  .clone_save, .clone_add_another, .clone_add_edit, .clone_continue
-    &:before, &:after
-      font-family: FontAwesome
-      display: inline-block
-
-  .clone_save
-    &:before
-      content: "\f0c7"
-
-  .clone_add_another
-    &:before
-      content: "\f0c7"
-    &:after
-      content: "\f067"
-      font-size: 10px
-      margin-left: -5px
-      margin-right: -5px
-      text-shadow: 0px 0px 2px #e53935, 0px 0px 2px #e53935, 0px 0px 2px #e53935, 0px 0px 2px #e53935
-  .clone_add_another:hover
-    &:after
-      text-shadow: 0px 0px 2px #c73800, 0px 0px 2px #c73800, 0px 0px 2px #c73800, 0px 0px 2px #c73800
-
-  .clone_add_edit
-    &:before
-      content: "\f0c7"
-    &:after
-      content: "\f040"
-      font-size: 10px
-      margin-left: -5px
-      margin-right: -5px
-      text-shadow: 0px 0px 2px #e53935, 0px 0px 2px #e53935, 0px 0px 2px #e53935, 0px 0px 2px #e53935
-  .clone_add_edit:hover
-    &:after
-      text-shadow: 0px 0px 2px #c73800, 0px 0px 2px #c73800, 0px 0px 2px #c73800, 0px 0px 2px #c73800
-
-  .clone_continue
-    &:before
-      content: "\f0e2"
-
-.cke_screen_reader_only
-  position: fixed
-  top: 0
-
-table.table
-  border-collapse: separate
-  border: 1px solid #e3e3e3
-  +border-radius(4px)
-
-  td, th
-    border-left: solid black 1px
-    border-top: solid black 1px
-    border: 0px
-
-  th
-    border-top: none
-
-  td:first-child, th:first-child
-    border-left: none
-
-  thead
-    tr:first-child
-      padding: 6px 2px 6px 2px
-    tr
-      th
-        position: relative
-        vertical-align: middle
-        padding: 6px 30px 6px 4px
-        &:after
-          margin-left: 10px
-          margin-right: 10px
-          position: absolute
-          right: 0
-          top: 50%
-          margin-top: -2px
-      th:first-child
-        //max-width: 40px
-        padding-left: 10px
-      th:last-child
-        padding-right: 10px
-  tbody
-    tr
-      td:first-child
-        padding: 6px 2px 6px 2px
-      td
-        position: relative
-        vertical-align: middle
-        text-align: left
-        padding: 3px 4px 3px 4px
-      td.other.right, td.last.links
-        padding: 6px 10px 6px 0px
-        max-width: 140px
-      .last.links
-        a
-          font-size: 16px
-      td.state_type
-        .label
-          margin-top: 10px
-          padding: 1px 5px
-          font-size: 12px
-          line-height: 1.5
-          border-radius: 3px
-          display: inline-block
-        .btn.btn-mini
-          margin-bottom: 10px !important
-        .btn.btn-mini.label-default
-          color: #fff
-      td:first-child
-        //max-width: 40px
-        padding-left: 10px
-      td:last-child
-        padding-right: 10px
-
-#bulk_form
-  thead
-    tr
-      th:first-child
-        max-width: 40px
-        padding-left: 2px
-  tbody
-    tr
-      td:first-child
-        max-width: 40px
-        padding-left: 2px
-
-.mCS-minimal.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar
-  background-color: rgba(25, 25, 25, 0.2)
-
-.mCS-minimal.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar, .mCS-minimal.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar
-  background-color: rgba(25, 25, 25, 0.5)
-
-.toolbar
-  .mCS-minimal.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar
-    background-color: rgba(255, 255, 255, 0.2)
-  .mCS-minimal.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar, .mCS-minimal.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar
-    background-color: rgba(255, 255, 255, 0.5)
-
-body.rails_admin .nav.nav-tabs
-  font-size: 0px
-  li
-    font-size: 14px
-    display: inline-block
-    float: none
-    margin: 0px
-    max-width: 130px
-    a
-      overflow: hidden
-      white-space: nowrap
-      text-overflow: ellipsis
-
-.form-group.form-actions
-  margin-left: 0px
-  margin-right: 0px
-  margin-top: 25px
-
-#rails_admin_model_accesses
-  padding: 15px
-  .controls
-    input, label
-      display: inline-block
-      vertical-align: top
-      float: none
-    label
-      font-size: 14px
-      font-weight: normal
-    input
-      margin: 0px 10px
-
-.rails_admin_multiple_file_upload_block
-  margin-top: 15px
-
-@media all and (max-width: 1366px)
-  body.rails_admin .nav.nav-tabs
-    li
-      font-size: 13px
-    li > a
-      padding: 6px 8px
-  body.rails_admin
-    table.table.table-condensed
-      font-size: 13px
-  #bulk_form thead tr th:first-child, body.rails_admin table.table thead tr th:first-child
-    max-width: 35px
-  body.rails_admin table.table thead tr th.user
-    max-width: none
-
-
-.hancock_enum.hidden + *
-  display: none
-
-.footer-nav-link.sitemap, .footer-nav-link.robots_txt
-  a
-    font-size: 0
-    &:before
-      display: inline-block
-      font-family: FontAwesome
-      font-size: 18px
-      text-rendering: auto
-      -webkit-font-smoothing: antialiased
-      -moz-osx-font-smoothing: grayscale
-      content: "\f0e8"
-      box-sizing: border-box
-
-.hancock_enum_with_custom_type .ra-multiselect-search, .hancock_array_type .ra-multiselect-search
-  display: inline-block
-  margin-right: 10px
-
-
-@import "hancock/rails_admin/custom/theming"
+body.rails_admin .table td
+  max-width: 120px

data/app/assets/stylesheets/rails_admin/custom/theming.sass

@@ -1,4 +1,4 @@
 @import hancock/cms/mixins
 
 @import hancock/rails_admin/cms.theming
-@import hancock/rails_admin/custom/theming
+@import hancock/rails_admin/custom/theming

data/app/controllers/concerns/hancock/current_user.rb

@@ -1,4 +1,4 @@
-module Hancock::CurrentUser
+module Hancock::Errors
   extend ActiveSupport::Concern
 
   included do

data/app/controllers/concerns/hancock/decorators/home.rb

@@ -2,7 +2,7 @@ module Hancock::Decorators
   module Home
     extend ActiveSupport::Concern
 
-    # included do
+    # included
     #   def index
     #     render layout: Hancock.config.main_index_layout
     #   end