sunrise-cms 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3067042b43db55a77e22577281d9b57726e266e8
-  data.tar.gz: 1889f74f4f96d8d860cb736c571e132595f4dae0
+  metadata.gz: f16976245e13fe93bc1c0de8d3f07e0925dea26e
+  data.tar.gz: b973a2726856b5732fef592accf355a1aaaf9b6e
 SHA512:
-  metadata.gz: 3bd0e0f72630c74fcb6ce100be8e9da6d793e8c5f7a61970d79469f011cf5206ced9f517477b6e79ac2a7e524cf0a60612c2786d558953678b5d23bbaf2d59a1
-  data.tar.gz: 1ae32d7c1832b1237ca18d68e326e5ae73bb37b8519540c62548a5813a6b55a28581605b5328900a12153ed9173ec677129ff3d5f596b15b13158f880391d9b1
+  metadata.gz: 4fd90d5b0a8d6139fc3f3a69ca1c6a65b72edc728755a4bdefb27383fbeb3327ef197632534a6b95536374da21b68fa5cd5d4b284219700cdab30386c7ebf41a
+  data.tar.gz: dd1b9a847686bc41a4e415b2fc92989a150c9be553036096aeeea70623819743fec770876d99e18f6ceb0fb0f7e815ef4df5c1cfeded121395079ca22f3c8f9c

data/app/assets/javascripts/sunrise/jquery.pagination.js.coffee

@@ -1,15 +1,13 @@
 $ = jQuery
 
-$.fn.extend({
-  pagination: (options) ->
-    # Do no harm and return as soon as possible for unsupported browsers, namely IE6 and IE7
-    return this if $.browser.msie and ($.browser.version is "6.0" or $.browser.version is "7.0")
-    $(this).each((input_field) ->
-      el = $(this).data('pagination')
-      el ?= new Pagination(this, options)
-      return el
-    )
-})
+$.fn.pagination = (options = {}) ->
+  @each ->
+    $this = $(this)
+    data = $this.data("pagination")
+    if (!data)
+      $this.data("pagination", new Pagination(this, options))
+    if (typeof options is 'string')
+      data[options]()
 
 class Pagination
 

data/app/controllers/sunrise/activities_controller.rb

@@ -0,0 +1,20 @@
+module Sunrise
+  class ActivitiesController < Sunrise::ApplicationController
+    include Sunrise::Utils::SearchWrapper
+    
+    authorize_resource :class => false
+    
+    def index
+      per_page = Sunrise::Config.activities_per_page
+      cur_page = (params[:page] || 1).to_i
+      offset = (cur_page - 1) * per_page
+      
+      @events = Sunrise.activities
+      @events = @events.limit(per_page).offset(offset)
+
+      respond_with(@events) do |format|
+        format.html { render :layout => params[:time].blank? }
+      end
+    end
+  end
+end

data/app/controllers/sunrise/dashboard_controller.rb

@@ -5,16 +5,6 @@ module Sunrise
     authorize_resource :class => false
     
     def index
-      per_page = Sunrise::Config.activities_per_page
-      cur_page = (params[:page] || 1).to_i
-      offset = (cur_page - 1) * per_page
-      
-      @events = Sunrise.activities
-      @events = @events.limit(per_page).offset(offset)
-
-      respond_with(@events) do |format|
-        format.html { render :layout => params[:time].blank? }
-      end
     end
   end
 end

data/app/helpers/sunrise/activities_helper.rb

@@ -0,0 +1,36 @@
+module Sunrise
+  module ActivitiesHelper
+
+    # For generating time tags calculated using jquery.timeago
+    def timeago_tag(time, options = {})
+      options[:class] ||= "timeago"
+      content_tag(:abbr, time.to_s, options.merge(:title => time.getutc.iso8601)) if time
+    end
+
+    def activity_icon_tag(key, options = {})
+      icon = key.split('.').last
+      image = image_path("sunrise/icons/#{icon}.svg")
+
+      options = {
+        :class => "mega-icon",
+        :style => "background-image: url(#{image});"
+      }.merge(options)
+
+      content_tag(:div, nil, options)
+    end
+
+    # Check if object still exists in the database and display a link to it,
+    # otherwise display a proper message about it.
+    # This is used in activities that can refer to
+    # objects which no longer exist, like removed posts.
+    def link_to_trackable(object, object_type)
+      model_name = object_type.downcase
+
+      if object
+        link_to(model_name, edit_path(:model_name => model_name.pluralize, :id => object.id))
+      else
+        "a #{model_name} which does not exist anymore"
+      end
+    end
+  end
+end

data/app/helpers/sunrise/dashboard_helper.rb

@@ -1,36 +1,4 @@
 module Sunrise
   module DashboardHelper
-
-    # For generating time tags calculated using jquery.timeago
-    def timeago_tag(time, options = {})
-      options[:class] ||= "timeago"
-      content_tag(:abbr, time.to_s, options.merge(:title => time.getutc.iso8601)) if time
-    end
-
-    def activity_icon_tag(key, options = {})
-      icon = key.split('.').last
-      image = image_path("sunrise/icons/#{icon}.svg")
-
-      options = {
-        :class => "mega-icon",
-        :style => "background-image: url(#{image});"
-      }.merge(options)
-
-      content_tag(:div, nil, options)
-    end
-
-    # Check if object still exists in the database and display a link to it,
-    # otherwise display a proper message about it.
-    # This is used in activities that can refer to
-    # objects which no longer exist, like removed posts.
-    def link_to_trackable(object, object_type)
-      model_name = object_type.downcase
-
-      if object
-        link_to(model_name, edit_path(:model_name => model_name.pluralize, :id => object.id))
-      else
-        "a #{model_name} which does not exist anymore"
-      end
-    end
   end
 end

data/app/views/sunrise/activities/_header.html.erb

@@ -0,0 +1,12 @@
+<div class="filter-line-wrapper">
+  <div class="filter-line-holder">
+    <div class="struct-name"><%= t('manage.menu.main.dashboard') %></div>
+    
+    <div class="vline-block">
+      <%= form_for search_wrapper, :url => root_path,  :html => {:method => :get, :novalidate => true} do |f| %>
+        <%= f.text_field :q %>
+        <%= f.submit t('manage.search'), :class => "button" %>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/sunrise/activities/index.html.erb

@@ -0,0 +1,37 @@
+<div class="wrapper without-panel">
+  <div class="dbTable">
+    <table id="events-table" cellpadding="0" cellspacing="0" border="0" width="100%">
+      <tbody>
+        <tr class="theader">
+          <% ["created_at", "owner", "key", "trackable"].each do |attr| %>
+            <th>
+              <%= image_tag("sunrise/audit/#{attr}.png") %>
+              <%= PublicActivity::Activity.human_attribute_name("activity.#{attr}") %>
+            </th>
+          <% end -%>
+        </tr>
+        <%= render :partial => 'activity', :collection => @events %>
+      </tbody>
+    </table>
+
+    <% if @events.count >= Sunrise::Config.activities_per_page -%>
+      <div class="centerBtnHolder">
+        <%= link_to t('manage.buttons.next_50'), "#", :class=>"button", :style=>"width:100px;", :id=>"events-next" %>
+        
+        <script type="text/javascript">
+          $(document).ready(function(){
+            $("#events-table").pagination({
+              url: '/manage/dashboard',
+              binder: '#events-next',
+              event: 'click',
+              callback: function(data){
+                var rows = $(data).find("#events-table tr.event");
+                $('#events-table tbody').append(rows);
+              }
+            });
+          });
+        </script>
+      </div>
+    <% end -%>
+  </div>
+</div>

data/app/views/sunrise/dashboard/index.html.erb

@@ -1,37 +1,5 @@
 <div class="wrapper without-panel">
   <div class="dbTable">
-    <table id="events-table" cellpadding="0" cellspacing="0" border="0" width="100%">
-      <tbody>
-        <tr class="theader">
-          <% ["created_at", "owner", "key", "trackable"].each do |attr| %>
-            <th>
-              <%= image_tag("sunrise/audit/#{attr}.png") %>
-              <%= PublicActivity::Activity.human_attribute_name("activity.#{attr}") %>
-            </th>
-          <% end -%>
-        </tr>
-        <%= render :partial => 'activity', :collection => @events %>
-      </tbody>
-    </table>
-
-    <% if @events.count >= Sunrise::Config.activities_per_page -%>
-      <div class="centerBtnHolder">
-        <%= link_to t('manage.buttons.next_50'), "#", :class=>"button", :style=>"width:100px;", :id=>"events-next" %>
-        
-        <script type="text/javascript">
-          $(document).ready(function(){
-            $("#events-table").pagination({
-              url: '/manage/dashboard',
-              binder: '#events-next',
-              event: 'click',
-              callback: function(data){
-                var rows = $(data).find("#events-table tr.event");
-                $('#events-table tbody').append(rows);
-              }
-            });
-          });
-        </script>
-      </div>
-    <% end -%>
+    
   </div>
 </div>

data/config/locales/sunrise/en.yml

@@ -126,6 +126,7 @@ en:
         users: "Users"
         settings: "Settings"
         services: "Services"
+        activities: "Activities"
       creates:
         structures: "Structure"
         users: "User"

data/config/locales/sunrise/ru.yml

@@ -126,6 +126,7 @@ ru:
         users: "Пользователи"
         settings: "Настройки"
         services: "Сервисные модули"
+        activities: "Активность"
       creates:
         structures: "Раздел"
         users: "Пользователя"

data/config/locales/sunrise/uk.yml

@@ -126,6 +126,7 @@ uk:
         users: "Користувачі"
         settings: "Налаштування"
         services: "Сервісні модулі"
+        activities: "Активність"
       creates:
         structures: "Розділ"
         users: "Користувача"

data/config/routes.rb

@@ -1,9 +1,11 @@
 Sunrise::Engine.routes.draw do
-  root to: Sunrise::Config.root_controller
+  root Sunrise::Config.root_route_options
   
-  get "/dashboard/p/:page", to: "dashboard#index", page: /\d+/
+  get "/activities/p/:page", to: "activities#index", page: /\d+/
+  get "/dashboard", to: "dashboard#index", as: :dashboard
   
   resource :settings, only: [:edit, :update]
+  resources :activities, only: [:index]
   
   controller "manager" do
     scope ":model_name" do

data/lib/generators/sunrise/templates/config/active_record/sunrise.rb

@@ -40,8 +40,8 @@ Sunrise.setup do |config|
   # Lists the formats that should be treated as navigational (default: [:html, :json])
   # config.navigational_formats = [:html, :json]
 
-  # Welcome (root) controller path
-  # config.root_controller = "dashboard#index"
+  # Welcome root path options
+  # config.root_route_options = {to: "manager#index", model_name: "structures"}
 end
 
 PublicActivity::Config.set do

data/lib/generators/sunrise/templates/config/mongoid/sunrise.rb

@@ -40,8 +40,8 @@ Sunrise.setup do |config|
   # Lists the formats that should be treated as navigational (default: [:html, :json])
   # config.navigational_formats = [:html, :json]
 
-  # Welcome (root) controller path
-  # config.root_controller = "dashboard#index"
+  # Welcome root path options
+  # config.root_route_options = {to: "manager#index", model_name: "structures"}
 end
 
 PublicActivity::Config.set do

data/lib/generators/sunrise/templates/models/sunrise/sunrise_navigation.rb

@@ -1,9 +1,9 @@
 class SunriseNavigation < Sunrise::Config::Navigation
   navigation :main do
-    item :dashboard,  root_path, class: "icon1"
     item :structures, index_path(model_name: "structures"), class: "icon2"
     item :users,      index_path(model_name: "users"), class: "icon3"
     item :settings,   edit_settings_path, class: "icon4"
+    item :activities, activities_path, class: "icon1"
   end
   
   navigation :creates do

data/lib/sunrise/config.rb

@@ -51,9 +51,9 @@ module Sunrise
     mattr_accessor :navigational_formats
     @@navigational_formats = [:html, :json]
 
-    # Welcome (root) controller path
-    mattr_accessor :root_controller
-    @@root_controller = "dashboard#index"
+    # Welcome root path options
+    mattr_accessor :root_route_options
+    @@root_route_options = {to: "manager#index", model_name: "structures"}
 
     def self.scoped_views?
       @@scoped_views === true

data/lib/sunrise/version.rb

@@ -1,3 +1,3 @@
 module Sunrise
-  VERSION = "1.0.0.rc2".freeze
+  VERSION = "1.0.0.rc3".freeze
 end

data/spec/controllers/sunrise/{dashboard_controller_spec.rb → activities_controller_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sunrise::DashboardController do
+describe Sunrise::ActivitiesController do
   render_views  
   
   before(:all) do

data/spec/requests/activities_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe "Sunrise Manager Activities" do
+  subject { page }
+  before(:all) do 
+    @admin = FactoryGirl.create(:admin_user, :email => "#{Time.now.to_i}@gmail.com")    
+
+    @post = FactoryGirl.create(:post)
+    @user = FactoryGirl.create(:redactor_user)
+    @event = @post.create_activity :key => 'post.create', :owner => @user
+  end
+
+  context "admin" do
+    before(:each) { login_as @admin }
+
+    describe "GET /manage" do
+      before(:each) do 
+        visit activities_path
+      end
+      
+      it "should show page title" do
+        should have_content "Activities"
+      end
+      
+      it "should render records" do
+        dom_id = ["activity", @event.id].join('_')
+        should have_selector("#" + dom_id)
+      end
+    end
+  end
+  
+  describe "anonymous user" do
+    before(:each) do
+      visit activities_path
+    end
+    
+    it "should redirect to login page" do
+      should have_content('Sign in')
+    end
+  end
+end

data/spec/requests/dashboard_spec.rb

@@ -7,7 +7,6 @@ describe "Sunrise Manager Dashboard" do
 
     @post = FactoryGirl.create(:post)
     @user = FactoryGirl.create(:redactor_user)
-    @event = @post.create_activity :key => 'post.create', :owner => @user
   end
 
   context "admin" do
@@ -15,23 +14,18 @@ describe "Sunrise Manager Dashboard" do
 
     describe "GET /manage" do
       before(:each) do 
-        visit root_path
+        visit dashboard_path
       end
       
       it "should show page title" do
         should have_content "Dashboard"
       end
-      
-      it "should render records" do
-        dom_id = ["activity", @event.id].join('_')
-        should have_selector("#" + dom_id)
-      end
     end
   end
   
   describe "anonymous user" do
     before(:each) do
-      visit root_path
+      visit dashboard_path
     end
     
     it "should redirect to login page" do

data/spec/support/helpers/controller_helper.rb

@@ -22,6 +22,6 @@ module ControllerHelper
 
     def process_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
       parameters ||= {}
-      process(action, parameters.merge!(:use_route => Sunrise::Engine.engine_name), session, flash, method)
+      process(action, method, parameters.merge!(:use_route => Sunrise::Engine.engine_name), session, flash)
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunrise-cms
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -434,10 +434,12 @@ files:
 - app/assets/stylesheets/sunrise/customize.css
 - app/assets/stylesheets/sunrise/main.css
 - app/assets/stylesheets/sunrise/pagination.css
+- app/controllers/sunrise/activities_controller.rb
 - app/controllers/sunrise/application_controller.rb
 - app/controllers/sunrise/dashboard_controller.rb
 - app/controllers/sunrise/manager_controller.rb
 - app/controllers/sunrise/settings_controller.rb
+- app/helpers/sunrise/activities_helper.rb
 - app/helpers/sunrise/application_helper.rb
 - app/helpers/sunrise/dashboard_helper.rb
 - app/helpers/sunrise/manager_helper.rb
@@ -451,7 +453,9 @@ files:
 - app/views/kaminari/sunrise/_prev_page.html.erb
 - app/views/layouts/sunrise/application.html.erb
 - app/views/layouts/sunrise/devise.html.erb
-- app/views/sunrise/dashboard/_activity.html.erb
+- app/views/sunrise/activities/_activity.html.erb
+- app/views/sunrise/activities/_header.html.erb
+- app/views/sunrise/activities/index.html.erb
 - app/views/sunrise/dashboard/_header.html.erb
 - app/views/sunrise/dashboard/index.html.erb
 - app/views/sunrise/manager/_controls.html.erb
@@ -610,7 +614,7 @@ files:
 - Rakefile
 - README.md
 - CHANGELOG.rdoc
-- spec/controllers/sunrise/dashboard_controller_spec.rb
+- spec/controllers/sunrise/activities_controller_spec.rb
 - spec/controllers/sunrise/manager_controller_spec.rb
 - spec/controllers/sunrise/settings_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
@@ -683,6 +687,7 @@ files:
 - spec/orm/kaminari/active_record.rb
 - spec/orm/kaminari/mongoid.rb
 - spec/orm/mongoid.rb
+- spec/requests/activities_spec.rb
 - spec/requests/dashboard_spec.rb
 - spec/requests/manager/default/create_spec.rb
 - spec/requests/manager/default/destroy_spec.rb
@@ -727,7 +732,7 @@ signing_key:
 specification_version: 4
 summary: Rails CMS
 test_files:
-- spec/controllers/sunrise/dashboard_controller_spec.rb
+- spec/controllers/sunrise/activities_controller_spec.rb
 - spec/controllers/sunrise/manager_controller_spec.rb
 - spec/controllers/sunrise/settings_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
@@ -800,6 +805,7 @@ test_files:
 - spec/orm/kaminari/active_record.rb
 - spec/orm/kaminari/mongoid.rb
 - spec/orm/mongoid.rb
+- spec/requests/activities_spec.rb
 - spec/requests/dashboard_spec.rb
 - spec/requests/manager/default/create_spec.rb
 - spec/requests/manager/default/destroy_spec.rb