orange-sparkles 0.5.9 → 0.7.0

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

@@ -97,7 +97,7 @@ body .container .body .content{
 	margin-top: 1em;
 	padding: 1em 1.5em 1em;
 	margin-bottom: 1em;
-	background: #fff url(/assets/_sparkles_/images/logo_wm.png) no-repeat bottom right;
+	background: #fff;
 	width: 60%;
 	float: left;
 	border-right: 2px dotted #9cc8e6;

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

@@ -187,11 +187,18 @@ div#current-site-header {
 	border: 1px solid #d7d7d7;
 	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
-	height: 226px;
 	margin: 140px auto;
 	padding:15px;
 	width: 176px;
 }
+#login .message{
+	background: #efa;
+	border: 1px solid #bc8;
+	padding: 0.5em;
+	font-size: 0.9em;
+	text-align: center;
+	margin: 0 0 1em;
+}
 #login label {
 	color: #575555;
 	font-size: 18px;
@@ -271,6 +278,9 @@ div#box-container {
 		position: relative;
 		width: 400px;
 		z-index: 1;
+	}
+	#edit-sidebar{
+		height: 200px;
 	}
 		#edit input[type='text'] {
 			border: 1px solid #bbbbbb;
@@ -460,6 +470,10 @@ div#box-container {
 		padding: 10px;
 		width: 930px;
 	}
+	#cboxContent #pages-list, #cboxContent .list-view, #cboxContent .form-view{
+		width: 95%;
+		margin: 10px auto;
+	}
 	#pages-list table, .list-view table{
 		width: 100%;
 	}

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

@@ -6,6 +6,6 @@ $(function(){
   $("#site-selector").change(function(){
     window.location = $(this).val();
   });
-  
   $('a.insert_asset').colorbox({ width: "60%", height: "80%"});
+  // $(".markdown-editor").markItUp(mySettings);
 });

data/lib/orange-sparkles/assets/js/popout-effects-generic.js

@@ -21,7 +21,7 @@ $(function(){
 		$(this).parent("div").siblings().next("div.settings-area").slideDown();
 		$(this).children("img").attr('src','/assets/_sparkles_/images/collapse-up.png');
 	});
- 	$("#edit-content").markItUp(mySettings);
+ 	$(".markdown-editor").markItUp(mySettings);
 	$("textarea.autosize").autoResize({
 	    extraSpace : 15
 	});

data/lib/orange-sparkles/sparkles_app.rb

@@ -8,13 +8,11 @@ require 'orange-more/disqus'
 require 'orange-more/analytics'
 require 'orange-more/cloud'
 require 'orange-more/debugger'
-require 'orange-more/subsites'
-require 'maruku'
 require 'rack/builder'
 require 'rack/abstract_format'
 require 'rack/openid'
 require 'openid_dm_store'
-
+require 'kramdown'
 require 'orange-sparkles/plugin'
 
 class Orange::SparklesApp < Orange::Application
@@ -35,10 +33,12 @@ class Orange::SparklesApp < Orange::Application
         orange.fire(:view_admin, packet)
         'sparkles-admin.haml'
       elsif(packet['route.path'] == '/')
-        ['reset', 'text', 'main'].each{|c| packet.add_css("#{c}.css", :module => '_sparkles_')}
+        ['reset', 'text'].each{|c| packet.add_css("#{c}.css", :module => '_sparkles_')}
+        ['main'].each{|c| packet.add_css("#{c}.css", :module => '_sparkles_')} if orange[:sparkles].default_style?
         'home.haml'
       else
-        ['reset', 'text', 'main'].each{|c| packet.add_css("#{c}.css", :module => '_sparkles_')}
+        ['reset', 'text'].each{|c| packet.add_css("#{c}.css", :module => '_sparkles_')}
+        ['main'].each{|c| packet.add_css("#{c}.css", :module => '_sparkles_')} if orange[:sparkles].default_style?
         'subpage.haml'
       end
     end # end do
@@ -63,22 +63,14 @@ class Orange::SparklesApp < Orange::Application
 end
 
 class Orange::AssetResource < Orange::ModelResource
-  def markitup_insert(packet, opts = {})
-    do_view(packet, :markitup_insert, opts)
-  end
-  def create_markitup(packet, opts = {})
-    do_view(packet, :create_markitup, opts)
-  end
-  def list_markitup(packet, opts = {})
-    do_view(packet, :list_markitup, opts)
-  end
+  viewable :markitup_insert, :create_markitup, :list_markitup
 end
 
 class OrangeAsset
   def to_s
     <<-DOC
     <textarea>
-    {"id": #{self.id}, "html": "#{self.to_asset_tag}"}
+    {"id": #{self.id}, "name": "#{self.name}", "caption": "#{self.caption}", "html": "#{self.to_asset_tag}"}
     </textarea>
     DOC
   end
@@ -98,8 +90,8 @@ end
 module SparkleHelpers
   def markdown(string)
     # Preparse for radius
-    string = orange[:radius].parse_text(self, string)
-    Maruku.new(string).to_html
+    # string = orange[:radius].parse_text(self, string)
+    Kramdown::Document.new(string).to_html
   end
   def lorem(chars = 300)
     chars = chars.to_i

data/lib/orange-sparkles/sparkles_resource.rb

@@ -1,12 +1,23 @@
+require 'extlib/mash'
 class SparklesResource < Orange::Resource
   call_me :sparkles
   def stylesheets
-    orange.options["stylesheets"] || []
+    orange.options["sparkles.stylesheets"] || []
   end
   def javascripts
-    orange.options["javascripts"] || []
+    orange.options["sparkles.javascripts"] || []
   end
   def site_name(packet, default = "An Orange Site")
     packet['site'] ? packet['site'].name : default
   end
+  def sidebar?
+    orange.options["sidebar_on"] || false
+  end
+  def tabs
+    tabs = orange.options["sparkles.tabs"] || []
+    tabs.collect{|hash| Mash.new(hash)} || []
+  end
+  def default_style?
+    orange.options["sparkles.default_style"] || stylesheets.empty?
+  end
 end

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

@@ -1,14 +1,14 @@
 !!! 5
 %html{:lang => "en"}
   %head
-    %title= orange[:sparkles].site_name(packet)
+    %title= orange[:sparkles].site_name(packet, orange.options[:site_name])
     %meta{:charset => "utf-8"}
     -# CSS
     %script{:src => "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"}
+    - orange[:sparkles].stylesheets.each{|css| add_css("#{css}.css") }
+    - orange[:sparkles].javascripts.each{|js| add_js("#{js}.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

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'] 
+    %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}
     %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]
@@ -12,7 +13,7 @@
     %div#header
       %div#user-status 
         Welcome, #{packet["user"] ? packet["user"].name : "User"}!
-        %a.orange-text{:href => "/logout"} Sign Out
+        %a.orange-text{:href => full_url('logout')} Sign Out
         %p
           %a{:href => route_to(:users)} Manage Users
           |
@@ -20,12 +21,12 @@
       %div#current-site-header 
         %span Currently editing:
         %br
-        %a.orange-text{:href => "/"}= orange[:sparkles].site_name(packet)
+        %a.orange-text{:href => orange[:mapper].root_url(packet)}= 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"] || [])
+        - for link in (orange[:sparkles].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

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

@@ -1,13 +1,13 @@
 !!! 5
 %html{:lang => "en"}
   %head
-    %title= part[:page_title] +" - "+ orange[:sparkles].site_name(packet)
+    %title= part[:page_title] +" - "+ orange[:sparkles].site_name(packet, orange.options[:site_name])
     %meta{:charset => "utf-8"}
     %script{:src => "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"}
+    - orange[:sparkles].stylesheets.each{|css| add_css("#{css}.css") }
+    - orange[:sparkles].javascripts.each{|js| add_js("#{js}.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

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

@@ -9,7 +9,7 @@
   = view_list(:assets)
 .current-asset
   %hr
-  %a.asset-chooser-toggle{:href => "#"} Choose a previously uploaded image instead
+  %a.asset-chooser-toggle{:href => "#"} Upload a new image instead
   %hr
   %p 
     Currently chosen image:

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

@@ -1,6 +1,6 @@
-- colorbox ||= false
+- colorbox ||= packet.request.xhr?
 .form-view
-  %form#asset-insert{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post', :enctype=>"multipart/form-data"}
+  %form#asset-insert{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post', :enctype=>"multipart/form-data", :"accept-charset" => "UTF-8"}
     - if colorbox
       %input{:type => 'hidden', :name => "fake_xhr", :value => "1"}
     - for prop in props

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

@@ -1,4 +1,4 @@
-%form#asset-insert{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post', :enctype=>"multipart/form-data"}
+%form#asset-insert{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post', :enctype=>"multipart/form-data", :"accept-charset" => "UTF-8"}
   %input{:type => 'hidden', :name => "fake_xhr", :value => "1"}
   - for prop in props
     - next if [:path, :secondary_path].include?(prop[:name])
@@ -14,6 +14,6 @@
   %input{:type => 'submit', :value => 'Save New Item'}
 :javascript
   $("#asset-insert").ajaxForm({dataType: 'json', success: function(ret){ 
-    $.markItUp({ replaceWith: '<o:asset id="'+ret.id+'" />' } );
+    $.markItUp({ replaceWith: '<o:asset id="'+ret.id+'">'+ret.name+'</o:asset>' } );
     $.fn.colorbox.close();
   }});

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

@@ -0,0 +1,37 @@
+- colorbox ||= packet.request.xhr?
+.form-view
+  %form#asset-update{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post', :enctype=>"multipart/form-data", :"accept-charset" => "UTF-8"}
+    - 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, :value => model.attribute_get(prop[:name]), :model => model)
+    / %p
+    /   %label Secondary File
+    /   %br
+    /   %input{:type => 'file', :name => "#{model_name}[file2]"}
+    .current-asset
+      %hr
+      %p 
+        Currently chosen asset:
+        %em= model.name
+      .preview
+        = model.to_asset_tag
+      %p
+        %label To replace file choose a new one below:
+        %br
+        %input{:type => 'file', :name => "#{model_name}[file]"}
+    %hr
+    %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/list.haml

@@ -1,10 +1,10 @@
 - packet.add_js("page-list-effects.js", :module => "_sparkles_")
-- colorbox ||= false
+- colorbox ||= packet.request.xhr?
 .list-view
   .asset-list
     - for asset in list
       .asset-tile{:id => asset.id}
-        %p.asset_tag
+        .asset_tag
           -if(asset.image?)
             = asset.to_asset_tag
           -elsif(asset.pdf?)
@@ -19,6 +19,7 @@
           - else
             %em
               %a{:href => route_to(:assets, asset.id, :edit)}= name
+              = delete_button(route_to(:assets, asset.id, "delete"))
   %br.clearfix
   - unless colorbox
     %a.button.add-button{:href => route_to(model_name, 'create'), :style => "float: right"} Upload new asset
@@ -28,7 +29,13 @@
     $(".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+'" />' } );
+      var link = $.fn.colorbox.element();
+      var preview = link.prev();
+      var input_name = link.attr('rel');
+      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();
       return false;
     });

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

@@ -15,13 +15,15 @@
   $(".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+'" />' } );
+    var my_name = $(".asset_name", tile).text().trim();
+    $.markItUp({ replaceWith: '<o:asset id="'+id+'">'+my_name+'</o:asset>' } );
     $.fn.colorbox.close();
     return false;
   });
   $(".asset-tile").click(function(ret){ 
     var tile = $(this);
     var id = tile.attr("id");
-    $.markItUp({ replaceWith: '<o:asset id="'+id+'" />' } );
+    var my_name = $(".asset_name", tile).text().trim();
+    $.markItUp({ replaceWith: '<o:asset id="'+id+'">'+my_name+'</o:asset>' } );
     $.fn.colorbox.close();
   });

data/lib/orange-sparkles/views/blog/sitemap_row.haml

@@ -26,7 +26,7 @@
       %div.page-listing-location
         Current Location:  
         %span.last-uri-segment><
-          = route.full_path
+          = route_to(route)
       .menu-toggle
         Show in Menu:&nbsp;
         = button("Yes", route_to(:sitemap, route.id, :show_in_nav), :css_class => route.show_in_nav ? "white-button" : "grey-button")
@@ -39,7 +39,7 @@
       %a.button.status-published Published
 %td
   %div.page-listing-actions
-    %a.button.grey-button.preview-button{:href => route.full_path, :target => "_blank", :rel => "colorbox"}
+    %a.button.grey-button.preview-button{:href => route_to(route), :target => "_blank", :rel => "colorbox"}
       Preview
     = delete_button(route_to(model_name, model.id, "delete"))
     %a.button.grey-button.move-button{:href => "#"}

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

@@ -2,7 +2,7 @@
 - packet.add_js("popout-effects-generic.js", :module => "_sparkles_")
 - packet.add_js("popout-effects-page-edit.js", :module => "_sparkles_")
 %div#edit-box
-  %form#edit{:action => route_to(model_name, "new"), :method => "post"}
+  %form#edit{:action => route_to(model_name, "new"), :method => "post", :"accept-charset" => "UTF-8"}
     %label{:for => "edit-title"} Title
     %input#publish-social{:type => "hidden", :name => "#{model_name}[publish_to_social]", :value => "0"}
     %input#edit-title{:type => "text", :name => "#{model_name}[title]", :value => ""}

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

@@ -2,7 +2,7 @@
 - packet.add_js("popout-effects-generic.js", :module => "_sparkles_")
 - packet.add_js("popout-effects-page-edit.js", :module => "_sparkles_")
 %div#edit-box
-  %form#edit{:action => route_to(model_name, model.id, "save"), :method => "POST"}
+  %form#edit{:action => route_to(model_name, model.id, "save"), :method => "POST", :"accept-charset" => "UTF-8"}
     %label{:for => "edit-title"} Title
     - # Make it harder to republish to social by forcing publish to social off.
     %input#edit-title{:type => "text", :name => "#{model_name}[title]", :value => model.title}

data/lib/orange-sparkles/views/contactforms/contactform.haml

@@ -6,7 +6,7 @@
   %h3= model.title
   - if(flash['error'])
     .error= flash('error')
-  %form{ :class => 'contact_form', :id => 'contact_form_'+model.id.to_s, :action => route_to(:contactforms, :mailer, model.id), :method => 'POST' }
+  %form{ :class => 'contact_form', :id => 'contact_form_'+model.id.to_s, :action => route_to(:contactforms, :mailer, model.id), :method => 'POST' , :"accept-charset" => "UTF-8"}
     %p
       %label{ :for => 'contact_from'} Your Name
       %br

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

@@ -1,5 +1,5 @@
 .form-view
-  %form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post'}
+  %form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post', :"accept-charset" => "UTF-8"}
     - packet["page.title"] = "#{model_name.to_s.capitalize} > Create"
     - for prop in props
       %p= view_attribute(prop, model_name, :label => true)

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

@@ -3,7 +3,7 @@
   - if model
     - if resource.options[:sitemappable, false] 
       = orange[:sitemap, true].sitemap_links(packet, {:slug_me => orange[:sitemap, true].slug_for(model, props)})
-    %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post'}
+    %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post', :"accept-charset" => "UTF-8"}
       - for prop in props
         %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]), :model => model)
       %input{:type => 'submit', :value => 'Save Changes'}

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

@@ -2,7 +2,7 @@
   - if model
     - if resource.options[:sitemappable, false] 
       = orange[:sitemap, true].sitemap_links(packet, {:slug_me => orange[:sitemap, true].slug_for(model, props)})
-    %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post'}
+    %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post', :"accept-charset" => "UTF-8"}
       - packet["page.title"] = "#{model_name.to_s.capitalize} > Edit"
       - for prop in props
         %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))

data/lib/orange-sparkles/views/openid_login.haml

@@ -14,6 +14,9 @@
     %h2 You'll need to log in before you can continue.
     %div#login-box
       %form#login{:name => "login", :method => "post", :action => ""}
+        - unless packet.flash['login.message'].blank?
+          .message
+            %p= packet.flash('login.message')
         %label.center-block
           Login with Google
         %a.center-block{:href => "#", :onclick => "$(\"#login-openid\").val(\"https://www.google.com/accounts/o8/id\"); $(\"form#login\").submit(); return false;"}

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

@@ -2,7 +2,7 @@
 %h2 Site Settings
 .form-view
   - if model
-    %form{:action => route_to(model_name, model[:id], 'save'), :method => 'post'}
+    %form{:action => route_to(model_name, model[:id], 'save'), :method => 'post', :"accept-charset" => "UTF-8"}
       - for prop in props
         %p~ view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
       %input{:type => 'submit', :value => 'Save Changes'}

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

@@ -1,74 +1,60 @@
 - packet["page.title"] = "Pages > Edit"
 - packet.add_js("popout-effects-generic.js", :module => "_sparkles_")
 - packet.add_js("popout-effects-page-edit.js", :module => "_sparkles_")
-%div#edit-box
-  %form#edit{:action => route_to(model_name, model.id, "save"), :method => "POST"}
-    %label{:for => "edit-title"} Title
-    %input#edit-title{:type => "text", :name => "#{model_name}[title]", :value => model.title}
-    %textarea#edit-content{:cols => "32", :rows => "20", :name => "#{model_name}[body]"}<&= model.body
-    %div#save-status
-      #{model.published ? "Published" : "Draft saved"}
-    %input#publish-me{:type => "hidden", :name => "#{model_name}[published]", :value => "0"}
-    %div#button-container
-      %input#save-draft{:type => "button", :onclick => "$('#save-status').text('Saving draft...'); $('#edit').ajaxSubmit({success: function(){$('#save-status').text('Draft saved.');}, method: 'post'}); return false;", :value => "Save Draft"}
-      %input#publish{:type => "button", :onclick => "$('#publish-me').val('1'); $('#edit').submit(); return false;", :value => "Publish"}
-%div#popout-box
-  %div#popout-titlebar
-    Settings
-    %div#popout-collapse
-      %a#collapse{:href => "#"}
-        %img{:src => "/assets/_sparkles_/images/collapse-left.png", :border => "0"}
-  / %div.slider-container.main-slider-container
-  /     %div.slider-background.slider-background-general-custom
-  /       %div.slider
-  /         General
-  %div.page-settings-container
-    %div.page-settings-container-current
-      %div#page-settings-container-1
-        / %hr.one-px-grey
-        / %div#show-in-menu.control-label
-        /           - unless routes.empty?
-        /             Show in Menu
-        /             %div.slider-container
-        /               %div.slider-background.slider-background-yes-no
-        /                 - if routes.first.show_in_nav
-        /                   %div.slider
-        /                     Yes
-        /                 - else
-        /                   %div.slider-off
-        /                     No
-        /           - else
-        /             %a.grey-button Add to Menu
-        /           %hr.one-px-grey
-
-        .control-label
-          .preview-container
-            %a.button.grey-button{:onclick => " $('#edit').ajaxSubmit({async: false, beforeSubmit: function(){$('#save-status').text('Saving draft before preview...');}, success: function(){$('#save-status').text('Draft saved.')}});", :href => route_to(:pages, model.id, :show, :context => "preview"), :target => "_blank", :rel => "colorbox"} Show Preview
-            %a.button.green-button{:href => orange[:pages].route_for(packet, model.id), :target => "_blank", :rel => "colorbox"} Show Live
-          %hr.one-px-grey
-        .control-label
-          - unless(orange[:pages].route_for(packet, model.id).blank? || orange[:pages].route_for(packet, model.id).rindex('/').blank?)
-            %strong Total Views: #{orange[:analytics].pageviews(orange[:pages].route_for(packet, model.id))} hits
+- if(model)
+  %div#edit-box
+    %form#edit{:action => route_to(model_name, model.id, "save"), :method => "POST", :"accept-charset" => "UTF-8"}
+      %label{:for => "edit-title"} Title
+      %input#edit-title{:type => "text", :name => "#{model_name}[title]", :value => model.title}
+      %textarea#edit-content{:cols => "32", :rows => "20", :name => "#{model_name}[body]", :class => 'markdown-editor'}<&= model.body
+      %br
+      - if(orange[:sparkles].sidebar?)
+        %label{:for => "edit-sidebar"} Sidebar
+        %textarea#edit-sidebar{:cols => "32", :rows => "12", :name => "#{model_name}[sidebar]", :class => 'markdown-editor'}<&= model.sidebar
+      %div#save-status
+        #{model.published ? "Published" : "Draft saved"}
+      %input#publish-me{:type => "hidden", :name => "#{model_name}[published]", :value => "0"}
+      %div#button-container
+        %input#save-draft{:type => "button", :onclick => "$('#save-status').text('Saving draft...'); $('#edit').ajaxSubmit({success: function(){$('#save-status').text('Draft saved.');}, method: 'post'}); return false;", :value => "Save Draft"}
+        %input#publish{:type => "button", :onclick => "$('#publish-me').val('1'); $('#edit').submit(); return false;", :value => "Publish"}
+  %div#popout-box
+    %div#popout-titlebar
+      Settings
+      %div#popout-collapse
+        %a#collapse{:href => "#"}
+          %img{:src => "/assets/_sparkles_/images/collapse-left.png", :border => "0"}
+    %div.page-settings-container
+      %div.page-settings-container-current
+        %div#page-settings-container-1
+          .control-label
+            .preview-container
+              %a.button.grey-button{:onclick => " $('#edit').ajaxSubmit({async: false, beforeSubmit: function(){$('#save-status').text('Saving draft before preview...');}, success: function(){$('#save-status').text('Draft saved.')}});", :href => route_to(:pages, model.id, :show, :context => "preview"), :target => "_blank", :rel => "colorbox"} Show Preview
+              %a.button.green-button{:href => orange[:pages].route_for(packet, model.id), :target => "_blank", :rel => "colorbox"} Show Live
+            %hr.one-px-grey
+          .control-label
+            - unless(orange[:pages].route_for(packet, model.id).blank? || orange[:pages].route_for(packet, model.id).rindex('/').blank?)
+              - if orange.loaded?(:analytics)
+                %strong Total Views: #{orange[:analytics].pageviews(orange[:pages].route_for(packet, model.id))} hits
+                %br
+                %strong This Month's Views: #{orange[:analytics].pageviews(orange[:pages].route_for(packet, model.id), :start_date => Time.now.localtime.strftime("%Y-%m-01"))} hits
+                %br
+        %div#page-settings-container-2
+          %div#page-summary.control-label
+            Page Summary (optional)
+            %div.settings-collapse
+              %a.collapse-up{:href => "#"}
+                %img{:src => "/assets/_sparkles_/images/collapse-up.png", :border => "0"}
             %br
-            %strong This Month's Views: #{orange[:analytics].pageviews(orange[:pages].route_for(packet, model.id), :start_date => Time.now.localtime.strftime("%Y-%m-01"))} hits
+            %div#page-summary-textarea.settings-area
+              %textarea#edit-page-summary.autosize
+          %hr.one-px-grey
+          %div#page-keywords.control-label
+            Page Keywords (optional)
+            %div.settings-collapse
+              %a.collapse-up{:href => "#"}
+                %img{:src => "/assets/_sparkles_/images/collapse-up.png", :border => "0"}
             %br
-      %div#page-settings-container-2
-        %div#page-summary.control-label
-          Page Summary (optional)
-          %div.settings-collapse
-            %a.collapse-up{:href => "#"}
-              %img{:src => "/assets/_sparkles_/images/collapse-up.png", :border => "0"}
-          %br
-          %div#page-summary-textarea.settings-area
-            %textarea#edit-page-summary.autosize
-        %hr.one-px-grey
-        %div#page-keywords.control-label
-          Page Keywords (optional)
-          %div.settings-collapse
-            %a.collapse-up{:href => "#"}
-              %img{:src => "/assets/_sparkles_/images/collapse-up.png", :border => "0"}
-          %br
-          %div#page-keywords-textarea.settings-area
-            %textarea#edit-page-keywords.autosize
-        %hr.one-px-grey
-%br.clearfix
+            %div#page-keywords-textarea.settings-area
+              %textarea#edit-page-keywords.autosize
+          %hr.one-px-grey
+  %br.clearfix

data/lib/orange-sparkles/views/pages/sitemap_row.haml

@@ -31,7 +31,7 @@
       %div.page-listing-location
         Current Location:  
         %span.last-uri-segment><
-          = route.full_path
+          = route_to(route)
       .menu-toggle
         Show in Menu:&nbsp;
         = button("Yes", route_to(:sitemap, route.id, :show_in_nav), :css_class => route.show_in_nav ? "white-button" : "grey-button")
@@ -47,8 +47,8 @@
         = button("Draft", route_to(model_name, model.id, 'publish'), :css_class => "status-draft")
 %td
   %div.page-listing-actions
-    %a.button.grey-button.preview-button{:href => route.full_path, :target => "_blank", :rel => "colorbox"}
-      Preview
+    %a.button.grey-button.preview-button{:href => route_to(route), :target => "_blank", :rel => "colorbox"}
+      View
     - unless route.level == 0
       = delete_button(route_to(:sitemap, route.id, "delete"))
       %a.button.grey-button.move-button{:href => "#"}

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

@@ -2,30 +2,30 @@
   %p
     - if packet['route.main_site_route'] && model.ancestors.count > 0
       - for a in packet['route.main_site_route'].self_and_ancestors
-        %a{:href => a.full_path}= orange[:sitemap].link_text_for(a)
+        %a{:href => route_to(a)}= orange[:sitemap].link_text_for(a)
         >
       - for a in (model.ancestors - model.root)
-        %a{:href => a.full_path}= orange[:sitemap].link_text_for(a)
+        %a{:href => route_to(a)}= orange[:sitemap].link_text_for(a)
         >
       %span.here= orange[:sitemap].link_text_for(model)
     - elsif packet['route.main_site_route']
       - for a in packet['route.main_site_route'].ancestors
-        %a{:href => a.full_path}= orange[:sitemap].link_text_for(a)
+        %a{:href => route_to(a)}= orange[:sitemap].link_text_for(a)
         >
       %span.here= orange[:sitemap].link_text_for packet['route.main_site_route']
     - else
       - for a in model.ancestors
-        %a{:href => a.full_path}= orange[:sitemap].link_text_for(a)
+        %a{:href => route_to(a)}= orange[:sitemap].link_text_for(a)
         >
       %span.here= orange[:sitemap].link_text_for(model)
 - else # Possibly a restful route
   %p
     - if packet['route.main_site_route']
       - for a in packet['route.main_site_route'].self_and_ancestors
-        %a{:href => a.full_path}= orange[:sitemap].link_text_for(a)
+        %a{:href => route_to(a)}= orange[:sitemap].link_text_for(a)
         >
     - else
       - home = orange[:sitemap].home(packet)
-      %a{:href => home.full_path}= orange[:sitemap].link_text_for(home)
+      %a{:href => route_to(home)}= orange[:sitemap].link_text_for(home)
       >
     %span.here= packet['route.resource'].to_s.capitalize

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

@@ -1,5 +1,5 @@
 .form-view
-  %form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post'}
+  %form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post', :"accept-charset" => "UTF-8"}
     - packet["page.title"] = "Sitemap > Create Link/Folder"
     %p
       You can use this to create a new link or folder in the navigation

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

@@ -1,10 +1,10 @@
 .form-view
   - if model
-    %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post'}
+    %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post', :"accept-charset" => "UTF-8"}
       - for prop in props
         %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]), :model => model)
       %input{:type => 'submit', :value => 'Save Changes'}
-    %form#move_me{:action => route_to(model_name, model[:id], 'into'), :method => 'post'}
+    %form#move_me{:action => route_to(model_name, model[:id], 'into'), :method => 'post', :"accept-charset" => "UTF-8"}
       %p
         %label Move into:
         %select{:onchange => "$('#move_me').attr('action', $('#move_me').attr('action')+'/'+$(this).val()); $('#move_me').submit();"}

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

@@ -1,7 +1,7 @@
 %ul.nav
   %li.first
-    %a{:href => model.full_path} Home
+    %a{:href => route_to(model)} Home
   - for item in model.children
     - next unless item.show_in_nav
     %li
-      %a{:href => item.full_path}= orange[:sitemap].link_text_for(item)
+      %a{:href => route_to(item)}= orange[:sitemap].link_text_for(item)

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

@@ -26,7 +26,7 @@
       %div.page-listing-location
         Current Location:  
         %span.last-uri-segment><
-          = model.full_path
+          = route_to(model)
       .menu-toggle
         Show in Menu:&nbsp;
         = button("Yes", route_to(:sitemap, route.id, :show_in_nav), :css_class => route.show_in_nav ? "white-button" : "grey-button")
@@ -37,7 +37,7 @@
       &nbsp;
 %td
   %div.page-listing-actions
-    %a.button.grey-button.preview-button{:href => model.full_path, :target => "_blank", :rel => "colorbox"}
+    %a.button.grey-button.preview-button{:href => route_to(model), :target => "_blank", :rel => "colorbox"}
       Preview
     = delete_button(route_to(model_name, model.id, "delete"))
     %a.button.grey-button.move-button{:href => "#"}

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

@@ -2,4 +2,4 @@
   Built on 
   %a{:href => "http://www.orangerb.com"} Orange 
   |
-  %a{:href => "/admin/sitemap"} Site Admin
+  %a{:href => full_url("admin/sitemap")} Site Admin

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

@@ -1,6 +1,6 @@
 .form-view
   - packet["page.title"] = "Users > Edit"
-  %form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post'}
+  %form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post', :"accept-charset" => "UTF-8"}
     - for prop in props
       %p= view_attribute(prop, model_name, :label => true)
     %fieldset

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

@@ -3,7 +3,7 @@
   - if model
     - if resource.options[:sitemappable, false] 
       = orange[:sitemap, true].sitemap_links(packet, {:slug_me => orange[:sitemap, true].slug_for(model, props)})
-    %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post'}
+    %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post', :"accept-charset" => "UTF-8"}
       - for prop in props
         %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
       %fieldset

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: orange-sparkles
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 9
-  version: 0.5.9
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - David Haslem
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 -04:00
+date: 2010-10-05 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
@@ -51,14 +46,12 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: maruku
+  name: kramdown
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,11 +61,9 @@ 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"
@@ -281,6 +272,7 @@ files:
 - lib/orange-sparkles/views/assets/change.haml
 - lib/orange-sparkles/views/assets/create.haml
 - lib/orange-sparkles/views/assets/create_markitup.haml
+- lib/orange-sparkles/views/assets/edit.haml
 - lib/orange-sparkles/views/assets/insert.haml
 - lib/orange-sparkles/views/assets/list.haml
 - lib/orange-sparkles/views/assets/list_markitup.haml
@@ -346,27 +338,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