orange-sparkles 0.5.7 → 0.5.8

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 David Haslem
+Copyright (c) 2009 Orange Sparkle Ball, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -18,4 +18,4 @@ complicated with the views and custom css/templates (which you probably do).
 
 == Copyright
 
-Copyright (c) 2010 David Haslem. See LICENSE for details.
+Copyright (c) 2010 Orange Sparkle Ball, inc. See LICENSE for details.

data/lib/orange-sparkles/assets/css/sparkles-admin.css

@@ -105,6 +105,7 @@ body#members a#members-tab
 #page-content {
 	margin: 0 auto;
 	padding: 0 43px 48px;
+	z-index: 1;
 }
 br.clearfix { 
 	clear:both;
@@ -176,6 +177,7 @@ div#current-site-header {
 	text-align: center;
 	width: 100%;
 	position: fixed;
+	z-index: 100;
 }
 
 /* Login Styles */

data/lib/orange-sparkles/sparkles_app.rb

@@ -36,11 +36,11 @@ class Orange::SparklesApp < Orange::Application
         orange.fire(:view_admin, packet)
         'sparkles-admin.haml'
       elsif(packet['route.path'] == '/')
-        packet.add_js('jquery-1.4.1.min.js', :module => '_sparkles_')
+        # packet.add_js('jquery-1.4.1.min.js', :module => '_sparkles_')
         ['reset', '960_24_col', 'text', 'main'].each{|c| packet.add_css("#{c}.css", :module => '_sparkles_')}
         'home.haml'
       else
-        packet.add_js('jquery-1.4.1.min.js', :module => '_sparkles_')
+        # packet.add_js('jquery-1.4.1.min.js', :module => '_sparkles_')
         ['reset', '960_24_col', 'text', 'main'].each{|c| packet.add_css("#{c}.css", :module => '_sparkles_')}
         'subpage.haml'
       end

data/lib/orange-sparkles/templates/home.haml

@@ -1,18 +1,20 @@
 !!! 5
 %html{:lang => "en"}
   %head
-    %title Orange Site
+    %title= packet['site'] ? packet['site'].name : "Orange Site"
     %meta{:charset => "utf-8"}
+    /[if lt IE 9]
+      %script{:src => "http://html5shiv.googlecode.com/svn/trunk/html5.js"}    
+    / 
+    %script{:src => "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"}
     -# CSS
     = part[:css]
     = part[:js]
-    /[if lt IE 9]
-      %script{:src => "http://html5shiv.googlecode.com/svn/trunk/html5.js"}
   %body#home
     .container.container_24
       %header.head
         .logo
-          %h1 Orange Site
+          %h1= packet['site'] ? packet['site'].name : "Orange Site"
         %nav.clearfix
           = orange[:sitemap].two_level(packet)
           %br.clear

data/lib/orange-sparkles/templates/sparkles-admin.haml

@@ -17,14 +17,15 @@
           |
           %a{:href => route_to(:orange_sites, packet["site"].id, "edit")} Site Settings
       %div#current-site-header 
-        %span Current Site:
+        %span Currently editing:
         %br
-        %select{:id => "site-selector"}
-          - for site in packet["user"].orange_sites
-            %option{:value => (!site.is_a?(OrangeSubsite) ? "/admin/sitemap" : "/admin#{orange[:subsites].url_for(packet, site)}sitemap"), :selected => (packet['subsite', false] ? site == packet['subsite'] : site == packet['site'])}= site.name
+        %a.orange-text{:href => "/"}= packet['site'].name
       %div.tab-container
         / %a.tab#home-tab{:href => "#"} Home
         %a.tab#sitemap-tab{:href => route_to(:sitemap)} Pages
+        - for link in (orange[:admin].links(packet)["tabs"] || [])
+          %style= "body##{link[:resource]} a##{link[:resource]}-tab{ background: #999999;}"
+          %a.tab{:id => "#{link[:resource]}-tab", :href => route_to(link[:resource])}= link[:text]
     %div#subheader
       %h1
         %img.subhead-icon{:src => "/assets/_sparkles_/images/edit.png", :width => "23", :height => "22", :alt => "Pages icon"}

data/lib/orange-sparkles/views/orange_sites/edit.haml

@@ -4,7 +4,6 @@
   - if model
     %form{:action => route_to(model_name, model[:id], 'save'), :method => 'post'}
       - for prop in props
-        - next unless [:show_ads, :linked_in_group, :vimeo_page, :spreedly_on].include? prop[:name]
         %p~ view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
       %input{:type => 'submit', :value => 'Save Changes'}
     %br.clearfix

data/lib/orange-sparkles/views/slices/slice_helper.haml

@@ -1,20 +1,6 @@
 %h2 Code Slices
 %hr
 .slice-list
-  %p
-    %label Event Calendars: 
-    %select.calendar
-      %option{} Choose a calendar to insert
-      - for cal in OrangeCalendar.all
-        %option{:value => cal.name}= cal.name
-  %br
-  %p
-    %label Contact Forms: 
-    %select.contact
-      %option{} Choose a form to insert
-      - for form in OrangeContactForms.all
-        %option{:value => form.title}= form.title
-  %br
   %p
     %label Links:
     %select.link

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: orange-sparkles
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - David Haslem
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -04:00
+date: 2010-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: orange-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 5
@@ -38,11 +35,9 @@ dependencies:
   name: orange-more
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 5
@@ -54,11 +49,9 @@ dependencies:
   name: maruku
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,17 +61,15 @@ dependencies:
   name: rack-abstract-format
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
-description: "This gem is a "
+description: This gem is a CMS theme for orange
 email: therabidbanana@gmail.com
 executables: []
 
@@ -319,8 +310,6 @@ files:
 - lib/orange-sparkles/views/sitemap/one_level.haml
 - lib/orange-sparkles/views/sitemap/route_actions.haml
 - lib/orange-sparkles/views/sitemap/table_row.haml
-- lib/orange-sparkles/views/slices/footer.haml
-- lib/orange-sparkles/views/slices/header.haml
 - lib/orange-sparkles/views/slices/lorem.haml
 - lib/orange-sparkles/views/slices/slice_helper.haml
 - lib/orange-sparkles/views/users/create.haml
@@ -337,27 +326,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Adding some prettiness to orange-core

data/lib/orange-sparkles/views/slices/footer.haml

@@ -1,17 +0,0 @@
-.newsletter.grid_22.prefix_1.suffix_1
-  .grid_16.alpha
-    %form{:action => route_to(:members, :register)}
-      %p
-        %label Sign up for our newsletter:
-        %input{:name => 'email'}
-        %input{:type => "submit", :value => "Sign Up"}
-  .grid_5.prefix_1.omega
-    %p.members
-      Log in: 
-      %a{:href => route_to(:members, :login)} Participant
-      = '|'
-      %a{:href => route_to(:sitemap, :context => "admin")} Admin
-%footer.foot
-  %p.copyright 
-    All Content © #{Time.now.strftime('%Y')}    |
-    WNSF - Women's Network for a Sustainable Future |

data/lib/orange-sparkles/views/slices/header.haml

@@ -1,17 +0,0 @@
-%nav.clearfix
-  .breadcrumb.grid_15.suffix_1.alpha
-    = orange[:sitemap].breadcrumb(packet)
-  %section.social_buttons.grid_6.omega
-    %header.grid_2.prefix_1.alpha
-      %h1 Follow us:
-    %ul.grid_3.omega
-      %li
-        %a{:href => "http://www.twitter.com/wnsf2009"} 
-          %img{:src => '/assets/_sparkles_/images/twitter_sticker_small.png'}
-      %li
-        %a{:href => "http://www.facebook.com/pages/WNSF/134628901298"} 
-          %img{:src => '/assets/_sparkles_/images/facebook_sticker_small.png'}
-      - unless packet['site'].vimeo_page.blank?
-        %li
-          %a{:href => packet['site'].vimeo_page} 
-            %img{:src => '/assets/_sparkles_/images/vimeo_sticker_small.png'}