junebug 0.0.6 → 0.0.7

data/README

@@ -5,7 +5,7 @@ Junebug is a minimalist wiki, running on Camping.
 
 == Status
 
-Junebug v0.0.4 release, 2006-11-05
+Junebug v0.0.7 release, 2006-11-07
 
 This is an alpha release.  Use at your own risk.  Please do not use this for anything important.
 

data/deploy/static/style/base.css

@@ -137,33 +137,35 @@ body {
     font-size: 100%;
 }
 
-.content h2, .content h3, .content h4 {
-    margin-top: 25px;
-    margin-bottom: 10px;
-}
 
 .content h2, .content h3, .content h4 {
     color: 04766f;
 }
 
 .content h1 {
-    margin-bottom: 10px;
     font-size:  182%;
+    margin-bottom: 10px;
 }
 
 .content h2 {
     font-size:  152%;
     border-bottom: 1px dotted #bbb;
+    margin-top: 25px;
+    margin-bottom: 10px;
 /*    background-color: #d6fbf4;*/
 }
 
 .content h3 {
     font-size:  129%;
+    margin-top: 25px;
+    margin-bottom: 10px;
 /*    border-bottom: 1px dotted #bbb;*/
 }
 
 .content h4 {
     font-size:  107%;
+    margin-top: 10px;
+    margin-bottom: 10px;
 }
 
 .content ul {

data/lib/junebug/controllers.rb

@@ -1,16 +1,19 @@
 require 'junebug/diff'
 
 module Junebug::Controllers
+  
+
   class Index < R '/'
     def get
-      redirect Show, Junebug.config['startpage']
+      redirect Junebug.startpage
     end
   end
 
   class Show < R '/(\w+)', '/(\w+)/(\d+)'
     def get page_name, version = nil
       @page_title = page_name
-      redirect(Edit, page_name, 1) and return unless @page = Page.find_by_title(page_name)
+      #redirect(Edit, page_name, 1) and return unless @page = Page.find_by_title(page_name)
+      redirect("#{Junebug.config['url']}/#{page_name}/1/edit") and return unless @page = Page.find_by_title(page_name)
       @version = (version.nil? or version == @page.version.to_s) ? @page : @page.versions.find_by_version(version)
       render :show
     end
@@ -18,7 +21,7 @@ module Junebug::Controllers
 
   class Edit < R '/(\w+)/edit', '/(\w+)/(\d+)/edit' 
     def get page_name, version = nil
-      redirect(Login) and return if @state.user_id.blank?
+      redirect("#{Junebug.config['url']}/login") and return if @state.user_id.blank?
       @page_title = "Edit #{page_name}"
       @page = Page.find(:first, :conditions=>['title = ?', page_name])
       @page = Page.create(:title => page_name, :user_id=>@state.user_id) unless @page
@@ -27,15 +30,16 @@ module Junebug::Controllers
     end
     
     def post page_name
-      redirect(Login) and return if @state.user_id.blank?
+      redirect("#{Junebug.config['url']}/login") and return if @state.user_id.blank?
       if input.submit == 'delete'
         Page.find_by_title(page_name).destroy() if @state.user_id == 1
-        redirect Index
+        redirect Junebug.startpage
       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
+          # redirect Show, input.post_title
+          redirect "#{Junebug.config['url']}/#{input.post_title}"
         end
       end
     end
@@ -127,7 +131,7 @@ module Junebug::Controllers
         if @user.password == input.password
           @state.user_id = @user.id
           @state.user_username = @user.username
-          redirect(Index); return
+          redirect(Junebug.startpage); return
         else
           @notice = 'Authentication failed'
         end
@@ -136,7 +140,7 @@ module Junebug::Controllers
           if @user.errors.empty?
             @state.user_id = @user.id
             @state.user_username = @user.username
-            redirect(Index); return
+            redirect(Junebug.startpage); return
           else
             @notice = @user.errors.full_messages[0]
           end
@@ -149,7 +153,7 @@ module Junebug::Controllers
       def get
           @state.user_id = nil
           @state.user_username = nil
-          redirect(Index)
+          redirect(Junebug.startpage)
       end
   end
 end

data/lib/junebug.rb

@@ -32,6 +32,10 @@ module Junebug
   def self.config
     @config ||= YAML.load(File.read('config.yml'))
   end
+  
+  def self.startpage
+    "#{Junebug.config['url']}/#{Junebug.config['startpage']}"
+  end
 end
 
 

metadata

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