mix-rails 0.10.4 → 0.12.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +4 -1
- data/MIX_RAILS_VERSION +1 -1
- data/README.md +1 -1
- data/admix/app/assets/javascripts/admix/{application.js → application.js.coffee} +7 -1
- data/admix/app/assets/stylesheets/admix/application.css +1 -0
- data/admix/app/controllers/admix/admix_controller.rb +5 -2
- data/admix/app/controllers/admix/sessions_controller.rb +6 -0
- data/admix/app/views/layouts/admix/admix.html.haml +3 -2
- data/admix/config/routes.rb +9 -5
- data/admix/lib/admix.rb +5 -1
- data/admix/lib/admix/version.rb +2 -2
- data/mix-rails-albums/app/assets/javascripts/templates/photo_view.hamlc.erb +1 -1
- data/mix-rails-albums/app/views/admix/photos/_upload.html.haml +1 -10
- data/mix-rails-albums/config/routes.rb +1 -1
- data/mix-rails-albums/lib/mix-rails-albums/version.rb +2 -2
- data/mix-rails-auth/app/models/user.rb +1 -1
- data/mix-rails-auth/config/routes.rb +3 -4
- data/mix-rails-auth/config/sessions.rb +3 -0
- data/mix-rails-auth/lib/mix-rails-auth/version.rb +2 -2
- data/mix-rails-core/lib/mix-rails-core.rb +2 -0
- data/mix-rails-core/lib/mix-rails-core/version.rb +2 -2
- data/mix-rails-message-board/config/routes.rb +1 -1
- data/mix-rails-message-board/lib/mix-rails-message-board/version.rb +2 -2
- data/mix-rails-settings/config/routes.rb +1 -1
- data/mix-rails-settings/lib/mix-rails-settings/version.rb +2 -2
- data/mix-rails-songs/config/routes.rb +1 -1
- data/mix-rails-songs/lib/mix-rails-songs/version.rb +2 -2
- data/mix-rails-videos/config/routes.rb +1 -1
- data/mix-rails-videos/lib/mix-rails-videos/version.rb +2 -2
- data/mix-rails-vouchers/config/routes.rb +1 -1
- data/mix-rails-vouchers/lib/mix-rails-vouchers/version.rb +2 -2
- data/mix-rails-writer/config/routes.rb +1 -1
- data/mix-rails-writer/lib/mix-rails-writer/version.rb +2 -2
- data/mix-rails.gemspec +3 -0
- data/version.rb +2 -2
- metadata +42 -25
data/Gemfile
CHANGED
data/MIX_RAILS_VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.
|
1
|
+
0.12.1
|
data/README.md
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# MixRails
|
2
2
|
|
3
|
-
[![Build Status](https://travis-ci.org/mixinternet/mix-rails.png)](https://travis-ci.org/mixinternet/mix-rails)
|
3
|
+
[![Build Status](https://travis-ci.org/mixinternet/mix-rails.png)](https://travis-ci.org/mixinternet/mix-rails)
|
4
4
|
[![Dependency Status](https://gemnasium.com/mixinternet/mix-rails.png)](https://gemnasium.com/mixinternet/mix-rails)
|
5
5
|
|
6
6
|
MixRails is a CMS based on Ruby on Rails and uses Mongoid as ORM(MongoDB).
|
@@ -1,5 +1,7 @@
|
|
1
1
|
//= require jquery
|
2
2
|
//= require jquery_ujs
|
3
|
+
//= require jquery/jquery.livequery
|
4
|
+
//= require fancybox
|
3
5
|
//= require jquery.ui.datepicker
|
4
6
|
//= require ../../bootstrap/js/bootstrap.min
|
5
7
|
//= require ./dates
|
@@ -8,4 +10,8 @@
|
|
8
10
|
//= require ../../nicedit/nicEdit
|
9
11
|
//= require ./nicedit_applier
|
10
12
|
//= require ../../tipsy/src/javascripts/jquery.tipsy
|
11
|
-
//= require ./tipsy_init
|
13
|
+
//= require ./tipsy_init
|
14
|
+
|
15
|
+
$ ->
|
16
|
+
$('.fancybox').livequery ->
|
17
|
+
$(@).fancybox();
|
@@ -1,10 +1,13 @@
|
|
1
1
|
module Admix
|
2
2
|
class AdmixController < MixController
|
3
3
|
|
4
|
-
before_filter :
|
4
|
+
before_filter :authenticate_admix_user!, :add_initial_breadcrumbs, :globals
|
5
5
|
|
6
|
-
|
6
|
+
def current_user
|
7
|
+
current_admix_user
|
8
|
+
end
|
7
9
|
|
10
|
+
protected
|
8
11
|
def add_initial_breadcrumbs
|
9
12
|
breadcrumbs.add t('admix.dashboard'), admix_root_path, :id => 'dashboard', :title => 'Go to the home page'
|
10
13
|
end
|
@@ -24,9 +24,10 @@
|
|
24
24
|
%input.span3{:type => "text"}
|
25
25
|
%button.btn{:type => "submit"}
|
26
26
|
%i.icon-search
|
27
|
-
%ul.nav
|
27
|
+
%ul.nav.pull-right
|
28
|
+
%li= link_to current_user.email, admix_user_path(current_user)
|
28
29
|
%li
|
29
|
-
= link_to
|
30
|
+
= link_to destroy_admix_user_session_url do
|
30
31
|
%i{class: 'icon-off'}
|
31
32
|
= t('admix.logout')
|
32
33
|
|
data/admix/config/routes.rb
CHANGED
@@ -1,6 +1,10 @@
|
|
1
1
|
Rails.application.routes.draw do
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
end
|
2
|
+
|
3
|
+
scope Admix::namespace_path, as: :admix, module: :admix do
|
4
|
+
match 'upload' => 'nicedit#upload'
|
5
|
+
root to: 'dashboard#index'
|
6
|
+
end
|
7
|
+
|
8
|
+
|
9
|
+
|
10
|
+
end
|
data/admix/lib/admix.rb
CHANGED
data/admix/lib/admix/version.rb
CHANGED
@@ -4,7 +4,7 @@
|
|
4
4
|
%a.link-popover{"data-content" => "<i class=icon-edit></i> Edit"}
|
5
5
|
.loading-file
|
6
6
|
- if @image.url
|
7
|
-
%a.
|
7
|
+
%a.fancybox{href: ROOT_PATH + @image.medium.url, rel: 'photo-album'}
|
8
8
|
%img{src: ROOT_PATH + @image.thumb.url}
|
9
9
|
- else
|
10
10
|
%img{src: "http://placehold.it/130x90&text=Carregando"}
|
@@ -1,15 +1,6 @@
|
|
1
|
-
- content_for :stylesheets do
|
2
|
-
= stylesheet_link_tag 'colorbox/colorbox'
|
3
1
|
- content_for :javascripts do
|
4
2
|
= javascript_include_tag 'admix/photos'
|
5
|
-
|
6
|
-
= javascript_include_tag 'colorbox/jquery.colorbox-min'
|
7
|
-
:coffeescript
|
8
|
-
$ ->
|
9
|
-
$('.colorbox').livequery ->
|
10
|
-
$(@).colorbox();
|
11
|
-
|
12
|
-
|
3
|
+
|
13
4
|
%h3 Upload de fotos
|
14
5
|
#upload-buttons{:style => "padding: 20px;"}
|
15
6
|
%div{:style => "display:none;"}
|
@@ -9,7 +9,7 @@ class User
|
|
9
9
|
# :token_authenticatable, :confirmable,
|
10
10
|
# :lockable, :timeoutable and :omniauthable
|
11
11
|
devise :database_authenticatable, :recoverable, :rememberable,
|
12
|
-
:trackable, :validatable
|
12
|
+
:trackable, :validatable, :registerable
|
13
13
|
|
14
14
|
## Database authenticatable
|
15
15
|
field :email, :type => String, :default => ""
|
@@ -1,10 +1,9 @@
|
|
1
1
|
Rails.application.routes.draw do
|
2
2
|
|
3
|
-
devise_for :users,
|
4
|
-
path_names: { :sign_in => 'login', :sign_out => 'logout' }
|
3
|
+
devise_for :users, sign_out_via: 'get'
|
5
4
|
|
6
|
-
|
7
|
-
|
5
|
+
scope Admix::namespace_path, as: :admix, module: :admix do
|
6
|
+
devise_for :users, sign_out_via: 'get', controllers: {sessions: 'admix/sessions', passwords: 'admix/passwords'}, :path_names => { :sign_in => 'login', :sign_out => 'logout' }
|
8
7
|
resources :users
|
9
8
|
end
|
10
9
|
|
@@ -6,7 +6,7 @@ Rails.application.routes.draw do
|
|
6
6
|
match 'vouchers/:id/confirm/:user_id' => 'vouchers#confirmation', as: :vouchers_confirmation
|
7
7
|
match 'vouchers/:id/imprimir/:user_id' => 'vouchers#print', as: :vouchers_print
|
8
8
|
|
9
|
-
|
9
|
+
scope Admix::namespace_path, as: :admix, module: :admix do
|
10
10
|
get 'vouchers/:id/users/print' => 'vouchers#print', as: :voucher_print
|
11
11
|
get 'vouchers/:id/users' => 'vouchers#users', as: :voucher_users
|
12
12
|
delete 'vouchers/:id/users/:user_id/delete' => 'vouchers#delete_user', as: :voucher_user_delete
|
data/mix-rails.gemspec
CHANGED
data/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mix-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.12.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-01-
|
12
|
+
date: 2013-01-23 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: mix-rails-core
|
@@ -18,7 +18,7 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - '='
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 0.
|
21
|
+
version: 0.12.1
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -26,7 +26,7 @@ dependencies:
|
|
26
26
|
requirements:
|
27
27
|
- - '='
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 0.
|
29
|
+
version: 0.12.1
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: mix-rails-auth
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
@@ -34,7 +34,7 @@ dependencies:
|
|
34
34
|
requirements:
|
35
35
|
- - '='
|
36
36
|
- !ruby/object:Gem::Version
|
37
|
-
version: 0.
|
37
|
+
version: 0.12.1
|
38
38
|
type: :runtime
|
39
39
|
prerelease: false
|
40
40
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -42,7 +42,7 @@ dependencies:
|
|
42
42
|
requirements:
|
43
43
|
- - '='
|
44
44
|
- !ruby/object:Gem::Version
|
45
|
-
version: 0.
|
45
|
+
version: 0.12.1
|
46
46
|
- !ruby/object:Gem::Dependency
|
47
47
|
name: admix
|
48
48
|
requirement: !ruby/object:Gem::Requirement
|
@@ -50,7 +50,7 @@ dependencies:
|
|
50
50
|
requirements:
|
51
51
|
- - '='
|
52
52
|
- !ruby/object:Gem::Version
|
53
|
-
version: 0.
|
53
|
+
version: 0.12.1
|
54
54
|
type: :runtime
|
55
55
|
prerelease: false
|
56
56
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -58,7 +58,7 @@ dependencies:
|
|
58
58
|
requirements:
|
59
59
|
- - '='
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: 0.
|
61
|
+
version: 0.12.1
|
62
62
|
- !ruby/object:Gem::Dependency
|
63
63
|
name: mix-rails-settings
|
64
64
|
requirement: !ruby/object:Gem::Requirement
|
@@ -66,7 +66,7 @@ dependencies:
|
|
66
66
|
requirements:
|
67
67
|
- - '='
|
68
68
|
- !ruby/object:Gem::Version
|
69
|
-
version: 0.
|
69
|
+
version: 0.12.1
|
70
70
|
type: :runtime
|
71
71
|
prerelease: false
|
72
72
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -74,7 +74,7 @@ dependencies:
|
|
74
74
|
requirements:
|
75
75
|
- - '='
|
76
76
|
- !ruby/object:Gem::Version
|
77
|
-
version: 0.
|
77
|
+
version: 0.12.1
|
78
78
|
- !ruby/object:Gem::Dependency
|
79
79
|
name: mix-rails-writer
|
80
80
|
requirement: !ruby/object:Gem::Requirement
|
@@ -82,7 +82,7 @@ dependencies:
|
|
82
82
|
requirements:
|
83
83
|
- - '='
|
84
84
|
- !ruby/object:Gem::Version
|
85
|
-
version: 0.
|
85
|
+
version: 0.12.1
|
86
86
|
type: :runtime
|
87
87
|
prerelease: false
|
88
88
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -90,7 +90,7 @@ dependencies:
|
|
90
90
|
requirements:
|
91
91
|
- - '='
|
92
92
|
- !ruby/object:Gem::Version
|
93
|
-
version: 0.
|
93
|
+
version: 0.12.1
|
94
94
|
- !ruby/object:Gem::Dependency
|
95
95
|
name: mix-rails-albums
|
96
96
|
requirement: !ruby/object:Gem::Requirement
|
@@ -98,7 +98,7 @@ dependencies:
|
|
98
98
|
requirements:
|
99
99
|
- - '='
|
100
100
|
- !ruby/object:Gem::Version
|
101
|
-
version: 0.
|
101
|
+
version: 0.12.1
|
102
102
|
type: :runtime
|
103
103
|
prerelease: false
|
104
104
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -106,7 +106,7 @@ dependencies:
|
|
106
106
|
requirements:
|
107
107
|
- - '='
|
108
108
|
- !ruby/object:Gem::Version
|
109
|
-
version: 0.
|
109
|
+
version: 0.12.1
|
110
110
|
- !ruby/object:Gem::Dependency
|
111
111
|
name: mix-rails-videos
|
112
112
|
requirement: !ruby/object:Gem::Requirement
|
@@ -114,7 +114,7 @@ dependencies:
|
|
114
114
|
requirements:
|
115
115
|
- - '='
|
116
116
|
- !ruby/object:Gem::Version
|
117
|
-
version: 0.
|
117
|
+
version: 0.12.1
|
118
118
|
type: :runtime
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -122,7 +122,7 @@ dependencies:
|
|
122
122
|
requirements:
|
123
123
|
- - '='
|
124
124
|
- !ruby/object:Gem::Version
|
125
|
-
version: 0.
|
125
|
+
version: 0.12.1
|
126
126
|
- !ruby/object:Gem::Dependency
|
127
127
|
name: mix-rails-message-board
|
128
128
|
requirement: !ruby/object:Gem::Requirement
|
@@ -130,7 +130,7 @@ dependencies:
|
|
130
130
|
requirements:
|
131
131
|
- - '='
|
132
132
|
- !ruby/object:Gem::Version
|
133
|
-
version: 0.
|
133
|
+
version: 0.12.1
|
134
134
|
type: :runtime
|
135
135
|
prerelease: false
|
136
136
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -138,7 +138,7 @@ dependencies:
|
|
138
138
|
requirements:
|
139
139
|
- - '='
|
140
140
|
- !ruby/object:Gem::Version
|
141
|
-
version: 0.
|
141
|
+
version: 0.12.1
|
142
142
|
- !ruby/object:Gem::Dependency
|
143
143
|
name: mix-rails-vouchers
|
144
144
|
requirement: !ruby/object:Gem::Requirement
|
@@ -146,7 +146,7 @@ dependencies:
|
|
146
146
|
requirements:
|
147
147
|
- - '='
|
148
148
|
- !ruby/object:Gem::Version
|
149
|
-
version: 0.
|
149
|
+
version: 0.12.1
|
150
150
|
type: :runtime
|
151
151
|
prerelease: false
|
152
152
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -154,7 +154,7 @@ dependencies:
|
|
154
154
|
requirements:
|
155
155
|
- - '='
|
156
156
|
- !ruby/object:Gem::Version
|
157
|
-
version: 0.
|
157
|
+
version: 0.12.1
|
158
158
|
- !ruby/object:Gem::Dependency
|
159
159
|
name: mix-rails-songs
|
160
160
|
requirement: !ruby/object:Gem::Requirement
|
@@ -162,7 +162,7 @@ dependencies:
|
|
162
162
|
requirements:
|
163
163
|
- - '='
|
164
164
|
- !ruby/object:Gem::Version
|
165
|
-
version: 0.
|
165
|
+
version: 0.12.1
|
166
166
|
type: :runtime
|
167
167
|
prerelease: false
|
168
168
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -170,7 +170,23 @@ dependencies:
|
|
170
170
|
requirements:
|
171
171
|
- - '='
|
172
172
|
- !ruby/object:Gem::Version
|
173
|
-
version: 0.
|
173
|
+
version: 0.12.1
|
174
|
+
- !ruby/object:Gem::Dependency
|
175
|
+
name: fancybox-rails
|
176
|
+
requirement: !ruby/object:Gem::Requirement
|
177
|
+
none: false
|
178
|
+
requirements:
|
179
|
+
- - ~>
|
180
|
+
- !ruby/object:Gem::Version
|
181
|
+
version: 0.1.4
|
182
|
+
type: :runtime
|
183
|
+
prerelease: false
|
184
|
+
version_requirements: !ruby/object:Gem::Requirement
|
185
|
+
none: false
|
186
|
+
requirements:
|
187
|
+
- - ~>
|
188
|
+
- !ruby/object:Gem::Version
|
189
|
+
version: 0.1.4
|
174
190
|
description: MixRails is a CMS and system based on Ruby on Rails and use Mongoid as
|
175
191
|
ORM(MongoDB)
|
176
192
|
email:
|
@@ -1207,7 +1223,7 @@ files:
|
|
1207
1223
|
- admix/app/assets/images/admix/mix-framework-small.png
|
1208
1224
|
- admix/app/assets/images/admix/page_edit.png
|
1209
1225
|
- admix/app/assets/images/admix/zoom.png
|
1210
|
-
- admix/app/assets/javascripts/admix/application.js
|
1226
|
+
- admix/app/assets/javascripts/admix/application.js.coffee
|
1211
1227
|
- admix/app/assets/javascripts/admix/backbone-min.js
|
1212
1228
|
- admix/app/assets/javascripts/admix/bootstrap.js
|
1213
1229
|
- admix/app/assets/javascripts/admix/dates.js.coffee
|
@@ -1461,6 +1477,7 @@ files:
|
|
1461
1477
|
- mix-rails-auth/config/locales/devise.en.yml
|
1462
1478
|
- mix-rails-auth/config/locales/devise.pt-BR.yml
|
1463
1479
|
- mix-rails-auth/config/routes.rb
|
1480
|
+
- mix-rails-auth/config/sessions.rb
|
1464
1481
|
- mix-rails-auth/lib/mix-rails-auth.rb
|
1465
1482
|
- mix-rails-auth/lib/mix-rails-auth/engine.rb
|
1466
1483
|
- mix-rails-auth/lib/mix-rails-auth/version.rb
|
@@ -2005,7 +2022,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
2005
2022
|
version: '0'
|
2006
2023
|
segments:
|
2007
2024
|
- 0
|
2008
|
-
hash: -
|
2025
|
+
hash: -589095447981552963
|
2009
2026
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
2010
2027
|
none: false
|
2011
2028
|
requirements:
|
@@ -2014,7 +2031,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
2014
2031
|
version: '0'
|
2015
2032
|
segments:
|
2016
2033
|
- 0
|
2017
|
-
hash: -
|
2034
|
+
hash: -589095447981552963
|
2018
2035
|
requirements: []
|
2019
2036
|
rubyforge_project:
|
2020
2037
|
rubygems_version: 1.8.24
|