ab_admin 0.8.3 → 0.10.0

data/app/assets/stylesheets/ab_admin/components/_form.scss

@@ -17,7 +17,9 @@ input[type="color"],
 .uneditable-input {
   padding: 4px;
 }
-
+.save-error {
+  box-shadow: 0 0 4px 4px rgba(232,109,109,1);
+}
 .simple_form {
   input, textarea.text {
     width: 100%;
@@ -78,12 +80,10 @@ input[type="color"],
 }
 
 #search_form {
+  margin: 0;
   .right-label {
     padding: 5px 0 0 130px;
   }
-  #search_cancel {
-    float: right;
-  }
   label {
     margin-top: 5px;
   }
@@ -108,27 +108,21 @@ input[type="color"],
     }
     input {
       float: right;
+      width: 45%;
     }
   }
   .select select {
     width: 100%;
   }
-  .tooltip.left {
-    -moz-transform: translateX(-10px) translateY(-4px);
-    -ms-transform: translateX(-10px) translateY(-4px);
-    -o-transform: translateX(-10px) translateY(-4px);
-    -webkit-transform: translateX(-10px) translateY(-4px);
-    transform: translateX(-10px) translateY(-4px);
-  }
   hr {
     margin: 10px 0;
   }
-  .search-submit-wide {
-    display: block;
-    width: calc(100% + 26px);
-    margin-top: -13px;
-    margin-left: -13px;
-    margin-right: -13px;
+  .search-submit {
+    width: 78%;
+  }
+  .search-cancel {
+    width: 20%;
+    float: right;
   }
 }
 
@@ -201,6 +195,10 @@ textarea.text {
   margin-bottom: 1px;
 }
 
+.popover-title {
+  max-width: 600px;
+}
+
 .auto-submit-checkbox-wrap {
   display: inline-block;
   padding: 2px 4px 2px 6px;
@@ -209,7 +207,7 @@ textarea.text {
     width: auto;
     margin: 0;
     line-height: normal;
-    vertical-align: text-bottom;
+    vertical-align: baseline;
   }
   label {
     margin-bottom: 0;

data/app/assets/stylesheets/ab_admin/components/_grid_view.scss

@@ -1,5 +1,5 @@
 .grid_view {
-  #columns_hider_show, .pagination .pagination, .per_page {
+  #columns_hider_wrap, .pagination .pagination, .per_page {
     display: none;
   }
   .pagination_info {
@@ -21,7 +21,7 @@
 
 #main {
   .grid_view {
-    #columns_hider_show {
+    #columns_hider_wrap {
       display: none;
     }
     .content_actions {

data/app/assets/stylesheets/ab_admin/components/_locale_tabs.scss

@@ -3,43 +3,31 @@
 }
 
 .locale_tabs {
-  @each $locale in ru, uk, en, it, de, fr, es, pl {
-    li {
-      a.ico_#{$locale} {
-        opacity: 0.5;
-        padding-left: 12px;
-      }
-      &.active a.ico_#{$locale} {
-        opacity: 1;
-      }
+  .nav-tabs li {
+    a {
+      opacity: 0.5;
+      font-size: 28px;
+      padding: 8px 12px;
     }
-
-    .t_locale_#{$locale} {
-      background: image-url("admin/flags/#{$locale}.png") 10px center no-repeat;
-    }
-    ##{$locale} {
-      .t_locale_#{$locale} {
-         display: none;
-      }
+    &.active a {
+      opacity: 1;
+      padding: 14px 12px 2px;
     }
   }
 }
 
 .t_locales {
   position: absolute;
-  top: 0;
-  left: -5px;
-  height: 60px;
-  width: 40px;
+  top: 25px;
+  left: 2px;
   margin-left: 5px;
 }
 
 .t_locale {
   cursor: pointer;
-  width: 30px;
-  height: 19px;
   padding: 5px;
   opacity: 0.6;
+  font-size: 26px;
   &:hover {
     opacity: 1;
   }

data/app/assets/stylesheets/ab_admin/components/_navigation.scss

@@ -36,6 +36,12 @@
   margin-bottom: 5px;
 }
 
+.btn.btn-symbol {
+  font-size: 22px;
+  padding-top: 2px;
+  padding-bottom: 6px;
+}
+
 .resource_actions {
   float: left;
   margin-top: -10px;
@@ -64,25 +70,15 @@
 
 #main .content_actions {
   margin-bottom: 10px;
-  margin-left: -30px;
   .btn-group {
     float: left;
     margin-left: 10px;
   }
   > *:first-child {
-    margin-left: 30px;
+    margin-left: 0;
   }
 }
 
-#columns_hider {
-  width: 60%;
-  margin-left: -30%;
-}
-
-#columns_hider_show {
-  margin-left: 10px;
-}
-
 #lang_bar img {
   height: 16px;
   width: 24px;

data/app/assets/stylesheets/ab_admin/components/_table_view.scss

@@ -7,6 +7,16 @@
 }
 
 table.index_table {
+  &.table th, &.table td {
+    padding: 3px 3px 5px;
+  }
+  input[type='checkbox'] {
+    margin-right: 5px;
+    margin-top: 0;
+  }
+  p {
+    margin: 0 0 4px;
+  }
   & > thead th {
     background: #EFEFEF;
     @include gradient-vertical(#EFEFEF, #DFE1E2);
@@ -21,9 +31,9 @@ table.index_table {
     color: #2E3439;
     border-right: none;
     text-align: left;
-    padding-left: 6px;
-    padding-right: 6px;
-
+    & > thead th a.sort_link {
+      white-space: normal;
+    }
     a, a:link, a:visited {
       text-decoration: none;
       display: block;
@@ -31,22 +41,18 @@ table.index_table {
       -webkit-font-smoothing: antialiased;
       color: #2E3439;
     }
-
     a:hover {
       color: #2E3439;
     }
-
     &.sortable a {
-      background: url("/images/admin/orderable.png") no-repeat 0 4px; padding-left: 13px;
+      background: url("/images/admin/orderable.png") no-repeat 0 4px;
+      padding-left: 13px;
     }
-
     &.sorted-asc a { background-position: 0 -27px; }
     &.sorted-desc a {  background-position: 0 -56px;}
-
     &.sorted-asc, &.sorted-desc {
       @include gradient-vertical(#e2e2e2, #d2d4d6);
     }
-
     &:last-child {
       border-right: solid 1px #d4d4d4;
     }
@@ -93,8 +99,8 @@ table.index_table {
     border: none;
     .actions_panel-wrap_outer {
       position: relative;
-      top: 0px;
-      bottom: 0px;
+      top: 0;
+      bottom: 0;
       height: 100%;
       padding: 0 0 20px 0
     }
@@ -130,7 +136,75 @@ table.index_table {
   }
 }
 
+@mixin colored_row($color) {
+  background-color: $color !important;
+  & > td, &:hover > td {
+    background-color: $color !important;
+  }
+}
+.table tbody {
+  .bg-green {
+    @include colored_row(#a4f58a);
+  }
+  .bg-skyblue {
+    @include colored_row(#9de8f7);
+  }
+  .bg-blue {
+    @include colored_row(#bbddfb);
+  }
+  .bg-orange {
+    @include colored_row(#fce492);
+  }
+  .bg-yellow {
+    @include colored_row(#ffefd5);
+  }
+  .bg-pink {
+    @include colored_row(#f2c0db);
+  }
+  .bg-violet {
+    @include colored_row(#f0dcff);
+  }
+  .bg-violet-dark {
+    @include colored_row(#d8c0ff);
+  }
+  .bg-grey {
+    @include colored_row(#eaeaea);
+    color: #828282;
+  }
+  .bg-turquoise {
+    @include colored_row(#ddfff3fc);
+  }
+  .success {
+    @include colored_row(#dff0d8);
+  }
+  .error {
+    @include colored_row(#f2dede);
+  }
+  .warning {
+    @include colored_row(#fcf8e3);
+  }
+  .info {
+    @include colored_row(#d9edf7);
+  }
+  .bg-lemon {
+    @include colored_row(#d7ff76);
+  }
+}
+.muted {
+  & > td, &:hover > td {
+    background-color: #ededed !important;
+  }
+}
+
 #batch_action_form {
   margin-bottom: 10px;
 }
 
+#columns_hider_wrap {
+  .dropdown-menu {
+    margin-top: 60px;
+  }
+  label {
+    margin: 0 10px;
+  }
+}

data/app/assets/stylesheets/ab_admin/components/_tooltip.scss

@@ -0,0 +1,81 @@
+.tool {
+  position: relative;
+}
+
+.tool::before,
+.tool::after {
+  left: 50%;
+  position: absolute;
+  color: white;
+  opacity: 0;
+  z-index: -100;
+  pointer-events: none;
+}
+
+//.tool::before,
+//.tool::after,
+.tool:hover::before,
+.tool:focus::before,
+.tool:hover::after,
+.tool:focus::after {
+  opacity: 0.8;
+  z-index: 100;
+}
+
+.tool::before {
+  border-style: solid;
+  border-width: 4px 3px 0 3px;
+  border-color: black transparent transparent transparent;
+  bottom: 100%;
+  content: "";
+  transform: translateX(-50%);
+}
+
+.tool::after {
+  background: black;
+  border-radius: 5px;
+  bottom: calc(100% + 4px);;
+  color: white;
+  content: attr(title);
+  padding: 5px 10px;
+  transform: translateX(-50%);
+}
+
+.tool-left::before, .tool-left::after {
+  right: 100%;
+  left: auto;
+  bottom: 50%;
+  margin-bottom: 2px;
+  transform: none;
+}
+
+.tool-left::before {
+  border-width: 3px 2px 3px 4px;
+  border-color: transparent transparent transparent black;
+  transform: translateY(50%);
+}
+
+.tool-left::after {
+  white-space: nowrap;
+  margin-right: 6px;
+  transform: translateY(50%);
+}
+
+.tool-bottom::before, .tool-bottom::after {
+  bottom: auto;
+  top: 100%;
+  left: 50%;
+  margin-bottom: 2px;
+}
+
+.tool-bottom::before {
+  border-width: 0 3px 4px 3px;
+  border-color: transparent transparent black transparent;
+  transform: translateX(-50%);
+}
+
+.tool-bottom::after {
+  white-space: nowrap;
+  margin-top: 4px;
+  transform: translateX(-50%);
+}

data/app/assets/stylesheets/ab_admin/components/_tree_view.scss

@@ -46,7 +46,7 @@ ol.sortable_tree {
 
 #main {
   .tree_view {
-    #columns_hider_show {
+    #columns_hider_wrap {
       display: none;
     }
     .content_actions {

data/app/assets/stylesheets/ab_admin/devise.scss

@@ -1,5 +1,5 @@
-@import "bootstrap";
-@import "bootstrap-responsive";
+@import "bootstrap_2_3_2/bootstrap";
+@import "bootstrap_2_3_2/bootstrap-responsive";
 
 $element_width: 280px;
 $element_font_size: 16px;

data/app/assets/stylesheets/ab_admin/fileupload.scss

@@ -1,5 +1,3 @@
-//q= require ab_admin/jquery.Jcrop.min
-
 .fileupload {
   overflow: hidden;
   position: relative;
@@ -48,7 +46,7 @@
       margin: 3px;
       position: relative;
       z-index: 3;
-      .destroy_asset, .main_image, .crop_image, .rotate_image {
+      .destroy_asset, .main_image, .rotate_image {
         position: absolute;
         cursor: pointer;
         background: rgba(100, 131, 137, 0.6);
@@ -63,14 +61,9 @@
         right: 0;
         bottom: 0;
       }
-      .crop_image {
-        display: none;
-        left: 0;
-        bottom: 0;
-      }
       .rotate_image {
         left: 0;
-        bottm: 0;
+        bottom: 0;
       }
     }
     &.fileupload-single .main_image {

data/app/assets/stylesheets/ab_admin/main.scss

@@ -1,6 +1,5 @@
 //= require bootstrap-wysihtml5
-//= require select2
-//= require fancybox
+//= require select2_3_5_2/select2
 //= require ab_admin/bootstrap_and_overrides
 //= require ab_admin/bootstrap-editable
 //= require ab_admin/bootstrap-datetimepicker

data/app/controllers/admin/assets_controller.rb

@@ -53,7 +53,7 @@ class Admin::AssetsController < ApplicationController
   protected
 
   def permitted_params
-    params[:asset].try!(:permit, :data, :is_main, :original_name, :base_filename, *Asset.all_translated_attribute_names)
+    params[:asset].try!(:permit, :data, :is_main, :original_name, :human_filename, *Asset.all_translated_attribute_names)
   end
 
   def find_asset