junebug 0.0.5 → 0.0.6

data/deploy/static/style/base.css

@@ -7,8 +7,7 @@ span.actions a {
 }
 
 input.button {
-    margin-right: 5px;
-    margin-top: 4px;
+    margin: 5px 4px;
 }
 
 input, textarea {
@@ -143,6 +142,10 @@ body {
     margin-bottom: 10px;
 }
 
+.content h2, .content h3, .content h4 {
+    color: 04766f;
+}
+
 .content h1 {
     margin-bottom: 10px;
     font-size:  182%;
@@ -151,7 +154,7 @@ body {
 .content h2 {
     font-size:  152%;
     border-bottom: 1px dotted #bbb;
-/*    background-color: #eef;*/
+/*    background-color: #d6fbf4;*/
 }
 
 .content h3 {
@@ -211,11 +214,16 @@ body {
     padding: 8px 20px;
 }
 
+.content table {
+}
+
 .content th, .content td {
     padding: 2px 5px;
+    border: solid #eee;
 }
 
 .content th {
     font-weight: bold;
+    background-color: #d7e0ff;
 }
   /* http://longren.org/2006/09/27/wrapping-text-inside-pre-tags */

data/fixtures/junebug_pages.yml

@@ -1,144 +1,144 @@
---- 
-- updated_at: 2006-11-06 09:15:45 -08:00
-  title: JunebugWiki
-  readonly: true
-  body: |
-    h1. Welcome to Junebug!
-    
-    To complete setup of you new wiki, here are a few things you should do:
-    
-    
-    h3. 1. Login to your account
-    
-    When you created this wiki, the username and password you submitted were used to set up an account for you.  Now click the 'sign in' link at the upper right and sign in.
-    
-    Once you sign in you will see your username in the upper right corner.
-    
-    
-    h3. 2. Set the start page
-    
-    This page will always be the default start page for a new wiki.  Probably not what you want, right?  Fortunately, it is easy to change.  Open the config.yml file (in your wiki directory) with any texteditor, and change the startpage field to the page you want.
-    
-    Next, in your wiki directory, run the command:
-    
-     ./wiki restart
-    
-    The next time you click on the 'Home' link in the nav bar, you will be taken to your new start page.  If the page doesn't already exist, you will first be asked to login, and then you will be presented with an edit form to create the page.
-    
-    
-    h3. 3. Create some pages!
-    
-    If you have any trouble, or need some help getting started, click on the 'Help' link in the nav bar.  The documentation is pretty sparse right now, but I'm working on it!
-
-  id: 1
-  version: 1
-  user_id: 1
-  created_at: 2006-10-29 16:19:34 -08:00
-- updated_at: 2006-11-06 09:15:45 -08:00
-  title: JunebugHelp
-  readonly: 
-  body: This is a work in progress
-  id: 2
-  version: 1
-  user_id: 1
-  created_at: 2006-11-01 00:10:07 -08:00
-- updated_at: 2006-11-06 21:49:04 -08:00
-  title: FormatTest
-  readonly: 
-  body: |-
-    See "this page":http://hobix.com/textile/ for the full range of formatting options
-    
-    h2. Headers
-    
-    h1. Header 1
-    
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-    
-    h2. Header 2
-    
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-    
-    h3. Header 3
-    
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-    
-    h4. Header 4
-    
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-    
-    h2. Structural emphasis
-    
-    This is _emphasis_ (italic)
-    
-    This is *strong* (bold)
-    
-    This is @code@
-    
-     more code
-     @difftext = diff( @v1_markup , @v2_markup)
-    
-    This is -deleted- text
-    
-    This is +inserted+ text
-    
-    Arbitrary style: I'm %{color:red}unaware% of most soft drinks.
-    
-    
-    h2. Arbitrary html, pre, and code
-    
-    Inserting arbitrary html (pre/code)
-    
-    <pre><code>a.gsub!( /</, '' )</code></pre>
-    
-    Inserting arbitrary html (pre/code)
-    
-    <pre>
-    <code>a.gsub!( /</, '' )</code>
-    </pre>
-    
-    Arbitrary html (pre)
-    
-    <pre>
-    a.gsub!( /</, '' )
-    </pre>
-    
-    Code by indenting
-    
-     more code
-     @difftext = diff( @v1_markup , @v2_markup)
-    
-    h2. Lists
-    
-    # A first item
-    # A second item
-    # A third
-    
-    # Fuel could be:
-    ## Coal
-    ## Gasoline
-    ## Electricity
-    # Humans need only:
-    ## Water
-    ## Protein
-    
-    * A first item
-    * A second item
-    * A third
-    
-    h2. External references
-    
-    This is a link: "Google":http://google.com
-    
-    Images: !/static/images/feed-icon-14x14.png! 
-    
-    
-    h2. Tables
-    
-    |_. name |_. age |_. sex |
-    | joan | 24 | f |
-    | archie | 29 | m |
-    | bella | 45 | f |
-  id: 3
-  version: 1
-  user_id: 1
-  created_at: 2006-11-06 09:40:53 -08:00
+--- 
+- updated_at: 2006-11-07 18:24:43 -08:00
+  title: JunebugWiki
+  readonly: true
+  body: |
+    h1. Welcome to Junebug!
+    
+    To complete setup of you new wiki, here are a few things you should do:
+    
+    
+    h3. 1. Login to your account
+    
+    When you created this wiki, the username and password you submitted were used to set up an account for you.  Now click the 'sign in' link at the upper right and sign in.
+    
+    Once you sign in you will see your username in the upper right corner.
+    
+    
+    h3. 2. Set the start page
+    
+    This page will always be the default start page for a new wiki.  Probably not what you want, right?  Fortunately, it is easy to change.  Open the config.yml file (in your wiki directory) with any texteditor, and change the startpage field to the page you want.
+    
+    Next, in your wiki directory, run the command:
+    
+     ./wiki restart
+    
+    The next time you click on the 'Home' link in the nav bar, you will be taken to your new start page.  If the page doesn't already exist, you will first be asked to login, and then you will be presented with an edit form to create the page.
+    
+    
+    h3. 3. Create some pages!
+    
+    If you have any trouble, or need some help getting started, click on the 'Help' link in the nav bar.  The documentation is pretty sparse right now, but I'm working on it!
+
+  id: 1
+  version: 1
+  user_id: 1
+  created_at: 2006-10-29 16:19:34 -08:00
+- updated_at: 2006-11-07 18:24:43 -08:00
+  title: JunebugHelp
+  readonly: 
+  body: This is a work in progress
+  id: 2
+  version: 1
+  user_id: 1
+  created_at: 2006-11-01 00:10:07 -08:00
+- updated_at: 2006-11-07 18:24:43 -08:00
+  title: FormatTest
+  readonly: 
+  body: |-
+    See "this page":http://hobix.com/textile/ for the full range of formatting options
+    
+    h2. Headers
+    
+    h1. Header 1
+    
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+    
+    h2. Header 2
+    
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+    
+    h3. Header 3
+    
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+    
+    h4. Header 4
+    
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+    
+    h2. Structural emphasis
+    
+    This is _emphasis_ (italic)
+    
+    This is *strong* (bold)
+    
+    This is @code@
+    
+     more code
+     @difftext = diff( @v1_markup , @v2_markup)
+    
+    This is -deleted- text
+    
+    This is +inserted+ text
+    
+    Arbitrary style: I'm %{color:red}unaware% of most soft drinks.
+    
+    
+    h2. Arbitrary html, pre, and code
+    
+    Inserting arbitrary html (pre/code)
+    
+    <pre><code>a.gsub!( /</, '' )</code></pre>
+    
+    Inserting arbitrary html (pre/code)
+    
+    <pre>
+    <code>a.gsub!( /</, '' )</code>
+    </pre>
+    
+    Arbitrary html (pre)
+    
+    <pre>
+    a.gsub!( /</, '' )
+    </pre>
+    
+    Code by indenting
+    
+     more code
+     @difftext = diff( @v1_markup , @v2_markup)
+    
+    h2. Lists
+    
+    # A first item
+    # A second item
+    # A third
+    
+    # Fuel could be:
+    ## Coal
+    ## Gasoline
+    ## Electricity
+    # Humans need only:
+    ## Water
+    ## Protein
+    
+    * A first item
+    * A second item
+    * A third
+    
+    h2. External references
+    
+    This is a link: "Google":http://google.com
+    
+    Images: !/static/images/feed-icon-14x14.png! 
+    
+    
+    h2. Tables
+    
+    |_. name |_. age |_. sex |
+    | joan | 24 | f |
+    | archie | 29 | m |
+    | bella | 45 | f |
+  id: 3
+  version: 1
+  user_id: 1
+  created_at: 2006-11-06 09:40:53 -08:00

data/lib/junebug/controllers.rb

@@ -28,10 +28,15 @@ module Junebug::Controllers
     
     def post page_name
       redirect(Login) and return if @state.user_id.blank?
-      attrs = { :body => input.post_body, :title => input.post_title }
-      attrs[:readonly] = input.post_readonly if @state.user_id == 1
-      if Page.find_or_create_by_title(page_name).update_attributes( attrs )
-        redirect Show, input.post_title
+      if input.submit == 'delete'
+        Page.find_by_title(page_name).destroy() if @state.user_id == 1
+        redirect Index
+      else
+        attrs = { :body => input.post_body, :title => input.post_title }
+        attrs[:readonly] = input.post_readonly if @state.user_id == 1
+        if Page.find_or_create_by_title(page_name).update_attributes( attrs )
+          redirect Show, input.post_title
+        end
       end
     end
   end

data/lib/junebug/views.rb

@@ -73,7 +73,8 @@ module Junebug::Views
               text " Readonly"
               br
             end
-            input :type => 'submit', :value=>'save'
+            input :type => 'submit', :name=>'submit', :value=>'delete', :class=>'button', :onclick=>'return confirm("You sure?")', :style=>'float: right;'
+            input :type => 'submit', :name=>'submit', :value=>'save', :class=>'button'
           end
           _button 'cancel', :href => R(Show, @page.title, @page.version); text ' '
           a 'syntax help', :href => 'http://hobix.com/textile/', :target=>'_blank'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
-date: 2006-11-06 00:00:00 -08:00
+  version: 0.0.6
+date: 2006-11-07 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki.
 require_paths: 
 - lib