wheels 0.1.25 → 0.1.27

data/VERSION

@@ -1 +1 @@
-0.1.25
+0.1.27

data/app/models/user.rb

@@ -6,6 +6,8 @@ class User < ActiveRecord::Base
   has_many :access_control_entries, :dependent=>:destroy
   before_create :create_profile
 
+  validates :role, :presence => true
+
   accepts_nested_attributes_for :profile
 
   def initialize(*args)

data/app/views/attachments/_edit.html.haml

@@ -0,0 +1,7 @@
+%li.attachment
+  %ul{:id=>@attachment.element_id}
+    %li= link_to @attachment.file.original_filename, @attachment.file.url
+    %li Size: #{number_to_human_size @attachment.file.size}
+    %li Modified: #{@attachment.updated_at.try(:strftime, "%D %R")}
+    %li= link_to 'Remove File', page_attachment_path(@page, @attachment), :method=>:delete, "data-confirm"=>'Are you sure?', :remote=>true
+

data/app/views/attachments/destroy.js.haml

@@ -1,3 +1,3 @@
-$('##{container}').remove;
+$('##{container}').remove();
 = render :partial => "loadbehind/destroy"
 

data/app/views/pages/_form.html.haml

@@ -1,12 +1,43 @@
-- include_ckeditor
+
 = render :partial => "child_pages_links"
+-if @page.errors.any?
+  #errorExplanation
+    %h2= "#{pluralize(@page.errors.count, "error")} prohibited this page from being saved:"
+    %ul
+      - @page.errors.full_messages.each do |msg|
+        %li= msg
 
-- if params[:action]=="new"
+#tabs
+  %ul
+    %li= link_to 'Page Text', '#field-body'
+    %li= link_to 'Files', '#field-attachments'
+    %li= link_to 'Stylesheet', '#field-stylesheet'
   = form_for resource, :remote=>true do |f|
-    = render :partial => "form_fields", :locals=>{:f=>f}
-- else
-  = form_for form_object, {:url=>form_url, :remote=>true} do |f|
-    = render :partial => "form_fields", :locals=>{:f=>f}
+    #field-body
+      .field
+        = f.label :title
+        = f.text_field :title
+      .field
+        .fieldName "Display Title for this page?"
+        = f.check_box :show_title
+      .textarea
+        = f.label :body
+        = f.text_area :body, :class=>'ckeditor_textarea', :size => "120x20"
+        = f.label :stylesheet
+        = hidden_field_tag :container, 'content_pane'
+        = hidden_field_tag :ajax_function, 'html'
+    #field-stylesheet
+      = f.text_area :stylesheet, :rows=>80, :cols=>20
+  #field-attachments
+    %ul#attachments_list
+      %li.sidebar_title Files
+      - @page.attachments.each do |attachment|
+        = render :partial => "attachments/edit", :locals=>{:a=>(@attachment=attachment)}
+      %li
+        Upload a file to this page.
+        = render :partial=>'attachments/form'
+
+
 
 = content_for :head do
   = javascript_include_tag 'jquery-validate/jquery.validate.pack'

data/app/views/pages/edit.js.haml

@@ -2,3 +2,5 @@ if (CKEDITOR.instances['page_body']) {CKEDITOR.remove(CKEDITOR.instances['page_b
 $('##{container}').#{ajax_function}(#{raw render_js('form')});
 $('.ckeditor_textarea').ckeditor({filebrowserBrowseUrl : '/galleries'});
 
+$('#tabs').tabs();
+

data/app/views/sitemaps/index.html.haml

@@ -2,6 +2,8 @@
 = content_for :head do
   = javascript_include_tag %w(jquery.hotkeys jquery.cookie jquery.jstree)
   = javascript_include_tag %(sitemap_jstree)
+  = javascript_include_tag %(uploadify/jquery.uploadify.v2.1.0.min)
+  = javascript_include_tag %(uploadify/swfobject)
   = stylesheet_link_tag %(admin)
 
 = sidebar_content do

data/wheels.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.1.25"
+  s.version = "0.1.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
-  s.date = %q{2010-10-04}
+  s.date = %q{2010-11-01}
   s.description = %q{Call rails generate wheels.}
   s.email = %q{tgannon@gmail.com}
   s.extra_rdoc_files = [
@@ -101,6 +101,7 @@ Gem::Specification.new do |s|
      "app/views/app_configs/show.html.haml",
      "app/views/app_configs/show.js.haml",
      "app/views/app_configs/update.js.haml",
+     "app/views/attachments/_edit.html.haml",
      "app/views/attachments/_form.html.haml",
      "app/views/attachments/_index.html.haml",
      "app/views/attachments/_show.html.haml",
@@ -108,6 +109,7 @@ Gem::Specification.new do |s|
      "app/views/attachments/create.js.haml",
      "app/views/attachments/destroy.js.haml",
      "app/views/attachments/edit.js.haml",
+     "app/views/attachments/file",
      "app/views/attachments/index.html.haml",
      "app/views/attachments/index.js.haml",
      "app/views/attachments/new.html.haml",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 25
-  version: 0.1.25
+  - 27
+  version: 0.1.27
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -07:00
+date: 2010-11-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,6 +124,7 @@ files:
 - app/views/app_configs/show.html.haml
 - app/views/app_configs/show.js.haml
 - app/views/app_configs/update.js.haml
+- app/views/attachments/_edit.html.haml
 - app/views/attachments/_form.html.haml
 - app/views/attachments/_index.html.haml
 - app/views/attachments/_show.html.haml
@@ -131,6 +132,7 @@ files:
 - app/views/attachments/create.js.haml
 - app/views/attachments/destroy.js.haml
 - app/views/attachments/edit.js.haml
+- app/views/attachments/file
 - app/views/attachments/index.html.haml
 - app/views/attachments/index.js.haml
 - app/views/attachments/new.html.haml