admix 0.10.4 → 0.11.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -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();
@@ -11,5 +11,6 @@
11
11
  *= require_self
12
12
  *= require jquery.ui.all
13
13
  *= require ../../tipsy/src/stylesheets/tipsy
14
+ *= require fancybox
14
15
  *= require_tree .
15
16
  */
@@ -1,10 +1,13 @@
1
1
  module Admix
2
2
  class AdmixController < MixController
3
3
 
4
- before_filter :authenticate_user!, :add_initial_breadcrumbs, :globals
4
+ before_filter :authenticate_admix_user!, :add_initial_breadcrumbs, :globals
5
5
 
6
- protected
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
@@ -1,3 +1,9 @@
1
1
  class Admix::SessionsController < Devise::SessionsController
2
+
2
3
  layout 'admix/login'
4
+
5
+ def after_sign_in_path_for(resource)
6
+ request.env['omniauth.origin'] || session[:admix_user_return_to] || admix_root_path
7
+ end
8
+
3
9
  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 destroy_user_session_url, method: :delete do
30
+ = link_to destroy_admix_user_session_url do
30
31
  %i{class: 'icon-off'}
31
32
  = t('admix.logout')
32
33
 
data/config/routes.rb CHANGED
@@ -1,6 +1,10 @@
1
1
  Rails.application.routes.draw do
2
- namespace :admix do
3
- match 'upload' => 'nicedit#upload'
4
- root to: 'dashboard#index'
5
- end
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/lib/admix/version.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  module Admix
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
- MINOR = 10
5
- TINY = 4
4
+ MINOR = 11
5
+ TINY = 0
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
data/lib/admix.rb CHANGED
@@ -19,9 +19,13 @@ require 'mix-rails-auth'
19
19
 
20
20
 
21
21
  module Admix
22
- mattr_accessor :menus_container
22
+
23
+ mattr_accessor :menus_container, :namespace_path
24
+
23
25
  self.menus_container = []
24
26
 
27
+ self.namespace_path = 'admix'
28
+
25
29
 
26
30
  module Navigation
27
31
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: admix
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.4
4
+ version: 0.11.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-01-22 00:00:00.000000000 Z
13
+ date: 2013-01-23 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
@@ -35,7 +35,7 @@ dependencies:
35
35
  requirements:
36
36
  - - '='
37
37
  - !ruby/object:Gem::Version
38
- version: 0.10.4
38
+ version: 0.11.0
39
39
  type: :runtime
40
40
  prerelease: false
41
41
  version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
43
43
  requirements:
44
44
  - - '='
45
45
  - !ruby/object:Gem::Version
46
- version: 0.10.4
46
+ version: 0.11.0
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: mix-rails-auth
49
49
  requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
51
51
  requirements:
52
52
  - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 0.10.4
54
+ version: 0.11.0
55
55
  type: :runtime
56
56
  prerelease: false
57
57
  version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
59
59
  requirements:
60
60
  - - '='
61
61
  - !ruby/object:Gem::Version
62
- version: 0.10.4
62
+ version: 0.11.0
63
63
  - !ruby/object:Gem::Dependency
64
64
  name: mix-rails-settings
65
65
  requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
67
67
  requirements:
68
68
  - - '='
69
69
  - !ruby/object:Gem::Version
70
- version: 0.10.4
70
+ version: 0.11.0
71
71
  type: :runtime
72
72
  prerelease: false
73
73
  version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
75
75
  requirements:
76
76
  - - '='
77
77
  - !ruby/object:Gem::Version
78
- version: 0.10.4
78
+ version: 0.11.0
79
79
  - !ruby/object:Gem::Dependency
80
80
  name: inherited_resources
81
81
  requirement: !ruby/object:Gem::Requirement
@@ -1259,9 +1259,9 @@ files:
1259
1259
  - app/assets/javascripts/admix/bootstrap.js
1260
1260
  - app/assets/javascripts/admix/tipsy_init.js
1261
1261
  - app/assets/javascripts/admix/nicedit_applier.js.coffee
1262
+ - app/assets/javascripts/admix/application.js.coffee
1262
1263
  - app/assets/javascripts/admix/underscore-min.js
1263
1264
  - app/assets/javascripts/admix/backbone-min.js
1264
- - app/assets/javascripts/admix/application.js
1265
1265
  - app/assets/javascripts/admix/dates.js.coffee
1266
1266
  - app/assets/nicedit/nicEditorIcons.gif
1267
1267
  - app/assets/nicedit/nicEdit.js
@@ -1317,7 +1317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
1317
1317
  version: '0'
1318
1318
  segments:
1319
1319
  - 0
1320
- hash: -3671584419596070281
1320
+ hash: -848358817085374323
1321
1321
  required_rubygems_version: !ruby/object:Gem::Requirement
1322
1322
  none: false
1323
1323
  requirements:
@@ -1326,7 +1326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1326
1326
  version: '0'
1327
1327
  segments:
1328
1328
  - 0
1329
- hash: -3671584419596070281
1329
+ hash: -848358817085374323
1330
1330
  requirements: []
1331
1331
  rubyforge_project:
1332
1332
  rubygems_version: 1.8.24