tmatt_cms 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07f504b4e24b7606d32152bc9fc78f10dc9f8c0d
-  data.tar.gz: 5ee1622aa689a5a780b6d94899645bf5e4763b06
+  metadata.gz: fc96eaec80f30bf401a732a6c93ab047649d2ff9
+  data.tar.gz: b3120484c9bf945c935be734993b77f3bfb1da4f
 SHA512:
-  metadata.gz: 5da7e66548d29ff65a11ffd630a84290f9358ed74eede4741bfa44b25f8a78e88c794cdee0bc05f9936cccb8f0d0361b735bffb5508e7c870211629b52779e0e
-  data.tar.gz: d100307ad8e57bec3575543aff1c85d05e59d3d692676cc6d777416f8c8ddac3309f0984b47e6bd35f333982716df86b13a18f64ae7a2bc9292b2031822c706d
+  metadata.gz: 9ce881c0f3d977ce626238df679b1c754530d584b63a63b634854dfcb67592df1768de35a627286c37b2240434a99597a8cca9a5e993f6672c4a1705099d981f
+  data.tar.gz: 7715d1eb2a9a47d6aa4d7f00a168bb2695787feeb2e9b08c46e9d8b9be7750d7d5dbc7e5fd2c0ed6953a5aa00391a60c5817594ff19590c412261f5e53e50ab6

data/lib/generators/tmatt_cms/install_generator.rb

@@ -198,21 +198,6 @@ module TmattCms
         end
       end
 
-      # def config_paperclip
-      #   filename = 'config/environments/development.rb'
-      #   if File.readlines(filename).grep(/Paperclip/).size == 0
-      #     line_count = get_line_count filename
-      #     insert_at_line(filename, line_count - 1, ["\n\t#Paperclip.options[:command_path] = '/usr/local/bin/'"])
-      #   end
-      #
-      #
-      #   filename = 'config/environments/production.rb'
-      #   if File.readlines(filename).grep(/Paperclip/).size == 0
-      #     line_count = get_line_count filename
-      #     insert_at_line(filename, line_count - 1, ["\n\t#Paperclip.options[:command_path] = '/usr/bin/'"])
-      #   end
-      # end
-
       def config_jasny_bootstrap
         copy_file 'css/utils/jasny-bootstrap.min.css', 'app/assets/stylesheets/utils/jasny-bootstrap.min.css'
         copy_file 'js/utils/jasny-bootstrap.min.js', 'app/assets/javascripts/utils/jasny-bootstrap.min.js'
@@ -226,7 +211,17 @@ module TmattCms
         end
       end
 
+      def config_head
+        copy_file 'views/application/_head.html.haml', 'app/views/application/_head.html.haml'
+        copy_file 'views/application/_head_dashboard.html.haml', 'app/views/application/_head_dashboard.html.haml'
+      end
+
+      def config_footer
+        copy_file 'views/application/_footer.html.haml', 'app/views/application/_footer.html.haml'
+      end
+
       def add_dashboard
+        copy_file 'css/layouts/dashboard.css.scss', 'app/assets/stylesheets/layouts/dashboard.css.scss'
         copy_file 'views/dashboard/partial/_sidebar.html.haml', 'app/views/dashboard/partial/_sidebar.html.haml'
         copy_file 'views/layouts/dashboard.html.haml', 'app/views/layouts/dashboard.html.haml'
 
@@ -298,6 +293,10 @@ module TmattCms
         copy_file 'config/initializers/carrier_wave.rb', 'config/initializers/carrier_wave.rb'
       end
 
+      def config_turbolinks
+        copy_file 'js/utils/turbolinks.js', 'app/assets/javascripts/utils/turbolinks.js'
+      end
+
       private
 
       def get_line_count(filename)

data/lib/generators/tmatt_cms/templates/concerns/pretty_url.rb

@@ -23,10 +23,18 @@ module PrettyUrl
   private
   def update_url_name
     if I18n.locale == :en
-      if self.has_attribute?(:name) || self.translations.first.has_attribute?(:name)
+      if self.has_attribute?(:name)
         self.update_column :url_name, "#{name.to_url}-#{id}"
-      elsif self.has_attribute?(:title) || self.translations.first.has_attribute?(:title)
+
+      elsif self.has_attribute?(:title)
+        self.update_column :url_name, "#{title.to_url}-#{id}"
+
+      elsif self.translations.first.has_attribute?(:name)
+        self.update_column :url_name, "#{name.to_url}-#{id}"
+
+      elsif self.translations.first.has_attribute?(:title)
         self.update_column :url_name, "#{title.to_url}-#{id}"
+
       else
         self.update_column :url_name, self.id
       end

data/lib/generators/tmatt_cms/templates/css/layouts/dashboard.css.scss

@@ -0,0 +1,61 @@
+.dashboard {
+  @media (min-width: $screen-md) {
+    #main {
+      padding: 0 0 0 300px;
+    }
+  }
+
+  @media (max-width: $screen-md - 1) {
+
+    .navmenu.navmenu-default.navmenu-fixed-left.offcanvas-sm {
+      z-index:100;
+      left: -300px;
+    }
+
+    .navbar-toggle {
+      display: block !important;
+    }
+  }
+
+  .navbar.navbar-default.navbar-fixed-top.hidden-md.hidden-lg {
+    z-index:90;
+  }
+
+  form {
+    .control-label {
+      text-align: left !important;
+    }
+  }
+
+  li:hover {
+    ul {
+      color: $orange !important;
+      margin-left: 0 !important;
+    }
+    cursor: pointer;
+  }
+
+  li {
+    a {
+      span {
+        color: $gray;
+      }
+    }
+
+    a.visited {
+      span {
+        color: $orange !important;
+      }
+    }
+
+    a.active {
+      @extend .font-bold;
+      color: $orange !important;
+
+      span {
+        @extend .font-bold;
+        color: $orange !important;
+      }
+    }
+  }
+}

data/lib/generators/tmatt_cms/templates/css/style.css.scss

@@ -33,7 +33,7 @@ img { max-width: 100%; }
 ul {
   &.fa-ul li {
     margin-bottom: $gutter/2.5;
-    .fa { margin-right: 5px; }
+    .fa { margin-right: .5rem; }
   }
 }
 
@@ -45,7 +45,7 @@ ul, li {
 
 ol, ul {
   margin-top: 0;
-  margin-bottom: 10px;
+  margin-bottom: 1rem;
 }
 
 
@@ -73,17 +73,36 @@ a:visited, a:hover, a:active, a:focus {
 
 hr {
   margin: $gutter 0;
-  border-top: 1px solid $light-gray;
+  border-top: .1rem solid $light-gray;
 }
 
 mark { background: none; color: $font-highlight-color; }
 abbr[title] { border: 0; }
 
+#main {
+  transition: .3s;
+}
+
+.main-blur {
+  @include blur_image(.1rem);
+}
+
+.main-no-blur {
+  @include blur_image(0);
+}
+
 .block { display:block; }
 .inline-block { display:inline-block; }
 .relative { position:relative; }
 .absolute { position:absolute; }
 
+.full {
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
 .overflow-h { overflow: hidden }
 
 .no-scroll { position: fixed; overflow-y:scroll }
@@ -271,6 +290,7 @@ abbr[title] { border: 0; }
 .text-orange { color: $orange !important; }
 .text-blue { color: $blue !important; }
 .text-grey { color: $gray; }
+.text-light-grey { color: $light-gray; }
 
 .pull-none { float: none; }
 .media > .pull-left { margin-right: $gutter*2; }
@@ -280,7 +300,7 @@ abbr[title] { border: 0; }
 .float_r { float: right; }
 
 .btn {
-  border-radius: .4rem;
+  border-radius: 0;
   border: .1rem solid $black;
 }
 
@@ -309,7 +329,7 @@ abbr[title] { border: 0; }
 .table-cell { display:table-cell; }
 
 .bg-blur {
-  @include blur_image(10px);
+  @include blur_image(1rem);
 }
 
 .cover-black:after {
@@ -331,16 +351,19 @@ abbr[title] { border: 0; }
 }
 
 .image-bg {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
+  position: absolute !important;
+  top: -2rem;
+  right: -2rem;
+  bottom: -2rem;
+  left: -2rem;
   overflow: hidden;
+  z-index: $cover-image-index !important;
 }
 
 .cover-image {
-  background-repeat: no-repeat;background-size: cover;
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-position: center center;
 }
 
 .fa-lg {

data/lib/generators/tmatt_cms/templates/gemfile/Gemfile

@@ -136,4 +136,7 @@ gem 'material_icons'
 # Froala
 gem 'wysiwyg-rails'
 
-gem 'aws-sdk', '~> 2'
+gem 'aws-sdk', '~> 2'
+
+gem 'turbolinks', '~> 5.0.0'
+gem 'jquery-turbolinks'

data/lib/generators/tmatt_cms/templates/js/application.js

@@ -14,6 +14,7 @@
 //= require h5bp
 //= require respond
 //= require jquery
+//= require jquery.turbolinks
 //= require jquery_ujs
 //= require jquery-ui
 //= require bootstrap
@@ -23,6 +24,8 @@
 //= require utils/body_util
 //= require utils/action_alert
 //= require utils/froala_editor
+//= require utils/magnificPopup
+//= require utils/turbolinks
 //= require froala_editor.min.js
 //= require plugins/align.min.js
 //= require plugins/colors.min.js
@@ -45,3 +48,4 @@
 //= require plugins/url.min.js
 //= require plugins/video.min.js
 //= require languages/zh_cn.js
+//= require turbolinks

data/lib/generators/tmatt_cms/templates/js/utils/action_alert.js

@@ -1,4 +1,4 @@
-$(function() {
+$(document).on('turbolinks:load', function() {
   var action_alert = $('.action-alert');
   var action_alert_count = action_alert.length;
 
@@ -14,19 +14,20 @@ $(function() {
       // $("#action_alert_audio")[0].play();
     }
   }, 200);
+});
 
-  var action_alert_close = action_alert.find('.close');
-  action_alert_close.click(function(e) {
-    var alert = $(this).parent('.action-alert');
-    var select_bottom = parseFloat(alert.css('bottom')) / 10;
-    var select_height = parseFloat(alert.css('height')) / 10;
-    $(this).parent('.action-alert').animate({bottom: -1 * select_height - 5 + 'rem'});
 
-    $.each(action_alert, function() {
-      var bottom = parseFloat($(this).css('bottom')) / 10;
-      if (bottom > select_bottom ) {
-        $(this).animate({bottom: bottom - select_height - 1 + 'rem'});
-      }
-    })
-  })
+$(document).on('click', '.action-alert-close', function() {
+  var alert = $(this).parent('.action-alert');
+  var select_bottom = parseFloat(alert.css('bottom')) / 10;
+  var select_height = parseFloat(alert.css('height')) / 10;
+  alert.animate({bottom: -1 * select_height - 5 + 'rem'});
+
+  var action_alert = $('.action-alert');
+  $.each(action_alert, function() {
+    var bottom = parseFloat($(this).css('bottom')) / 10;
+    if (bottom > select_bottom ) {
+      $(this).animate({bottom: bottom - select_height - 1 + 'rem'});
+    }
+  });
 });

data/lib/generators/tmatt_cms/templates/js/utils/body_util.js

@@ -2,7 +2,7 @@
  * Created by Charlie on 17/05/2017.
  */
 function lockScrollAndGetScrollTop() {
-  $('body').css('top', -(document.documentElement.scrollTop) + 'px')
+  $('body').css('top', ( $(document).scrollTop()) + 'px')
       .addClass('no-scroll');
 }
 

data/lib/generators/tmatt_cms/templates/js/utils/froala_editor.js

@@ -1,5 +1,5 @@
 
-$(function() {
+$(document).on('turbolinks:load', function() {
   var froala_editor = $('.froala-editor');
 
   if (froala_editor.length > 0) {

data/lib/generators/tmatt_cms/templates/js/utils/magnificPopup.js

@@ -2,15 +2,23 @@
  * Created by Charlie on 20/12/2016.
  */
 
-$(function() {
-    $('.open-popup-link').magnificPopup({
-        removalDelay: 500,
-        type:'inline',
-        midClick: true,
-        callbacks: {
-            beforeOpen: function() {
-                this.st.mainClass = this.st.el.attr('data-effect');
-            }
-        }
-    });
+$(document).on('turbolinks:load', function() {
+  $('.open-popup-link').magnificPopup({
+    removalDelay: 500,
+    type: 'inline',
+    midClick: true,
+    callbacks: {
+      beforeOpen: function () {
+        this.st.mainClass = this.st.el.attr('data-effect');
+        $('.navbar').hide().css({top: '-100px'});
+      },
+      close: function () {
+        $('.navbar').show();
+        setTimeout(function() {
+          $('.navbar').css({top: '0'});
+        }, 1);
+
+      }
+    }
+  });
 });

data/lib/generators/tmatt_cms/templates/js/utils/turbolinks.js

@@ -0,0 +1,14 @@
+$(document).on('turbolinks:request-start', function() {
+  $('#main').removeClass('main-no-blur').addClass('main-blur');
+  $('#footer').removeClass('main-no-blur').addClass('main-blur');
+});
+
+$(document).on('turbolinks:load', function() {
+  var main = $('#main');
+  var footer = $('#footer');
+
+  setTimeout(function() {
+    main.removeClass('main-blur').addClass('main-no-blur');
+    footer.removeClass('main-blur').addClass('main-no-blur');
+  }, 300);
+});

data/lib/generators/tmatt_cms/templates/views/application/_footer.html.haml

@@ -0,0 +1 @@
+%footer#footer.main-blur

data/lib/generators/tmatt_cms/templates/views/application/_head.html.haml

@@ -0,0 +1,58 @@
+%head
+  /[if lt IE 9]
+<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+  %meta{:charset => 'UTF-8'}
+  /[if IE]
+<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
+  - if current_page?(root_url)
+    - @title_tag = 'Tmatt Technology'
+  - else
+    - @title_tag = 'Tmatt Technology'
+  = display_meta_tags site: @title_tag,
+                      keywords: '',
+                      description: '',
+                      separator: '|',
+                      reverse: true
+
+  %meta{content: 'Tmatt Tech', :name => 'author'}
+  %meta{content: 'google-site-verification', :name => 'google-site-verification'}
+  %meta{:content => 'Copyright Brand #{Date.today.year}. All Rights Reserved.', :name => 'Copyright'}
+
+  -#%meta{:content => 'no-preview', :name => 'turbolinks-cache-control'}/
+
+  %meta{name:'viewport', content:'width=device-width, initial-scale=1'}
+  :javascript
+    (function(doc) {
+      viewport = document.querySelector("meta[name=viewport]");
+      if ( navigator.userAgent.match(/iPhone/i) || navigator.userAgent.match(/iPod/i) ) {
+        viewport.setAttribute('content', 'width=device-width, initial-scale=1');
+      } else if ( navigator.userAgent.match(/iPad/i) ) {
+        viewport.setAttribute('content', 'width=device-width, initial-scale=1');
+      } else if ( navigator.userAgent.match(/Android/i) ) {
+        viewport.setAttribute('content', 'width=900, initial-scale=1');
+      }
+    }(document));
+
+  %link{:href => '/favicon.ico', :rel => 'shortcut icon'}
+  %link{href: '/apple-touch-icon.png', rel: 'apple-touch-icon'}
+  %link{href: '/apple-touch-icon-57x57.png', rel: 'apple-touch-icon', sizes: '57x57'}
+  %link{href: '/apple-touch-icon-72x72.png', rel: 'apple-touch-icon', sizes: '72x72'}
+  %link{href: '/apple-touch-icon-76x76.png', rel: 'apple-touch-icon', sizes: '76x76'}
+  %link{href: '/apple-touch-icon-114x114.png', rel: 'apple-touch-icon', sizes: '114x114'}
+  %link{href: '/apple-touch-icon-120x120.png', rel: 'apple-touch-icon', sizes: '120x120'}
+  %link{href: '/apple-touch-icon-144x144.png', rel: 'apple-touch-icon', sizes: '144x144'}
+  %link{href: '/apple-touch-icon-152x152.png', rel: 'apple-touch-icon', sizes: '152x152'}
+  / %link{href: "http://fonts.googleapis.com/css?family=Open+Sans:300,400,700", rel: "stylesheet", type: "text/css"}
+
+  = render 'stylesheets'
+  = javascript_include_tag 'polyfills'
+
+  = render 'javascripts'
+  = yield :js
+  = yield :custom_javascripts
+
+  = csrf_meta_tag
+
+  /[if lt IE 9]
+<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+

data/lib/generators/tmatt_cms/templates/views/application/_head_dashboard.html.haml

@@ -0,0 +1,61 @@
+%head
+  /[if lt IE 9]
+<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+  %meta{:charset => 'UTF-8'}
+  /[if IE]
+<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
+  - if current_page?(root_url)
+    - @title_tag = 'Tmatt Technology'
+  - else
+    - @title_tag = 'Tmatt Technology'
+  = display_meta_tags site: @title_tag,
+                      keywords: '',
+                      description: '',
+                      separator: '|',
+                      reverse: true
+
+  %meta{content: 'Tmatt Tech', :name => 'author'}
+  %meta{content: 'google-site-verification', :name => 'google-site-verification'}
+  %meta{:content => 'Copyright Brand #{Date.today.year}. All Rights Reserved.', :name => 'Copyright'}
+
+  -#%meta{:content => 'no-preview', :name => 'turbolinks-cache-control'}/
+
+  %meta{name:'viewport', content:'width=device-width, initial-scale=1'}
+  :javascript
+    (function(doc) {
+      viewport = document.querySelector("meta[name=viewport]");
+      if ( navigator.userAgent.match(/iPhone/i) || navigator.userAgent.match(/iPod/i) ) {
+        viewport.setAttribute('content', 'width=device-width, initial-scale=1');
+      } else if ( navigator.userAgent.match(/iPad/i) ) {
+        viewport.setAttribute('content', 'width=device-width, initial-scale=1');
+      } else if ( navigator.userAgent.match(/Android/i) ) {
+        viewport.setAttribute('content', 'width=900, initial-scale=1');
+      }
+    }(document));
+
+  %link{:href => '/favicon.ico', :rel => 'shortcut icon'}
+  %link{href: '/apple-touch-icon.png', rel: 'apple-touch-icon'}
+  %link{href: '/apple-touch-icon-57x57.png', rel: 'apple-touch-icon', sizes: '57x57'}
+  %link{href: '/apple-touch-icon-72x72.png', rel: 'apple-touch-icon', sizes: '72x72'}
+  %link{href: '/apple-touch-icon-76x76.png', rel: 'apple-touch-icon', sizes: '76x76'}
+  %link{href: '/apple-touch-icon-114x114.png', rel: 'apple-touch-icon', sizes: '114x114'}
+  %link{href: '/apple-touch-icon-120x120.png', rel: 'apple-touch-icon', sizes: '120x120'}
+  %link{href: '/apple-touch-icon-144x144.png', rel: 'apple-touch-icon', sizes: '144x144'}
+  %link{href: '/apple-touch-icon-152x152.png', rel: 'apple-touch-icon', sizes: '152x152'}
+  / %link{href: "http://fonts.googleapis.com/css?family=Open+Sans:300,400,700", rel: "stylesheet", type: "text/css"}
+
+  = stylesheet_link_tag 'utils/jasny-bootstrap.min'
+
+  = render 'stylesheets'
+  = javascript_include_tag 'polyfills'
+
+  = render 'javascripts'
+  = yield :js
+  = yield :custom_javascripts
+  = javascript_include_tag 'utils/jasny-bootstrap.min'
+
+  = csrf_meta_tag
+
+  /[if lt IE 9]
+    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+

data/lib/generators/tmatt_cms/templates/views/layouts/application.html.haml

@@ -1,14 +1,14 @@
 !!!
 - html_tag class: 'no-js', lang: 'en' do
+
   = render 'head'
+
   %body{ class: "#{controller.controller_name} #{controller.action_name}" }
-    #main
+    #main.main-blur
       = render 'chromeframe'
+
       = render 'header'
       = flash_tag
       = yield
-    = render 'footer'
 
-    = render 'javascripts'
-    = yield :js
-    = yield :custom_javascripts
+    = render 'footer'

data/lib/generators/tmatt_cms/templates/views/layouts/dashboard.html.haml

@@ -1,19 +1,16 @@
 !!!
+- html_tag class: 'no-js', lang: 'en' do
 
-- content_for :custom_stylesheets do
-  = stylesheet_link_tag 'utils/jasny-bootstrap.css'
+  = render 'head_dashboard'
 
-- html_tag class: 'no-js', lang: 'en' do
-  = render 'head'
-  %body{ class: "#{controller.controller_name} #{controller.action_name} dashboard #{('admin' if admin_user_signed_in?)}" }
-    #main
+  %body{ class: "#{controller.controller_name} #{controller.action_name} dashboard #{('admin' if admin_signed_in?)}" }
+    #main.main-blur
       = render 'chromeframe'
 
       = render 'dashboard/partial/sidebar'
-      .padd-side-lg
+      = flash_tag
+      .padd.hidden-xs.hidden-md.hidden-lg
+      .padd-2
         = yield
 
-    = render 'javascripts'
-    = yield :js
-    = yield :custom_javascripts
-    = javascript_include_tag 'utils/jasny-bootstrap.js'
+

data/lib/tmatt_cms/version.rb

@@ -1,3 +1,3 @@
 module TmattCms
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmatt_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Xingyu Ye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - lib/generators/tmatt_cms/templates/css/application/mixin.css.scss
 - lib/generators/tmatt_cms/templates/css/application/variables.css.scss
 - lib/generators/tmatt_cms/templates/css/application/z_index.css.scss
+- lib/generators/tmatt_cms/templates/css/layouts/dashboard.css.scss
 - lib/generators/tmatt_cms/templates/css/layouts/footer.css.scss
 - lib/generators/tmatt_cms/templates/css/layouts/form.css.scss
 - lib/generators/tmatt_cms/templates/css/layouts/header.css.scss
@@ -116,7 +117,11 @@ files:
 - lib/generators/tmatt_cms/templates/js/utils/froala_editor.js
 - lib/generators/tmatt_cms/templates/js/utils/jasny-bootstrap.min.js
 - lib/generators/tmatt_cms/templates/js/utils/magnificPopup.js
+- lib/generators/tmatt_cms/templates/js/utils/turbolinks.js
 - lib/generators/tmatt_cms/templates/seed_bank/all.seeds.rb
+- lib/generators/tmatt_cms/templates/views/application/_footer.html.haml
+- lib/generators/tmatt_cms/templates/views/application/_head.html.haml
+- lib/generators/tmatt_cms/templates/views/application/_head_dashboard.html.haml
 - lib/generators/tmatt_cms/templates/views/dashboard/partial/_sidebar.html.haml
 - lib/generators/tmatt_cms/templates/views/layouts/application.html.haml
 - lib/generators/tmatt_cms/templates/views/layouts/dashboard.html.haml