trusty-cms 2.0.9.pre.beta → 2.0.10.pre.beta

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzZlNzVjNDNjNWJlYjUxOTZiOWM2NzcxOWUxMzY1NzI4ZjA4ZDI3NQ==
-  data.tar.gz: !binary |-
-    NWY2YThhMzczMWQ3NjAzOTI2YWQ4OWYxOWJhZDM1MzUyM2M5MDU4NQ==
+SHA1:
+  metadata.gz: a7590ad24723593fb10926b12ed30b81acbae091
+  data.tar.gz: f00f59504392dabf938b509478dbbe28b8a6ab92
 SHA512:
-  metadata.gz: !binary |-
-    NDk4OWI0ZWViYThjNDlkMWIxYmQwYTdhY2RiMTBiZTI5ZWE2MGU2ZjY5ZjU4
-    MjJlZjVjYjg0MzRiZjQxMjIwNTYzZTI2MjA3M2JiYmQyZmI2NmVkNDg5OGRi
-    MDI5OGU3MmZkZmU2ZDY5ZjFmNDFhY2I2OGE3MjE0NjE2NGZmNjk=
-  data.tar.gz: !binary |-
-    NGJkMzNmYzE3ODNhMTFhNmY5NGFhMTgxYjFlYzNmYjM0M2ZlY2Y1Mjg1ZWI2
-    NmMwYzE0YWRiMWViMGUzNjYyZjFjYWU3YzcxYWFiYjEyZWQxZDQyNjU1YzQz
-    YmFlMzdlNzNiZmY4ZDljOWFiOWQ0YmIxNWEzYjhjMWI5NTA1MmY=
+  metadata.gz: 17828472ac5124c3b4727409edd75321f578d96b4dec89dcfd8ecad5ffdbacb61e36a4ff494abfb9a5ab3d52905d62e146196218d69f5b976782f590f7a1d32a
+  data.tar.gz: e629dc11e7fb3fdbb7886c0b424f6bc8813127592b2cc3cb4c8279d16892a6a1485839fe88bd13b469e39ab54e1dccacef75aaf226037b8f33e1d6a6b37d6478

data/.gitignore

@@ -3,6 +3,8 @@ db/*.db
 log/*.log
 pkg
 tmp/*
+spec/dummy/log/*.log
+spec/dummy/tmp/*
 .DS_Store
 .svn
 TAGS

data/Gemfile

@@ -7,7 +7,7 @@ source 'https://rubygems.org'
 # requires radiant and therefore pulls in every
 # dependency mentioned in radiant.gemspec.
 
-gem 'trustygems', '~> 0.1.0'
+gem 'trustygems', '~> 0.2.0'
 
 gemspec
 
@@ -42,4 +42,8 @@ group :development, :test do
   gem 'database_cleaner', '~> 1.3.0'
   gem 'poltergeist',      '~> 1.5.1'
   gem "ckeditor",        "~> 4.1.0"
+  gem 'factory_girl_rails', '~> 4.5.0'
+  gem 'rails-observers'
+  gem "protected_attributes"
+  gem "pry-byebug"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (2.0.9.pre.beta)
+    trusty-cms (2.0.10.pre.beta)
       RedCloth (~> 4.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)
@@ -30,6 +30,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
+    RedCloth (4.2.9-java)
     actionmailer (4.2.3)
       actionpack (= 4.2.3)
       actionview (= 4.2.3)
@@ -68,8 +69,10 @@ GEM
     acts_as_tree (2.2.0)
       activerecord (>= 3.0.0)
     addressable (2.3.8)
-    arel (6.0.2)
+    arel (6.0.3)
     builder (3.2.2)
+    byebug (5.0.0)
+      columnize (= 0.9.0)
     capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -77,7 +80,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     chunky_png (1.3.4)
-    ckeditor (4.1.2)
+    ckeditor (4.1.3)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.0.3)
@@ -86,6 +89,7 @@ GEM
     cocaine (0.5.7)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.0)
+    columnize (0.9.0)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -108,14 +112,19 @@ GEM
       rails (>= 3.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    eventmachine (1.0.7)
-    eventmachine (1.0.7-java)
+    eventmachine (1.0.8)
+    eventmachine (1.0.8-java)
     execjs (2.5.2)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
     ffi (1.9.10)
     ffi (1.9.10-java)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
-    haml (4.0.6)
+    haml (4.0.7)
       tilt
     haml-rails (0.9.0)
       actionpack (>= 4.0.1)
@@ -123,7 +132,7 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (1.7.2)
+    highline (1.7.3)
     hike (1.2.3)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
@@ -149,7 +158,7 @@ GEM
     method_source (0.8.2)
     mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     multi_json (1.11.2)
     mysql (2.9.1)
     nokogiri (1.6.6.2)
@@ -172,6 +181,9 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
+    pry-byebug (3.2.0)
+      byebug (~> 5.0)
+      pry (~> 0.10)
     rack (1.6.4)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -197,6 +209,8 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
     railties (4.2.3)
       actionpack (= 4.2.3)
       activesupport (= 4.2.3)
@@ -225,7 +239,7 @@ GEM
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
-    ruby_parser (3.7.0)
+    ruby_parser (3.7.1)
       sexp_processor (~> 4.1)
     sass (3.4.16)
     sass-rails (5.0.1)
@@ -259,7 +273,7 @@ GEM
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
     tilt (1.4.1)
-    trustygems (0.1.0)
+    trustygems (0.2.1)
       rake
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -284,10 +298,14 @@ DEPENDENCIES
   ckeditor (~> 4.1.0)
   compass-rails (~> 2.0.1)
   database_cleaner (~> 1.3.0)
+  factory_girl_rails (~> 4.5.0)
   launchy (~> 2.4.2)
   poltergeist (~> 1.5.1)
+  protected_attributes
   pry (~> 0.10.0)
+  pry-byebug
+  rails-observers
   rspec-rails (~> 3.0.0)
   thin (~> 1.6.2)
   trusty-cms!
-  trustygems (~> 0.1.0)
+  trustygems (~> 0.2.0)

data/Rakefile

@@ -2,7 +2,27 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
-STDOUT.sync = true
-TrustyCms::Application.load_tasks
-require 'trustygems'
+# require File.expand_path('../config/application', __FILE__)
+# STDOUT.sync = true
+# TrustyCms::Application.load_tasks
+
+require 'pry'
+require 'byebug'
+require 'trustygems'
+
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+Bundler::GemHelper.install_tasks
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
+require 'rspec/core'
+require 'rspec/core/rake_task'
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+task :default => :spec
+#TrustyCms::Application.load_tasks

data/app/assets/javascripts/admin/page-edit.js

@@ -11,7 +11,7 @@
         }
       )
     }
-  }
+  };
 
   PageEdit.partAdded = function (tabId) {
     $('#add_part_busy').hide();
@@ -20,12 +20,12 @@
     $('#part_name_field').val('');
     TabControl.updateTabsBasedOnPages();
     TabControl.selectTab($('div#tab_control .tabs .tab').last().attr('id'));
-  }
+  };
 
   PageEdit.partLoading = function () {
     $('#add_part_button').attr('disabled', true);
     $('#add_part_busy').show();
-  }
+  };
 
   PageEdit.validPartName = function () {
     var partNameField = $('#part_name_field');

data/app/assets/javascripts/admin/tabcontrol.js.erb

@@ -15,29 +15,29 @@
         TabControl.removeTab($(this).closest('.tab').attr('id'));
       });
 
-      TabControl.selectTab($pages.first().attr('id'));
+      TabControl.selectTab($pages.first().attr('id').replace(/-/, "_"));
     }
   }
 
+    TabControl.selectTab = function(id) {
+        id = id.replace(/^tab_/, '').replace(/^page_/, '');
+        var underscored_id = id.replace(/_/g, "-");
+        var $pages = $('div#tab_control .pages .page');
+        var $tabs  = $('div#tab_control .tabs .tab');
+
+        $pages.hide();
+        $tabs.removeClass('here');
+
+        $pages.filter('#page_' + underscored_id).show();
+        $tabs.filter('#tab_' + id).addClass('here');
+    }
+
   TabControl.addTab = function(tabText) {
     $('div#tab_control .tabs').append("<a id='tab_" + tabText + "' href='#' class='tab'><span>" + tabText + "</span><img src='" + relative_url_root + "<%= asset_path('admin/tab_close.png') %>' class='close' alt='Remove part' title='Remove part' /></a>");
     var $page_part_index = $('#page_part_index_field');
     $page_part_index.val(parseInt($page_part_index.val()) + 1);
   }
 
-  TabControl.selectTab = function(id) {
-    id = id.replace(/^tab_/, '').replace(/^page_/, '');
-    var underscored_id = id.replace("_", "-");
-    var $pages = $('div#tab_control .pages .page');
-    var $tabs  = $('div#tab_control .tabs .tab');
-
-    $pages.hide();
-    $tabs.removeClass('here');
-
-    $pages.filter('#page_' + underscored_id).show();
-    $tabs.filter('#tab_' + id).addClass('here');
-  }
-
   TabControl.removeTab = function(id) {
     id = id.replace(/^tab_/, '').replace(/^page_/, '');
     var underscored_id = id.replace("_", "-");

data/app/assets/javascripts/admin/treetable.js

@@ -25,15 +25,16 @@ $(function() {
     },
     onNodeExpand: function() {
       var node = this;
+      var spinner = $($(node.row[0]).find(".busy")[0]);
+      spinner.show();
       persistStore.set(node.id, 'expanded');
       // Render loader/spinner while loading
       $.ajax({
-        async: false, // Must be false, otherwise loadBranch happens after showChildren?
+        async: true, // Must be false, otherwise loadBranch happens after showChildren?
         url: "/admin/pages/" + node.row.data('ttPageId') + "/children?index=" + node.id
       }).done(function(html) {
         var rows = $(html).filter("tr");
 
-
         $("#pages").treetable("loadBranch", node, rows);
         $.each(node.children, function() {
           var state = persistStore.get(this.id);
@@ -44,6 +45,7 @@ $(function() {
         $('a.dropdown').each(function(){
           Dropdown.setup(this);
         });
+        spinner.hide();
       });
     }
   });

data/app/assets/stylesheets/admin/_base.scss

@@ -1,14 +1,14 @@
 // Fonts
-$base-font-family: "Lucida Grande", "Bitstream Vera Sans", Helvetica, Verdana, Arial, sans-serif;
+$base-font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 $base-font-size: 15px;
 
 // Links
-$base-link-color:#66d9e0 ;
+$base-link-color:#94BDC3 ;
 $alt-link-color: red;
 
 // Header
 $header: #000 !default;
-$primary-tab: rgba(white, 0.3);
+$primary-tab: rgba(236, 6, 115, 0.6);
 $primary-tab-current: white;
 
 // Modules

data/app/assets/stylesheets/admin/modules/_links.scss

@@ -8,7 +8,7 @@
 
 @mixin alt-link {
   color: $alt-link-color;
-  text-decoration: underline;
+  text-decoration: none;
   &:hover {
     text-decoration: none;
   }

data/app/assets/stylesheets/admin/partials/_content.scss

@@ -25,9 +25,16 @@ table.fieldset {
 }
 
 body.reversed {
+  fieldset h1 {
+    font-size: 1.5em;
+  }
+  #content > h1:first-of-type {
+    font-size: 2em;
+  }
   h1 {
-    border-bottom: 1px solid #ababab;
-    background: #7e7e7e;
+    color: #94BDC3;
+    border-bottom: 1px solid #94BDC3;
+    background: #fff;
     font-size: 125%;
     margin: -20px -20px 20px;
     padding: 15px 20px;

data/app/assets/stylesheets/admin/partials/_forms.scss

@@ -22,6 +22,7 @@
           font-size: 95%;
           text-shadow: none;
           margin-right: 1em;
+          text-align: left;
         }
         &.multi_option {
           margin-bottom: 0.3em;
@@ -51,7 +52,6 @@
         text-shadow: 0px 0px 20px rgba(255, 255, 255, 0.1);
       }
       a {
-        color: white;
         &.action {
           background-color: #7e7e7e;
           font-size: 75%;
@@ -83,17 +83,6 @@
         margin: 0 1em 0 0;
       }
     }
-    .buttons {
-      color: #666666;
-      font-size: 80%;
-      margin: 2.5em 0 1em;
-      button, input.button {
-        font-size: 150%;
-      }
-      a {
-        @include alt-link;
-      }
-    }
   }
 }
 
@@ -103,7 +92,7 @@
 }
 
 .drawer_contents {
-  background: #7e7e7e;
+  background: #c9c9c9;
   @include border-bottom-right-radius(6px);
   margin: 0;
   margin-right: 2px;
@@ -282,9 +271,8 @@ body.reversed {
     form {
       p {
         label {
-          color: whitesmoke;
+          color: #B9B9B9;
           font-weight: normal;
-          text-shadow: 1px 1px 0 #888888;
           .hint {
             display: inline;
           }
@@ -298,7 +286,7 @@ body.reversed {
         @include alt-box;
       }
       fieldset {
-        background: #858585;
+        background: #fff;
         padding: 20px 15px;
         margin-bottom: 20px;
         overflow: hidden;
@@ -320,7 +308,17 @@ body.reversed {
       color: #eeeeee;
     }
     textarea {
-      border: 1px solid white;
+      border: 1px solid #EAEAEA;
+    }
+    input:not([type=submit]):focus, textarea:focus {
+      border: 1px #EC65A5;
+      -webkit-box-shadow: 0 0 10px #EC65A5;
+      -moz-box-shadow: 0 0 10px #EC65A5;
+      box-shadow: 0 0 10px #EC65A5;
+      outline: 0;
+    }
+    input[type=checkbox] {
+      border-radius: 5px;
     }
     .box {
       @include single-box-shadow(rgba(0, 0, 0, 0.15), 2px, 2px, 3px);
@@ -417,3 +415,47 @@ body.edit_user, body.edit_personal_preferences {
     }
   }
 }
+
+.button, button, input[type=button], input[type=submit] {
+  -webkit-appearance: none;
+  font-size: 1.1em;
+  padding: .5em 3em;
+  margin: 0.5em;
+  color: #f3f3f3;
+  background-color: #94BDC3;
+  border: 2px outset buttonface;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  text-decoration: none;
+  &:hover {
+    color: #94BDC3;
+    background-color: #f3f3f3;
+    -webkit-transition: all .2s;
+    -moz-transition: all .2s;
+    -ms-transition: all .2s;
+    -o-transition: all .2s;
+    transition: all .2s;
+  }
+  &:hover > .fa {
+    color: #94BDC3;
+    -webkit-transition: all .2s;
+    -moz-transition: all .2s;
+    -ms-transition: all .2s;
+    -o-transition: all .2s;
+    transition: all .2s;
+  }
+  .fa {
+    color: #f3f3f3;
+  }
+}
+
+.hover {
+  color: #94BDC3;
+  background-color: #f3f3f3;
+  -webkit-transition: all .2s;
+  -moz-transition: all .2s;
+  -ms-transition: all .2s;
+  -o-transition: all .2s;
+  transition: all .2s;
+}