junebug 0.0.15 → 0.0.16

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.0.16 2006-11-19
+
+ * Style tweaks
+ * Login/logout redirects you back to the page you were on
+
 v0.0.15 2006-11-17
 
  * Loosen up mongrel requirements for windows users -- thanks deejay
@@ -5,6 +10,7 @@ v0.0.15 2006-11-17
  * Added css for wrapping pre text
  * Changed wikiword syntax to [[link]]
  * Unit testing improvements
+ * Command line help
  
 v0.0.14 2006-11-14
 

data/Rakefile

@@ -13,7 +13,7 @@ Gem.manage_gems
 
 gem_spec = Gem::Specification.new do |s|
   s.name = 'junebug'
-  s.version = '0.0.15'
+  s.version = Junebug::VERSION
   s.summary = "Junebug is a minimalist ruby wiki."
   s.description = "Junebug is a minimalist ruby wiki running on Camping."
   s.author = "Tim Myrtle"
@@ -29,7 +29,7 @@ gem_spec = Gem::Specification.new do |s|
   s.add_dependency('mongrel', '>=0.3.13.3')
   s.add_dependency('camping', '>=1.5')
   s.add_dependency('RedCloth', '>=3.0.4')
-  s.add_dependency('daemons')
+  s.add_dependency('daemons', '>=1.0.3')
   s.add_dependency('sqlite3-ruby', '>=1.1.0.1')
   s.add_dependency('activerecord', '>=1.14.4')
 end

data/deploy/static/style/base.css

@@ -1,12 +1,12 @@
 /* Baseline Junebug style */
 
 a:link, a:visited {
-    text-decoration: none;
-    color: #00f;
+/*    text-decoration: none;*/
+    color: #0000cc;
 }
 a:hover {
-    text-decoration: underline;
-    color: #00f;
+/*    text-decoration: underline;*/
+    color: #0000cc;
 }
 
 form { display: inline; }
@@ -55,8 +55,8 @@ body {
 }
 
 #hd {
-    border-top: 6px solid #4682b4;
-    background-color: #191970;
+/*    border-top: 6px solid #809fff;*/
+    background-color: #6677aa;
     padding: 8px 25px;
     color: #ffffff;
 }
@@ -68,6 +68,10 @@ body {
 #hd h1 a {
     color: #ffffff;
 }
+#hd h1 a:link, #hd h1 a:visited {
+    text-decoration: none;
+}
+
 
 #hd h1 {
     font-size: 167%;
@@ -151,9 +155,15 @@ body {
     min-height: 300px;
 }
 
-.content h2, .content h3, .content h4 {
+.content h2, .content h3, .content h4, .content h5 {
 /*    color: #04766f;*/
-    color: #548b54;
+    font-weight: normal;
+    color: #447744;
+    border-bottom: 2px dotted #bbb;
+    margin-left: -5px;
+    margin-top: 20px;
+    margin-bottom: 10px;
+    padding: 1px 5px;
 }
 
 .content h1 {
@@ -162,26 +172,32 @@ body {
 }
 
 .content h2 {
-    font-size:  129%;
+    font-size:  140%;
     border-bottom: 2px dotted #bbb;
-    margin-top: 25px;
-    margin-bottom: 10px;
-/*    background-color: #d6fbf4;*/
+/*    margin-top: 25px;*/
+/*    margin-bottom: 10px;*/
+    background-color: #edf9ef;
 }
 
 .content h3 {
     font-size:  129%;
-    margin-top: 25px;
-    margin-bottom: 10px;
-/*    border-bottom: 1px dotted #bbb;*/
+/*    margin-top: 25px;*/
+/*    margin-bottom: 10px;*/
 }
 
 .content h4 {
     font-size:  107%;
-    margin-top: 15px;
-    margin-bottom: 10px;
+/*    margin-top: 15px;*/
+/*    margin-bottom: 10px;*/
 }
 
+.content h5 {
+    font-size:  100%;
+/*    margin-top: 15px;*/
+/*    margin-bottom: 10px;*/
+}
+
+
 .content ul {
     list-style-type: square;
     margin: 10px 0px 10px 15px;
@@ -197,8 +213,8 @@ body {
 }
 
 .content p {
-    line-height: 130%;
-    margin: 10px 0px;
+    line-height: 145%;
+    margin: 15px 0px;
 }
 
 .content em {
@@ -207,8 +223,8 @@ body {
 
 .content strong {
     font-weight: bold;
-    background-color: #ffffcc;
-    padding: 3px;
+/*    background-color: #ffffcc;
+    padding: 3px;*/
 }
 
 .content label {
@@ -217,7 +233,7 @@ body {
 
 .content code {
 /*    font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;*/
-    background: #eee;
+    background: #f4f4f4;
     padding: 2px;
 }
 
@@ -228,7 +244,7 @@ body {
 .content pre {
 /*    font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;*/
     display: block;
-    background: #eee;
+    background: #f4f4f4;
     border: 1px solid #ddd;
     padding: 8px 20px;
 }

data/dump/junebug_pages.yml

@@ -21,7 +21,7 @@
     
     Next, in your wiki directory, run the command:
     
-     ./wiki restart
+     ruby 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.
     
@@ -52,19 +52,23 @@
     
     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.
+    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.
     
     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.
+    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.
     
     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.
+    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.
     
     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.
+    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.
+    
+    h5. Header 5
+    
+    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.
     
     h2. Structural emphasis
     

data/lib/junebug.rb

@@ -18,7 +18,7 @@ require 'fileutils'
 module Junebug
   include Camping::Session
   
-  VERSION='0.0.15'
+  VERSION='0.0.16'
 
   def self.create
     Junebug::Models.create_schema :assume => (Junebug::Models::Page.table_exists? ? 1.0 : 0.0)

data/lib/junebug/controllers.rb

@@ -137,27 +137,31 @@ module Junebug::Controllers
   class Login
     def get
       @page_title = "Login/Create Account"
+      @return_to = input.return_to
       render :login
     end
 
     def post
       @page_title = "Login/Create Account"
       @user = User.find :first, :conditions => ['username = ? AND password = ?', input.username, input.password]
+      @return_to = input.return_to
       if @user
         if @user.password == input.password
           @state.user = @user
-          redirect(Junebug.startpage); return
+          input.return_to.blank? ? redirect(Junebug.startpage) : redirect(input.return_to)
+          return
         else
           @notice = 'Authentication failed'
         end
       else
-          @user = User.create :username=>input.username, :password=>input.password
-          if @user.errors.empty?
-            @state.user = @user
-            redirect(Junebug.startpage); return
-          else
-            @notice = @user.errors.full_messages[0]
-          end
+        @user = User.create :username=>input.username, :password=>input.password
+        if @user.errors.empty?
+          @state.user = @user
+          redirect(Junebug.startpage)
+          return
+        else
+          @notice = @user.errors.full_messages[0]
+        end
       end
       render :login
     end
@@ -166,7 +170,7 @@ module Junebug::Controllers
   class Logout
       def get
         @state.user = nil
-        redirect(Junebug.startpage)
+        input.return_to.blank? ? redirect(Junebug.startpage) : redirect(input.return_to)
       end
   end
 end

data/lib/junebug/views.rb

@@ -49,8 +49,8 @@ module Junebug::Views
     }
     if is_admin?
       div.admin {
-        _button 'delete', R(Delete, @page.title), {:onclick=>'return confirm("Sure you want to delete?")'} if @version.version == @page.version
-        _button 'revert to', R(Revert, @page.title, @version.version), {:onclick=>'return confirm("Sure you want to revert?")'} if @version.version != @page.version
+        _button 'delete', R(Delete, @page.title), {:onclick=>"return confirm('Sure you want to delete?')"} if @version.version == @page.version
+        _button 'revert to', R(Revert, @page.title, @version.version), {:onclick=>"return confirm('Sure you want to revert?')"} if @version.version != @page.version
       }
     end
   end
@@ -191,6 +191,8 @@ module Junebug::Views
 
         label 'Password', :for => 'password'; br
         input :name => 'password', :type => 'password'; br
+        
+        input :name => 'return_to', :type => 'hidden', :value=>@return_to
 
         input :type => 'submit', :name => 'login', :value => 'Login'
       end
@@ -222,7 +224,7 @@ module Junebug::Views
   def _header type, page_title
     div :id=>'hd' do
       span :id=>'userlinks', :style=>'float: right;' do
-        logged_in? ? (text "Welcome, #{@state.user.username} - " ; a('sign out', :href=>R(Logout))) : a('sign in', :href=>R(Login))
+        logged_in? ? (text "Welcome, #{@state.user.username} - " ; a('sign out', :href=>"#{R(Logout)}?return_to=#{@env['REQUEST_URI']}")) : a('sign in', :href=> "#{R(Login)}?return_to=#{@env['REQUEST_URI']}")
       end
       if type == :static
         h1 page_title
@@ -260,7 +262,7 @@ module Junebug::Views
       span :style=>'float: right;' do
         text 'Powered by '
         a 'JunebugWiki', :href => 'http://www.junebugwiki.com/'
-        text ' '
+        text " <small>v#{Junebug::VERSION}</small> "
         a :href => Junebug.config['feed'] do
           img :src => '/static/images/feed-icon-14x14.png'
         end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
-date: 2006-11-17 00:00:00 -08:00
+  version: 0.0.16
+date: 2006-11-19 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki.
 require_paths: 
 - lib
@@ -120,9 +120,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 1.0.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby