admix 0.10.4 → 0.11.0

data/app/assets/javascripts/admix/{application.js → application.js.coffee}

@@ -1,5 +1,7 @@
 //= require jquery
 //= require jquery_ujs
+//= require jquery/jquery.livequery
+//= require fancybox
 //= require jquery.ui.datepicker
 //= require ../../bootstrap/js/bootstrap.min
 //= require ./dates
@@ -8,4 +10,8 @@
 //= require ../../nicedit/nicEdit
 //= require ./nicedit_applier
 //= require ../../tipsy/src/javascripts/jquery.tipsy
-//= require ./tipsy_init
+//= require ./tipsy_init
+
+$ ->
+  $('.fancybox').livequery ->
+    $(@).fancybox();

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

@@ -11,5 +11,6 @@
  *= require_self
  *= require jquery.ui.all
  *= require ../../tipsy/src/stylesheets/tipsy
+ *= require fancybox
  *= require_tree .
  */

data/app/controllers/admix/admix_controller.rb

@@ -1,10 +1,13 @@
 module Admix
   class AdmixController < MixController
 
-    before_filter :authenticate_user!, :add_initial_breadcrumbs, :globals
+    before_filter :authenticate_admix_user!, :add_initial_breadcrumbs, :globals
 
-    protected
+    def current_user
+      current_admix_user
+    end
 
+    protected
     def add_initial_breadcrumbs
       breadcrumbs.add t('admix.dashboard'), admix_root_path, :id => 'dashboard', :title => 'Go to the home page'
     end

data/app/controllers/admix/sessions_controller.rb

@@ -1,3 +1,9 @@
 class Admix::SessionsController < Devise::SessionsController
+    
     layout 'admix/login'
+
+    def after_sign_in_path_for(resource)
+      request.env['omniauth.origin'] || session[:admix_user_return_to] || admix_root_path
+    end
+
 end

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

@@ -24,9 +24,10 @@
               %input.span3{:type => "text"}
                 %button.btn{:type => "submit"}
                   %i.icon-search
-          %ul.nav
+          %ul.nav.pull-right
+            %li= link_to current_user.email, admix_user_path(current_user)
             %li
-              = link_to destroy_user_session_url, method: :delete do
+              = link_to destroy_admix_user_session_url do
                 %i{class: 'icon-off'}
                 = t('admix.logout')
 

data/config/routes.rb

@@ -1,6 +1,10 @@
 Rails.application.routes.draw do
-  namespace :admix do
-    match 'upload' => 'nicedit#upload'
-    root to: 'dashboard#index'
-  end
-end
+
+    scope Admix::namespace_path, as: :admix, module: :admix do
+      match 'upload' => 'nicedit#upload'
+      root to: 'dashboard#index'
+    end
+
+
+
+end

data/lib/admix/version.rb

@@ -1,8 +1,8 @@
 module Admix
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 10
-    TINY  = 4
+    MINOR = 11
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/admix.rb

@@ -19,9 +19,13 @@ require 'mix-rails-auth'
 
 
 module Admix
-  mattr_accessor :menus_container
+
+  mattr_accessor :menus_container, :namespace_path
+
   self.menus_container = []
 
+  self.namespace_path = 'admix'
+
 
   module Navigation
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admix
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: mix-rails-auth
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: mix-rails-settings
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
@@ -1259,9 +1259,9 @@ files:
 - app/assets/javascripts/admix/bootstrap.js
 - app/assets/javascripts/admix/tipsy_init.js
 - app/assets/javascripts/admix/nicedit_applier.js.coffee
+- app/assets/javascripts/admix/application.js.coffee
 - app/assets/javascripts/admix/underscore-min.js
 - app/assets/javascripts/admix/backbone-min.js
-- app/assets/javascripts/admix/application.js
 - app/assets/javascripts/admix/dates.js.coffee
 - app/assets/nicedit/nicEditorIcons.gif
 - app/assets/nicedit/nicEdit.js
@@ -1317,7 +1317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3671584419596070281
+      hash: -848358817085374323
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1326,7 +1326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3671584419596070281
+      hash: -848358817085374323
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24