Changeset 865

Show
Ignore:
Timestamp:
05/10/08 23:37:02 (2 months ago)
Author:
seancribbs
Message:

Convert all views to Haml.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/prototype/admin/_layout.haml

    r852 r865  
    11!!! 
    2 %html 
     2%html{html_attrs} 
    33  %head 
    44    %meta{"http-equiv"=>"Content-type", :content=>"text/html; charset=utf-8"}/ 

  • trunk/radiant/CHANGELOG

    r864 r865  
    22 
    33=== Edge 
     4* Convert all views to Haml. [Sean Cribbs, John Long] 
    45* Avoid authenticity check when listing page children. [Sean Cribbs] 
    56* Add radiant:extensions:update_all task. [Josh French] 

  • trunk/radiant/CONTRIBUTORS

    r863 r865  
    66 
    77=== Edge 
     8* John Long 
    89* Josh French 
    910* Sean Cribbs 

  • trunk/radiant/app/helpers/admin/page_helper.rb

    r589 r865  
    3131    @homepage ||= Page.find_by_parent_id(nil) 
    3232  end 
     33   
     34  def page_edit_javascripts 
     35    <<-CODE 
     36    var last_type = "#{@page.class_name}"; 
     37    function load_tag_reference(part) { 
     38      page_type = $F('page_class_name'); 
     39      popup = $('tag-reference-popup'); 
     40      if(last_type != page_type) { 
     41        url = "#{tag_reference_url}"; 
     42        params = "class_name=" + page_type; 
     43        new Effect.Highlight('tag-reference-link-'+ part); 
     44        req = new Ajax.Request(url, { method: 'get', parameters: params, evalScripts: true }); 
     45      } else { 
     46         center(popup); 
     47         Element.toggle(popup); 
     48      } 
     49      return false; 
     50    } 
     51    var last_filter = "#{default_filter_name}"; 
     52    function load_filter_reference(part) { 
     53      filter_type = $F("part_" + part + "_filter_id"); 
     54      popup = $('filter-reference-popup'); 
     55      if(last_filter != filter_type) { 
     56        url = "#{filter_reference_url}"; 
     57        params = "filter_name=" + filter_type; 
     58        new Effect.Highlight('filter-reference-link-'+ part); 
     59        req = new Ajax.Request(url, { method: 'get', parameters: params, evalScripts: true }); 
     60      } else { 
     61        center(popup); 
     62        Element.toggle(popup); 
     63      } 
     64      return false; 
     65    } 
     66     
     67    CODE 
     68  end 
    3369end 

  • trunk/radiant/app/helpers/admin/user_helper.rb

    r1 r865  
    11module Admin::UserHelper 
     2  def roles(user) 
     3    roles = [] 
     4    roles << 'Administrator' if user.admin? 
     5    roles << 'Developer' if user.developer? 
     6    roles.join(', ') 
     7  end 
    28end 

  • trunk/radiant/app/helpers/application_helper.rb

    r794 r865  
    122122      meta_errors? 
    123123    end 
    124     ' style="display: none"' unless v 
     124    v ? {} : {:style => "display:none"} 
    125125  end 
    126126   

  • trunk/radiant/public/javascripts/admin/admin.js

    r821 r865  
    11document.observe('dom:loaded', function() { 
    2   when('site-map', function(table) { new SiteMap(table) }); 
    3  
     2   
     3  when('table.index', function(table){ 
     4    if(table.identify() == 'site-map') 
     5      new SiteMap(table); 
     6    else 
     7      new RuledTable(table); 
     8  }); 
     9   
    410  when('page_title', function(title) { 
    511    var slug = $('page_slug'), 

  • trunk/radiant/public/stylesheets/admin/main.css

    r800 r865  
    8181  padding-right: .9em; 
    8282  text-decoration: none; 
     83  outline: none; 
     84  -moz-outline: none; 
    8385} 
    8486#navigation a:hover, #navigation a:visited:hover { 
    …… 
    446448  text-decoration: none; 
    447449  text-transform: titlecase; 
     450  outline: none; 
     451  -moz-outline: none; 
    448452} 
    449453#content #tabs .tab.here { 

  • trunk/radiant/spec/helpers/admin/page_helper_spec.rb

    r785 r865  
    3939    homepage.should == pages(:home) 
    4040  end 
     41   
     42  it "should render javascript for the page editing form" do 
     43    self.should respond_to(:page_edit_javascripts) 
     44  end 
    4145end 

  • trunk/radiant/spec/helpers/admin/user_helper_spec.rb

    r785 r865  
    22 
    33describe Admin::UserHelper do 
     4  scenario :users 
     5   
     6  it "should render a string containing the user's roles" do 
     7    roles(users(:admin)).should == "Administrator" 
     8    roles(users(:developer)).should == "Developer" 
     9    roles(users(:existing)).should == '' 
     10  end 
    411end 

  • trunk/radiant/spec/helpers/application_helper_spec.rb

    r794 r865  
    138138   
    139139  it "should determine whether a meta area item should be visible" do 
    140     meta_visible(:meta_more).should be_nil 
    141     meta_visible(:meta_less).should == ' style="display: none"' 
    142     meta_visible(:meta).should == ' style="display: none"' 
     140    meta_visible(:meta_more).should be_empty 
     141    meta_visible(:meta_less).should == {:style => "display:none"}  
     142    meta_visible(:meta).should == {:style => "display:none"}  
    143143  end 
    144144