c80_estate 0.1.0.12 → 0.1.0.13

data/app/assets/javascript/c80_estate_active_admin.js.coffee

@@ -1,4 +1,5 @@
 #= require_tree ./c80_estate/lib
 #= require ./c80_estate/backend/init
 #= require ./c80_estate/backend/init_selectpicker
-#= require_tree ./c80_estate/backend/admin
+#= require_tree ./c80_estate/backend/admin/shared
+#= require_tree ./c80_estate/backend/admin/src

data/app/assets/stylesheets/c80_estate/backend/admin_areas.scss

@@ -193,6 +193,17 @@ body.admin_areas {
 
   &.show {
 
+    div#main_content {
+      opacity: 0;
+
+      -webkit-transition: opacity .2s ease-in;
+      -moz-transition: opacity .2s ease-in;
+      -ms-transition: opacity .2s ease-in;
+      -o-transition: opacity .2s ease-in;
+      transition: opacity .2s ease-in;
+
+    }
+
   }
 
 }

data/app/assets/stylesheets/c80_estate/backend/admin_sevents.scss

@@ -11,74 +11,6 @@ body.admin_sevents {
       -o-transition: opacity .2s ease-in;
       transition: opacity .2s ease-in;      
 
-      div#index_adds {
-        height: calc(183px + 15px);
-        min-height: calc(183px + 15px);
-        margin-bottom: 0;
-
-        > div {
-          float: left;
-          padding: 10px;
-          border-radius: 2px;
-          border: 2px solid #f1f1f1;
-          height: 183px;
-
-          &#ecoef {
-            width: 200px;
-            text-align: center;
-
-            p {
-              width: 100%;
-
-              &.val {
-                margin-top: 15px;
-                margin-bottom: 0;
-                font-size: 40px;
-              }
-
-            }
-          }
-
-          &#text_stats {
-            width: 400px;
-            margin-left: 30px;
-
-            ul {
-              padding: 0 5px;
-              list-style: none;
-              #title {
-                font-weight: bold;
-              }
-            }
-
-          }
-
-          &#graph {
-            /*width: calc(100% - 200px - 400px - 30px - 30px);*/
-            width: 100%;
-            height: 200px;
-            margin-top: 15px;
-
-            /*margin-left: 30px;*/
-            padding: 0;
-            display: none;
-            opacity: 0;
-
-            -webkit-transition: opacity .2s ease-in;
-            -moz-transition: opacity .2s ease-in;
-            -ms-transition: opacity .2s ease-in;
-            -o-transition: opacity .2s ease-in;
-            transition: opacity .2s ease-in;
-
-            #graph_canvas {
-              width: 100%;
-            }
-
-          }
-
-        }
-      }
-
     }
 
     .batch_actions_selector {

data/app/assets/stylesheets/c80_estate/backend/common/minor_fix.scss

@@ -0,0 +1,3 @@
+.batch_actions_selector {
+  margin-right: 20px !important;
+}

data/app/assets/stylesheets/c80_estate/backend/common/panel.scss

@@ -0,0 +1,42 @@
+.panel {
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+
+  > h3 {
+    background-color: #5e7188 !important;
+    background-image: none !important;
+    text-shadow: none !important;
+    border: none !important;
+    box-shadow: none !important;
+    line-height: 30px !important;;
+    margin-bottom: 0.5em;
+    color: #ffffff !important;
+    padding: 5px 10px 3px 10px;
+  }
+
+  .panel_contents {
+    padding: 10px 0 !important;
+    border-bottom: none !important;
+  }
+
+  table {
+    th {
+      background-color: #ffffff !important;
+      border-bottom: 1px solid #cecece !important;
+      line-height: 5px !important;
+      background-image: none !important;
+      color: #288feb !important;
+    }
+  }
+}
+
+div#sidebar {
+  div.sidebar_section.panel {
+    h3 {
+      color: #444444 !important;
+    }
+    .panel_contents {
+      padding: 3px 15px 15px 15px !important;
+    }
+  }
+}

data/app/assets/stylesheets/c80_estate/backend/dashboard/atype_in_list.scss

@@ -1,3 +1,10 @@
+body.admin_dashboard {
+  table.index_table th {
+    background-color: transparent !important;
+    border-bottom: 2px solid #eaeaea !important;
+  }
+}
+
 a.atype_in_list {
   display: block;
   float: left;

data/app/assets/stylesheets/c80_estate/backend/dashboard/common.scss

@@ -8,35 +8,9 @@ body.admin_dashboard {
     margin-bottom: 30px;
   }
 
-  .panel {
-    -webkit-box-shadow: none !important;
-    box-shadow: none !important;
-
-    > h3 {
-      background-color: #5e7188 !important;
-      background-image: none !important;
-      text-shadow: none !important;
-      border: none !important;
-      box-shadow: none !important;
-      line-height: 30px !important;;
-      margin-bottom: 0.5em;
-      color: #ffffff !important;
-      padding: 5px 10px 3px 10px;
-    }
-
+  .proplist {
     .panel_contents {
-      padding: 10px 0 !important;
-      border-bottom: none !important;
-    }
-
-    table {
-      th {
-        background-color: #ffffff !important;
-        border-bottom: 1px solid #cecece !important;
-        line-height: 5px !important;
-        background-image: none !important;
-        color: #288feb !important;
-      }
+      margin-right: -15px;
     }
   }
 

data/app/assets/stylesheets/c80_estate/backend/dashboard/prop_in_list.scss

@@ -1,8 +1,8 @@
 div.prop_in_list {
   float: left;
-  width: 200px;
+  width: calc(25% - 15px);
   height: 214px;
-  margin-right: 30px;
+  margin-right: 15px;
   margin-bottom: 15px;
   border: 2px solid #ededed;
   border-radius: 3px;
@@ -12,7 +12,7 @@ div.prop_in_list {
     height: 100px;
     display: block;
     position: relative;
-    margin: 0 46px;
+    margin: 0 auto;
     top: 35px;
     text-align: center;         /*!*/
     white-space: nowrap;        /*!*/

data/app/assets/stylesheets/c80_estate/backend/shared/areas/gallery3.scss

@@ -0,0 +1,107 @@
+#gallery3_wrapper {
+  padding: 0;
+  height: 672px;
+  margin: 0 0 30px 35px;
+
+  #gallery3 {
+
+    width: 841px;
+    font-family: "HelveticaRegular", Arial, Helvetica, sans-serif;
+
+    .img-holder {
+      width: 841px;
+      height: 672px;
+      padding: 0;
+    }
+
+    img {
+      display: block;
+      margin: 0 auto;
+      max-width: 100%;
+    }
+
+    button {
+
+      z-index: 999;
+    }
+
+    .frame {
+      padding: 0;
+      height: 672px;
+      .name {
+        padding-top: 15px !important;
+        padding-left: 15px !important;
+      }
+    }
+
+    .desc {
+      overflow: hidden;
+      padding: 0;
+    }
+
+    .slick-prev,
+    .slick-next{
+      top: 50%;
+    }
+    .slick-next{
+      right: -53px;
+    }
+
+
+  }
+
+}
+
+#gallery3_nav_wrapper {
+  width: 880px;
+  padding-left: 0;
+  margin-bottom: 40px;
+  margin-left: 35px;
+  #gallery3_nav {
+    img {
+      /*width: 100%;*/
+      border: 1px solid transparent;
+    }
+  }
+
+}
+
+// Общие свойства фреймов верхней части и нижней части компонента
+#gallery3_wrapper,
+#gallery3_nav_wrapper
+{
+  .frame {
+    position: relative;
+    cursor: pointer;
+    .name {
+      background-color: rgba(103, 102, 102, 0.0);
+      width: 187px;
+      height: 50px;
+      position: absolute;
+      bottom: 0;
+      z-index: 1000;
+      font-size: 16px;
+      color: rgba(255, 255, 255, 0.0);
+      padding: 5px;
+      line-height: 18px;
+
+      -webkit-transition: all .2s ease-out;
+      -moz-transition: all .2s ease-out;
+      -ms-transition: all .2s ease-out;
+      -o-transition: all .2s ease-out;
+      transition: all .2s ease-out;
+
+    }
+  }
+}
+
+// Немного поправим свойства фрейма верхней части компонента
+#gallery3_wrapper {
+  .frame {
+    .name {
+      width: 841px;
+      color: rgba(255, 255, 255, 1.0);
+      background-color: rgba(103, 102, 102, 1.0);
+    }
+  }
+}

data/app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item.scss

@@ -0,0 +1 @@
+@import "stroitelnye_materialy_item/*";

data/app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_button_order.scss

@@ -0,0 +1,8 @@
+div#div_button_order {
+  /*background-color: rgba(0, 255, 0, 0.08);*/
+  float: left;
+  width: 139px;
+  min-height: 61px;
+  border-right: 1px solid #cacaca;
+  padding-top: 10px; /*выравниваем по нижнему краю мелких картинок возможной галереи, той, что справа*/
+}

data/app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_comments.scss

@@ -0,0 +1,8 @@
+div.comments.c80_estate_area {
+  clear: both;
+
+  form.active_admin_comment {
+    margin: 10px 0 0 0 !important;
+  }
+
+}

data/app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_common_props.scss

@@ -0,0 +1,51 @@
+div#div_common_props {
+  float: left;
+  width: 100%;
+  clear: both;
+
+  table {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    width: 621px;
+
+    tr {
+
+      td {
+        min-height: 39px;
+        margin: 0;
+        padding: 9px 7px 9px 7px;
+        font-size: 16px;
+        color: #767676;
+      }
+
+      span.ptitle {
+        display: inline-block;
+        max-width: 220px;
+      }
+
+      &.p0 {
+
+        td {
+          box-shadow: 0px -19px 17px -8px rgba(0, 0, 0, 0.12) inset,
+          0 17px 17px -8px rgba(0, 0, 0, 0.12) inset;
+
+          -o-box-shadow: 0px -19px 17px -8px rgba(0, 0, 0, 0.12) inset,
+          0 17px 17px -8px rgba(0, 0, 0, 0.12) inset;
+
+          -ms-box-shadow: 0px -19px 17px -8px rgba(0, 0, 0, 0.12) inset,
+          0 17px 17px -8px rgba(0, 0, 0, 0.12) inset;
+
+          -moz-box-shadow: 0px -19px 17px -8px rgba(0, 0, 0, 0.12) inset,
+          0 17px 17px -8px rgba(0, 0, 0, 0.12) inset;
+
+          -webkit-box-shadow: 0px -19px 17px -8px rgba(0, 0, 0, 0.12) inset,
+          0 17px 17px -8px rgba(0, 0, 0, 0.12) inset;
+        }
+
+      }
+
+    }
+
+  }
+}

data/app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_desc.scss

@@ -0,0 +1,10 @@
+div#div_desc {
+  width: 100%;
+  float: left;
+  margin-top: 20px;
+  font-size: 15px;
+  min-height: 20px;
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: hidden;
+}

data/app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_main.scss

@@ -0,0 +1,151 @@
+$gallery_block_width: 320px;
+$gallery_wrapper_margin_left: 45px;
+$gallery_frame_width: 310px;
+$gallery_frame_height: 188px;
+
+body.admin_areas.show {
+
+  h4 {
+    background-color: transparent !important;
+    background-image: none !important;
+    text-shadow: none !important;
+    border: none !important;
+    box-shadow: none !important;
+    line-height: 30px !important;
+    color: #484444 !important;
+    padding: 5px 10px 3px 0;
+    font-size: 24px;
+    clear: both;
+  }
+
+}
+
+div#div_main_show_area {
+  width: 1085px;
+  border-right: 1px solid #C2C2C2;
+  float: left;
+
+  a {
+    display: block;
+    float: left;
+    margin-right: 30px;
+    width: calc(621px * 0.7);
+    height: calc(377px * 0.7);
+    border: 3px solid #F2F2F2;
+
+    img {
+      /*background-color: #ffffff;*/
+      max-width: 100% !important;
+      display: block !important;
+      padding: 5px;
+      margin: 0 auto;
+    }
+  }
+
+  div#main_props {
+    float: left;
+    overflow: hidden;
+
+    ul {
+      list-style: none;
+      margin: 0;
+      padding: 0;
+
+      li {
+
+        abbr {
+          font-size: 16px;
+        }
+
+        span {
+          font-size: 16px;
+          line-height: 25px;
+
+          &.atype_badge {
+            /*white-space: nowrap;
+            border-radius: 3px;
+            background-color: #74b1b2;
+            color: white;
+            font-weight: bold;
+            padding: 5px;
+            display: inline-block;*/
+          }
+
+          &.ptitle {
+            color: #288feb;
+          }
+
+          &.puom {
+            color: #727272;
+          }
+
+        }
+      }
+    }
+  }
+
+}
+
+div#gallery_block {
+  float: left;
+  /*background-color: rgba(10, 110, 20, 0.08);*/
+  width: $gallery_block_width;
+  margin-bottom: -20px;
+
+  #gallery3_wrapper {
+    height: $gallery_frame_height;
+    margin: 0 0 10px $gallery_wrapper_margin_left;
+
+    #gallery3 {
+      width: $gallery_frame_width;
+
+      .frame {
+        height: $gallery_frame_height;
+        .img-holder {
+          width: $gallery_frame_width;
+          height: $gallery_frame_height;
+        }
+        .name {
+          display: none;
+        }
+      }
+
+      button {
+        opacity: 0;
+        visibility: hidden;
+      }
+
+    }
+
+  }
+
+  #gallery3_nav_wrapper {
+    width: 337px;
+    margin-left: $gallery_wrapper_margin_left;
+    margin-bottom: -100px;
+
+    #gallery3_nav {
+      margin-bottom: 10px !important;
+      .frame {
+        .img-holder {
+          width: 94px;
+          img {
+            width: 94px;
+          }
+          .name {
+            display: none;
+          }
+        }
+
+      }
+    }
+
+    a#goto_gallery {
+      float: right;
+      margin-right: 13px;
+      text-decoration: underline;
+    }
+  }
+
+}
+