junebug 0.0.11 → 0.0.12

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.0.12 2006-11-13
+
+ * content div bugfix
+
 v0.0.11 2006-11-13
 
  * Added revert

data/Rakefile

@@ -12,7 +12,7 @@ Gem.manage_gems
 
 gem_spec = Gem::Specification.new do |s|
   s.name = 'junebug'
-  s.version = '0.0.11'
+  s.version = '0.0.12'
   s.summary = "Junebug is a minimalist ruby wiki."
   s.description = "Junebug is a minimalist ruby wiki running on Camping."
   s.author = "Tim Myrtle"

data/deploy/static/style/base.css

@@ -77,7 +77,6 @@ body {
     background-color: #ffffff;
 	border:5px solid #929292;
 	border-width:0 5px 5px 0;
-    padding: 25px;
     min-height: 300px;
 }
 
@@ -144,7 +143,8 @@ body {
 
 /* WIKI CONTENT STYLES */
 .content {
-    font-size: 107%;
+    font-size: 114%;
+    padding: 25px;
 }
 
 .content a:link, .content a:visited, .content a:hover {

data/lib/junebug/views.rb

@@ -23,11 +23,9 @@ module Junebug::Views
   def show
     _header (@version.version == @page.version ? :show : :backlinks), @page.title
     _body {
-      div.content {
-        _button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if (@version.version == @page.version && (! @page.readonly || @state.user_id == 1))
-        _markup @version.body
-        _button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if (@version.version == @page.version && (! @page.readonly || @state.user_id == 1)) && (@version.body && @version.body.size > 100)
-      }
+      _button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if (@version.version == @page.version && (! @page.readonly || @state.user_id == 1))
+      _markup @version.body
+      _button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if (@version.version == @page.version && (! @page.readonly || @state.user_id == 1)) && (@version.body && @version.body.size > 100)
     }
     _footer {
       text "Last edited by <b>#{@version.user.username}</b> on #{@page.updated_at.strftime('%B %d, %Y %I:%M %p')}"
@@ -59,34 +57,32 @@ module Junebug::Views
   def edit
     _header :backlinks, @page.title
     _body {
-      div.content {
-        div.formbox {
-          form :method => 'post', :action => R(Edit, @page.title) do
-            p { 
-              label 'Page Title'
-              br
-              input :value => @page.title, :name => 'post_title', :size => 30, 
-                    :type => 'text'
-              small " [ CamelCase only ]"
-            }
-            p {
-              label 'Page Content'
-              br
-              textarea @page.body, :name => 'post_body', :rows => 17, :cols => 80
-            }
-            if @state.user_id == 1
-              opts = { :type => 'checkbox', :value=>'1', :name => 'post_readonly' }
-              opts[:checked] = 1 if @page.readonly
-              input opts
-              text " Readonly"
-              br
-            end
-            input :type => 'submit', :name=>'submit', :value=>'cancel', :class=>'button', :style=>'float: right;'
-            input :type => 'submit', :name=>'submit', :value=>'save', :class=>'button', :style=>'float: right;'
+      div.formbox {
+        form :method => 'post', :action => R(Edit, @page.title) do
+          p { 
+            label 'Page Title'
+            br
+            input :value => @page.title, :name => 'post_title', :size => 30, 
+                  :type => 'text'
+            small " [ CamelCase only ]"
+          }
+          p {
+            label 'Page Content'
+            br
+            textarea @page.body, :name => 'post_body', :rows => 17, :cols => 80
+          }
+          if @state.user_id == 1
+            opts = { :type => 'checkbox', :value=>'1', :name => 'post_readonly' }
+            opts[:checked] = 1 if @page.readonly
+            input opts
+            text " Readonly"
+            br
           end
-          a 'syntax help', :href => 'http://hobix.com/textile/', :target=>'_blank'
-          br :clear=>'all'
-        }
+          input :type => 'submit', :name=>'submit', :value=>'cancel', :class=>'button', :style=>'float: right;'
+          input :type => 'submit', :name=>'submit', :value=>'save', :class=>'button', :style=>'float: right;'
+        end
+        a 'syntax help', :href => 'http://hobix.com/textile/', :target=>'_blank'
+        br :clear=>'all'
       }
     }
     _footer { '' }
@@ -247,15 +243,15 @@ module Junebug::Views
   end
 
   def _body
-    div.content {
-      div :id=>'bd' do
-        div :id=>'yui-main' do
-          div :class=>'yui-b' do
+    div :id=>'bd' do
+      div :id=>'yui-main' do
+        div :class=>'yui-b' do
+          div.content do
             yield
           end
         end
       end
-    }
+    end
   end
 
   def _footer

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 date: 2006-11-13 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki.
 require_paths: