radiant 0.9.0.rc2 → 0.9.1

data/lib/tasks/cucumber.rake

@@ -7,7 +7,7 @@
 
 unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
 
-vendored_cucumber_bin = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
 $LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
 
 begin

data/lib/tasks/framework.rake

@@ -106,8 +106,7 @@ unless File.directory? "#{RAILS_ROOT}/app"
 
       desc "Update the cached assets for the admin UI"
       task :cached_assets do
-        dir = File.join(Rails.root, 'public', 'javascripts', 'admin')
-        TaskSupport.cache_files(dir, TaskSupport.find_admin_js, 'all.js')
+        TaskSupport.cache_admin_js
       end
 
       desc "Update config/boot.rb from your current radiant install"

data/lib/tasks/release.rake

@@ -33,7 +33,8 @@ namespace 'radiant' do
     s.bindir = 'bin'
     s.executables = (Dir['bin/*'] + Dir['scripts/*']).map { |file| File.basename(file) } 
     s.add_dependency 'rake', '>= 0.8.3'
-    s.add_dependency 'rack', '>=1.0.1' # No longer bundled in actionpack
+    s.add_dependency 'rack', '~> 1.1.0' # No longer bundled in actionpack
+    s.add_dependency 'will_paginate', '~> 2.3.11'
     s.add_dependency 'RedCloth', '>=4.0.0'
     s.has_rdoc = true
     s.rdoc_options << '--title' << RDOC_TITLE << '--line-numbers' << '--main' << 'README'
@@ -82,7 +83,7 @@ namespace 'radiant' do
   namespace :gem do
     desc "Uninstall Gem"
     task :uninstall do
-      sudo = "sudo " unless RUBY_PLATFORM =~ /mswin|mingw/
+      sudo = "sudo " if ENV['SUDO'] == 'true'
       sh "#{sudo}gem uninstall #{PKG_NAME}" rescue nil
     end
 
@@ -90,12 +91,19 @@ namespace 'radiant' do
     task :install => [:gemspec, :package, :uninstall] do
       chdir("#{RADIANT_ROOT}/pkg") do
         latest = Dir["#{PKG_NAME}-*.gem"].last
-        sudo = "sudo " unless RUBY_PLATFORM =~ /mswin|mingw/
+        sudo = "sudo " if ENV['SUDO'] == 'true'
         sh "#{sudo}gem install #{latest}"
       end
     end
   end
 
+  task :gem => [ :generate_cached_assets ]
+
+  desc "Generates cached assets from source files"
+  task :generate_cached_assets do
+    TaskSupport.cache_admin_js
+  end
+
   desc "Publish the release files to RubyForge."
   task :release => [:gem, :package] do
     files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }

data/lib/tasks/rspec.rake

@@ -19,7 +19,7 @@ begin
 
   desc 'Run all specs in spec directory (excluding plugin & generator specs)'
   task :spec => spec_prereq do
-    errors = %w(spec:integration spec:models spec:controllers spec:views spec:helpers spec:lib spec:generators).collect do |task|
+    errors = %w(spec:integration spec:models spec:controllers spec:views spec:helpers spec:lib spec:generators spec:extensions).collect do |task|
       begin
         puts %{\nRunning #{task.gsub('spec:', '').titlecase} Spec Task}
         Rake::Task[task].invoke

data/public/javascripts/admin/application.js

@@ -78,5 +78,8 @@ Event.addBehavior({
   
   'input.date': DateInputBehavior(),
   
-  'select#page_status_id':  PageStatusBehavior()
+  'select#page_status_id':  PageStatusBehavior(),
+  
+  'span.error':  ValidationErrorBehavior()
+  
 });

data/public/javascripts/admin/cookie.js

@@ -58,7 +58,7 @@ Cookie = {
   accept: function() {
     Cookie.set('b49f729efde9b2578ea9f00563d06e57', 'true');
     if (Cookie.get('b49f729efde9b2578ea9f00563d06e57') == 'true') {
-      Cookie.unset('b49f729efde9b2578ea9f00563d06e57');
+      Cookie.erase('b49f729efde9b2578ea9f00563d06e57');
       return true;
     }
     return false;
@@ -77,4 +77,4 @@ Cookie = {
       return now.toGMTString();     
     }
   }
-}
+}

data/public/javascripts/admin/validationerror.js

@@ -0,0 +1,18 @@
+var ValidationErrorBehavior = Behavior.create({
+  initialize: function() {
+    new ValidationError(this.element);
+  }
+});
+
+var ValidationError = Class.create({
+  initialize: function(element) {
+    this.element = $(element);
+    this.closer = new Element('a', {'href' : '#', 'class' : 'closer' }).update("x");
+    this.closer.observe('click', this.hide.bindAsEventListener(this));
+    this.element.insert(this.closer, {position : 'top'});
+  },
+  hide: function (event) {
+    event.stop();
+    this.element.fade();
+  }
+});

data/public/stylesheets/admin/main.css

@@ -769,52 +769,102 @@ body.reversed #content h1 {
   left: 0;
   right: 0;
   bottom: 0;
-  background: #777; }
+  background: #777 url(../../images/admin/shadow_grey.png) repeat-x; }
   #actions ul {
     padding: 14px 8px; }
-  #actions li {
-    display: inline;
-    margin-right: 5px; }
-  #actions a {
-    background: #eee url(../../images/admin/buttons_background.png) repeat-x;
-    color: #333;
-    font-size: 80%;
-    padding: 8px 12px;
-    text-decoration: none;
-    text-shadow: 1px 1px 1px #eee;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px; }
-    #actions a:hover {
-      background: #fff;
-      color: black;
-      text-shadow: 1px 1px 1px #fff; }
-    #actions a img {
-      vertical-align: -20%; }
+    #actions ul li {
+      display: inline;
+      margin-right: 5px; }
+      #actions ul li a {
+        background: #eee url(../../images/admin/buttons_background.png) repeat-x;
+        color: #333;
+        font-size: 80%;
+        padding: 8px 12px;
+        text-decoration: none;
+        text-shadow: 1px 1px 1px #eee;
+        -moz-border-radius: 5px;
+        -webkit-border-radius: 5px;
+        border-radius: 5px;
+        -webkit-box-shadow: 1px 2px 4px #333333;
+        -moz-box-shadow: 1px 2px 4px #333333;
+        box-shadow: 1px 2px 4px #333333; }
+        #actions ul li a:hover {
+          background: #fff;
+          color: #06c;
+          text-shadow: 1px 1px 1px #fff; }
+        #actions ul li a:active {
+          background: #fff url(../../images/admin/shadow.png) repeat-x;
+          color: #000;
+          -webkit-box-shadow: none;
+          -moz-box-shadow: none;
+          box-shadow: none; }
+        #actions ul li a img {
+          vertical-align: -20%; }
   #actions .pagination {
+    position: relative;
+    overflow: hidden;
     float: right;
-    padding: 14px 8px; }
-    #actions .pagination span.current, #actions .pagination span.disabled {
-      background: #eee url(../../images/admin/buttons_background.png) repeat-x;
-      color: #333;
+    margin-right: 24px;
+    padding: 0 5px 5px 0; }
+    #actions .pagination a, #actions .pagination span.current, #actions .pagination span.disabled {
+      display: block;
+      float: left;
+      background: #fff url(../../images/admin/shadow.png) repeat-x;
+      color: #999;
       font-size: 80%;
-      padding: 8px 12px;
+      padding: 6px 12px 6px 12px;
+      margin-right: 1px;
       text-decoration: none;
       text-shadow: 1px 1px 1px #eee;
-      -moz-border-radius: 5px;
-      -webkit-border-radius: 5px;
-      border-radius: 5px; }
+      -moz-border-radius-bottomleft: 5px;
+      -webkit-border-bottom-left-radius: 5px;
+      border-bottom-left-radius: 5px;
+      -moz-border-radius-bottomright: 5px;
+      -webkit-border-bottom-right-radius: 5px;
+      border-bottom-right-radius: 5px; }
+    #actions .pagination a:hover {
+      background: #fff url(../../images/admin/buttons_background.png) repeat-x;
+      color: #06c;
+      text-shadow: none;
+      -webkit-box-shadow: 1px 2px 4px #333333;
+      -moz-box-shadow: 1px 2px 4px #333333;
+      box-shadow: 1px 2px 4px #333333; }
+    #actions .pagination a:active {
+      background: #fff url(../../images/admin/shadow.png) repeat-x;
+      color: #000;
+      -webkit-box-shadow: none;
+      -moz-box-shadow: none;
+      box-shadow: none; }
     #actions .pagination span.disabled {
-      -moz-opacity: 0.5;
-      -khtml-opacity: 0.5;
-      -webkit-opacity: 0.5;
-      filter: alpha(opacity=50);
-      -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
-      opacity: 0.5; }
+      -moz-opacity: 0.3;
+      -khtml-opacity: 0.3;
+      -webkit-opacity: 0.3;
+      filter: alpha(opacity=30);
+      -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=30);
+      opacity: 0.3; }
     #actions .pagination span.current {
+      color: #000;
       font-weight: bold;
-      color: #999;
-      border: 1px solid #999; }
+      background-image: none;
+      -webkit-box-shadow: 1px 2px 4px #333333;
+      -moz-box-shadow: 1px 2px 4px #333333;
+      box-shadow: 1px 2px 4px #333333; }
+    #actions .pagination span.gap {
+      display: block;
+      float: left;
+      padding: 6px;
+      color: #ccc; }
+  #actions .depaginate {
+    float: right;
+    padding: 6px 12px; }
+    #actions .depaginate a {
+      background: none;
+      font-size: 80%;
+      color: #eee;
+      text-shadow: none;
+      text-decoration: none; }
+      #actions .depaginate a:hover {
+        color: #fff; }
 
 #footer {
   color: #999;
@@ -903,7 +953,7 @@ div.popup {
       border: 1px solid #ddd;
       color: #666;
       font-family: Monaco, "Courier New", Courier, monospace;
-      overflow: hidden;
+      overflow: auto;
       padding: 10px; }
     div.popup .reference h4 {
       color: green;
@@ -1120,6 +1170,29 @@ div.textarea_toolbar {
     background-color: #ffffff;
     padding: 1px 0; }
 
+#content form p span.error-with-field input {
+  border-color: #c00;
+  border-width: 1px;
+  border-style: solid; }
+#content form p span.error-with-field span.error {
+  line-height: 1.4;
+  background-color: #c00;
+  color: white;
+  padding: 4px;
+  margin: 0 0 0 6px;
+  background-color: #c00;
+  cursor: pointer;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  -webkit-box-shadow: 1px 1px 4px #666666;
+  -moz-box-shadow: 1px 1px 4px #666666;
+  box-shadow: 1px 1px 4px #666666; }
+  #content form p span.error-with-field span.error a.closer {
+    margin-left: 10px;
+    color: #fcc;
+    text-decoration: none; }
+
 table.index td.note {
   color: silver;
   font-size: 85%;

data/public/stylesheets/sass/admin/main.sass

@@ -21,6 +21,7 @@
 @import partials/tabcontrol.sass
 @import partials/dateinput.sass
 @import partials/toolbar.sass
+@import partials/validations.sass
 
-// Depreciated
-@import partials/depreciated.sass
+// Deprecated
+@import partials/deprecated.sass

data/public/stylesheets/sass/admin/modules/_grid.sass

@@ -0,0 +1,56 @@
+!width = 100%
+!grid = 12
+!margin = 1%
+!box = !width / !grid
+
+=grid(!count)
+  width = (!count * !box) - (2 * !margin)
+  display: inline
+  float: left
+  position: relative
+  margin-left = !margin
+  margin-right = !margin
+=prefix(!count)
+  padding-left = !count * !box
+=suffix(!count)
+  padding-right = !count * !box
+=push(!count)
+  left = !count * !box
+=pull(!count)
+  left = !count * !box * -1
+=flush_left
+  margin-left: 0
+=flush_right
+  margin-right: 0
+=flush
+  margin-left: 0
+  margin-right: 0
+=clear
+  clear: left
+
+.container_#{!grid}
+  width = !width
+  position: relative
+  margin-left: auto
+  margin-right: auto
+  overflow: hidden
+  @for !marker from 1 through !grid
+    .grid_#{!marker}
+      +grid(!marker)
+    .prefix_#{!marker}
+      +prefix(!marker)
+    .suffix_#{!marker}
+      +suffix(!marker)
+    .push_#{!marker}
+      +push(!marker)
+    .pull_#{!marker}
+      +pull(!marker)
+  .flush_left, .alpha
+    +flush_left
+  .flush_right, .omega
+    +flush_right
+  .flush
+    +flush
+  .row, .newline
+    +clear
+

data/public/stylesheets/sass/admin/partials/_actions.sass

@@ -1,43 +1,83 @@
+=button-shadow
+  +box-shadow(1px, 2px, 4px, #333)
+  
 #actions
   position: fixed
   left: 0
   right: 0
   bottom: 0
-  background: #777
+  background: #777 url(../../images/admin/shadow_grey.png) repeat-x
   ul
     padding: 14px 8px
-  li
-    display: inline
-    margin-right: 5px
-  a
-    background: #eee url(../../images/admin/buttons_background.png) repeat-x
-    color: #333
-    font-size: 80%
-    padding: 8px 12px
-    text-decoration: none
-    text-shadow: 1px 1px 1px #eee
-    +round-corners(5px)
-    &:hover
-      background: #fff
-      color: black
-      text-shadow: 1px 1px 1px #fff
-    img
-      vertical-align: -20%
-  .pagination 
-    :float right
-    :padding 14px 8px
-    span.current, span.disabled
-      :background #eee url(../../images/admin/buttons_background.png) repeat-x
-      :color #333
-      :font-size 80%
-      :padding 8px 12px
-      :text-decoration none
-      :text-shadow 1px 1px 1px #eee
-      +round-corners(5px)
+    li
+      display: inline
+      margin-right: 5px
+      a
+        background: #eee url(../../images/admin/buttons_background.png) repeat-x
+        color: #333
+        font-size: 80%
+        padding: 8px 12px
+        text-decoration: none
+        text-shadow: 1px 1px 1px #eee
+        +round-corners(5px)
+        +button-shadow
+        &:hover
+          background: #fff
+          color: #06c
+          text-shadow: 1px 1px 1px #fff
+        &:active
+          background: #fff url(../../images/admin/shadow.png) repeat-x
+          color: #000
+          +no-box-shadow
+        img
+          vertical-align: -20%
+  .pagination
+    position: relative
+    overflow: hidden
+    float: right
+    margin-right: 24px
+    padding: 0 5px 5px 0
+    a, span.current, span.disabled
+      display: block
+      float: left
+      background: #fff url(../../images/admin/shadow.png) repeat-x
+      color: #999
+      font-size: 80%
+      padding: 6px 12px 6px 12px
+      margin-right: 1px
+      text-decoration: none
+      text-shadow: 1px 1px 1px #eee
+      +round-bottom-corners(5px)
+    a
+      &:hover
+        background: #fff url(../../images/admin/buttons_background.png) repeat-x
+        color: #06c
+        text-shadow: none
+        +button-shadow
+      &:active
+        background: #fff url(../../images/admin/shadow.png) repeat-x
+        color: #000
+        +no-box-shadow
     span.disabled
-      +opacity(0.5)
+      +opacity(0.3)
     span.current
-      :font-weight bold
-      :color #999
-      :border 1px solid #999
-
+      color: #000
+      font-weight: bold
+      background-image: none
+      +button-shadow
+    span.gap
+      display: block
+      float: left
+      padding: 6px
+      color: #ccc
+  .depaginate
+    float: right
+    padding: 6px 12px
+    a
+      background: none
+      font-size: 80%
+      color: #eee
+      text-shadow: none
+      text-decoration: none
+      &:hover
+        color: #fff