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

Add nccu icon 

Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
This commit is contained in:
Christophe Vilayphiou 2012-05-08 15:27:43 +08:00
parent ba4385e3fd
commit caba8ce7a4
6 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/ncculogo.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

1
app/views/layouts/new_admin.html.erb
View File

@ -3,6 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title><%= @title || APP_CONFIG['orbit'] %></title> <title><%= @title || APP_CONFIG['orbit'] %></title>
<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<%= javascript_include_tag "html5" %> <%= javascript_include_tag "html5" %>
<![endif]--> <![endif]-->

1
app/views/layouts/page_layout.html.erb
View File

@ -3,6 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<%= page_title(@item).html_safe %> <%= page_title(@item).html_safe %>
<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
<%= page_metas(@item).html_safe %> <%= page_metas(@item).html_safe %>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<%= javascript_include_tag "html5" %> <%= javascript_include_tag "html5" %>

19
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb vendored
View File

@ -15,15 +15,18 @@
<%= @bulletin.text[I18n.locale].html_safe %> <%= @bulletin.text[I18n.locale].html_safe %>
</div> </div>
<b><%= t('announcement.link') %></b> <% if @bulletin.bulletin_links.size > 0 %>
<% @bulletin.bulletin_links.each do | blink | %> <b><%= t('announcement.link') %></b>
<%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %> <% @bulletin.bulletin_links.each do | blink | %>
<%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
<% end %>
<% end %> <% end %>
</li>
<li> <% if @bulletin.bulletin_files.size > 0 %>
<b><%= t('announcement.file') %></b> <b><%= t('announcement.file') %></b>
<% @bulletin.bulletin_files.each do | bfile | %> <% @bulletin.bulletin_files.each do | bfile | %>
<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %> <%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
<% end %>
<% end %> <% end %>
<div class="fb"> <div class="fb">

35
vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb vendored
View File

@ -8,25 +8,24 @@
<h1 class="h1"><%= t('news.list_news') %></h1> <h1 class="h1"><%= t('news.list_news') %></h1>
<% end %> <% end %>
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tbody>
<th><%= t('news.news_bulletin.category') %></th> <tr>
<th><%= t('news.news_bulletin.title') %></th> <th><%= t('news.news_bulletin.image') %></th>
<th><%= t('news.news_bulletin.postdate') %></th> <th><%= t('news.news_bulletin.title') %></th>
</tr> <th><%= t('news.news_bulletin.postdate') %></th>
</tr>
<% @news_bulletins.each do |post| %> <% @news_bulletins.each do |post| %>
<tr> <tr>
<td><%= post.news_bulletin_category.i18n_variable[I18n.locale] %></td> <td><%= image_tag post.image %></td>
<td><%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post) %> <td>
<%#= link_to post.title, panel_news_back_end_news_bulletin_path(post) %> <%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post) %>
</td> <%= post.subtitle[I18n.locale].html_safe %>
<td><%= post.postdate %></td> </td>
</tr> <td><%= post.postdate %></td>
</tr>
<% end %> <% end %>
</tbody>
</table> </table>
<%= paginate @news_bulletins, :params => {:inner => 'false'} %> <%= paginate @news_bulletins, :params => {:inner => 'false'} %>

19
vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb vendored
View File

@ -15,15 +15,18 @@
<%= @news_bulletin.text[I18n.locale].html_safe %> <%= @news_bulletin.text[I18n.locale].html_safe %>
</div> </div>
<b><%= t('announcement.link') %></b> <% if @news_bulletin.news_bulletin_links.size > 0 %>
<% @news_bulletin.bulletin_links.each do | blink | %> <b><%= t('announcement.link') %></b>
<%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %> <% @news_bulletin.news_bulletin_links.each do | blink | %>
<%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %>
<% end %>
<% end %> <% end %>
</li>
<li> <% if @news_bulletin.news_bulletin_files.size > 0 %>
<b><%= t('announcement.file') %></b> <b><%= t('announcement.file') %></b>
<% @news_bulletin.bulletin_files.each do | bfile | %> <% @news_bulletin.news_bulletin_files.each do | bfile | %>
<%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %> <%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
<% end %>
<% end %> <% end %>
<div class="fb"> <div class="fb">