cms-fortress 1.0.4 → 1.0.5

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/app/assets/stylesheets/cms/fortress/admin_overrides.css

@@ -1,5 +1,5 @@
 body#comfy .body-wrapper {
-  margin-top: 3em;
+  margin-top: 2.9em;
 }
 
 .navbar-container, .footer-container {
@@ -14,3 +14,7 @@ body#comfy form.formatted.form-horizontal .control-group .controls select.status
 body#comfy form.formatted.form-horizontal .control-group .controls input[type='text'].status-control {
   width: 30%;
 }
+
+body#comfy .nav-height {
+
+}

data/app/models/cms/page_workflow.rb

@@ -16,12 +16,16 @@ class Cms::PageWorkflow < ActiveRecord::Base
     }
   end
 
-  def self.statuses_for_select
-    self.statuses.map {|k,v| [v.to_s.titleize, k]}
+  def self.statuses_for_select(can_publish, can_review)
+    ret = [["Draft", 0]]
+    ret << ["Review", 1] if can_review
+    ret << ["Published", 3] if can_publish
+    # self.statuses.map {|k,v| [v.to_s.titleize, k]}
+    ret
   end
 
   def page_published?
-    status_id.eql?(3) || status_id.eql?(2) && published_date < Time.now
+    (status_id.eql?(3) || status_id.eql?(2)) && published_date <= Date.today
   end
 
 end

data/app/views/admin/cms/pages/_form.html.haml

@@ -1,8 +1,11 @@
+- @page.page_workflow ||= Cms::PageWorkflow.new
+
 - content_for :right_column do
   #form-save.box
-    %label.checkbox.inline
-      %input{:type => 'checkbox'}
-      = ::Cms::Page.human_attribute_name(:is_published)
+    
+    /%label.checkbox.inline
+    /  %input{:type => 'checkbox'}
+    /  = ::Cms::Page.human_attribute_name(:is_published)
     %button.btn.btn-small.btn-primary.pull-right
   = render :partial => 'admin/cms/files/index'
 
@@ -31,9 +34,8 @@
 = render :partial => 'form_blocks'
 
 =# form.check_box :is_published, :label => t('.is_published')
-- @page.page_workflow ||= Cms::PageWorkflow.new
 = form.fields_for :page_workflow do |wf|
-  = wf.select :status_id, Cms::PageWorkflow.statuses_for_select, {}, {class: "status-control"}
+  = wf.select :status_id, Cms::PageWorkflow.statuses_for_select(can?(:manage, 'contents.page.publish'), can?(:manage, 'contents.page.review')), {}, {class: "status-control"}
   = wf.text_field :published_date, class: "status-control", :data => {:utc_date => (@page.page_workflow.published_date.nil? ? Time.now : @page.page_workflow.published_date).strftime("%d %B, %Y") }
 
 = render 'admin/cms/partials/page_form_after', :object => form

data/app/views/cms/fortress/shared/_admin_topnav.html.haml

@@ -1,5 +1,5 @@
 .navbar.navbar-inverse.navbar-fixed-top
-  .navbar-inner
+  .navbar-inner.nav-height
     .navbar-container
       %button.btn.btn-navbar{'type' => 'button', 'data-toggle' => 'collapse', 'data-target' => '.nav-collapse'}
         %span.icon-bar
@@ -22,7 +22,7 @@
         %ul.nav.nav-pill.pull-right
           - if current_cms_fortress_user
             %li
-              = link_to ":: #{ current_cms_fortress_user.email }", "#"
+              = link_to "#{ current_cms_fortress_user.email } ::", "#"
             %li
               = link_to "Logout", destroy_cms_fortress_user_session_path, :method => 'delete'
 

data/cms-fortress.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cms-fortress"
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Melvin Sembrano"]
-  s.date = "2013-12-11"
+  s.date = "2013-12-12"
   s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email = "melvinsembrano@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -264,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3584437866439993559
+      hash: 2392009849821988709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: