structure.css -> default.css

Themes are optional, a theme overrides style in default.css
This commit is contained in:
chris2tof committed 2011-09-05 15:18:36 +08:00
1 parent f4b1d1e182
commit 151f005815
11 files changed
+29 -33

No files matched your search

+4 -4
View File
@@ -26,11 +26,11 @@
<% end %>
</p>
<p>
<%= f.label "structure_css", t('admin.structure_css') %>
<% if @design.structure_css.blank? %>
<%= f.file_field :structure_css %>
<%= f.label "default_css", t('admin.default_css') %>
<% if @design.default_css.blank? %>
<%= f.file_field :default_css %>
<% else%>
<%= File.basename (@design.structure_css.url) %>
<%= File.basename (@design.default_css.url) %>
<% end %>
</p>
<p>
+1 -1
View File
@@ -27,7 +27,7 @@
<% if @design %>
<%= f.select :theme_id, @design.themes.collect { |t| [t.name.capitalize, t.id] }%>
<% else %>
<%= f.select :theme_id, @default_design.themes.collect { |t| [t.name.capitalize, t.id] }, :selected => @default_theme.id %>
<%= f.select :theme_id, @default_design.themes.collect { |t| [t.name.capitalize, t.id] }, :include_blank => true %>
<% end %>
</p>
@@ -0,0 +1,2 @@
<option></option>
<%= options_from_collection_for_select(@themes, :id, :name) %>
+1 -1
View File
@@ -1 +1 @@
$('#page_theme_id').html("<%= escape_javascript(options_from_collection_for_select(@themes, :id, :name, @default_theme.id )) %>");
$('#page_theme_id').html("<%= escape_javascript(render :partial => 'admin/pages/themes_ddl') %>");