sunrise-cms 0.5.3 → 0.6.0

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.6.0
+  * Raname attributes kind and position to structure_type_id and position_type_id
+  * Integrate "public_activity" gem
+  * Remove "activerecord-audited" and "mongoid-history" gems
+  * Fix search class in Utils
+
 == 0.5.0
   * Integrate "strong_parameters" gem
   * Add config option "navigational_formats"

data/README.md

@@ -10,7 +10,6 @@ List of gems for [active_record](https://gist.github.com/4529926#file-gemfile-ac
 
 ```bash
 $> rails g devise:install
-$> rails g audited:install
 $> rails g sunrise:install --orm=active_record
 ```
 
@@ -20,6 +19,7 @@ Copy db migrations files:
 $> rake sunrise:install:migrations
 $> rake page_parts_engine:install:migrations
 $> rake meta_manager_engine:install:migrations
+$> rails g public_activity:migration
 ```
 
 ### Mongoid

data/app/assets/javascripts/sunrise/manage.js.coffee

@@ -12,6 +12,7 @@ class Sunrise
     ($ '[data-lang]').lang_tabs()
     
     this.init_submit_buttons()
+    this.init_group_menus()
   
   getParameterByName: (name) ->
     match = RegExp('[?&]' + name + '=([^&]*)').exec(window.location.search)
@@ -27,7 +28,18 @@ class Sunrise
     
     $('#submit-form-button').bind 'click', (evt) ->
       $('form:first').submit()
-    
+
+  init_group_menus: ->
+    $(".title-switcher").bind('click', (e) ->
+      $(this).parent().find(".padder").toggle()
+
+      if $(this).hasClass('up')
+        $(this).removeClass('up').addClass('down')
+      else
+        $(this).removeClass('down').addClass('up')
+
+      return false
+    )
 
   # Store params: page, per, sort and view for current namespace
   storeQuery: () ->

data/app/controllers/sunrise/application_controller.rb

@@ -1,5 +1,7 @@
 module Sunrise
   class ApplicationController < ::ApplicationController
+    include ::PublicActivity::StoreController
+
     prepend_before_filter :authenticate_user!
     check_authorization
     

data/app/controllers/sunrise/dashboard_controller.rb

@@ -5,12 +5,13 @@ module Sunrise
     authorize_resource :class => false
     
     def index
-      per_page = Sunrise::Config.audit_events_per_page
+      per_page = Sunrise::Config.activities_per_page
       cur_page = (params[:page] || 1).to_i
       offset = (cur_page - 1) * per_page
       
-      @events = Sunrise::Config.audit_scope.limit(per_page).offset(offset)
-      
+      @events = PublicActivity::Activity.includes(:owner, :trackable, :recipient)
+      @events = @events.limit(per_page).offset(offset)
+
       respond_with(@events) do |format|
         format.html { render :layout => params[:time].blank? }
       end

data/app/helpers/sunrise/dashboard_helper.rb

@@ -0,0 +1,36 @@
+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/dashboard/_activity.html.erb

@@ -0,0 +1,16 @@
+<%= content_tag(:tr, :id => ["activity", activity.id].join("_"), :class => "event") do -%>
+  <td><%= I18n.l activity.created_at, :format => "%d.%m.%Y %H:%M" %></td>
+  <% if activity.owner -%>
+    <td>
+      <%= link_to activity.owner.name, edit_path(:model_name => activity.owner_type, :id => activity.owner_id) %>
+    </td>
+  <% else -%>
+    <td>someone</td>
+  <% end -%>
+  <td><%= activity.key %></td>
+  <td>
+    <% if ['create', 'update'].include?(activity.key.split('.').last) %>
+      <%= link_to_trackable activity.trackable, activity.trackable_type %>
+    <% end %>
+  </td>
+<% end -%>

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

@@ -1,37 +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", "user", "action", "auditable", "remote_address"].each do |attr| %>
-  			  <th>
-  			    <%= image_tag("sunrise/audit/#{attr}.png") %>
-  			    <%= t(attr, :scope => [:sunrise, :audit]) %>
-  			  </th>
-			  <% end -%>
-		  </tr>
-		  <%= render :partial => 'event', :collection => @events %>  	    	    
-	    </tbody>
-	  </table>
+    <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.audit_events_per_page -%>
-	    <div class="centerBtnHolder">
-	      <a id="events-next" href="#" class="button" style="width: 100px;">Показать еще 50</a>
-	      
-	      <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 -%>
+    <% 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

@@ -20,9 +20,9 @@ en:
         title_en: "Name (eng.)"
         parent_id: "Main Categories"
         is_visible: "Show?"
-        kind: "Page Type"
+        structure_type_id: "Page Type"
         redirect_url: "Redirect (URL)"
-        position: "Position"
+        position_type_id: "Position"
         slug: "Slug"
       
       header:
@@ -66,6 +66,13 @@ en:
         remote_ip: "IP address"
         user_agent: "Browser Version"
         message: "Message"
+
+      activity:
+        created_at: "Created at"
+        owner: "User"
+        key: "Action"
+        trackable: "Object"
+        remote_address: "IP"
               
   manage:
     title: "System <br /> Management"
@@ -156,6 +163,7 @@ en:
       edit_profile: "My profile"
       exit: "Exit"
       add_nested_field: "+Add"
+      next_50: "Show more 50"
 
     user:
       actions: "action"

data/config/locales/sunrise/ru.yml

@@ -20,9 +20,9 @@ ru:
         title_en: "Название (eng.)"
         parent_id: "Главная категория"
         is_visible: "Отображать?"
-        kind: "Тип страницы"
+        structure_type_id: "Тип страницы"
         redirect_url: "Перенаправление (URL)"
-        position: "Позиция"
+        position_type_id: "Позиция"
         slug: "URL"
       
       header:
@@ -67,11 +67,11 @@ ru:
         user_agent: "Версия браузера"
         message: "Сообщение"
       
-      audit:
+      activity:
         created_at: "Дата"
-        user: "Пользователь"
-        action: "Что"
-        auditable: "Объект"
+        owner: "Пользователь"
+        key: "Что"
+        trackable: "Объект"
         remote_address: "IP"
               
   manage:
@@ -163,6 +163,7 @@ ru:
       edit_profile: "Мой профайл"
       exit: "Выход"
       add_nested_field: "+Еще"
+      next_50: "Показать еще 50"
     
     user:
       actions: "действия"
@@ -259,6 +260,9 @@ ru:
       edit: "Редактировать"
       settings: "Настройки"
       delete: "Удалить"
+
+    groups:
+      meta_tags: "Мета теги"
   
   views:
     pagination:

data/config/locales/sunrise/uk.yml

@@ -20,9 +20,9 @@ uk:
         title_en: "Назва (eng.)"
         parent_id: "Головна категорія"
         is_visible: "Відображати?"
-        kind: "Тип сторінки"
+        structure_type_id: "Тип сторінки"
         redirect_url: "Перенаправлення (URL)"
-        position: "Позиція"
+        position_type_id: "Позиція"
         slug: "URL"
       
       header:
@@ -67,11 +67,11 @@ uk:
         user_agent: "Версія браузера"
         message: "Повідомлення"
       
-      audit:
+      activity:
         created_at: "Дата"
-        user: "Пользователь"
-        action: "Что"
-        auditable: "Объект"
+        owner: "Пользователь"
+        key: "Что"
+        trackable: "Объект"
         remote_address: "IP"
               
   manage:
@@ -163,6 +163,7 @@ uk:
       edit_profile: "Мій профайл"
       exit: "Вихід"
       add_nested_field: "+Ще"
+      next_50: "Показати ще 50"
     
     user:
       actions: "дії"
@@ -258,6 +259,9 @@ uk:
       edit: "Редагувати"
       settings: "Настройки"
       delete: "Видалити"
+
+    groups:
+      meta_tags: "Мета теги"
   
   views:
     pagination:

data/db/migrate/20111216144915_create_structures.rb

@@ -3,8 +3,8 @@ class CreateStructures < ActiveRecord::Migration
     create_table :structures do |t|
       t.string    :title, :null => false
       t.string    :slug, :null => false, :limit => 25
-      t.integer   :kind, :limit => 1, :default => 0
-      t.integer   :position, :limit => 2, :default => 0
+      t.integer   :structure_type_id, :limit => 1, :default => 0
+      t.integer   :position_type_id, :limit => 2, :default => 0
       t.boolean   :is_visible, :default => true
       t.string    :redirect_url
       
@@ -16,7 +16,8 @@ class CreateStructures < ActiveRecord::Migration
       t.timestamps
     end
     
-    add_index :structures, [:kind, :slug], :unique => true
+    add_index :structures, :structure_type_id
+    add_index :structures, :position_type_id
     add_index :structures, :parent_id
     add_index :structures, [:lft, :rgt]
   end

data/lib/generators/sunrise/templates/config/nginx-config

@@ -70,7 +70,7 @@ server {
     }
   }
   
-  location ~ ^/(assets|ckeditor_assets|images|javascripts|stylesheets)/ {
+  location ~ ^/(assets|uploads|images|javascripts|stylesheets)/ {
     expires 1y;
     add_header Cache-Control public;
    

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

@@ -22,9 +22,8 @@ end
 def insert_structures
   Structure.truncate!
   
-  main_page = Structure.create!({:title => "Главная страница", :slug => "main-page", :structure_type => StructureType.main, :parent => nil}, :as => :admin)
-  #Structure.create!({:title => "Трансляции", :slug => "broadcasts", :structure_type => StructureType.broadcasts, :parent => main_page}, :as => :admin)
-  #Structure.create!({:title => "Прямые репортажи", :slug => "posts", :structure_type => StructureType.posts, :parent => main_page}, :as => :admin)
+  main_page = Structure.create!(title: "Главная страница", slug: "main-page", structure_type: StructureType.main, parent: nil)
+  # Structure.create!(title: "Трансляции", slug: "broadcasts", structure_type: StructureType.broadcasts, parent: main_page)
 end
 
 insert_user

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

@@ -1,16 +1,49 @@
+# require 'meta_manager/orm/active_record'
+# require 'page_parts/orm/active_record'
+
 # Use this hook to configure sunrise
-if Object.const_defined?("Sunrise")
-  Sunrise.setup do |config|
-    # Flash keys
-    #config.flash_keys = [ :success, :failure ]
-  end
-end
+Sunrise.setup do |config|
+  # Paginate records per page (default: 25)
+  # config.default_items_per_page = 25
+  
+  # Display audits events on dashboard (default: 50)
+  # config.activities_per_page = 50
+  
+  # By default show latest first (default: :desc)
+  # config.default_sort_mode = :desc
+  
+  # The display for a model instance (i.e. a single database record).
+  # config.label_methods = [:title, :name]
+  
+  # Defailt list template view (default: "thumbs")
+  # config.default_list_view = "thumbs"
+  
+  # Avariable lists views (default: [:list, :thumbs, :table])
+  # config.available_list_view = [:list, :thumbs, :table]
+  
+  # Defailt list template view (default: "sort_order")
+  # config.sort_column = "sort_order"
+  
+  # Find template before rendering (default: true)
+  # config.scoped_views = true
+  
+  # Set available locales in app (default: [])
+  # config.available_locales = []
 
-# Assuming HistoryTracker is your tracker class
-# Mongoid::History.tracker_class_name = :history_tracker
+  # Set transliteration for babosa gem
+  # more info here: https://github.com/norman/babosa (default: :russian)
+  # config.transliteration = :russian
 
-# Assuming you're using devise/authlogic
-# Mongoid::History.current_user_method = :current_user
+  # Set list toolbar buttons (default: [:delete, :edit, :new, :sort, :export])
+  # config.default_toolbar_buttons = [:delete, :edit, :new, :sort, :export]
+  
+  # Lists the formats that should be treated as navigational (default: [:html, :json])
+  # config.navigational_formats = [:html, :json]
+end
+
+#PublicActivity::Config.set do
+#  orm :mongoid
+#end
 
 #if Settings.table_exists?
 #  Settings.defaults[:some_setting] = "value"

data/lib/generators/sunrise/templates/models/active_record/asset.rb

@@ -1,6 +1,6 @@
 class Asset < ActiveRecord::Base
   include Sunrise::Models::Asset
-  
+
   validates_presence_of :data
 	
 	default_scope order("#{quoted_table_name}.sort_order")