grat 0.3.1 → 0.4.0

data/README.rdoc

@@ -25,13 +25,13 @@ Use it like so:
 4. rackup (or passenger, if you know how)
 
 5. http://localhost:9292/__admin/edit/mypage edits a page that will be available at http://localhost:9292/mypage
-6. http://localhost:9292/__admin/all for a list of all pages
+6. http://localhost:9292/__admin/ for a list of all pages
 7. http://localhost:9292/__admin/export to get a json dump of all pages
 8. http://localhost:9292/__admin/import to import one of those dumps
 
 9. Protect from writes by strangers with Rack::If
      # http://github.com/samsm/Rackif
-   
+
      use Rack::If, {:method => /(POST)|(PUT)|(DELETE)/, :path => /__admin/}, :any do
        use Rack::Auth::Basic, "Grat protected" do |username, password|
          'secret' == password
@@ -40,7 +40,7 @@ Use it like so:
 
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/grat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grat}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Schenkman-Moore"]
-  s.date = %q{2010-01-12}
+  s.date = %q{2010-01-17}
   s.description = %q{Basic interface for making webpages with Haml and Erb. Supports nested templates.}
   s.email = %q{samsm@samsm.com}
   s.extra_rdoc_files = [
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
      "lib/grat/system.rb",
      "public/gratfiles/application.js",
      "public/gratfiles/custom.css",
+     "public/gratfiles/custom2.css",
      "public/gratfiles/einars-js-beautify/HTML-Beautify.js",
      "public/gratfiles/einars-js-beautify/beautify-cl.js",
      "public/gratfiles/einars-js-beautify/beautify-tests.js",
@@ -52,7 +53,22 @@ Gem::Specification.new do |s|
      "public/gratfiles/einars-js-beautify/unmaintained/opera-userscript/make_opera_userscript.sh",
      "public/gratfiles/einars-js-beautify/unmaintained/opera-userscript/opera_userscript.js",
      "public/gratfiles/favicon.ico",
+     "public/gratfiles/images/ui-bg_diagonals-thick_18_b81900_40x40.png",
+     "public/gratfiles/images/ui-bg_diagonals-thick_20_666666_40x40.png",
+     "public/gratfiles/images/ui-bg_flat_10_000000_40x100.png",
+     "public/gratfiles/images/ui-bg_glass_100_f6f6f6_1x400.png",
+     "public/gratfiles/images/ui-bg_glass_100_fdf5ce_1x400.png",
+     "public/gratfiles/images/ui-bg_glass_65_ffffff_1x400.png",
+     "public/gratfiles/images/ui-bg_gloss-wave_35_f6a828_500x100.png",
+     "public/gratfiles/images/ui-bg_highlight-soft_100_eeeeee_1x100.png",
+     "public/gratfiles/images/ui-bg_highlight-soft_75_ffe45c_1x100.png",
+     "public/gratfiles/images/ui-icons_222222_256x240.png",
+     "public/gratfiles/images/ui-icons_228ef1_256x240.png",
+     "public/gratfiles/images/ui-icons_ef8c08_256x240.png",
+     "public/gratfiles/images/ui-icons_ffd27a_256x240.png",
+     "public/gratfiles/images/ui-icons_ffffff_256x240.png",
      "public/gratfiles/jquery-combined.min.js",
+     "public/gratfiles/jquery-ui.css",
      "public/gratfiles/js-beautifier.min.js",
      "public/gratfiles/oocss.min.css",
      "public/gratfiles/oocss/content.css",
@@ -66,6 +82,7 @@ Gem::Specification.new do |s|
      "public/gratfiles/oocss/talk_skins.css",
      "public/gratfiles/oocss/template.css",
      "public/gratfiles/oocss/template_debug.css",
+     "public/gratfiles/reset.css",
      "views/content_form.haml",
      "views/css/_content.sass",
      "views/css/_custom.sass",
@@ -81,7 +98,8 @@ Gem::Specification.new do |s|
      "views/import_form.haml",
      "views/layout.haml",
      "views/list.haml",
-     "views/missing.haml"
+     "views/missing.haml",
+     "views/page_list.haml"
   ]
   s.homepage = %q{http://github.com/samsm/grat}
   s.rdoc_options = ["--charset=UTF-8"]

data/lib/grat.rb

@@ -19,8 +19,8 @@ class Grat::Application < Sinatra::Base
     file_data
   end
 
-  get '/__admin/all' do
-    @pages = model.all
+  get '/__admin/' do
+    pages
     @templates = templates
     haml :list
   end
@@ -39,7 +39,7 @@ class Grat::Application < Sinatra::Base
   post '/__admin/import' do
     json_text = file_import_text || params[:import][:text]
     @import_results = import(json_text, params[:import][:strategy])
-    redirect '/__admin/all'
+    redirect '/__admin/'
   end
 
   # Rather inefficient at present.
@@ -77,6 +77,7 @@ class Grat::Application < Sinatra::Base
   end
 
   get '/__admin/edit/*' do
+    @page_heading_text = "Editing: <a href='#{url}'>#{url}</a>"
     haml :content_form
   end
 
@@ -185,6 +186,68 @@ class Grat::Application < Sinatra::Base
     def form_nest(name)
       "content[#{name}]"
     end
+
+    # The next few methods build the tree for the file list
+    # This can likely be greatly simpified and more efficient.
+    def peel(pages, start)
+      pages.each do |page|
+        if under?(start,page)
+          if immediate_child?(start,page)
+            start.children << page
+          else
+            # Skip if already done
+            unless start.children.detect {|ec| ec.url == next_dir(start,page) }
+              ec = Grat::EmptyContent.new(next_dir(start,page))
+              peel(pages,ec)
+              unless start.children.detect {|c| c.url == ec.url }
+                start.children << ec
+              end
+            end
+          end
+        end
+      end
+    end
+
+    def under?(start,other)
+      other.url.index(start.url) == 0 && other.url != start.url
+    end
+
+    def next_dir(start,other)
+      other.url.match(/#{start.url}?[^\/]+\//)[0]
+    end
+
+    def immediate_child?(start,other)
+      !url_difference(start,other).index('/')
+    end
+
+    def url_difference(start,other)
+      other.url.sub(/#{start.url}/, '')
+    end
+
+    def recursive_url_list(page)
+      puts page.url
+      page.children.each { |c| recursive_url_list(c) }
+    end
+
+    # only works if there's a url '/'
+    def nested_root
+      sorted_pages = pages.sort_by {|p| p.url }
+      first = sorted_pages.first
+      peel(sorted_pages, first)
+      first
+    end
+
+    def pages
+      @pages ||= model.all
+    end
+
+    def nested_root_list
+      to_list([nested_root])
+    end
+
+    def page_heading_text
+      @page_heading_text or 'Unnamed page.'
+    end
   end
 
 end

data/lib/grat/content.rb

@@ -118,4 +118,21 @@ class Grat::Content
   def suggested_fields
     @suggested_fields or []
   end
-end
+
+  def children
+    @children ||= []
+  end
+
+end
+
+class Grat::EmptyContent
+  attr_accessor :url
+  def initialize(url)
+    self.url = url
+  end
+
+  def children
+    @children ||= []
+  end
+
+end

data/public/gratfiles/application.js

@@ -1,6 +1,6 @@
 // once page is loaded ...
 $(document).ready(function(){
-  
+
   // Collapse fields
   $('.collapsable').each(function() {
     parent_div = $(this);
@@ -19,7 +19,7 @@ $(document).ready(function(){
       parent_div.addClass('activeCollapse');
     }
   })
-  
+
   // Add fields for selected template.
   $('.template select').change(function() {
     // if template has url
@@ -37,26 +37,26 @@ $(document).ready(function(){
       })
     }
   })
-  
+
   // New field button + features
   $('a[href=#new_field]').click(function(){
-    
+
     $('#new_fields').prepend("<div class='new_field'><p class='myEditableText sameaslabel'>Write the title here</p><input name='content[new_field]' value='' /></div>");
-    
+
     // upon click make label editable and other junk associated with customizing the new field
     $('.myEditableText').click(function(){
       editable = $(this);
-      
+
       editable.attr('contentEditable',true);
       editable.addClass('editing'); // style for editing
       editable.focus(); // put cursor in element
-            
+
       // this should only clear if default text is in there
       if (!editable[0].className.match(/edited/)) {
         editable.text(''); // clear text
         editable.addClass('edited')
       }
-      
+
       // On focus of input, change name= to correspond to p sibling
       editable.parent().children().filter('input').focus(function() {
         input = $(this);
@@ -64,19 +64,19 @@ $(document).ready(function(){
         // need to sanitize key
         sanitized_key = key.replace(/[^a-zA-Z]/g,'_').toLowerCase().replace(/[^a-z]/,'').toLowerCase()
         new_name = 'content[' + sanitized_key + ']';
-        
+
         input.attr('name',new_name);
       })
-      
+
       // Move to input field on enter
       editable.keypress(function(event){
-        
+
         // move to field input is cancelled if enter is pressed
         if (event.which == 13) {
-          
+
           // Remove editing class -- should add edited class maybe
           editable.removeClass('editing');
-          
+
           // forward to text input
           $(editable).parent().children().filter('input').focus();
           return false
@@ -84,28 +84,30 @@ $(document).ready(function(){
           return event.which
         }
       });
-      
+
       editable.change(function() {
         console.log('blur');
         editable.removeClass('editing');
       })
-      
+
     });
-    
+
     //  bind an event listener that will be called when
     //  user saves changed content
     $('.editableText').change(function(){
       var newValue = $(this).html();
     });
-    
-    
-    
+
+
+
     return false;
   })
-  
+
   // Beautify default data textarea
   $('#default_content_vars').each(function() {
     this.innerHTML = js_beautify(this.innerHTML, {'indent_size':2});
-  })
-  
+  });
+
+  $('.tabs').tabs();
+
 });

data/public/gratfiles/custom.css

@@ -1,4 +1,4 @@
-/* @override
+/* @override 
 	http://localhost:9393/custom.css
 	http://grat.local/css/custom.css
 	http://localhost:9393/gratfiles/custom.css
@@ -80,4 +80,61 @@ a.collapse {
 }
 .expander, .collapser {
   margin-left: 1em;
-}
+}
+
+.pages {
+  background-color: #573515;
+  color: whitesmoke;
+  border-bottom: solid black;
+  -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+  -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+  box-shadow: 0 1px 10px rgba(0,0,0,.1);
+  font-weight: normal;
+  font-style: normal;
+  font-family: "Lucida Grande", Lucida, Verdana, sans-serif;
+  padding: 1em;
+}
+
+.pages a.emptycontent {
+ color: #b6ff48;
+}
+.pages .missing_message {
+  font-size: .75em;
+  visibility: hidden;
+}
+
+.pages a {
+  color: white;
+}
+
+.pages li {
+  margin: 0;
+  margin-bottom: 0.5em;
+  padding-left: 1em;
+  border-top: solid 1px rgba(250,250,250,.3);
+}
+.pages ol {
+  padding:  0;
+  padding-top: 0.25em;
+  padding-bottom: 0;
+  padding-left: 0;
+}
+
+.tags, .template, .created {
+  margin-left: 2em;
+  float: right;
+}
+
+
+/*.pages ol:before {
+  content:  "collapse";
+}*/
+
+
+
+/*.pages li:nth-child(odd) {
+	background-color: #86B486;
+}
+.pages li:nth-child(even) {
+	background-color: red;
+}*/

data/public/gratfiles/custom2.css

@@ -0,0 +1,280 @@
+/* @override http://localhost:9393/gratfiles/custom2.css */
+
+/*
+rgba(114,123,127,1) // medium grey
+rgba(204,234,234,1) // very light blue
+rgba(122,117,86,1)  // medium brown
+rgba(46,33,37,1)    // dark brown
+rgba(68,202,204,1)  // bright blue
+
+
+rgba(255,255,255,1) // white
+rgba(0,0,0,1)       // black
+*/
+body {
+	font: normal 62.5% helvetica, arial, sans-serif;
+	background-color: rgba(204,234,234,1);
+	color: rgba(0,0,0,.8);
+	}
+
+.container {
+	/*margin-left: 10em;*/
+	}
+
+.mod:after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
+	}
+
+
+.masthead {
+	background-color: rgba(46,33,37,1);
+	padding: 1em;
+	height: 4em;
+	}
+
+.masthead h1, .masthead h2 {
+	text-shadow: 1px 1px 1px rgba(68,202,204,.4);
+	color: rgba(204,234,234,1);
+	}
+
+.masthead h1 {
+	font-size: 4em;
+	float: left;
+	}
+.masthead h2 {
+	margin-top: 1em;
+	font-size: 2em;
+	float: right;
+	}
+.masthead h2 a, .masthead h1 a {
+	color:  inherit;
+	}
+.masthead h1 a {
+  text-decoration: none;
+  }
+
+.panel {
+	margin: 0 auto;
+	width: 30em;
+	background-color: rgba(255,255,255,1);
+	padding: 1em;
+	padding-top: 2em;
+	float:  left;
+
+	border-right: 2px solid rgba(114,123,127,1);
+	margin-bottom: 2em;
+	-webkit-box-shadow: 0 1px 5px rgba(114,123,127,.5);
+	-moz-box-shadow: 0 1px 5px rgba(114,123,127,.5);
+	box-shadow: 0 1px 5px rgba(114,123,127,.5);
+
+	margin-right: 2.2em;
+
+	/* Make column go to bottom of screen */
+	margin-bottom: -1000px;
+	padding-bottom: 1000px;
+	}
+.panel h2 {
+	font-size: 2em;
+	color: rgba(46,33,37,1);
+	text-shadow: 2px 2px 2px rgba(114,123,127,.4);
+	}
+
+.pages {
+	float: left;
+	}
+.pages li {
+	margin-left: 1em;
+	margin-top: 1em;
+	}
+
+/* form stuffs */
+.container {
+	margin-top: 1em;
+	margin-left: 17em;
+	width: 40em;
+	font-size: 2em;
+	}
+
+input, textarea, label, .sameaslabel {
+	display: block;
+	width: 99%;
+	}
+
+.sameaslabel, label {
+	margin-top: .5em;
+	}
+
+textarea {
+	font-family: "Courier New", Courier, mono;
+	font-weight: bold;
+	height: 13em;
+}
+.sameaslabel {
+	padding-left: 0; // no padding like p has
+	}
+
+.submit input {
+	width: auto;
+	}
+
+
+p.editing {
+  min-height: 1em;
+  background-color: yellow;
+}
+
+input[type=file] {
+  padding-top: .5em;
+  font-size: 1.5em;
+}
+
+input[type=radio] {
+  width: 1em;
+  float: left;
+  margin-top: .25em;
+}
+
+input {
+	width: 33%;
+	}
+input[type=submit] {
+	width: auto;
+	display: inline;
+	}
+
+a.collapse {
+  font-size: .5em;
+  font-weight: normal;
+}
+
+.activeCollapse textarea {
+  display: none;
+}
+
+.activeCollapse .collapser {
+  display:none;
+}
+
+a.button {
+	color: rgba(68,202,204,1);
+	padding: .5em;
+	-moz-border-radius: 1em;
+	-webkit-border-radius: 1em;
+	border-radius: 1em;
+
+	background-color: rgba(46,33,37,1);
+	text-decoration: none;
+
+	-webkit-box-shadow: 0 1px 5px rgba(122,117,86,.5);
+	-moz-box-shadow: 0 1px 5px rgba(122,117,86,.5);
+	box-shadow: 0 1px 5px rgba(122,117,86,.5);
+	}
+#new_fields p {
+	margin-top: 1em;
+	}
+.expander {
+	display: none;
+	float: left;
+	}
+.collapser {
+	float: right;
+	margin-top: -1.5em;
+	margin-right: 1em;
+	}
+.activeCollapse .expander {
+	display: inline;
+	}
+.expander, .collapser {
+	font-size: .65em;
+	font-weight: normal;
+	color: rgba(68,202,204,1);
+	text-decoration: none;
+	}
+
+/* JQuery UI Tabs tweaks */
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+
+.tabs ul.mod {
+	height: 1.8em;
+	}
+.tabs li {
+	float:  right;
+	background-color: rgba(46,33,37,1);
+	border: solid 2px rgba(46,33,37,1);
+	margin-right: .5em;
+	padding: 1em;
+	padding-bottom: .5em;
+
+	border-bottom: 0;
+	-moz-border-radius-topleft: 1.5em;
+	-webkit-border-top-left-radius: 1.5em;
+
+	-moz-border-radius-topright: .5em;
+	-webkit-border-top-right-radius: .5em;
+	/*border-radius: .5em;*/
+
+	font-size: .65em;
+
+
+	/*-webkit-box-shadow: 0 1px 5px rgba(114,123,127,.5);
+	-moz-box-shadow: 0 1px 5px rgba(114,123,127,.5);
+	box-shadow: 0 1px 5px rgba(114,123,127,.5);*/
+	/*letter-spacing: 0em;*/
+	}
+.tabs li.ui-tabs-selected {
+	background-color: rgba(122,117,86,1);
+	border-bottom: solid 3px rgba(122,117,86,1);
+	}
+.tabs li a {
+	color: rgba(68,202,204,1);
+	text-decoration: none;
+	}
+#basics, #data, #history {
+	border-top: solid 2px;
+	border-left: dotted 1px rgba(46,33,37,.5);
+	border-right: dotted 1px rgba(46,33,37,.5);
+	background-color: rgba(122,117,86,1);
+	padding: 1em;
+	}
+
+/* Radio buttons on import */
+.import_replace_or_add input {
+	float: left;
+	margin-top: .5em;
+	display: inline;
+	}
+.import_replace_or_add label {
+	margin-left: .5em;
+	display: inline;
+	}
+.import_replace_or_add div {
+	margin-top: .5em;
+	}
+
+.bulk-options li {
+	margin-bottom: 2em;
+	}
+.new_page {
+	margin-bottom: .5em;
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+