developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ldap

Browse Source
This commit is contained in:
Christophe Vilayphiou committed 2012-03-21 12:44:22 +08:00
2 parents a1034f90ba 3aa7c5120d
commit 2c6208db3c
6 files changed
+32 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@
</div>
</td>
<td><%= bulletin.bulletin_category.i18n_variable[I18n.locale] %></td>
<td><%= link_to bulletin.title[I18n.locale], panel_announcement_back_end_bulletin_path(bulletin) rescue ''%></td>
<td><%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin) rescue ''%></td>
<td><%= bulletin.postdate %></td>
<td><%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %></td>
<td>
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
Vendored
+2 -9
View File
@@ -146,7 +146,7 @@
<% @site_valid_locales.each do |locale| %>
<td>
<%= I18nVariable.from_locale(locale) %>
<%= f.text_area locale, :style=>"width:100%" %>
<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
</td>
<% end %>
<% end %>
@@ -158,7 +158,7 @@
<% @site_valid_locales.each do |locale| %>
<td>
<%= I18nVariable.from_locale(locale) %>
<%= f.text_area locale, :style=>"width:100%" %>
<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
</td>
<% end %>
<% end %>
@@ -286,11 +286,4 @@
$(this).parents('table').append(("<%= escape_javascript(add_attribute 'bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id));
});
</script>
<script type="text/javascript">
$(function() {
$('textarea').tinymce({
theme: 'advanced'
});
});
</script>
<% end %>
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
Vendored
-12
View File
@@ -1,15 +1,3 @@
<% content_for :secondary do %>
<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
<% end -%>
<%= flash_messages %>
<br />
<br />
<br />
<br />
<br />
<ul>
<li>
<b><%= t('announcement.category') %></b>
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
Vendored
+1 -12
View File
@@ -15,7 +15,7 @@
<% @site_valid_locales.each do |locale| %>
<td>
<%= I18nVariable.from_locale(locale) %>
<%= f.text_area locale, :style=>"width:100%" %>
<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
</td>
<% end %>
<% end %>
@@ -27,14 +27,3 @@
</div>
</div>
<% content_for :page_specific_javascript do %>
<script type="text/javascript">
$(function() {
$('textarea').tinymce({
theme: 'advanced'
});
});
</script>
<% end %>