mix-rails 0.16.0 → 0.22.0

data/Gemfile

@@ -2,4 +2,9 @@ source 'https://rubygems.org'
 Encoding.default_external = Encoding::UTF_8
 
 # Specify your gem's dependencies in mix-rails.gemspec
-gemspec
+gemspec
+
+group :development do
+    gem 'capistrano'
+    gem 'rvm-capistrano'
+end

data/MIX_RAILS_VERSION

@@ -1 +1 @@
-0.16.0
+0.22.0

data/README.md

@@ -82,6 +82,7 @@ TODO: Add some docs for admix
 
 # Plugins (Extensions)
 
-## Creatig a extensions
+## Creating a extension
 
     $ rails plugin new mix-rails-pluginame -T --skip-active-record --skip-bundle --dummy-path=spec/dummy --full
+s

data/admix/Gemfile

@@ -20,7 +20,6 @@ gem 'coffee-script'
 gem 'inherited_resources'
 gem 'simple_form'
 gem 'datagrid'
-gem 'will_paginate_mongoid'
 
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or

data/admix/admix.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'mix-rails-settings', version
 
   s.add_dependency "inherited_resources"
-  s.add_dependency 'will_paginate_mongoid'
   s.add_dependency 'simple_form'
   s.add_dependency 'datagrid'
 
@@ -31,8 +30,4 @@ Gem::Specification.new do |s|
   s.add_dependency "jquery-rails"
   s.add_dependency "jquery-ui-rails"
 
-  # TODO Retirar isso aqui, ta quebrando quando tira
-  s.add_dependency 'formtastic'
-  s.add_dependency 'formtastic-bootstrap'
-
 end

data/admix/app/assets/javascripts/admix/application.js.coffee

@@ -4,20 +4,24 @@
 #= require backbone
 #= require jquery/jquery.livequery
 #= require fancybox
-#= require jquery.ui.datepicker
+#= require jquery.ui.all
 #= require bootstrap
-#= require ./dates
 #= require ../../nicedit/nicEdit
 #= require ./nicedit_applier
 #= require ../../tipsy/src/javascripts/jquery.tipsy
 # ./tipsy_init
 #= require jquery.qtip.js
+#= require jquery.globalmoney
+
 
 
 Backbone.emulateHTTP = true
 
 $ ->
 
+  window.cfgCulture = 'pt-BR'
+  $.preferCulture(cfgCulture)
+
   $(".actions [title]").livequery ->
     $(this).qtip
       content: $(this).attr("title") # Use the tooltip attribute of the element for the content
@@ -26,4 +30,18 @@ $ ->
         classes: 'qtip-bootstrap'
   
   $('.fancybox').livequery ->
-    $(@).fancybox();
+    $(@).fancybox();
+
+  $('.currency').livequery ->
+    $(@).maskMoney
+      symbol: 'R$'
+      decimal: ','
+      precision: 2
+      thousands: ''
+      showSymbol: false
+
+  $("input.datepicker").each (i) ->
+    $(this).datepicker
+      altFormat: "yy-mm-dd"
+      dateFormat: "dd/mm/yy"
+      altField: $(this).next()

data/admix/app/assets/stylesheets/admix/admix_bootstrap.scss

@@ -1 +1,18 @@
-@import "bootstrap";
+$navbarHeight: 60px;
+
+@import "bootstrap";
+@import "bootstrap-responsive";
+
+.form-admix {
+  label {
+    font-weight: bold;
+  }
+}
+
+.thumbnails > li:nth-child(4n+1) {
+    margin-left: 0px;
+}
+
+form legend {
+  margin-bottom:0;
+}

data/admix/app/assets/stylesheets/admix/application.css

@@ -21,4 +21,8 @@
 .admix-photo-modal {
   width: 61%;
   margin-left: -30%;
+}
+
+form abbr {
+  color: red;
 }

data/admix/app/assets/stylesheets/admix/style.css

@@ -32,7 +32,6 @@ textarea {
 .site-logo {
     float:left;
     width: 200px;
-    height:100px;
     vertical-align:middle
 }
 th > .order {

data/admix/app/controllers/admix/inherited_controller.rb

@@ -3,17 +3,17 @@ module Admix
 
     inherit_resources
 
-    load_and_authorize_resource
+    # TODO: Add authorization here.
 
     helper :all
 
     before_filter :generate_datagrid , only: [:index ]
 
     
-    # Add a breadcrumb, in this case nested resources. ;) by: sadjow@gmail.com
+    # Add a breadcrumb, in this case nested resources. ;)
     before_filter -> {
       if defined?(parent_type)
-        breadcrumbs.add t("#{parent_type.to_s.gsub('_', '').pluralize}.#{parent_type.to_s.gsub('_', '').pluralize}") , polymorphic_path([:admix,parent_class])
+        breadcrumbs.add t("#{parent_type.to_s.gsub('_', '').pluralize}.#{parent_type.to_s.gsub('_', '').pluralize}") , polymorphic_path([:admix, parent_class])
         breadcrumbs.add "#{parent.name}" , parent_url
       end
     }
@@ -23,11 +23,6 @@ module Admix
     before_filter -> { breadcrumbs.add t("admix.crud.new.title"), :i18n => false } , only: [:new ]
     before_filter -> { @crumb_field = crumb_field } , only: [:edit ]
 
-    def initialize(datagrid_class = nil)
-      super()
-      @datagrid_class = guess_datagrid_class unless datagrid_class
-    end
-
     protected
 
     def crumb_field
@@ -43,7 +38,7 @@ module Admix
     end
 
     def collection_name
-      resource_class.to_s.downcase.pluralize
+      @collection_name = resource_class.to_s.underscore.pluralize.gsub("::", "_")
     end
 
     def resource_name
@@ -60,7 +55,11 @@ module Admix
     end
 
     def report
-      @datagrid_class.new(params[datagrid_param_name])
+      datagrid_class.new(params[datagrid_param_name])
+    end
+
+    def datagrid_class
+      @datagrid_class = guess_datagrid_class
     end
 
     private

data/admix/app/helpers/admix_helper.rb

@@ -1,5 +1,11 @@
 module AdmixHelper
   
+  include CoreHelper
+
+  def app_title
+    Setting.app_title
+  end
+
   def input_label(model_name, input_name)
     I18n.t("#{model_name}.#{input_name}", scope: :"simple_form.labels", default: [:"defaults.#{input_name}"])
   end

data/admix/app/views/admix/inherited/_form.html.haml

@@ -4,11 +4,11 @@
   - array_of_resources << parent_type
 - array_of_resources << resource
 
-= simple_form_for array_of_resources, :html => { :class => 'form-horizontal' }, wrapper: :bootstrap  do |f|
+= simple_form_for array_of_resources, :html => { :class => 'form-admix' }, wrapper: :bootstrap  do |f|
   
   = f.error_notification
 
   = render partial: "form_fields", locals: {f: f}
 
   .form-actions
-    = f.button :submit
+    = f.button :submit, class: 'btn-primary'

data/admix/app/views/admix/inherited/index.html.haml

@@ -1,5 +1,4 @@
-- pluralized_resource = resource_class.to_s.downcase.pluralize
-%h1= t('admix.crud.listing', resources: t("#{pluralized_resource}.#{pluralized_resource}"))
+%h1= t('admix.crud.listing', resources: t("#{@collection_name}.#{@collection_name}"))
 
 = datagrid_table @report, @assets, html: {class: 'table table-striped'}
 = will_paginate @assets

data/admix/app/views/admix/inherited/show.html.haml

@@ -1,6 +1,5 @@
-- pluralized_resource = resource_class.to_s.downcase.pluralize
 %h1= t('admix.crud.show.title')
 = render partial: 'show', locals: {resource: resource}
 %br
 .well{style: 'clear:both;'}
-  = link_to t('admix.crud.list.title', resources: t("#{pluralized_resource}.#{pluralized_resource}")), collection_url, class: 'btn'
+  = link_to t('admix.crud.list.title', resources: t("#{@collection_name}.#{@collection_name}")), collection_url, class: 'btn'

data/admix/app/views/layouts/admix/admix.html.haml

@@ -2,21 +2,22 @@
 %html
   %head
     %meta{:charset => "utf-8"}
-      %meta{:content => "noindex, nofollow", :name => "robots"}
-        %title Admix
-        = stylesheet_link_tag    "admix/application", :media => "all"
-        = yield :stylesheets
-        %script
-          var HOST_NAME  = "#{request.protocol + request.host_with_port}";
-          var ROOT_PATH  = HOST_NAME + "#{root_path.chomp("/")}";
-        = javascript_include_tag "admix/application"
-        = yield :javascripts
-        = csrf_meta_tags
+    %meta{:content => "noindex, nofollow", :name => "robots"}
+    %meta{:name => 'viewport', :content => "width=device-width, initial-scale=1.0"}
+    %title= app_title
+    = stylesheet_link_tag    "admix/application", :media => "all"
+    = yield :stylesheets
+    %script
+      var HOST_NAME  = "#{request.protocol + request.host_with_port}";
+      var ROOT_PATH  = HOST_NAME + "#{root_path.chomp("/")}";
+    = javascript_include_tag "admix/application"
+    = yield :javascripts
+    = csrf_meta_tags
   %body
 
     / Top
     .container-fluid
-      .navbar
+      .navbar.navbar-inverse
         .navbar-inner
           = render_navigation context: :admix, expand_all: true, renderer: :bootstrap
           -#
@@ -38,7 +39,7 @@
           .site-logo
             - admix_logo = Setting.admix_logo
             - if admix_logo and admix_logo.image?
-              = image_tag admix_logo.image.url
+              = image_tag admix_logo.image.url()
             - else
               = image_tag("admix/mix-framework-small.png")
         .span10
@@ -46,28 +47,30 @@
 
 
     #content.container-fluid
-      - if notice
-        %p.alert.alert-success= notice
-      - if alert
-        %p.alert.alert-warn= alert
-      = yield
+      .row-fluid
+        .span12
+          - if notice
+            %p.alert.alert-success= notice
+          - if alert
+            %p.alert.alert-warn= alert
+          = yield
 
-      -#
-        .row-fluid
-          .span2
-            %ul.nav.nav-pills.nav-stacked
-              %li.active
-                %a{href: ''} List
-              %li
-                %a{href: ''} New
-              %li
-                %a{href: ''} Remove
-          .span10
-            - if notice
-              %p.alert.alert-success= notice
-            - if alert
-              %p.alert.alert-warn= alert
-            = yield
+
+      -#.row-fluid
+        .span2
+          %ul.nav.nav-pills.nav-stacked
+            %li.active
+              = link_to t("#{@collection_name}.#{@collection_name}"), polymorphic_path([:admix, resource])
+            %li
+              = link_to "Novo " + t("#{@collection_name}.#{@collection_name}"), new_polymorphic_path([:admix, resource])
+            %li
+              = link_to t("Editar #{@collection_name}.#{@collection_name}"), polymorphic_path([:admix, resource])
+        .span10
+          - if notice
+            %p.alert.alert-success= notice
+          - if alert
+            %p.alert.alert-warn= alert
+          = yield
 
 
     .container-fluid

data/admix/app/views/layouts/admix/login.html.haml

@@ -27,6 +27,6 @@
       - if notice
         %p.alert.alert-success= notice
       - if alert
-        %p.alert.alert-warn= alert
+        %p.alert.alert-warn= alert 
     = yield
 

data/admix/config/admix_navigation.rb

@@ -12,11 +12,13 @@ dashboard.url   = admix_root_url
 dashboard.icon  = 'icon-flag'
 
 # General
-general = Admix::Navigation::Menu.new
-general.key   = :general
-general.title = t 'general.general'
-general.url   = 'javascript:;'
-general.icon  = 'icon-flag'
+if current_user.has_role? :admin
+  general = Admix::Navigation::Menu.new
+  general.key   = :general
+  general.title = t 'general.general'
+  general.url   = 'javascript:;'
+  general.icon  = 'icon-flag'
+end
 
 # Content
 content = Admix::Navigation::Menu.new

data/admix/lib/admix.rb

@@ -10,8 +10,6 @@ require 'admix/table-actions'
 require 'simple-navigation'
 require 'simple-navigation-bootstrap'
 require 'inherited_resources'
-require 'formtastic'
-require 'formtastic-bootstrap'
 require 'jquery-rails'
 require 'jquery-ui-rails'
 

data/admix/lib/admix/version.rb

@@ -1,7 +1,7 @@
 module Admix
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 16
+    MINOR = 22
     TINY  = 0
     PRE   = nil
 

data/lib/mix-rails/admix.rb

@@ -0,0 +1 @@
+require 'admix'

data/lib/mix-rails/albums.rb

@@ -0,0 +1 @@
+require 'mix-rails-albums'

data/lib/mix-rails/auth.rb

@@ -0,0 +1 @@
+require 'mix-rails-auth'

data/lib/mix-rails/core.rb

@@ -0,0 +1 @@
+require 'mix-rails-core'

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

@@ -0,0 +1 @@
+require 'mix-rails-message-board'

data/lib/mix-rails/settings.rb

@@ -0,0 +1 @@
+require 'mix-rails-settings.rb'

data/lib/mix-rails/songs.rb

@@ -0,0 +1 @@
+require 'mix-rails-songs'

data/lib/mix-rails/videos.rb

@@ -0,0 +1 @@
+require 'mix-rails-videos'

data/lib/mix-rails/vouchers.rb

@@ -0,0 +1 @@
+require 'mix-rails-vouchers'

data/lib/mix-rails/wireframe.rb

@@ -0,0 +1 @@
+require 'mix-rails-wireframe'

data/lib/mix-rails/writer.rb

@@ -0,0 +1 @@
+require 'mix-rails-writer'

data/mix-rails-albums/app/assets/javascripts/backbone/models/photo.js.coffee

@@ -3,7 +3,7 @@ class Application.Models.Photo extends Backbone.Model
   idAttribute: '_id'
   defaults:
     image: null
-    description: null
+    description: ''
     progress: 0
   
   initialize: ->

data/mix-rails-albums/app/assets/javascripts/backbone/routers/photos_router.js.coffee

@@ -1,16 +1,20 @@
 class Application.Routers.PhotosRouter extends Backbone.Router
   initialize: (options) ->
     @photos = new Application.Collections.PhotosCollection()
+    @upload_index()
+
     @photos.url = options.collectionUrl
     @photos.reset options.photos
 
+
   routes:
-    "new"      : "newPhoto"
-    "index"    : "index"
-    "upload_index" : "upload_index"
-    ":id/edit" : "edit"
-    ":id"      : "show"
-    ".*"        : "upload_index"
+    "new"           : "newPhoto"
+    "index"         : "index"
+    "upload_index"  : "upload_index"
+    "photo_edited"  : "photo_edited"
+    ":id/edit"      : "edit"
+    ":id"           : "show"
+    ".*"            : "upload_index"
 
   newPhoto: ->
     @view = new Application.Views.Photos.NewView(collection: @photos)
@@ -32,6 +36,10 @@ class Application.Routers.PhotosRouter extends Backbone.Router
 
   edit: (id) ->
     photo = @photos.get(id)
-    console.log 'Editando a foto!' + photo
+    console.log 'Editando a foto!', id
+    $("#photo-modal-#{id}").modal()
     #@view = new Application.Views.Photos.EditView(model: photo)
     #$("#upload-container").html(@view.render().el)
+    
+  photo_edited: () ->
+