orange-sparkles 0.5.8 → 0.5.9

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

@@ -0,0 +1,253 @@
+/* @override 
+	http://www.orangerb.com/assets/public/css/main.css
+	http://localhost:9292/assets/public/css/main.css
+*/
+
+body{
+	background: #b6daf2 url(/assets/_sparkles_/images/pattern_light.png);
+	background-position: -800px 0;
+	font-size: 100%;
+	padding: 3.3em 0;
+}
+
+a{
+  color: #dd7200;
+}
+
+header.head .logo{
+	padding: 2em 0 1.2em;
+}
+
+header.head .logo h1 {
+	font: 2em Georgia, "Times New Roman", Times, serif;
+	color: #002d56;
+	width: 100%;
+	text-align: center;
+	margin: 0;
+}
+
+header.head nav{
+	margin: 0 0 1em;
+	text-align: center;
+}
+
+header.head nav ul{
+	background: #b6daf2 url(/assets/_sparkles_/images/nav_rpt.png) repeat-x;
+	border-width: 3px 0 1px 0;
+	border-color: #002d56;
+	border-style: solid;
+	list-style: none;
+	margin: 0;
+	padding: 0.3em 0 0.2em;
+	font-size: 1.0em;
+	font-weight: bold;
+}
+
+header.head nav ul li{
+	display: inline;
+	margin: 0 0.1em;
+	padding: 0;
+}
+
+header.head nav a{
+	color: #002d56;
+	text-decoration: none;
+	border-bottom: none;
+	padding: 9px 10px 7px;
+}
+
+header.head nav a:link{
+	border-bottom: none;
+}
+
+header.head nav a:hover{
+	background: #002d56 url(/assets/_sparkles_/images/nav_active_rpt.png) repeat-x;
+	color: #fff;
+}
+
+
+body .container{
+	width: 75%;
+	min-width: 860px;
+	max-width: 960px;
+	background-color: #FFF;
+	border-radius: 0.5em;
+	-moz-border-radius: 0.5em; 
+	-webkit-border-radius: 0.5em;
+	box-shadow: 0px 1px 3px #666;
+	-moz-box-shadow: 0px 1px 3px #666;
+	-webkit-box-shadow: 0px 1px 3px #666;
+	margin: 0 auto;
+	font-family: "Myriad Pro", Myriad, Arial, Helvetica, sans-serif;
+}
+
+body .container .body{
+	color: #444;
+	margin-bottom: 1em;
+	padding-bottom: 0.5em;
+}
+
+body .container .body h3 {
+	margin-left: 0.8em;
+	color: #002d56;
+}
+
+body .container .body .content{
+	color: #444;
+	margin-top: 1em;
+	padding: 1em 1.5em 1em;
+	margin-bottom: 1em;
+	background: #fff url(/assets/_sparkles_/images/logo_wm.png) no-repeat bottom right;
+	width: 60%;
+	float: left;
+	border-right: 2px dotted #9cc8e6;
+}
+
+body .container .body img{
+	max-width: 575px;
+}
+
+
+body .container .body .fullwidthcontent {
+	width: 90%;
+	padding: 2em 1.5em 1em;
+	margin-bottom: 1em;
+}
+
+body .container .body .sidebar{
+	padding: 2em 0 1em;
+	margin-bottom: 1em;
+	width: 34%;
+	float: left;
+}
+
+body .body h1{
+	color: #666;
+	font-size: 1.8em;
+	border-bottom: 1px solid #bbb;
+}
+
+body .body .content>pre{
+	padding: 1em 1em 0.1em;
+	margin: 1em 3em;
+	font: 0.9em "Courier New", Courier, mono;
+	background-color: #666;
+	color: white;
+	border-radius: 1em;
+	-moz-border-radius: 1em; 
+	-webkit-border-radius: 1em;
+	border: 0.4em solid #aaa;
+}
+
+body .body blockquote{
+	padding: 1em 1em 0.1em;
+	margin: 1em 3em;
+	font: italic 0.9em Georgia, "Times New Roman", Times, serif;
+}
+
+body .body p{
+	margin: 0 1em 1em;
+}
+
+blockquote p, .body .content>pre code{
+	display: block;
+	margin: 0 0 1.1em;
+}
+
+.body footer.footer{
+	border-top: 1px solid #666;
+	margin: 0 2em;
+	color: #666;
+	position: relative;
+	min-height: 30px;
+	text-align: center;
+	padding: 1em 1em 0 1em;
+}
+
+.body footer.footer .credits{
+	text-align:center;
+}
+
+body .container .body section.content img{
+  max-width: 500px;
+}
+
+.body footer.footer a.logo{
+	background: url(/assets/_sparkles_/images/osb_light_transparent.png);
+	color: #ff7e0e;
+	font-size: 1px;
+	display: block;
+	overflow: hidden;
+	height: 71px;
+	width: 330px;
+	text-decoration: none;
+	text-indent: -1000px;
+}
+
+span.strong {
+	font-weight:bold;
+}
+
+br.clearfix {
+	clear: both;
+}
+
+span.pdf_link, span.file_link{
+  display: inline-block;
+  min-height: 48px;
+  margin-bottom: 0.5em;
+  background: url(/assets/_sparkles_/images/pdf_icon_small.png) center left no-repeat;
+}
+section.content span.pdf_link, section.content span.file_link{
+	margin-left: 2em;
+}
+section.sidebar span.pdf_link, section.sidebar span.file_link{
+  margin-left: 1em;
+  margin-right: 1em;
+}
+section.sidebar li span.pdf_link, section.sidebar li span.file_link{
+  margin-left: 0;
+}
+.contact_form .contact_phone { display : none;}
+
+section.sidebar img {
+	margin-left: 1em;
+}
+
+span.file_link{
+  background-image: url(/assets/_sparkles_/images/file_icon_small.png);
+}
+
+span.pdf_link a, span.file_link a{
+  display: inline-block;
+  padding-left: 62px;
+  padding-right: 2em;
+  padding-top: 0.4em;
+  min-height: 48px;
+}
+.center {
+	text-align: center;
+}
+
+form.contact_form {
+	width: 216px;
+	padding: 1em;
+	margin-left: 1em;
+	background: #d7f4fd;
+	border: 1px solid #9cc8e6;
+}
+
+.admin{
+  font-size: 0.7em;
+  color: #003a65;
+  text-align: center;
+}
+
+.admin a{
+  color: #003a65;
+}
+
+/* For email obfuscation: */
+span.hideme{
+  display: none;
+}

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

@@ -1 +1,102 @@
-html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}:focus{outline:0}ins{text-decoration:none}del{text-decoration:line-through}table{border-collapse:collapse;border-spacing:0}
+/* 
+html5doctor.com Reset Stylesheet
+v1.6
+Last Updated: 2010-08-18
+Author: Richard Clark - http://richclarkdesign.com 
+Twitter: @rich_clark
+*/
+
+html, body, div, span, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+abbr, address, cite, code,
+del, dfn, em, img, ins, kbd, q, samp,
+small, strong, sub, sup, var,
+b, i,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, figcaption, figure, 
+footer, header, hgroup, menu, nav, section, summary,
+time, mark, audio, video {
+    margin:0;
+    padding:0;
+    border:0;
+    outline:0;
+    font-size:100%;
+    vertical-align:baseline;
+    background:transparent;
+}
+
+body {
+    line-height:1;
+}
+
+article,aside,details,figcaption,figure,
+footer,header,hgroup,menu,nav,section { 
+	display:block;
+}
+
+nav ul {
+    list-style:none;
+}
+
+blockquote, q {
+    quotes:none;
+}
+
+blockquote:before, blockquote:after,
+q:before, q:after {
+    content:'';
+    content:none;
+}
+
+a {
+    margin:0;
+    padding:0;
+    font-size:100%;
+    vertical-align:baseline;
+    background:transparent;
+}
+
+/* change colours to suit your needs */
+ins {
+    background-color:#ff9;
+    color:#000;
+    text-decoration:none;
+}
+
+/* change colours to suit your needs */
+mark {
+    background-color:#ff9;
+    color:#000; 
+    font-style:italic;
+    font-weight:bold;
+}
+
+del {
+    text-decoration: line-through;
+}
+
+abbr[title], dfn[title] {
+    border-bottom:1px dotted inherit;
+    cursor:help;
+}
+
+table {
+    border-collapse:collapse;
+    border-spacing:0;
+}
+
+/* change border colour to suit your needs */
+hr {
+    display:block;
+    height:1px;
+    border:0;   
+    border-top:1px solid #cccccc;
+    margin:1em 0;
+    padding:0;
+}
+
+input, select {
+    vertical-align:middle;
+}

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

@@ -97,7 +97,8 @@ body#subsites a#sites-tab,
 body#events a#events-tab,
 body#news a#news-tab,
 body#blog_posts a#blog-tab,
-body#members a#members-tab
+body#members a#members-tab,
+body#assets a#assets-tab
 {
 	background: #999999;
 	z-index: 0;
@@ -720,6 +721,16 @@ table.tablesorter .headerSortDown {
 }
 .asset-tile img{
   max-width: 120px;
+  max-height: 120px;
+}
+
+.asset-tile .asset_tag{
+  width: 120px;
+  height: 120px;
+}
+
+.asset-tile .asset_name{
+  height: 3em;
 }
 
 .asset_preview img{

data/lib/orange-sparkles/plugin.rb

@@ -1,8 +1,10 @@
+require 'orange-sparkles/sparkles_resource'
 module Orange::Plugins
   class Sparkles < Base
     assets_dir      File.join(File.dirname(__FILE__), 'assets')
     views_dir       File.join(File.dirname(__FILE__), 'views')
     templates_dir   File.join(File.dirname(__FILE__), 'templates')
+    resource SparklesResource.new
   end
 end
 

data/lib/orange-sparkles/sparkles_app.rb

@@ -12,6 +12,8 @@ require 'orange-more/subsites'
 require 'maruku'
 require 'rack/builder'
 require 'rack/abstract_format'
+require 'rack/openid'
+require 'openid_dm_store'
 
 require 'orange-sparkles/plugin'
 
@@ -22,37 +24,30 @@ class Orange::SparklesApp < Orange::Application
         packet.add_css('sparkles-admin.css', :position => 0, :module => '_sparkles_')
         packet.add_css('colorbox.css', :module => '_sparkles_')
         packet.add_css('smoothness/jquery-ui-1.7.2.custom.css', :module => '_sparkles_')
-        packet.add_js('jquery-1.4.1.min.js', :module => '_sparkles_')
         packet.add_js('markitup/sets/markdown/set.js', :module => '_sparkles_')
         packet.add_js('markitup/jquery.markitup.pack.js', :module => '_sparkles_')
         packet.add_js('autoresize.jquery.min.js', :module => '_sparkles_')
         packet.add_js('jquery-ui-1.7.2.custom.min.js', :module => '_sparkles_')
-        packet.add_js('jquery.form.js', :module => '_sparkles_')
-        packet.add_js('jquery.colorbox.js', :module => '_sparkles_')
-        packet.add_js('jquery.tools.min.js', :module => '_sparkles_')
-        packet.add_js('jquery.tablesorter.js', :module => '_sparkles_')
-        packet.add_js('jquery.tablesorter.pager.js', :module => '_sparkles_')
+        %w(form colorbox tools.min tablesorter tablesorter.pager).each do |js|
+          packet.add_js("jquery.#{js}.js", :module => '_sparkles_')
+        end
         packet.add_js('admin.js', :module => '_sparkles_')
         orange.fire(:view_admin, packet)
         'sparkles-admin.haml'
       elsif(packet['route.path'] == '/')
-        # 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_')}
+        ['reset', '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_')
-        ['reset', '960_24_col', 'text', 'main'].each{|c| packet.add_css("#{c}.css", :module => '_sparkles_')}
+        ['reset', 'text', 'main'].each{|c| packet.add_css("#{c}.css", :module => '_sparkles_')}
         'subpage.haml'
       end
     end # end do
   end
   
   stack do
-    orange.options[:development_mode] = true
     use Rack::CommonLogger
     use Rack::MethodOverride
     use Rack::Session::Cookie, :secret => (orange.options['main_user'] || 'the_secret')
-    auto_reload!
     use_exceptions
     
     use Rack::OpenID, OpenIDDataMapper::DataMapperStore.new
@@ -89,6 +84,16 @@ class OrangeAsset
   end
 end
 
+class OrangePage
+  admin do
+    fulltext :sidebar
+  end
+end
+
+class OrangePageVersion
+  fulltext :sidebar
+end
+
 
 module SparkleHelpers
   def markdown(string)

data/lib/orange-sparkles/sparkles_resource.rb

@@ -0,0 +1,12 @@
+class SparklesResource < Orange::Resource
+  call_me :sparkles
+  def stylesheets
+    orange.options["stylesheets"] || []
+  end
+  def javascripts
+    orange.options["javascripts"] || []
+  end
+  def site_name(packet, default = "An Orange Site")
+    packet['site'] ? packet['site'].name : default
+  end
+end

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

@@ -1,22 +1,25 @@
 !!! 5
 %html{:lang => "en"}
   %head
-    %title= packet['site'] ? packet['site'].name : "Orange Site"
+    %title= orange[:sparkles].site_name(packet)
     %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
+    %script{:src => "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"}
     = part[:css]
     = part[:js]
+    - orange[:sparkles].stylesheets.each{|css| add_css("#{css}.css") }
+    - orange[:sparkles].javascripts.each{|js| add_js("#{css}.js") }
+    /[if lt IE 9]
+      %script{:src => "http://html5shiv.googlecode.com/svn/trunk/html5.js"}
   %body#home
-    .container.container_24
-      %header.head
-        .logo
-          %h1= packet['site'] ? packet['site'].name : "Orange Site"
-        %nav.clearfix
-          = orange[:sitemap].two_level(packet)
-          %br.clear
-      .body.grid_22.prefix_1.suffix_1
-        = yield
+    .container
+      %o:slice{:mode => "header"}
+      .body
+        - if(part[:sidebar]).blank?
+          %section.fullwidthcontent= yield
+        - else
+          %section.content= yield
+          %section.sidebar= part[:sidebar]
+        %br.clearfix
+        %o:slice{:mode => "footer"}
+    %o:slice{:mode => "administrivia"}

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

@@ -2,6 +2,7 @@
 %html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en"}
   %head
     %title= part[:title, 'Orange Site'] 
+    %script{:src => "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"}
     %link{:rel => "stylesheet", :type => "text/css", :href => "http://yui.yahooapis.com/3.0.0/build/cssreset/reset-min.css"}
     = part[:css]
     = part[:js]
@@ -19,10 +20,11 @@
       %div#current-site-header 
         %span Currently editing:
         %br
-        %a.orange-text{:href => "/"}= packet['site'].name
+        %a.orange-text{:href => "/"}= orange[:sparkles].site_name(packet)
       %div.tab-container
         / %a.tab#home-tab{:href => "#"} Home
         %a.tab#sitemap-tab{:href => route_to(:sitemap)} Pages
+        %a.tab#assets-tab{:href => route_to(:assets)} Assets
         - 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]

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

@@ -1,20 +1,24 @@
 !!! 5
 %html{:lang => "en"}
   %head
-    %title Orange Site
+    %title= part[:page_title] +" - "+ orange[:sparkles].site_name(packet)
     %meta{:charset => "utf-8"}
-    -# CSS
+    %script{:src => "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"}
     = part[:css]
     = part[:js]
+    - orange[:sparkles].stylesheets.each{|css| add_css("#{css}.css") }
+    - orange[:sparkles].javascripts.each{|js| add_js("#{css}.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
-        %nav.clearfix
-          = orange[:sitemap].two_level(packet)
-          %br.clear
-      .body.grid_22.prefix_1.suffix_1
-        = yield
+    .container
+      %o:slice{:mode => "header"}
+      .body
+        - if(part[:sidebar]).blank?
+          %section.fullwidthcontent= yield
+        - else
+          %section.content= yield
+          %section.sidebar= part[:sidebar]
+        %br.clearfix
+        %o:slice{:mode => "footer"}
+    %o:slice{:mode => "administrivia"}

data/lib/orange-sparkles/views/assets/create.haml

@@ -1,25 +1,29 @@
-%form#asset-insert{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post', :enctype=>"multipart/form-data"}
-  %input{:type => 'hidden', :name => "fake_xhr", :value => "1"}
-  - for prop in props
-    - next if [:path, :secondary_path].include?(prop[:name])
-    %p= view_attribute(prop, model_name, :label => true)
-  %p
-    %label File
-    %br
-    %input{:type => 'file', :name => "#{model_name}[file]"}
-  / %p
-  /   %label Secondary File
-  /   %br
-  /   %input{:type => 'file', :name => "#{model_name}[file2]"}
-  %input{:type => 'submit', :value => 'Save New Item'}
-:javascript
-  $("#asset-insert").ajaxForm({dataType: 'json', success: function(ret){ 
-    var link = $.fn.colorbox.element();
-    var preview = link.prev();
-    var input_name = link.attr('rel');
-    preview.html(ret.html);
-    $("[name*='"+input_name+"']").attr("value", ret.id);
-    link.attr("href", "/admin/assets/"+ret.id+"/change");
-    link.text("Change Asset");
-    $.fn.colorbox.close();
-  }});
+- colorbox ||= false
+.form-view
+  %form#asset-insert{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post', :enctype=>"multipart/form-data"}
+    - if colorbox
+      %input{:type => 'hidden', :name => "fake_xhr", :value => "1"}
+    - for prop in props
+      - next if [:path, :secondary_path].include?(prop[:name])
+      %p= view_attribute(prop, model_name, :label => true)
+    %p
+      %label File
+      %br
+      %input{:type => 'file', :name => "#{model_name}[file]"}
+    / %p
+    /   %label Secondary File
+    /   %br
+    /   %input{:type => 'file', :name => "#{model_name}[file2]"}
+    %input{:type => 'submit', :value => 'Save New Item'}
+- if colorbox
+  :javascript
+    $("#asset-insert").ajaxForm({dataType: 'json', success: function(ret){ 
+      var link = $.fn.colorbox.element();
+      var preview = link.prev();
+      var input_name = link.attr('rel');
+      preview.html(ret.html);
+      $("[name*='"+input_name+"']").attr("value", ret.id);
+      link.attr("href", "/admin/assets/"+ret.id+"/change");
+      link.text("Change Asset");
+      $.fn.colorbox.close();
+    }});

data/lib/orange-sparkles/views/assets/insert.haml

@@ -2,11 +2,11 @@
   %h2 Upload a new image
   %hr
   .asset-upload-form
-    = view_create(:assets)
+    = view_create(:assets, :colorbox => true)
 .choose-asset{:style => "display: none"}
   %h2 Choose a previously uploaded image
   %hr
-  = view_list(:assets)
+  = view_list(:assets, :colorbox => true)
 .current-asset
   %hr
   %a.asset-chooser-toggle{:href => "#"} Choose a previously uploaded image instead

data/lib/orange-sparkles/views/assets/list.haml

@@ -1,19 +1,46 @@
-.asset-list
-  - for asset in list
-    .asset-tile{:id => asset.id}
-      %p.asset_tag= asset.to_asset_tag
-      %p
-        %em= asset.name
-:javascript
-  $(".asset-tile").click(function(ret){ 
-    var tile = $(this);
-    var link = $.fn.colorbox.element();
-    var preview = link.prev();
-    var input_name = link.attr('rel');
-    var id = tile.attr("id");
-    preview.html(tile.children(".asset_tag").html());
-    $("[name*='"+input_name+"']").attr("value", id);
-    link.attr("href", "/admin/assets/"+tile.attr("id")+"/change");
-    link.text("Change Asset");
-    $.fn.colorbox.close();
-  });
+- packet.add_js("page-list-effects.js", :module => "_sparkles_")
+- colorbox ||= false
+.list-view
+  .asset-list
+    - for asset in list
+      .asset-tile{:id => asset.id}
+        %p.asset_tag
+          -if(asset.image?)
+            = asset.to_asset_tag
+          -elsif(asset.pdf?)
+            %img{:src => '/assets/_sparkles_/images/pdf_icon.png'}
+          -else
+            %img{:src => '/assets/_sparkles_/images/file_icon.png'}
+        %p.asset_name
+          - name = asset.name.size > 50 ? asset.name[0,50] + '...' : asset.name
+          - name = name.blank? ? "Untitled Asset ##{asset.id}" : name
+          - if colorbox
+            %em= name
+          - else
+            %em
+              %a{:href => route_to(:assets, asset.id, :edit)}= name
+  %br.clearfix
+  - unless colorbox
+    %a.button.add-button{:href => route_to(model_name, 'create'), :style => "float: right"} Upload new asset
+  %br.clearfix
+- if colorbox
+  :javascript
+    $(".asset-tile .asset_tag a").click(function(ret){ 
+      var tile = $(this).closest('.asset-tile');
+      var id = tile.attr("id");
+      $.markItUp({ replaceWith: '<o:asset id="'+id+'" />' } );
+      $.fn.colorbox.close();
+      return false;
+    });
+    $(".asset-tile").click(function(ret){ 
+      var tile = $(this);
+      var link = $.fn.colorbox.element();
+      var preview = link.prev();
+      var input_name = link.attr('rel');
+      var id = tile.attr("id");
+      preview.html(tile.children(".asset_tag").html());
+      $("[name*='"+input_name+"']").attr("value", id);
+      link.attr("href", "/admin/assets/"+tile.attr("id")+"/change");
+      link.text("Change Asset");
+      $.fn.colorbox.close();
+    });

data/lib/orange-sparkles/views/assets/list_markitup.haml

@@ -1,10 +1,24 @@
 .asset-list
   - for asset in list
     .asset-tile{:id => asset.id}
-      %p.asset_tag= asset.to_asset_tag
-      %p
-        %em= asset.name
+      %p.asset_tag
+        -if(asset.image?)
+          = asset.to_asset_tag
+        -elsif(asset.pdf?)
+          %img{:src => '/assets/_sparkles_/images/pdf_icon.png'}
+        -else
+          %img{:src => '/assets/_sparkles_/images/file_icon.png'}
+      %p.asset_name
+        - name = asset.name.size > 50 ? asset.name[0,50] + '...' : asset.name
+        %em= name
 :javascript
+  $(".asset-tile .asset_tag a").click(function(ret){ 
+    var tile = $(this).closest('.asset-tile');
+    var id = tile.attr("id");
+    $.markItUp({ replaceWith: '<o:asset id="'+id+'" />' } );
+    $.fn.colorbox.close();
+    return false;
+  });
   $(".asset-tile").click(function(ret){ 
     var tile = $(this);
     var id = tile.attr("id");

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

@@ -9,4 +9,10 @@
     %br.clearfix
   - else
     %p Couldn't find the item you're looking for.
-- packet["page.title"] = "Site Settings"
+- packet["page.title"] = "Site Settings"
+- if orange.loaded?(:adverts)
+  %h2 Site Ads
+  = view_list(:adverts, :is_short => true)
+- if orange.loaded?(:contactforms)
+  %h2 Contact Forms
+  = view_list(:contactforms, :is_short => true)

data/lib/orange-sparkles/views/sitemap/one_level.haml

@@ -1,7 +1,7 @@
 %ul.nav
   %li.first
-    %a{:href => "#{orange[:subsites].url_for(packet).gsub(/\/$/, '')}#{model.full_path}"}= packet["subsite"].name
+    %a{:href => model.full_path} Home
   - for item in model.children
     - next unless item.show_in_nav
     %li
-      %a{:href => "#{orange[:subsites].url_for(packet).gsub(/\/$/, '')}#{item.full_path}"}= orange[:sitemap].link_text_for(item)
+      %a{:href => item.full_path}= orange[:sitemap].link_text_for(item)

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

@@ -0,0 +1,5 @@
+.admin
+  Built on 
+  %a{:href => "http://www.orangerb.com"} Orange 
+  |
+  %a{:href => "/admin/sitemap"} Site Admin

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

@@ -0,0 +1,7 @@
+%footer.footer
+  .credits
+    - if !orange.options["footer_text"].blank?
+      = markdown(orange.options["footer_text"])
+    - else
+      %p
+        %span.strong= packet['site'] ? packet['site'].name : "An Orange Site"

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

@@ -0,0 +1,5 @@
+%header.head
+  .logo
+    %h1= packet['site'] ? packet['site'].name : "An Orange Site"
+  %nav
+    = orange[:sitemap].one_level(packet)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: orange-sparkles
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - David Haslem
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 -04:00
+date: 2010-08-20 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
@@ -35,9 +38,11 @@ dependencies:
   name: orange-more
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 0
         - 5
@@ -49,9 +54,11 @@ dependencies:
   name: maruku
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -61,9 +68,11 @@ 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"
@@ -80,7 +89,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/orange-sparkles.rb
-- lib/orange-sparkles/assets/css/960_24_col.css
 - lib/orange-sparkles/assets/css/border-radius.htc
 - lib/orange-sparkles/assets/css/colorbox.css
 - lib/orange-sparkles/assets/css/main.css
@@ -119,6 +127,8 @@ files:
 - lib/orange-sparkles/assets/images/expand.png
 - lib/orange-sparkles/assets/images/facebook_sticker.png
 - lib/orange-sparkles/assets/images/facebook_sticker_small.png
+- lib/orange-sparkles/assets/images/file_icon.png
+- lib/orange-sparkles/assets/images/file_icon_small.png
 - lib/orange-sparkles/assets/images/google-small.png
 - lib/orange-sparkles/assets/images/green-button.png
 - lib/orange-sparkles/assets/images/grey-button.png
@@ -147,6 +157,8 @@ files:
 - lib/orange-sparkles/assets/images/move-outdent-disabled.png
 - lib/orange-sparkles/assets/images/move-outdent.png
 - lib/orange-sparkles/assets/images/move-up-disabled.png
+- lib/orange-sparkles/assets/images/nav_active_rpt.png
+- lib/orange-sparkles/assets/images/nav_rpt.png
 - lib/orange-sparkles/assets/images/orange-button.png
 - lib/orange-sparkles/assets/images/overlay.png
 - lib/orange-sparkles/assets/images/page-list-last-child.png
@@ -158,12 +170,16 @@ files:
 - lib/orange-sparkles/assets/images/page-listing-link.png
 - lib/orange-sparkles/assets/images/page-listing-page.png
 - lib/orange-sparkles/assets/images/page-listing-subsite.png
+- lib/orange-sparkles/assets/images/pattern.png
+- lib/orange-sparkles/assets/images/pattern_light.png
 - lib/orange-sparkles/assets/images/payment/amex.png
 - lib/orange-sparkles/assets/images/payment/check.png
 - lib/orange-sparkles/assets/images/payment/discover.png
 - lib/orange-sparkles/assets/images/payment/mastercard.png
 - lib/orange-sparkles/assets/images/payment/paypal.png
 - lib/orange-sparkles/assets/images/payment/visa.png
+- lib/orange-sparkles/assets/images/pdf_icon.png
+- lib/orange-sparkles/assets/images/pdf_icon_small.png
 - lib/orange-sparkles/assets/images/popout-shadow.png
 - lib/orange-sparkles/assets/images/slider-background.png
 - lib/orange-sparkles/assets/images/slider-bg-enabled-disabled.png
@@ -185,6 +201,7 @@ files:
 - lib/orange-sparkles/assets/images/twitter_sticker_small.png
 - lib/orange-sparkles/assets/images/vimeo_sticker.png
 - lib/orange-sparkles/assets/images/vimeo_sticker_small.png
+- lib/orange-sparkles/assets/images/yahoo-small.png
 - lib/orange-sparkles/assets/images/youtube_sticker.png
 - lib/orange-sparkles/assets/images/youtube_sticker_small.png
 - lib/orange-sparkles/assets/js/admin.js
@@ -257,7 +274,7 @@ files:
 - lib/orange-sparkles/assets/js/popout-effects-page-edit.js
 - lib/orange-sparkles/plugin.rb
 - lib/orange-sparkles/sparkles_app.rb
-- lib/orange-sparkles/templates/admin.haml
+- lib/orange-sparkles/sparkles_resource.rb
 - lib/orange-sparkles/templates/home.haml
 - lib/orange-sparkles/templates/sparkles-admin.haml
 - lib/orange-sparkles/templates/subpage.haml
@@ -310,6 +327,9 @@ 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/administrivia.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
@@ -326,23 +346,27 @@ 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.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Adding some prettiness to orange-core

data/lib/orange-sparkles/assets/css/960_24_col.css

@@ -1 +0,0 @@
-.container_24{margin-left:auto;margin-right:auto;width:960px}.grid_1,.grid_2,.grid_3,.grid_4,.grid_5,.grid_6,.grid_7,.grid_8,.grid_9,.grid_10,.grid_11,.grid_12,.grid_13,.grid_14,.grid_15,.grid_16,.grid_17,.grid_18,.grid_19,.grid_20,.grid_21,.grid_22,.grid_23,.grid_24{display:inline;float:left;margin-left:5px;margin-right:5px}.push_1,.pull_1,.push_2,.pull_2,.push_3,.pull_3,.push_4,.pull_4,.push_5,.pull_5,.push_6,.pull_6,.push_7,.pull_7,.push_8,.pull_8,.push_9,.pull_9,.push_10,.pull_10,.push_11,.pull_11,.push_12,.pull_12,.push_13,.pull_13,.push_14,.pull_14,.push_15,.pull_15,.push_16,.pull_16,.push_17,.pull_17,.push_18,.pull_18,.push_19,.pull_19,.push_20,.pull_20,.push_21,.pull_21,.push_22,.pull_22,.push_23,.pull_23{position:relative}.alpha{margin-left:0}.omega{margin-right:0}.container_24 .grid_1{width:30px}.container_24 .grid_2{width:70px}.container_24 .grid_3{width:110px}.container_24 .grid_4{width:150px}.container_24 .grid_5{width:190px}.container_24 .grid_6{width:230px}.container_24 .grid_7{width:270px}.container_24 .grid_8{width:310px}.container_24 .grid_9{width:350px}.container_24 .grid_10{width:390px}.container_24 .grid_11{width:430px}.container_24 .grid_12{width:470px}.container_24 .grid_13{width:510px}.container_24 .grid_14{width:550px}.container_24 .grid_15{width:590px}.container_24 .grid_16{width:630px}.container_24 .grid_17{width:670px}.container_24 .grid_18{width:710px}.container_24 .grid_19{width:750px}.container_24 .grid_20{width:790px}.container_24 .grid_21{width:830px}.container_24 .grid_22{width:870px}.container_24 .grid_23{width:910px}.container_24 .grid_24{width:950px}.container_24 .prefix_1{padding-left:40px}.container_24 .prefix_2{padding-left:80px}.container_24 .prefix_3{padding-left:120px}.container_24 .prefix_4{padding-left:160px}.container_24 .prefix_5{padding-left:200px}.container_24 .prefix_6{padding-left:240px}.container_24 .prefix_7{padding-left:280px}.container_24 .prefix_8{padding-left:320px}.container_24 .prefix_9{padding-left:360px}.container_24 .prefix_10{padding-left:400px}.container_24 .prefix_11{padding-left:440px}.container_24 .prefix_12{padding-left:480px}.container_24 .prefix_13{padding-left:520px}.container_24 .prefix_14{padding-left:560px}.container_24 .prefix_15{padding-left:600px}.container_24 .prefix_16{padding-left:640px}.container_24 .prefix_17{padding-left:680px}.container_24 .prefix_18{padding-left:720px}.container_24 .prefix_19{padding-left:760px}.container_24 .prefix_20{padding-left:800px}.container_24 .prefix_21{padding-left:840px}.container_24 .prefix_22{padding-left:880px}.container_24 .prefix_23{padding-left:920px}.container_24 .suffix_1{padding-right:40px}.container_24 .suffix_2{padding-right:80px}.container_24 .suffix_3{padding-right:120px}.container_24 .suffix_4{padding-right:160px}.container_24 .suffix_5{padding-right:200px}.container_24 .suffix_6{padding-right:240px}.container_24 .suffix_7{padding-right:280px}.container_24 .suffix_8{padding-right:320px}.container_24 .suffix_9{padding-right:360px}.container_24 .suffix_10{padding-right:400px}.container_24 .suffix_11{padding-right:440px}.container_24 .suffix_12{padding-right:480px}.container_24 .suffix_13{padding-right:520px}.container_24 .suffix_14{padding-right:560px}.container_24 .suffix_15{padding-right:600px}.container_24 .suffix_16{padding-right:640px}.container_24 .suffix_17{padding-right:680px}.container_24 .suffix_18{padding-right:720px}.container_24 .suffix_19{padding-right:760px}.container_24 .suffix_20{padding-right:800px}.container_24 .suffix_21{padding-right:840px}.container_24 .suffix_22{padding-right:880px}.container_24 .suffix_23{padding-right:920px}.container_24 .push_1{left:40px}.container_24 .push_2{left:80px}.container_24 .push_3{left:120px}.container_24 .push_4{left:160px}.container_24 .push_5{left:200px}.container_24 .push_6{left:240px}.container_24 .push_7{left:280px}.container_24 .push_8{left:320px}.container_24 .push_9{left:360px}.container_24 .push_10{left:400px}.container_24 .push_11{left:440px}.container_24 .push_12{left:480px}.container_24 .push_13{left:520px}.container_24 .push_14{left:560px}.container_24 .push_15{left:600px}.container_24 .push_16{left:640px}.container_24 .push_17{left:680px}.container_24 .push_18{left:720px}.container_24 .push_19{left:760px}.container_24 .push_20{left:800px}.container_24 .push_21{left:840px}.container_24 .push_22{left:880px}.container_24 .push_23{left:920px}.container_24 .pull_1{left:-40px}.container_24 .pull_2{left:-80px}.container_24 .pull_3{left:-120px}.container_24 .pull_4{left:-160px}.container_24 .pull_5{left:-200px}.container_24 .pull_6{left:-240px}.container_24 .pull_7{left:-280px}.container_24 .pull_8{left:-320px}.container_24 .pull_9{left:-360px}.container_24 .pull_10{left:-400px}.container_24 .pull_11{left:-440px}.container_24 .pull_12{left:-480px}.container_24 .pull_13{left:-520px}.container_24 .pull_14{left:-560px}.container_24 .pull_15{left:-600px}.container_24 .pull_16{left:-640px}.container_24 .pull_17{left:-680px}.container_24 .pull_18{left:-720px}.container_24 .pull_19{left:-760px}.container_24 .pull_20{left:-800px}.container_24 .pull_21{left:-840px}.container_24 .pull_22{left:-880px}.container_24 .pull_23{left:-920px}.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0}.clearfix:after{clear:both;content:' ';display:block;font-size:0;line-height:0;visibility:hidden;width:0;height:0}* html .clearfix,*:first-child+html .clearfix{zoom:1}

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

@@ -1,24 +0,0 @@
-!!! xml
-!!!
-%html
-  %head
-    %title= part[:title, 'Orange Site'] 
-    = part[:css]
-    = part[:js]
-  %body
-    #body
-      .header
-        ORANGISH
-      .container
-        #inner-body
-          .sidebar
-            - orange[:admin].links(packet).each do |k, section|
-              .sidebar_section
-                %h3= k
-                %ul
-                  - for link in section
-                    %li
-                      %a{:href => link[:href], :style => "background-image: url(#{link[:icon]})"}= link[:text]
-          .main
-            = yield
-      .footer