optimacms 0.2.21 → 0.2.22

data/app/assets/stylesheets/optimacms/tpl.scss

@@ -1,309 +1,309 @@
-
-/* html */
-html,
-body {
-  height: 100%;
-}
-
-/* Wrapper for page content to push down footer */
-#wrapper {
-  min-height: 100%;
-  height: auto !important;
-  height: 100%;
-
-  /* Negative indent footer by its height */
-  margin: 0 auto 20px;
-  /* Pad bottom by footer height */
-  padding: 0 0 0px;
-}
-
-
-
-
-/* main layout */
-#topbar{
-  background-color: $col-blue-1;
-
-  a{
-    color: #ffffff;
-  }
-
-  ul.nav{
-    a{
-      color: $gray;
-    }
-  }
-}
-
-
-// solution 1
-
-.main-container:before {
-    background-color: #ffffff;
-    bottom: 0;
-    content: "";
-    display: block;
-    max-width: inherit;
-    position: absolute;
-    top: 0;
-    width: 100%;
-    z-index: -2;
-}
-
-
-.main-content:before, .main-content:after {
-    content: " ";
-    display: table;
-}
-.main-content:after {
-    clear: both;
-}
-.main-content:before, .main-content:after {
-    content: " ";
-    display: table;
-}
-
-.main-content {
-    min-height: 100%;
-    padding: 0;
-}
-
-
-.main-content-inner {
-    float: left;
-    width: 100%;
-}
-
-.sidebar {
-  float: left;
-  padding-left: 0;
-  padding-right: 0;
-  position: static;
-  width: 240px;
-  min-height1:600px;
-}
-
-
-.sidebar:before {
-  background-color: inherit;
-  border-color: inherit;
-  border-style: inherit;
-  border-width: inherit;
-  bottom: 0;
-  content: "";
-  display: block;
-  position: absolute;
-  top: 0;
-  width: inherit;
-  z-index: -1;
-}
-
-.sidebar + .main-content {
-    margin-left: 240px;
-}
-
-
-
-.page-content {
-    background-color: #ffffff;
-    margin: 0;
-    position: relative;
-}
-
-
-.page-content{
-  padding: 0px 14px 20px 24px;
-}
-
-
-
-/* Set the fixed height of the footer here */
-#footer {
-    min-height: 60px;
-    background: none repeat scroll 0 0 #272727;
-    padding: 40px 0;
-    color: #dedede;
-
-    a {
-      margin: 0 2px;
-      font-size:13px;
-      color: $gray-light;
-      text-decoration: underline;
-
-      &:hover{
-        color:$gray-lighter;
-      }
-    }
-
-
-    .t{
-      color: #ffffff;
-    }
-
-    #footer-socials {
-      margin-top: 12px;
-      text-align: left;
-
-      li a {
-        color: #777777;
-        font-size: 17px;
-      }
-
-    }
-
-}
-
-
-/* common */
-
-.clear{
-  clear:both;
-}
-
-.pad20{
-  padding:20px;
-}
-
-
-/* nav list */
-
-ul.nav-list{
-  list-style-type: none;
-  padding-left: 0;
-
-  font-size: 13px;
-
-
-  > li {
-    a {
-      background-color: #ececec;
-      border-top: 1px solid #dfdfdf;
-      color: #555555;
-      display: block;
-      padding: 10px 0 10px 15px;
-      position: relative;
-
-      &:hover {
-        background-color: #f1f1f1;
-        text-decoration: none;
-      }
-
-      > .arrow {
-        display: block;
-        font-size: 18px;
-        height: 14px;
-        line-height: 14px;
-        padding: 0;
-        position: absolute;
-        right: 10px;
-        text-align: center;
-        text-shadow: none;
-        top: 12px;
-        width: 14px !important;
-      }
-
-    }
-
-    a[aria-expanded="false"]{
-      > .arrow{
-        &.for-expanded{
-          display:none;
-        }
-        &.for-collapsed{
-          display:block;
-        }
-      }
-    }
-
-    a[aria-expanded="true"]{
-      > .arrow{
-        &.for-expanded{
-          display:block;
-        }
-        &.for-collapsed{
-          display:none;
-        }
-      }
-    }
-
-  }
-
-  > li.active {
-    > a {
-      background-color: #dfdfdf;
-      font-weight: 700;
-    }
-  }
-
-  > li:first-child{
-    > a {
-      border-top: medium none;
-    }
-  }
-
-  .submenu {
-    padding-left: 0;
-    position: relative;
-
-    li{
-      a {
-        padding-left: 19px;
-      }
-    }
-
-    li.active {
-      a {
-        font-weight: 700;
-      }
-    }
-
-  }
-
-}
-
-
-
-/* page-header */
-
-.page-header{
-  margin-top: 12px;
-  margin-bottom: 12px;
-
-  border-bottom: 1px solid #e2e2e2;
-
-  h1{
-    margin: 0 8px 0px 0px;
-    color: $col-blue-2;
-    font-size: 24px;
-    font-weight: lighter;
-    padding: 0;
-
-    small {
-      color: $col-blue-4;
-      font-size: 14px;
-      font-weight: 400;
-      margin: 0 6px;
-    }
-  }
-}
-
-
-/* breadcrumbs */
-
-div.breadcrumbs{
-  background-color: $gray-light-light;
-  border-bottom: 1px solid #e5e5e5;
-  line-height: 30px;
-  min-height: 35px;
-  padding: 4px 0px 4px 0;
-  position: relative;
-  z-index: auto;
-  font-size: 13px;
-
-  ul.breadcrumb{
-    margin-bottom:0px;
-  }
-}
-
-
-
+
+/* html */
+html,
+body {
+  height: 100%;
+}
+
+/* Wrapper for page content to push down footer */
+#wrapper {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+
+  /* Negative indent footer by its height */
+  margin: 0 auto 20px;
+  /* Pad bottom by footer height */
+  padding: 0 0 0px;
+}
+
+
+
+
+/* main layout */
+#topbar{
+  background-color: $col-blue-1;
+
+  a{
+    color: #ffffff;
+  }
+
+  ul.nav{
+    a{
+      color: $gray;
+    }
+  }
+}
+
+
+// solution 1
+
+.main-container:before {
+    background-color: #ffffff;
+    bottom: 0;
+    content: "";
+    display: block;
+    max-width: inherit;
+    position: absolute;
+    top: 0;
+    width: 100%;
+    z-index: -2;
+}
+
+
+.main-content:before, .main-content:after {
+    content: " ";
+    display: table;
+}
+.main-content:after {
+    clear: both;
+}
+.main-content:before, .main-content:after {
+    content: " ";
+    display: table;
+}
+
+.main-content {
+    min-height: 100%;
+    padding: 0;
+}
+
+
+.main-content-inner {
+    float: left;
+    width: 100%;
+}
+
+.sidebar {
+  float: left;
+  padding-left: 0;
+  padding-right: 0;
+  position: static;
+  width: 240px;
+  min-height1:600px;
+}
+
+
+.sidebar:before {
+  background-color: inherit;
+  border-color: inherit;
+  border-style: inherit;
+  border-width: inherit;
+  bottom: 0;
+  content: "";
+  display: block;
+  position: absolute;
+  top: 0;
+  width: inherit;
+  z-index: -1;
+}
+
+.sidebar + .main-content {
+    margin-left: 240px;
+}
+
+
+
+.page-content {
+    background-color: #ffffff;
+    margin: 0;
+    position: relative;
+}
+
+
+.page-content{
+  padding: 0px 14px 20px 24px;
+}
+
+
+
+/* Set the fixed height of the footer here */
+#footer {
+    min-height: 60px;
+    background: none repeat scroll 0 0 #272727;
+    padding: 40px 0;
+    color: #dedede;
+
+    a {
+      margin: 0 2px;
+      font-size:13px;
+      color: $gray-light;
+      text-decoration: underline;
+
+      &:hover{
+        color:$gray-lighter;
+      }
+    }
+
+
+    .t{
+      color: #ffffff;
+    }
+
+    #footer-socials {
+      margin-top: 12px;
+      text-align: left;
+
+      li a {
+        color: #777777;
+        font-size: 17px;
+      }
+
+    }
+
+}
+
+
+/* common */
+
+.clear{
+  clear:both;
+}
+
+.pad20{
+  padding:20px;
+}
+
+
+/* nav list */
+
+ul.nav-list{
+  list-style-type: none;
+  padding-left: 0;
+
+  font-size: 13px;
+
+
+  > li {
+    a {
+      background-color: #ececec;
+      border-top: 1px solid #dfdfdf;
+      color: #555555;
+      display: block;
+      padding: 10px 0 10px 15px;
+      position: relative;
+
+      &:hover {
+        background-color: #f1f1f1;
+        text-decoration: none;
+      }
+
+      > .arrow {
+        display: block;
+        font-size: 18px;
+        height: 14px;
+        line-height: 14px;
+        padding: 0;
+        position: absolute;
+        right: 10px;
+        text-align: center;
+        text-shadow: none;
+        top: 12px;
+        width: 14px !important;
+      }
+
+    }
+
+    a[aria-expanded="false"]{
+      > .arrow{
+        &.for-expanded{
+          display:none;
+        }
+        &.for-collapsed{
+          display:block;
+        }
+      }
+    }
+
+    a[aria-expanded="true"]{
+      > .arrow{
+        &.for-expanded{
+          display:block;
+        }
+        &.for-collapsed{
+          display:none;
+        }
+      }
+    }
+
+  }
+
+  > li.active {
+    > a {
+      background-color: #dfdfdf;
+      font-weight: 700;
+    }
+  }
+
+  > li:first-child{
+    > a {
+      border-top: medium none;
+    }
+  }
+
+  .submenu {
+    padding-left: 0;
+    position: relative;
+
+    li{
+      a {
+        padding-left: 19px;
+      }
+    }
+
+    li.active {
+      a {
+        font-weight: 700;
+      }
+    }
+
+  }
+
+}
+
+
+
+/* page-header */
+
+.page-header{
+  margin-top: 12px;
+  margin-bottom: 12px;
+
+  border-bottom: 1px solid #e2e2e2;
+
+  h1{
+    margin: 0 8px 0px 0px;
+    color: $col-blue-2;
+    font-size: 24px;
+    font-weight: lighter;
+    padding: 0;
+
+    small {
+      color: $col-blue-4;
+      font-size: 14px;
+      font-weight: 400;
+      margin: 0 6px;
+    }
+  }
+}
+
+
+/* breadcrumbs */
+
+div.breadcrumbs{
+  background-color: $gray-light-light;
+  border-bottom: 1px solid #e5e5e5;
+  line-height: 30px;
+  min-height: 35px;
+  padding: 4px 0px 4px 0;
+  position: relative;
+  z-index: auto;
+  font-size: 13px;
+
+  ul.breadcrumb{
+    margin-bottom:0px;
+  }
+}
+
+
+

data/app/controllers/optimacms/admin/admin_base_controller.rb

@@ -1,45 +1,45 @@
-module Optimacms
-  module Admin
-    class AdminBaseController < ApplicationController
-      before_action :authenticate_cms_admin_user!
-
-
-      layout 'optimacms/admin/layouts/main'
-
-      add_flash_types :success
-
-      helper ApplicationHelper
-      helper FormsHelper
-
-
-      #### modal
-      def set_layout_modal_old
-        if @modal==1
-          self.class.layout false
-        end
-
-      end
-
-
-      ### devise
-
-      def after_sign_in_path_for(resource)
-        if resource.is_a?(CmsAdminUser)
-          dashboard_path
-        else
-          root_path
-        end
-
-      end
-
-
-      ### redirects
-      def redirect_to_res(res)
-        v_res = res ? 1 : 0
-        redirect_to res_common_path(res: v_res)
-      end
-
-    end
-
-  end
+module Optimacms
+  module Admin
+    class AdminBaseController < ApplicationController
+      before_action :authenticate_cms_admin_user!
+
+
+      layout 'optimacms/admin/layouts/main'
+
+      add_flash_types :success
+
+      helper ApplicationHelper
+      helper FormsHelper
+
+
+      #### modal
+      def set_layout_modal_old
+        if @modal==1
+          self.class.layout false
+        end
+
+      end
+
+
+      ### devise
+
+      def after_sign_in_path_for(resource)
+        if resource.is_a?(CmsAdminUser)
+          dashboard_path
+        else
+          root_path
+        end
+
+      end
+
+
+      ### redirects
+      def redirect_to_res(res)
+        v_res = res ? 1 : 0
+        redirect_to res_common_path(res: v_res)
+      end
+
+    end
+
+  end
 end