merge

app/controllers/admin/ad_banners_controller.rb

@@ -1,7 +1,7 @@
 class Admin::AdBannersController < OrbitBackendController
-  layout "new_admin"
+
   before_filter :force_order_for_visitor,:only=>[:index]
-  #before_filter :force_order_for_user,:except => [:index]
+  before_filter :force_order_for_user,:except => [:index]
   before_filter :for_app_sub_manager,:except => [:index]
   before_filter :for_app_manager,:except => [:index,:show,:update,:realtime_preview] 
   

app/controllers/admin/ad_images_controller.rb

@@ -1,7 +1,13 @@
-class Admin::AdImagesController < OrbitBackendController
-  layout 'new_admin'
-  before_filter :authenticate_user!
-  before_filter :for_app_sub_manager
+class Admin::AdImagesController < Admin::AdBannersController
+  
+  # before_filter :force_order_for_user
+  # before_filter :for_app_sub_manager
+  # before_filter :for_app_manager
+  
+  def initialize
+    super
+    @app_title = "ad_banner"
+  end
 
   def edit
     @ad_banner = AdBanner.find params[:ad_banner_id]

app/controllers/admin/designs_controller.rb

@@ -52,7 +52,7 @@ class Admin::DesignsController < OrbitBackendController
     case params[:type]
     when 'layout', 'css_default', 'css_reset'
       @object = @design.send(params[:type])
-    when 'image', 'javascript', 'theme'
+    when 'javascripts', 'themes'#, 'images'
       @object = @design.send(params[:type]).find(params[:object_id])
     end
 

app/controllers/admin/links_controller.rb

@@ -1,10 +1,4 @@
-class Admin::LinksController < ApplicationController
-
-  layout "site_editor"
-  
-  before_filter :authenticate_user!
-  before_filter :find_parent_item
-  before_filter :is_admin?
+class Admin::LinksController < Admin::ItemsController
   
   def show
     @item ||= Link.find(params[:id])

app/controllers/admin/page_parts_controller.rb

@@ -5,6 +5,8 @@ class Admin::PagePartsController < ApplicationController
   before_filter :authenticate_user!
   before_filter :is_admin?
   before_filter :set_current_item
+
+  helper 'admin/items'
   
   def show
     @part = PagePart.find(params[:id])

app/controllers/admin/pages_controller.rb

@@ -1,11 +1,4 @@
-class Admin::PagesController < ApplicationController
-
-  layout "site_editor"
-  
-  before_filter :authenticate_user!
-  before_filter :find_parent_item
-  before_filter :is_admin?
-  before_filter :set_current_item
+class Admin::PagesController < Admin::ItemsController
   
   def show
     @item = Page.find(params[:id])
@@ -40,7 +33,7 @@ class Admin::PagesController < ApplicationController
 	
 	  @frontend_path = @item.app_frontend_url ? @item.app_frontend_url : @module_app.widgets.keys[0]
 	  
-	  if @module_app.widgets.any?{|b| b.class == Array}
+	  if @module_app && @module_app.widgets && @module_app.widgets.any?{|b| b.class == Array}
         @frontend_style =  @module_app.widgets[@frontend_path] if !@frontend_path.blank? && !@module_app.widgets.blank?
 	  end
 	  

app/controllers/admin/users_new_interface_controller.rb

@@ -78,7 +78,7 @@ class Admin::UsersNewInterfaceController < ApplicationController
       #   @user.attribute_values.build(value)
       # }
     # @user.rebuild_sub_roles_from_attribute_values!(attribute_values)
-    binding.pry
+    # binding.pry
     if @user.save
       flash[:notice] = t('create.success.user')
       redirect_to :action => :index
@@ -103,6 +103,7 @@ class Admin::UsersNewInterfaceController < ApplicationController
   
   def update
     @user = User.find(params[:id])
+    
     @user.update_attributes(params[:user])
     attribute_values_key = params[:user].has_key?('new_attribute_values') ? 'new_attribute_values' : 'attribute_values'
     attribute_values = params[:user].delete(attribute_values_key)

app/controllers/application_controller.rb

@@ -8,6 +8,8 @@ class ApplicationController < ActionController::Base
   helper :admin
   before_filter :set_locale, :set_site
 
+  helper_attr :site_valid_locales
+
   def set_current_user
     User.current = current_or_guest_user
   end

app/controllers/desktop/journal_pages_controller.rb

@@ -21,6 +21,7 @@ class Desktop::JournalPagesController < ApplicationController
     respond_to do |format|
       format.html { render :layout => false}
     end
+
   end
 
   def edit
@@ -39,14 +40,19 @@ class Desktop::JournalPagesController < ApplicationController
 
       @writing_journal = WritingJournal.new(params[:writing_journal])
       if @writing_journal.save
-        respond_to do |format|
-          format.html { redirect_to desktop_journal_pages_url, :layout => false, notice: 'User was successfully created.'}
-          #      format.json { render json: @writing_journal, status: :created, location: @writing_journal}
-          #  format.js
-        end
+        # respond_to do |format|
+        #   format.html { redirect_to desktop_journal_pages_url, :layout => false, notice: 'User was successfully created.'}
+        #   #      format.json { render json: @writing_journal, status: :created, location: @writing_journal}
+        #   #  format.js
+        # end
+        render :json => {"success"=>true,"msg"=>"Paper successfully saved!"}.to_json
       else
+        render :json => {"success"=>false,"msg"=>"Saving failed!"}
       end
-    end
+
+    end   
+        render :json => {"success"=>true,"msg"=>"Paper successfully saved!"}.to_json
+     
   end
 
   def update
@@ -74,19 +80,19 @@ class Desktop::JournalPagesController < ApplicationController
     if not file.nil?
       file_type = MIME::Types.type_for(file).first.to_s.split("/")[1]
 
-      case file_type
-      when "jpg", "jpeg"
-        type = "jpg"
-      when "text", "txt"
-        type = "txt"
-      when "pdf"
-        type = "pdf"
-      when "png"
-        type = "png"
-      else "readme"
-      end
+      # case file_type
+      # when "jpg", "jpeg"
+      #   type = "jpg"
+      # when "text", "txt"
+      #   type = "txt"
+      # when "pdf"
+      #   type = "pdf"
+      # when "png"
+      #   type = "png"
+      # else "readme"
+      # end
 
-      file_type = "/assets/ft-icons/#{type}/#{type}-48_32.png"
+      file_type = "/assets/ft-icons/#{file_type}/#{file_type}-48_32.png"
     else
       file_type = ""
     end

app/controllers/orbit_backend_controller.rb

@@ -11,7 +11,7 @@ class OrbitBackendController < ApplicationController
   layout 'new_admin'
   
   def setup_vars
-    @app_title = controller_path.split('/')[1].singularize
+    @app_title ||= controller_path.split('/')[1].singularize
     @module_app ||= ModuleApp.first(conditions: {:key => @app_title} )
   end