ab_admin 0.3.6 → 0.4.0

data/app/assets/javascripts/ab_admin/core/view_layout.js.coffee

@@ -40,5 +40,5 @@ class window.ViewLayout
       @control.find("[data-css='#{css_class}']").addClass('active') for css_class in css.split(' ')
 
 $ ->
-  if $('#list')[0]
+  if $('#list')[0] && !$('#list').hasClass('skip_view_layout')
     window.view_layout = new ViewLayout()

data/app/assets/javascripts/ab_admin/inputs/datetime_input.js.coffee

@@ -1,22 +1,20 @@
 $ ->
-  window.setInputDateTime = (field) ->
-    date = $("##{field}_date").val()
-    time = $("##{field}_time").val()
-    $('#' + field).val("#{date} #{time}")
-
   window.initPickers = ->
-    $('input.datepicker')
-      .datepicker({format: 'dd.mm.yyyy', language: 'ru', autoclose: true})
-      .on 'changeDate', (e) ->
-        setInputDateTime($(e.target).data('target'))
-      .on 'show', (e) ->
-        if ($(document).width() - $(e.target).offset().left) < 200
-          $('.datepicker.dropdown-menu:visible').css({left: "#{$(document).width() - 255}px"}).addClass('right_picker')
-          
-    $('input.timepicker').timepicker({showMeridian: false}).bind 'hidden', (e) ->
-      setInputDateTime($(e.target).data('target'))
+    base_options =
+      format: "dd.mm.yyyy hh:ii"
+      autoclose: true
+      todayBtn: true
+      language: I18n.locale
 
-  initPickers()
+    search_options = _.defaults({pickerPosition: "bottom-left datetimepicker-bottom-left-custom"}, base_options)
+    $('#search_form input.datepicker').datetimepicker search_options
+
+    date_picker_options = _.defaults({format: "dd.mm.yyyy"}, base_options)
+    $('.simple_form input.date_picker').datetimepicker date_picker_options
 
-  $('.simple_form').bind "nested:fieldAdded", =>
-    initPickers()
+    $('.simple_form input.datetime_picker').datetimepicker base_options
+
+    time_picker_options = _.defaults({format: "hh:ii"}, base_options)
+    $('.simple_form input.time_picker').datetimepicker time_picker_options
+
+  initPickers()

data/app/assets/javascripts/ab_admin/main.js

@@ -1,25 +1,25 @@
 //= require i18n
 //= require i18n/translations
-//= require jquery/jquery.min
-//= require jquery/jquery-ui.min
+//= require jquery.min
 //= require jquery_ujs
 //= require handlebars.min
 //= require underscore.min
 //= require jquery.cookie
 //= require jquery.pjax
-//= require jquery.ui.nestedSortable
 //= require jquery.hotkeys
 //= require bootstrap
 //= require ab_admin/jquery_nested_form
 //= require ab_admin/bootstrap-tab-multi
-//= require ab_admin/bootstrap-datepicker/core
-//= require ab_admin/bootstrap-datepicker/locales/bootstrap-datepicker.ru.js
-//= require ab_admin/bootstrap-timepicker
+//= require ab_admin/bootstrap-datetimepicker/bootstrap-datetimepicker
+//= require ab_admin/bootstrap-datetimepicker/locales/bootstrap-datetimepicker.ru.js
 //= require bootstrap-wysihtml5
 //= require bootstrap-wysihtml5/locales/ru
-//= require ab_admin/bootstrap-editable-inline
+//= require moment.min
+//= require ab_admin/bootstrap-editable
+//= require ab_admin/bootbox.min
 //= require select2
 //= require fancybox
+//= require ab_admin/jquery-ui-1.10.3.custom.min
 //= require jquery.ui.nestedSortable
 //= require ab_admin/components/sortable_tree
 //= require ab_admin/components/google_translate

data/app/assets/stylesheets/ab_admin/bootstrap_and_overrides.css.scss

@@ -1,12 +1,13 @@
-// Set the correct sprite paths
-$iconSpritePath: asset-url('glyphicons-halflings.png', image);
-$iconWhiteSpritePath: asset-url('glyphicons-halflings-white.png', image);
+$baseFontSize: 13px !default;
+$baseLineHeight: 18px !default;
+
 @import "bootstrap";
 @import "bootstrap-responsive";
 @import "ab_admin/components/base";
 @import "ab_admin/components/navigation";
 @import "ab_admin/components/table_view";
 @import "ab_admin/components/grid_view";
+@import "ab_admin/components/tree_view";
 @import "ab_admin/components/form";
 
 @import "ab_admin/components/colored_tabs";
@@ -15,9 +16,9 @@ $iconWhiteSpritePath: asset-url('glyphicons-halflings-white.png', image);
 @import "ab_admin/components/perms";
 @import "ab_admin/components/admin_comments";
 @import "ab_admin/components/geo_input";
-@import "ab_admin/components/sortable_tree";
 @import "ab_admin/components/text_styles";
 @import "ab_admin/components/view_layout";
+@import "ab_admin/components/columns_hider";
 
 img {
   max-width: none;
@@ -27,6 +28,10 @@ img {
   background-color: white;
 }
 
+.pagination ul > li > a, .pagination ul > li > span {
+  padding: 6px 14px;
+}
+
 .breadcrumb {
   padding: 10px 14px;
   margin-bottom: 10px;
@@ -37,6 +42,10 @@ img {
   margin-bottom: 10px;
 }
 
+.well-small {
+  margin-bottom: 15px;
+}
+
 .dropdown .caret {
   margin-left: 5px;
 }
@@ -58,10 +67,6 @@ img {
   margin-left: 20px;
 }
 
-.well-small {
-  margin-bottom: 15px;
-}
-
 ul.nav li.dropdown:hover ul.dropdown-menu {
   display: block;
   margin: 0;
@@ -124,6 +129,7 @@ label.checkbox {
 label.input_set, label.label-large, .label.label-large {
   font-size: 15px;
   padding: 4px 10px 6px;
+  display: block;
 }
 
 label.label-med {
@@ -152,6 +158,10 @@ label.control-label.label-reset {
     background-color: #fcf8e3;
   }
 
+  tr.muted > td, &.muted > tr > td {
+    background-color: #ededed;
+  }
+
   tr.info > td, &.info > tr > td {
     background-color: #d9edf7;
   }
@@ -163,4 +173,7 @@ label.control-label.label-reset {
 }
 .clear {
   clear: both;
+}
+.inline_block {
+  display: inline-block;
 }

data/app/assets/stylesheets/ab_admin/components/_admin_comments.css.scss

@@ -1,9 +1,21 @@
 .admin_comments {
-  form input[type="submit"] {
-    display: block;
-    margin-top: 10px;
+  form {
+    input[type="submit"] {
+      display: block;
+      margin-top: 10px;
+    }
+    textarea {
+      width: 100%;
+    }
+    .file-types {
+      max-width: 800px;
+    }
   }
-  .admin_comment-meta > * {
-    margin-right: 10px;
+  .admin_comment-item-attachment {
+    float: left;
+    margin-right: 5px;
+    .thumbnail img {
+      max-height: 80px;
+    }
   }
 }

data/app/assets/stylesheets/ab_admin/components/_base.css.scss

@@ -55,4 +55,8 @@ footer {
   height: 20px;
   padding: 10px 50px;
   text-align: right;
+}
+
+.footer-notes {
+  text-align: center;
 }

data/app/assets/stylesheets/ab_admin/components/_colored_tabs.css.scss

@@ -14,7 +14,7 @@
   }
   .nav-tabs > .active > a, .nav-tabs > .active > a:hover {
     color: #333;
-    background-color: $white;
+    background-color: white;
     border: 1px solid $border_color;
     border-bottom-color: transparent;
   }
@@ -26,7 +26,4 @@
     padding: 10px;
   }
   margin: 20px 0;
-  input[type="text"] {
-    width: 50%;
-  }
 }

data/app/assets/stylesheets/ab_admin/components/_columns_hider.css.scss

@@ -0,0 +1,5 @@
+#columns_hider {
+  .btn-group.btn {
+    float: left;
+  }
+}

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

@@ -1,5 +1,29 @@
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  padding: 4px;
+}
+
 .simple_form {
   input, textarea {
+    width: 100%;
+    max-width: 600px;
+  }
+  .radio input[type="radio"], .checkbox input[type="checkbox"] {
     width: auto;
   }
   .fields {
@@ -19,6 +43,9 @@
   select.date {
     width: auto;
   }
+  select.datetime {
+    width: auto;
+  }
   .control-group.boolean {
     margin-bottom: 0;
     .controls {
@@ -36,6 +63,9 @@
       margin-right: 5px;
     }
   }
+  .input-append {
+    white-space: nowrap;
+  }
   .input-mini       { width: 60px; }
   .input-small      { width: 90px; }
   .input-medium     { width: 150px; }
@@ -59,23 +89,12 @@
   }
 }
 
-.form_block {
-  width: 700px;
+.datetimepicker-bottom-left-custom {
+  margin-left: -110px;
 }
 
-.datepicker {
-  margin-top: 0;
-}
-
-.right_picker {
-  &.datepicker::after {
-    right: 7px;
-    left: auto;
-  }
-  &.datepicker::before {
-    right: 6px;
-    left: auto;
-  }
+.form_block {
+  width: 700px;
 }
 
 input[type='color'] {
@@ -93,7 +112,9 @@ textarea.do_wysihtml5 {
 }
 
 textarea {
-  width: auto;
+  width: 100%;
+  max-width: 600px;
+  height: 90px;
 }
 
 .fancy_select, input.token {
@@ -109,3 +130,11 @@ textarea {
 .select2-results {
   max-height: 500px;
 }
+
+.select2-create-choise {
+  margin-left: 10px;
+}
+
+.label.control-label.label-reset {
+  display: block;
+}

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

@@ -18,3 +18,14 @@
     margin-left: -15px;
   }
 }
+
+#main {
+  .grid_view {
+    #columns_hider_show {
+      display: none;
+    }
+    .content_actions {
+      margin-left: 20px;
+    }
+  }
+}

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

@@ -4,7 +4,7 @@
 }
 // icons
 .locale_tabs {
-  @each $lang in ru, uk, en, it {
+  @each $lang in ru, uk, en, it, de, fr, es {
     li {
       a.ico_#{$lang} {
           background-position: 10px center;

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

@@ -1,27 +1,29 @@
 .downloads {
-  margin-top: 9px;
+  line-height: 14px;
   a {
     font-size: 14px;
     text-transform: uppercase;
     margin-right: 5px;
+    vertical-align: bottom;
     i {
       padding-right: 5px;
     }
   }
 }
 
-.pagination {
-  margin: 0;
+.pagination-wrap {
   .pagination {
-    float: left;
+    margin: 0;
+    display: inline-block;
   }
   .pagination_info {
-    float: left;
-    padding: 10px;
+    display: inline-block;
+    vertical-align: top;
+    padding: 5px;
   }
 }
 
-.batch_actions > .pagination {
+.content_actions > .pagination-wrap {
   margin-left: 15px;
 }
 
@@ -55,14 +57,14 @@
   font-size: 10px;
 }
 
-.batch_actions {
+#main .content_actions {
   margin-bottom: 10px;
   margin-left: -30px;
   .btn-group {
     float: left;
     margin-left: 10px;
   }
-  .btn-group:first-child {
+  > *:first-child {
     margin-left: 30px;
   }
 }

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

@@ -7,7 +7,7 @@
 }
 
 table.index_table {
-  th {
+  & > thead th {
     background: #EFEFEF;
     @include gradient-vertical(#EFEFEF, #DFE1E2);
     text-shadow: white 0 1px 0;

data/app/assets/stylesheets/ab_admin/components/_translations.css.scss

@@ -1,6 +1,7 @@
 #controller_locators {
   textarea {
     min-width: 450px;
+    height: 90px;
   }
   table {
     margin-top: 15px;

data/app/assets/stylesheets/ab_admin/components/{_sortable_tree.css.scss → _tree_view.css.scss}

@@ -44,8 +44,13 @@ ol.sortable_tree {
   color: #8a1f11;
 }
 
-.tree_view {
-  #columns_hider_show {
-    display: none;
+#main {
+  .tree_view {
+    #columns_hider_show {
+      display: none;
+    }
+    .content_actions {
+      margin-left: 20px;
+    }
   }
 }

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

@@ -1,23 +1,61 @@
+//q= require ab_admin/jquery.Jcrop.min
+
 .fileupload {
   overflow: hidden;
   position: relative;
   padding-top: 10px;
   padding-left: 10px;
-  &.image_asset_type {
-    .asset {
+  .fileupload-button {
+    position: relative;
+    overflow: hidden;
+    input {
+      position: absolute;
+      top: 0;
+      right: 0;
+      margin: 0;
+      opacity: 0;
+      font-size: 200px;
+      direction: ltr;
+      cursor: pointer;
+    }
+  }
+  .fileupload-edit-button {
+    margin-left: 10px;
+    display: none;
+  }
+  .fileupload-types {
+    overflow: hidden;
+    padding-top: 10px;
+    padding-left: 5px;
+    z-index: 2;
+    position: relative;
+  }
+  .fileupload-info {
+    float: right;
+    color: #5b6569;
+    font-size: 0.9em;
+  }
+  .fileupload-info-extensions {
+    text-transform: uppercase;
+  }
+  &.error .help-inline {
+    color: #b94a48;
+  }
+  &.fileupload-file_type-image {
+    .fileupload-asset {
       float: left;
       overflow: hidden;
       margin: 3px;
       position: relative;
       z-index: 3;
-      .del_asset, .main_image, .crop_image, .rotate_image {
+      .destroy_asset, .main_image, .crop_image, .rotate_image {
         position: absolute;
         cursor: pointer;
         background: rgba(100, 131, 137, 0.6);
         z-index: 4;
         padding: 1px 3px;
       }
-      .del_asset {
+      .destroy_asset {
         right: 0;
         top: 0;
       }
@@ -35,55 +73,25 @@
         bottm: 0;
       }
     }
-    &.one_asset .main_image {
+    &.fileupload-single .main_image {
       display: none;
     }
   }
-  &.file_asset_type {
-    .asset {
+  &.fileupload-file_type-file {
+    .fileupload-asset {
       margin-bottom: 10px;
       z-index: 2;
       position: relative;
-      .del_asset {
+      .destroy_asset {
         margin-left: 15px;
       }
     }
   }
-  .file-name {
-    color: #5b6569;
-    font-size: 0.9em;
-    font-weight: bold;
-  }
-  .file-types {
-    overflow: hidden;
-    padding-top: 10px;
-    padding-left: 5px;
-    z-index: 2;
-    position: relative;
-  }
-  .fileupload-button {
-    z-index: 3;
-  }
+}
 
-  .file-types .type-info {
-    float: right;
-    color: #5b6569;
-    font-size: 0.9em;
-    text-transform: uppercase;
-  }
-  .fileupload-drop-area {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    min-height: 70px;
-    z-index: 1;
-    text-align: center;
-    color: #999;
-    font-size: 18px;
-  }
-  &.error .help-inline {
-    color: #b94a48;
+.fileupload-edit-form {
+  .thumbnail img {
+    max-height: 130px;
   }
 }
+