locomotivecms 3.0.0.rc4 → 3.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b022aa4b532f3b4ab72f8e7218af9f6eb77f834
-  data.tar.gz: 7fa421098346655a1eb58290defc5ffe2d2b1e0f
+  metadata.gz: b2a2386aa3db8dd77dc0413f8e0c24eb8710f2e1
+  data.tar.gz: 587e0c476cdc25aac793826eead3d5b81e1ae5ee
 SHA512:
-  metadata.gz: 4dcd634a7df28ca685eb12c1cd2634d259db84a82a77336bd0abcc600d3e91e685129701ff10503367069c36aa3f2e3cb616bfd0b2f9174fcc11ef18ffb17f8d
-  data.tar.gz: 514754acae872d4b2ea2c0721990885136f0ba305d4e42b84ad0721ff289d0d4ae9d781b0ddff9053ac97d86553c2d1bcd914b4cebca1f72462e2723bfccf963
+  metadata.gz: 707774e1c999222c310e6443c70d0613eecd3ad41a059666e66f3f94169772b7785aa30b0e5d04cbebdd889cb59822c984746e755b79d162692138a4a2185f86
+  data.tar.gz: b2023115a565d4b551437631a636cb649e6b875cc73069de060e9e0d2d2f888b73e4750451be768e65c439fbe76e61277ec617e44b527e90dd5dea8a30d68b53

data/Gemfile

@@ -55,8 +55,8 @@ group :test do
   # gem 'cucumber-rails', require: false
   gem 'simplecov'
 
-  gem 'capybara',             '~> 2.4.4'
-  gem 'poltergeist'
+  gem 'capybara',             '~> 2.5.0'
+  gem 'poltergeist',          '~> 1.8.1'
 
   gem 'grape-entity-matchers'
   gem 'shoulda-matchers',     '2.7.0'

data/app/api/locomotive/api/resources/content_type_resource.rb

@@ -127,9 +127,13 @@ module Locomotive
 
           desc "Delete a content_type"
           params do
-            requires :id, type: String, desc: 'ContentType ID'
+            requires :id, type: String, desc: 'ContentType ID or SLUG'
           end
           delete ':id' do
+            content_type = current_site.content_types.by_id_or_slug(params[:id]).first
+
+            raise ::Mongoid::Errors::DocumentNotFound.new(current_site.content_types, params) if content_type.nil?
+
             authorize content_type, :destroy?
 
             content_type.destroy
@@ -137,6 +141,17 @@ module Locomotive
             present content_type, with: entity_klass
           end
 
+          desc 'Delete all content types'
+          delete '/' do
+            auth :destroy_all?
+
+            number = current_site.content_types.count
+
+            current_site.content_types.destroy_all
+
+            present({ deletions: number })
+          end
+
         end
 
       end

data/app/api/locomotive/api/resources/page_resource.rb

@@ -107,12 +107,17 @@ module Locomotive
             present page, with: entity_klass, site: current_site
           end
 
-          desc "Delete a page"
+          desc 'Delete a page'
           params do
-            requires :id, type: String, desc: 'Page ID'
+            requires :id, type: String, desc: 'Page ID or PATH'
           end
-          delete ':id' do
-            authorize page, :destroy?
+          delete '*id' do
+            page_id_or_fullpath = params[:id].split('.json').first
+            @page = current_site.pages.by_id_or_fullpath(page_id_or_fullpath).first
+
+            raise ::Mongoid::Errors::DocumentNotFound.new(current_site.pages, { id: page_id_or_fullpath }) if page.nil?
+
+            object_auth :destroy?
 
             page.destroy
 

data/app/api/locomotive/api/resources/snippet_resource.rb

@@ -74,16 +74,31 @@ module Locomotive
 
           desc "Delete a snippet"
           params do
-            requires :id, type: String, desc: 'Snippet ID'
+            requires :id, type: String, desc: 'Snippet ID or SLUG'
           end
           delete ':id' do
-            authorize snippet, :destroy?
+            @snippet = current_site.snippets.by_id_or_slug(params[:id]).first
+
+            raise ::Mongoid::Errors::DocumentNotFound.new(current_site.snippets, params) if snippet.nil?
+
+            object_auth :destroy?
 
             snippet.destroy
 
             present snippet, with: entity_klass
           end
 
+          desc 'Delete all snippets'
+          delete '/' do
+            auth :destroy_all?
+
+            number = current_site.snippets.count
+
+            current_site.snippets.destroy_all
+
+            present({ deletions: number })
+          end
+
         end
 
       end

data/app/api/locomotive/api/resources/theme_asset_resource.rb

@@ -87,6 +87,17 @@ module Locomotive
             present theme_asset, with: entity_klass
           end
 
+          desc 'Delete all theme assets'
+          delete '/' do
+            auth :destroy_all?
+
+            number = current_site.theme_assets.count
+
+            current_site.theme_assets.destroy_all
+
+            present({ deletions: number })
+          end
+
         end
 
       end

data/app/api/locomotive/api/resources/translation_resource.rb

@@ -76,9 +76,13 @@ module Locomotive
 
           desc "Delete a translation"
           params do
-            requires :id, type: String, desc: 'Translation ID'
+            requires :id, type: String, desc: 'Translation ID or KEY'
           end
           delete ':id' do
+            @translation = current_site.translations.by_id_or_key(params[:id]).first
+
+            raise ::Mongoid::Errors::DocumentNotFound.new(current_site.translations, params) if translation.nil?
+
             object_auth :destroy?
 
             translation.destroy
@@ -86,6 +90,17 @@ module Locomotive
             present translation, with: entity_klass
           end
 
+          desc 'Delete all translations'
+          delete '/' do
+            auth :destroy_all?
+
+            number = current_site.translations.count
+
+            current_site.translations.destroy_all
+
+            present({ deletions: number })
+          end
+
         end
 
       end

data/app/assets/javascripts/locomotive.js

@@ -10,6 +10,7 @@
 //= require bootstrap-sprockets
 //= require underscore/underscore
 //= require backbone/backbone
+//= require bootstrap-tagsinput/bootstrap-tagsinput
 //= require codemirror
 //= require codemirror/modes/markdown
 //= require select2

data/app/assets/javascripts/locomotive/{not_logged_in.js.coffee → account.js.coffee}

@@ -1,4 +1,5 @@
 #= require jquery
+#= require jquery_ujs
 #= require_self
 #= require underscore/underscore
 #= require locomotive/bootstrap-notify

data/app/assets/javascripts/locomotive/views/shared/form_view.js.coffee

@@ -44,10 +44,10 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
       @$('#active_tab').val(tab_name)
 
   change_state: ->
-    @$('form button[type=submit]').button('loading')
+    @$('form button[type=submit], form input[type=submit]').button('loading')
 
   reset_state: ->
-    @$('form button[type=submit]').button('reset')
+    @$('form button[type=submit], form input[type=submit]').button('reset')
 
   save: (event) ->
     @change_state()

data/app/assets/stylesheets/locomotive/{unauthorized.scss → account.scss}

@@ -1,14 +1,14 @@
 // =============================================================================
-// Unauthorized
+// Account
 // =============================================================================
 
 // Stylesheet for all un-authorized pages like register, sign in, ...
 
 // Core variables and mixins
 
-@import "unauthorized/variables";
+@import "account/variables";
 @import "bootstrap/mixins";
-@import "unauthorized/keyframes";
+@import "account/keyframes";
 
 // Reset and dependencies
 
@@ -19,9 +19,8 @@
 // Core CSS
 
 @import "bootstrap/scaffolding";
-@import "unauthorized/type";
-@import "bootstrap/grid";
-@import "unauthorized/forms";
+@import "account/type";
+@import "account/forms";
 @import "bootstrap/buttons";
 
 // Components
@@ -30,5 +29,5 @@
 
 // Custom components
 
-@import "unauthorized/notify";
-@import "unauthorized/public";
+@import "account/notify";
+@import "account/public";

data/app/assets/stylesheets/locomotive/{unauthorized → account}/_forms.scss

@@ -33,6 +33,25 @@ label {
   }
 }
 
+// Link next to a button in forms.
+
+.form-link {
+  display: inline-block;
+  margin-top: 17px;
+  margin-right: 20px;
+  color: $gray;
+  vertical-align: middle;
+  &:hover {
+    color: $gray-dark;
+    text-decoration: none;
+  }
+  &:focus,
+  &:active {
+    color: $gray-darker;
+    text-decoration: none;
+  }
+}
+
 // Inline validations
 // =============================================================================
 

data/app/assets/stylesheets/locomotive/{unauthorized → account}/_notify.scss

@@ -30,8 +30,10 @@
 
 [data-notify="container"] {
   position: relative;
+  width: 100%;
+  max-width: 350px;
   font-size: 0;
-  border: none;
+  border: 0;
   box-shadow: 0 1px 10px rgba($black, .2);
   animation: fade-left .5s ease-out;
   .close {

data/app/assets/stylesheets/locomotive/{unauthorized → account}/_public.scss

@@ -15,7 +15,7 @@
   background: linear-gradient(to bottom, $brand-primary 60px, $brand-primary 20%, $brand-primary-alt);
 }
 
-// Centers the content of a public page.
+// Centers the content vertically of a public page.
 
 .public-container {
   width: 100%;
@@ -30,16 +30,16 @@
   }
 }
 
-// Wraps and centers all content of the public forms.
+// Wraps and horizontally centers all content of the public boxes.
 
-.public-form-wrapper {
+.public-wrapper {
   display: inline-block;
   width: 480px;
   margin: 25px 0;
   vertical-align: middle;
 }
 
-// Adds a logo above the public form.
+// Adds a logo above the public box.
 
 .public-logo {
   display: inline-block;
@@ -63,10 +63,9 @@
   }
 }
 
-// Contains the form styling. Note that each form should have a different
-// height calculated.
+// Contains the box styling.
 
-.public-form {
+.public-box {
   display: block;
   padding: 50px;
   margin: 25px 0 20px;
@@ -81,11 +80,14 @@
   .btn {
     margin-top: 22px;
   }
+  &.without-padding {
+    padding: 0;
+  }
 }
 
 // Styles intro title and text above the public form.
 
-.public-form-text {
+.public-intro {
   display: block;
   margin-bottom: 20px;
   text-align: center;
@@ -96,15 +98,21 @@
     margin-bottom: 30px;
     color: $gray-light;
   }
+  &.with-padding {
+    padding: 50px 50px 0;
+    margin-bottom: 0;
+  }
 }
 
 // Creates a link below the public form.
 
 .public-link {
   display: inline-block;
+  margin: 0 10px;
   font-size: 14px;
   font-weight: 400;
   color: rgba($white, .7);
+  vertical-align: middle;
   transition: color $base-transition-speed linear;
   &:hover,
   &:active,
@@ -115,18 +123,98 @@
   }
 }
 
+.public-link-divider {
+  display: inline-block;
+  color: rgba($white, .7);
+  vertical-align: middle;
+}
+
+// Public entries collection for applying scrollbar when height is to high.
+
+.public-entries {
+  display: block;
+  max-height: 500px;
+  overflow: auto;
+}
+
+//  Public entries, used in the sites overview.
+
+.public-entry {
+  position: relative;
+  display: block;
+  padding: 15px 25px;
+  text-align: left;
+  background: transparent;
+  border-top: 1px solid $border-color-base;
+  transition: background $base-transition-speed linear;
+  img {
+    display: inline-block;
+    width: 60px;
+    margin-right: 25px;
+    vertical-align: middle;
+    border-radius: 50%;
+  }
+  .fa-arrow-right {
+    position: absolute;
+    top: 50%;
+    right: 25px;
+    margin-top: -8px;
+    font-size: 16px;
+    line-height: 1;
+    color: $gray-lighter;
+  }
+  &.is-add {
+    padding: 25px;
+    text-align: center;
+    border-radius: 0 0 $border-radius-base $border-radius-base;
+    .fa {
+      margin-right: 10px;
+    }
+  }
+  &:hover {
+    text-decoration: none;
+    background: $gray-lightest;
+  }
+  &:active,
+  &:focus {
+    text-decoration: none;
+    background: $gray-lighter;
+    outline: none;
+  }
+}
+
+// Public entry information next to the image.
+
+.public-entry-info {
+  display: inline-block;
+  vertical-align: middle;
+  h5 {
+    color: $gray-darker;
+  }
+  p {
+    margin: 5px 0 0;
+    color: $gray-light;
+  }
+}
+
 // Responsive
 // =============================================================================
 
 @media (max-width: $screen-xs-min) {
-  .public-form-wrapper {
+  .public-wrapper {
     left: 0;
     width: 99%;
     padding: 20px 10px;
     margin-left: 0;
   }
-  .public-form {
+  .public-box {
     display: inline-block;
     padding: 50px 20px;
   }
+  .public-intro.with-padding {
+    padding: 50px 20px 0;
+  }
+  .public-entry {
+    padding: 15px 20px;
+  }
 }