stiki 0.1.1 → 0.1.2

data/app/assets/stylesheets/stiki/pages.css

@@ -29,10 +29,10 @@
     }
     
     .title {
-      h1 {
+      a {
         .icon-chevron-left {
           position: relative;
-          top: 13px;
+          top: 9px;
         }
       }
     }

data/app/models/stiki/page.rb

@@ -20,7 +20,8 @@ module Stiki
     
     validates :title, :uniqueness => {:scope => :space_id}, :presence => true
     validates :body, :presence => true
-    
+    after_validation :move_friendly_id_error_to_name
+
     def mark_badges
       if authors.size > 1
         # XXX: need revisions to determine last edit and most edits
@@ -29,5 +30,10 @@ module Stiki
         #authors.where( ["#{Stiki::Author.table_name}.id = ?", last.id] ).update_all( :last_edit => true );
       end
     end
+    
+    protected
+    def move_friendly_id_error_to_name
+      errors.add :title, *errors.delete(:friendly_id) if errors[:friendly_id].present?
+    end
   end
 end

data/app/models/stiki/space.rb

@@ -7,10 +7,16 @@ module Stiki
     
     has_many :pages
     has_many :authors, :as => :authorable
-    has_one :creator, :class_name => 'Author', :conditions => "creator = true", :as => :authorable
+    has_one :creator, :class_name => 'Author', :conditions => ["creator = ?", true], :as => :authorable
     
     attr_accessible :name
     
     validates :name, :uniqueness => true, :presence => true
+    after_validation :move_friendly_id_error_to_name
+
+    protected
+    def move_friendly_id_error_to_name
+      errors.add :name, *errors.delete(:friendly) if errors[:friendly].present?
+    end
   end
 end

data/app/views/stiki/pages/_form.html.erb

@@ -21,7 +21,7 @@
         </div>
     </div>
     <div class="form-actions">
-      <div class="span2">
+      <div class="span4">
         <%= submit_tag "Save", :class => "btn btn-primary btn-large" %>
       </div>
       <div class="span2">

data/app/views/stiki/pages/index.html.erb

@@ -12,6 +12,7 @@
                 <button class="btn dropdown-toggle" data-toggle="dropdown">Change Space<span class="caret"></span></button>
                 <ul class="dropdown-menu">
                   <li><a href="<%= stiki_routes.spaces_path %>">All Spaces</a></li>
+                  <li class="divider"></li>
                   <%- @spaces.each do |space| %>
                     <li><a href="<%= stiki_routes.space_pages_path(space) %>"><%= space.name %></a></li>
                   <% end -%>

data/app/views/stiki/pages/show.html.erb

@@ -3,8 +3,8 @@
           <div class="span12 well">
             <div class="row-fluid">
               <div class="span7 title">
+                <%= link_to '<i class="icon-chevron-left"></i>'.html_safe, stiki_routes.space_pages_path(@space), :style => "float:left" %>
                 <h1>
-                  <%= link_to '<i class="icon-chevron-left"></i>'.html_safe, stiki_routes.space_pages_path(@space) %>
                   <%= @page.title %>
                 </h1>
               </div>

data/app/views/stiki/spaces/index.html.erb

@@ -1,15 +1,17 @@
 <%- @spaces.each do |space| %>
   <div class="row-fluid">
-    <div class="span8">
-      <div class="row-fluid">
-        <div class="hero-unit">
-          <h2><%= link_to space.name, stiki_routes.space_pages_path(space) %></h2>
-          <h4 style="float:left">Created by <%= user_name( space.creator ) %></h4>
-          <%- if has_access( :update, @page ) %>
-            <%= button_to "X", stiki_routes.space_path( space ), :method => :delete, 
-                 :class => 'close', :confirm => 'Are you sure you want to delete this Wiki Space?' %>
-          <% end -%>
-        </div>
+    <div class="span8 well">
+      <div style="float:right">
+        <%- if has_access( :update, @page ) %>
+          <%= button_to "X", stiki_routes.space_path( space ), :method => :delete, 
+               :class => 'close', :confirm => 'Are you sure you want to delete this Wiki Space?' %>
+        <% end -%>
+      </div>
+      <div style="float:left">
+        <h2 ><%= link_to space.name, stiki_routes.space_pages_path(space) %></h2>
+        <% if space.creator %>
+          <h4 >Created by <%= user_name( space.creator ) %></h4>
+        <% end %>
       </div>
     </div>
   </div>

data/lib/stiki/version.rb

@@ -1,3 +1,3 @@
 module Stiki
-  VERSION = "0.1.1" 
-end
+  VERSION = "0.1.2" 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stiki
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3907906137424960963
+      hash: -4343939876870482060
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3907906137424960963
+      hash: -4343939876870482060
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24