saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 

Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
This commit is contained in:
Christophe Vilayphiou 2012-04-05 15:24:39 +08:00
parent d45725cf3b 9382ef6ae8
commit 5f5871d1c2
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb vendored
View File

@ -153,19 +153,19 @@
<% end %> <% end %>
</div> </div>
<div class="title"> <div class="editor">
<%= f.label :subtitle %> <%= f.label :subtitle %>
<%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %> <%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %>
<%= I18nVariable.from_locale(locale) %> <%= I18nVariable.from_locale(locale) %>
<%= f.text_area locale, :style=>"width:100%" %> <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
<% end %> <% end %>
</div> </div>
<div class="title"> <div class="editor">
<%= f.label :text %> <%= f.label :text %>
<%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %> <%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %>
<%= I18nVariable.from_locale(locale) %> <%= I18nVariable.from_locale(locale) %>
<%= f.text_area locale, :style=>"width:100%" %> <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
<% end %> <% end %>
</div> </div>

1
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb vendored
View File

@ -30,7 +30,6 @@
</div> </div>
</div> </div>
<% end %> <% end %>
</div> </div>