Changeset 73

Show
Ignore:
Timestamp:
01/07/08 18:25:01 (11 months ago)
Author:
jweiss
Message:

adapt Rails 2.x template naming convention and add session cookie

Location:
trunk
Files:
3 modified
61 moved

Legend:

Unmodified
Added
Removed

  • trunk/CHANGELOG.txt

    r66 r73  
     1 
    12* SVN * 
     3 
     4* Used template naming conventions of Rails 2.x:  
     5    *.rhtml => *.html.erb 
     6    *.rjs => *.js.rjs  
     7     
     8* Updated to Prototype 1.6 
    29 
    310* Add script/deploy Ruby script to deploy from the command line, provided by Peter J Jones <pjones@pmade.com> 

  • trunk/app/controllers/application.rb

    r58 r73  
    66  before_filter :login_from_cookie, :login_required 
    77  around_filter :set_timezone 
    8    
    9   # Pick a unique cookie name to distinguish our session data from others' 
    10   session :session_key => '_webistrano_session_id' 
    11    
     8 
    129  layout 'application' 
    1310   
     11  helper :all # include all helpers, all the time 
    1412  helper_method :current_stage, :current_project 
     13 
     14  # See ActionController::RequestForgeryProtection for details 
     15  # Uncomment the :secret if you're not using the cookie session store 
     16  protect_from_forgery :secret => '34$$adea99357513604a2fcac57912a908e5-092:@#$8hsmne5390'  
    1517   
    1618  protected 

  • trunk/app/controllers/deployments_controller.rb

    r60 r73  
    2323      format.html # show.rhtml 
    2424      format.xml  { render :xml => @deployment.to_xml } 
    25       format.js { render :partial => 'status' } 
     25      format.js { render :partial => 'status.html.erb' } 
    2626    end 
    2727  end 

  • trunk/app/views/deployments/_status.html.erb

    r55 r73  
    6868     
    6969    function update_status(){ 
    70       new Ajax.Updater('status_info','<%=h project_stage_deployment_path(@project, @stage, @deployment) %>',{ 
     70      new Ajax.Updater('status_info','<%=h project_stage_deployment_path(@project, @stage, @deployment) %>.js',{ 
    7171        method: 'get', 
    7272        evalScripts: true,