grat 0.3.1 → 0.4.0

data/public/gratfiles/reset.css

@@ -0,0 +1,52 @@
+/* v1.0 | 20080212 http://meyerweb.com/eric/tools/css/reset/ */
+
+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;
+}
+
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+	text-decoration: none;
+}
+del {
+	text-decoration: line-through;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}

data/views/content_form.haml

@@ -1,50 +1,50 @@
-.grat_greet
-  - if content.new_record?
-    %p
-      Let's make some
-      %strong= url
-      content!
-  - else
-    %p
-      Editing
-      %a{:href => url}
-        %strong= url
-      content.
-    
 %form{:action => "#{content.url}", :method => 'post'}
-  .template
-    %label{:for => form_nest('template_url')} Template
-    %select{:name => form_nest('template_url')}
-      %option{:value=>''} None
-      - templates.each do |template|
-        - option_hash = {:value => template.url}
-        - option_hash.merge!(:selected => 'selected') if template.url == content.template_url
-        %option{option_hash}= template.url
-  .url
-    %label{:for => form_nest('url')} Url
-    %input{:name => form_nest('url'), :value => content.url}
-  .content.collapsable
-    %label{:for => form_nest('content')} Content
-    %textarea{:name => form_nest('content')}= content.content
-  .tags
-    %label{:for => form_nest('tags')} Tags
-    %input{:name => form_nest('tags'), :value => content.tags.join(' ')}
-  - content.editable_fields.each_pair do |k,v|
-    %div{:class => k}
-      %label{:for => form_nest(k)}= k.capitalize
-      %input{:name => form_nest(k), :value => v}
-  #suggested_fields
-    - content.suggested_fields.each do |field|
-      %div{:class => field}
-        %label{:for => form_nest(field)}= field.capitalize
-        %input{:name => form_nest(field)}
-  #new_fields
-    %p
-      %a.add{:href=>'#new_field'} Add a New Field
-    
+  .tabs
+    %ul.mod
+      %li
+        %a{:href => '#basics'} Basics
+      %li
+        %a{:href => '#data'} Data
+      %li
+        %a{:href => '#history'} History
+    #basics
+      %p Edit your page. :)
+      .template
+        %label{:for => form_nest('template_url')} Template
+        %select{:name => form_nest('template_url')}
+          %option{:value=>''} None
+          - templates.each do |template|
+            - option_hash = {:value => template.url}
+            - option_hash.merge!(:selected => 'selected') if template.url == content.template_url
+            %option{option_hash}= template.url
+      .url
+        %label{:for => form_nest('url')} Url
+        %input{:name => form_nest('url'), :value => content.url}
+      .content.collapsable
+        %label{:for => form_nest('content')} Content
+        %textarea{:name => form_nest('content')}= content.content
+      .tags
+        %label{:for => form_nest('tags')} Tags
+        %input{:name => form_nest('tags'), :value => content.tags.join(' ')}
+    #data
+      - content.editable_fields.each_pair do |k,v|
+        %div{:class => k}
+          %label{:for => form_nest(k)}= k.capitalize
+          %input{:name => form_nest(k), :value => v}
+      #suggested_fields
+        - content.suggested_fields.each do |field|
+          %div{:class => field}
+            %label{:for => form_nest(field)}= field.capitalize
+            %input{:name => form_nest(field)}
+      #new_fields
+        %p
+          %a.add.button{:href=>'#new_field'} Add a New Field
+      .defaults.collapsable
+        %label{:for => form_nest('default_content_vars')} Default Content
+        %textarea{:id => 'default_content_vars', :name => form_nest('default_content_vars')}=content.default_content_vars.to_json
+    #history
+      %p This isn't implemented yet, sorry!
+
   .submit
-    %input{:name => form_nest('submit'), :type => 'submit', :value => "Let's save this thing"}
-    %input{:name => form_nest('submit'), :type => 'submit', :value => "Save and make another"}
-  .defaults.collapsable.collapsed
-    %label{:for => form_nest('default_content_vars')} Default Content
-    %textarea{:id => 'default_content_vars', :name => form_nest('default_content_vars')}= content.default_content_vars.to_json
+    %input{:name => form_nest('submit'), :type => 'submit', :value => "Save and continue editing"}
+    %input{:name => form_nest('submit'), :type => 'submit', :value => "Save and make a new doc"}

data/views/import_form.haml

@@ -1,5 +1,4 @@
-.grat_greet
-  %p Hey, import some json if you like.
+%h1 Import
 %form{:action => "/__admin/import", :method => 'post', :enctype=>'multipart/form-data' }
   .import_file
     %label{:for => 'import_file'} Upload a json file:
@@ -21,4 +20,3 @@
       %input{:type=> 'radio', :id => 'import_demolish', :value => 'demolish', :name => 'import[strategy]'}
   .submit
     %input{:name => 'import[submit]', :type => 'submit', :value => "Let's save this thing"}
-    

data/views/layout.haml

@@ -4,16 +4,25 @@
   %head
     %title Grat
     %link{:rel=>"shortcut icon", :href=>"/gratfiles/favicon.ico"}
-    
+
     %script{:type=>"text/javascript", :src=>"/gratfiles/jquery-combined.min.js"}
     %script{:type=>"text/javascript", :src=>"/gratfiles/application.js"}
-    
+
     %script{:type=>"text/javascript", :src=>"/gratfiles/js-beautifier.min.js"}
-    
-    %link{:rel => 'stylesheet', :type => 'text/css', :media => 'all', :href => '/gratfiles/oocss.min.css'}
-    %link{:rel => 'stylesheet', :type => 'text/css', :media => 'all', :href => '/gratfiles/custom.css'}
+
+    %link{:rel => 'stylesheet', :type => 'text/css', :media => 'all', :href => '/gratfiles/reset.css'}
+    %link{:rel => 'stylesheet', :type => 'text/css', :media => 'all', :href => '/gratfiles/custom2.css'}
 
   %body
-    = yield
+    .masthead
+      %h1
+        %a{:href => '/__admin/'} Grat
+      %h2= page_heading_text
+    .panel.mod
+      %h2 Pages
+      .pages
+        = haml :page_list, :locals => {:pages => [nested_root]}, :layout => false
+    .container
+      = yield
     /
       .debug= params.inspect

data/views/list.haml

@@ -1,23 +1,24 @@
-.grat_greet
-  %p Great. Here's everything. Hope you're happy.
-%h2 Make a new page
+%ul.bulk-options
+  %li
+    %a.button{:href => "/__admin/import"} Import
+  %li
+    %a.button{:href => "/__admin/export"} Export
 .new_page
+  %h2 Make a new page
   %form{:action => "/__admin/new"}
     %input{:name => 'url'}
     %input{:name => "submit", :value=>'New Page', :type => 'submit'}
-%h2 Pages
-%ol
-  - @pages.each do |page|
-    %li
-      %a{:href => page.url}= page.url
-      (
-      %a{:href => edit_path(page.url)} edit
-      )
 %h2 Templates
-%ol
-  - @templates.each do |template|
-    %li
-      %a{:href => template.url}= template.url
-      (
-      %a{:href => edit_path(template.url)} edit
-      )
+- if @templates.any?
+  %ol
+    - @templates.each do |template|
+      %li
+        %a{:href => template.url}= template.url
+        (
+        %a{:href => edit_path(template.url)} edit
+        )
+- else
+  %p
+    Templates are ordinary pages with the tag
+    %strong template
+    \.

data/views/page_list.haml

@@ -0,0 +1,19 @@
+- if pages.any?
+  %ol
+    - pages.each do |page|
+      %li
+        %a{:href => "/__admin/edit#{page.url}", :class => page.class.to_s.downcase[/[a-z]+\Z/]}= page.url
+        - if page.class == Grat::Content
+          %span.tags
+            = page.tags.join(', ')
+          %span.template
+            - if page.template
+              = page.template
+            - else
+              No template!
+          %span.created
+            8 Jan 2009
+        - else
+          %span.missing_message <-- Page missing, click to create it
+        - if page.children.any?
+          = haml :page_list, :locals => {:pages => page.children}, :layout => false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grat
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 -05:00
+date: 2010-01-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ files:
 - 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
@@ -107,7 +108,22 @@ files:
 - 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
@@ -121,6 +137,7 @@ files:
 - 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
@@ -137,6 +154,7 @@ files:
 - views/layout.haml
 - views/list.haml
 - views/missing.haml
+- views/page_list.haml
 has_rdoc: true
 homepage: http://github.com/samsm/grat
 licenses: []