mix-rails 0.23.1 → 0.24.0

data/mix-rails-message-board/app/views/admix/board_replies/_grid_actions.haml

@@ -0,0 +1,8 @@
+- if obj.disapproved? or obj.status.pending?
+  = link_to image_tag('admix/icons/shield_go.png'), approve_admix_board_message_path(obj), method: :put, data: { confirm: t('message_board.confirms.approve') }, class: 'btn', title:'Aprovar'
+- if obj.status.approved? or obj.status.pending?
+  = link_to image_tag('admix/icons/shield_delete.png'), disapprove_admix_board_message_path(obj), method: :put,data: { confirm: t('message_board.confirms.disapprove') }, class: 'btn', title:'Reprovar'
+
+= link_to image_tag('admix/icons/comment_add.png'), new_admix_board_message_board_reply_path(obj), class: 'btn', title:'Adicionar comentário'
+
+= grid_actions_for(obj, [:show, :edit, :destroy])

data/mix-rails-message-board/app/views/admix/board_replies/_grid_columns.haml

@@ -0,0 +1,9 @@
+- grid.column name: input_label(:defaults, :name), attribute: 'name' do |obj|
+  - obj.name
+- grid.column name: input_label(:defaults, :date), attribute: 'date' do |obj|
+  - obj.date
+
+- grid.column name: input_label(:defaults, :status), attribute: 'status', 
+  custom_filter: {t('enumerize.status.approved') => 'approved', t('enumerize.status.disapproved') => 'disapproved', t('enumerize.status.pending') => 'pending'} do |obj|
+  - obj.status.text
+- column_actions(grid)

data/mix-rails-message-board/config/locales/message-board.pt-BR.yml

@@ -16,6 +16,7 @@ pt-BR:
     board_message: 'Recado'
   board_replies:
     board_replies: 'Respostas do mural'
+    board_reply: 'Resposta do mural'
     board_message: 'Resposta'
   simple_form:
     labels:

data/mix-rails-message-board/lib/mix-rails-message-board/engine.rb

@@ -1,15 +1,18 @@
 module MixRailsMessageBoard
   class Engine < ::Rails::Engine
     
-    def navigation
-      if defined? Admix
-        Admix::Navigation::NavBar.post_menu do
-          Admix::Navigation::NavBar.find(:content) do |menu|
-            menu.submenu do |submenu|
-              submenu.key   = :message_board
-              submenu.title = I18n.t 'message_board.message_board'
-              submenu.url   = 'admix_board_messages_url'
-            end
+
+    config.generators do |g|                                                               
+      g.test_framework :rspec
+      g.integration_tool :rspec
+    end
+
+    initializer "mix-rails-message-board.setup_menu", after: "admix.setup_menu" do
+      ActiveMenu::get('admix-nav') do |nav|
+        nav.get(:content) do |content|
+          content.child :message_board do |message_board|
+            message_board.text Proc.new {t('message_board.message_board')}
+            message_board.href Proc.new {admix_board_messages_url}
           end
         end
       end

data/mix-rails-message-board/lib/mix-rails-message-board/version.rb

@@ -1,8 +1,8 @@
 module MixRailsMessageBoard
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 23
-    TINY  = 1
+    MINOR = 24
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-settings/app/models/setting.rb

@@ -43,6 +43,14 @@ class Setting < ActiveRecord::Base
     end
   end
 
+  def self.link_instagram
+    begin
+      Setting.where(key: 'link_instagram', activated: true).first.value
+    rescue
+      false
+    end
+  end
+
   def self.albums_watermark
     begin
       Setting.where(key: 'albums_watermark', activated: true).first

data/mix-rails-settings/app/views/admix/settings/_form_config.haml

@@ -0,0 +1,9 @@
+- admix_tab 'Configuração' do |t|
+  - t.tab_content do
+    = f.input :name, label: t('settings.fields.name'), as: 'string', input_html: {class: 'span12'}
+    = f.input :key, label: t('settings.fields.key'), as: 'string', input_html: {class: 'span12'}
+    = f.input :value, label: t('settings.fields.value'), as: 'text', input_html: {class: 'span12'}
+    = f.input :image, label: t('settings.fields.image'), as: 'file', input_html: {class: 'span12'}
+
+- content_for :form_options do
+  = f.input :activated, label: t('settings.fields.activated'), as: 'boolean'

data/mix-rails-settings/app/views/admix/settings/_grid_columns.haml

@@ -0,0 +1,16 @@
+- grid.column name: input_label(:defaults, :name), attribute: 'name' do |obj|
+  - obj.name
+- grid.column name: input_label(:defaults, :key), attribute: 'key' do |obj|
+  - obj.key
+- grid.column name: input_label(:defaults, :value), attribute: 'value' do |obj|
+  - obj.value
+
+- grid.column name: input_label(:defaults, :image) do |obj|
+  - if obj.image.url
+    - image_tag(obj.image.url)
+  - else
+    - '--'
+
+- grid.column name: input_label(:defaults, :activated), attribute: 'activated' do |obj|
+  - obj.activated ? 'Sim' : 'Não'
+- column_actions(grid)

data/mix-rails-settings/lib/mix-rails-settings/engine.rb

@@ -31,23 +31,14 @@ module MixRailsSettings
       config.action_mailer.raise_delivery_errors = true
       
     end
-
-    def navigation
-      if defined? Admix
-        Admix::Navigation::NavBar.post_menu do
-          Admix::Navigation::NavBar.find(:general) do |menu|
-            menu.submenu do |submenu|
-              submenu.key   = :settings
-              submenu.title = I18n.t 'settings.settings'
-              submenu.url   = 'admix_settings_url'
-              
-              submenu.instance_eval do
-                def can_render?(current_user)
-                  current_user.has_role?(:admin)
-                end
-              end
-              
-            end
+    
+    initializer "mix-rails-settings.setup_menu", after: "admix.setup_menu" do
+      ActiveMenu::get('admix-nav') do |nav|
+        nav.get(:general) do |general|
+          general.child :settings do |settings|
+            settings.text Proc.new {t('settings.settings')}
+            settings.href Proc.new {admix_settings_url}
+            settings.visible Proc.new {current_user.has_role? :admin}
           end
         end
       end

data/mix-rails-settings/lib/mix-rails-settings/version.rb

@@ -1,8 +1,8 @@
 module MixRailsSettings
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 23
-    TINY  = 1
+    MINOR = 24
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-songs/app/views/admix/songs/_form_config.haml

@@ -0,0 +1,8 @@
+- admix_tab t('songs.song') do |t|
+  - t.tab_content do 
+    = f.input :title,         as: 'string', input_html: {class: 'span12'}
+    = f.input :author,        as: 'string', input_html: {class: 'span12'}
+    = f.input :mp3,           as: 'file' , input_html: {class: 'span12'}
+
+- content_for :form_options do
+  = f.input :status , input_html: {class: 'span12'}

data/mix-rails-songs/app/views/admix/songs/_grid_columns.haml

@@ -0,0 +1,9 @@
+- grid.column name: input_label(:defaults, :title), attribute: 'title' do |obj|
+  - obj.title
+- grid.column name: input_label(:defaults, :author), attribute: 'author' do |obj|
+  - obj.author
+
+- grid.column name: input_label(:defaults, :status), attribute: 'status', 
+  custom_filter: {t('enumerize.status.published') => 'published', t('enumerize.status.unpublished') => 'unpublished'} do |obj|
+  - obj.status.text
+- column_actions(grid)

data/mix-rails-songs/lib/mix-rails-songs/version.rb

@@ -1,8 +1,8 @@
 module MixRailsSongs
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 23
-    TINY  = 1
+    MINOR = 24
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-videos/app/views/admix/videos/_form_config.haml

@@ -0,0 +1,3 @@
+- admix_tab t('videos.video') do |t|
+  - t.tab_content do
+    = f.input :url

data/mix-rails-videos/lib/mix-rails-videos/version.rb

@@ -1,8 +1,8 @@
 module MixRailsVideos
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 23
-    TINY  = 1
+    MINOR = 24
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-vouchers/app/views/admix/vouchers/_form_config.haml

@@ -0,0 +1,15 @@
+- admix_tab t('vouchers.voucher') do |t|
+  - t.tab_content do
+    = f.input :name, label: t('vouchers.fields.name'), input_html: {class: 'span12'}
+    = f.input :rules, label: t('vouchers.fields.rules'), as: 'ckeditor', input_html: { ckeditor: {toolbar: 'Full'} } 
+
+
+
+- admix_tab t('tabs.images') do |t|
+  - t.tab_content do
+    = f.input :photo, label: t('vouchers.fields.photo'), as: :file
+    = f.input :partner_photo, label: t('vouchers.fields.partner_photo'), as: :file
+
+- content_for :form_options do 
+  = f.input :date_from, label: t('vouchers.fields.date_from'), as: 'datepicker'
+  = f.input :date_to, label: t('vouchers.fields.date_to'), as: 'datepicker'

data/mix-rails-vouchers/config/locales/vouchers.pt-BR.yml

@@ -1,13 +1,14 @@
 pt-BR:
   vouchers:
     vouchers: 'Vouchers'
+    voucher: 'Voucher'
     mailers:
       send_confirmation_link:
         subject: 'Imprima seu Voucher'
     fields:
       name: 'Nome'
-      date_from: 'De'
-      date_to: 'Até'
+      date_from: 'Válido de'
+      date_to: 'Válido até'
       rules: 'Regras'
       photo: 'Foto'
       partner_photo: 'Foto do parceiro'

data/mix-rails-vouchers/lib/mix-rails-vouchers/version.rb

@@ -1,8 +1,8 @@
 module MixRailsVouchers
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 23
-    TINY  = 1
+    MINOR = 24
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-wireframe/lib/mix-rails-wireframe/version.rb

@@ -1,8 +1,8 @@
 module MixRailsWireframe
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 23
-    TINY  = 1
+    MINOR = 24
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-writer/app/controllers/news_controller.rb

@@ -7,7 +7,7 @@ class NewsController < PostsController
 
   def show
     @news = News.find(params[:id])
-    @other_news = News.published.not_in(:id => @news.id).order('date DESC').paginate(page: params[:page], per_page: 10)
+    @other_news = News.published.where("id != ?", @news.id).order('date DESC').limit(3)
   end
 
 end

data/mix-rails-writer/app/models/post.rb

@@ -11,7 +11,7 @@ class Post < ActiveRecord::Base
 
 
   scope :published, where(status: :published)
-
+  scope :desc, order('posts.date DESC')
   mount_uploader :image, Writer::ImageUploader
 
 end

data/mix-rails-writer/app/views/admix/posts/_form_config.haml

@@ -0,0 +1,15 @@
+- admix_tab t('news.new') do |t|
+  -t.tab_content do
+    = f.input :title,         as: 'string', input_html: {class: 'span12'}    
+    = f.input :content,       as: 'ckeditor', input_html: { ckeditor: {toolbar: 'Full'} } 
+    = f.input :date,          as: 'datepicker', input_html: {class: 'span12'}    
+    = f.input :source,        as: 'string', input_html: {class: 'span12'}    
+- admix_tab t('tabs.images') do |t|
+  -t.tab_content do
+    = f.input :image,         as: 'file', input_html: {class: 'span12'}    
+
+- content_for :form_options do
+  = f.input :status, input_html: {class: 'span12'}  
+  
+
+

data/mix-rails-writer/app/views/admix/posts/_grid_columns.haml

@@ -0,0 +1,9 @@
+- grid.column name: input_label(:defaults, :title), attribute: 'title' do |obj|
+  - obj.title
+- grid.column name: input_label(:defaults, :date), attribute: 'date' do |obj|
+  - obj.date
+
+- grid.column name: input_label(:defaults, :status), attribute: 'status', 
+  custom_filter: {t('enumerize.status.published') => 'published', t('enumerize.status.unpublished') => 'unpublished'} do |obj|
+  - obj.status.text
+- column_actions(grid)

data/mix-rails-writer/config/locales/writer.pt-BR.yml

@@ -1,4 +1,6 @@
 pt-BR:
+  tabs:
+    images: 'Imagens'
   resources:
     news: 'noticias'
   will_paginate:

data/mix-rails-writer/lib/mix-rails-writer/engine.rb

@@ -6,15 +6,12 @@ module MixRailsWriter
       g.integration_tool :rspec
     end
 
-    def navigation
-      if defined? Admix
-        Admix::Navigation::NavBar.post_menu do
-          Admix::Navigation::NavBar.find(:content) do |menu|
-            menu.submenu do |submenu|
-              submenu.key   = :news
-              submenu.title = I18n.t 'news.news'
-              submenu.url   = 'admix_news_index_url'
-            end
+    initializer "mix-rails-writer.setup_menu", after: "admix.setup_menu" do
+      ActiveMenu::get('admix-nav') do |nav|
+        nav.get(:content) do |content|
+          content.child :news do |news|
+            news.text Proc.new {t('news.news')}
+            news.href Proc.new {admix_news_index_url}
           end
         end
       end

data/mix-rails-writer/lib/mix-rails-writer/version.rb

@@ -1,8 +1,8 @@
 module MixRailsWriter
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 23
-    TINY  = 1
+    MINOR = 24
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails.gemspec

@@ -2,22 +2,6 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require "mix-rails"
-
-MixRails::PROJECTS = []
-MixRails::PROJECTS << "mix-rails-core"
-MixRails::PROJECTS << "mix-rails-auth"
-MixRails::PROJECTS << "admix"
-MixRails::PROJECTS << "mix-rails-settings"
-MixRails::PROJECTS << "mix-rails-wireframe"
-
-MixRails::PROJECTS << "mix-rails-writer"
-MixRails::PROJECTS << "mix-rails-albums"
-MixRails::PROJECTS << "mix-rails-videos"
-MixRails::PROJECTS << "mix-rails-message-board"
-MixRails::PROJECTS << "mix-rails-vouchers"
-MixRails::PROJECTS << "mix-rails-songs"
-
 version = File.read(File.expand_path("../MIX_RAILS_VERSION", __FILE__)).strip
 
 Gem::Specification.new do |gem|
@@ -39,22 +23,34 @@ Gem::Specification.new do |gem|
   gem.add_dependency "acts-as-taggable-on", "~> 2.3.3"
   gem.add_dependency "fancybox-rails", "~> 0.1.4"
   gem.add_dependency "bootstrap-sass", "~> 2.3.0"
-  gem.add_dependency "jquery-qtip2-rails", "~> 0.4.0"
+  gem.add_dependency "jquery-qtip2-rails", "~> 0.5.0"
+  gem.add_dependency "haml-rails", "~> 0.4"
 
-  gem.add_dependency "haml-rails"
+  gem.add_dependency "activemenu"
 
   # Contact
   gem.add_dependency "mail_form",    "~> 1.4.0"
   gem.add_dependency "simple_form",  "~> 2.0.0"
 
   #ACL
-  gem.add_dependency "rolify"
-  gem.add_dependency "authority"
-  gem.add_dependency "will_paginate"
-  gem.add_dependency "will_paginate-bootstrap"
+  gem.add_dependency "rolify", "~> 3.2.0"
+  gem.add_dependency "authority", "~> 2.4.3"
+  
+  # Pagination
+  gem.add_dependency "will_paginate", "~> 3.0.4"
+  gem.add_dependency "will_paginate-bootstrap", "~> 0.2.2"
 
+  # Grid (datagrid, tables)
+  gem.add_dependency "wice_grid", "~> 3.2.1"
+
+  # Nice urls
   gem.add_dependency "friendly_id", "~> 4.0.9"
 
+  # Default editors
+  gem.add_dependency "ckeditor", "~> 4.0.2"
+
+  gem.add_dependency "activemenu", ">= 0.1.0"
+
   # Core dependencies
   gem.add_dependency "mix-rails-core",      version
   gem.add_dependency "mix-rails-auth",      version
@@ -63,6 +59,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mix-rails-wireframe", version
 
   # Content dependencies
+  gem.add_dependency "mix-rails-addresses",            version
   gem.add_dependency "mix-rails-writer",            version
   gem.add_dependency "mix-rails-albums",            version
   gem.add_dependency "mix-rails-videos",            version

data/tasks/release.rb

@@ -1,3 +1,5 @@
+require 'rails'
+require 'mix-rails'
 FRAMEWORKS = MixRails::PROJECTS
 
 root    = File.expand_path('../../', __FILE__)

data/version.rb

@@ -1,8 +1,8 @@
 module MixRailsCore
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 23
-    TINY  = 1
+    MINOR = 24
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')