chiu
/
epaper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chiu:master
Branches Tags
chiu:master
chiu:patch-1
..
compare: chiu:patch-1
Branches Tags
chiu:master
chiu:patch-1

1 Commits
master ... patch-1

Author SHA1 Message Date
chiu 0bba6cea01 fix error for the site that don't have e_papers' index page 2020-01-20 23:56:29 +08:00
2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
app/controllers/admin/e_paper_criterias_controller.rb
View File

@ -16,7 +16,7 @@ def initialize
# .with_tags(filters("tags")) # .with_tags(filters("tags"))
@criterias = search_data(@criterias,[:title]).page(params[:page]).per(10) @criterias = search_data(@criterias,[:title]).page(params[:page]).per(10)
@url = "/" + I18n.locale.to_s + "/" +Page.where(:module => "e_paper").first.url + "?method=papers" #@url = "/" + I18n.locale.to_s + "/" +Page.where(:module => "e_paper").first.url + "?method=papers"
render :partial => "index" if request.xhr? render :partial => "index" if request.xhr?
end end

4
app/views/admin/e_paper_criterias/emailer.html.erb
View File

@ -10,7 +10,7 @@
border-bottom: 2px solid #ddd; border-bottom: 2px solid #ddd;
padding: 0 0 10px; padding: 0 0 10px;
margin: 10px 0 20px; margin: 10px 0 20px;
color: #000; color: #881f05;
} }
.epaper-show .ep-info { .epaper-show .ep-info {
background: #fff; background: #fff;
@ -151,7 +151,7 @@
<div class="epaper-show"> <div class="epaper-show">
<h3 class="epaper-show-title"><%= t('e_paper.intro') %></h3> <h3 class="epaper-show-title"><%= t('e_paper.intro') %></h3>
<div class="ep-info"> <div class="ep-info">
<div class="ep-info-title"><%= t('e_paper.title') %>：<span><%= paper.title %></span></div> <div class="ep-info-title"><%= t('e_paper.title') %>：<a class="ep-content-title" href="<%= page + "/" + paper.to_param + "?method=topics" %>" target="_blank"><span><%= paper.title %></span></a></div>
<div class="ep-info-date"><%= t('e_paper.date') %>：<span><%= paper.created_at.strftime("%Y-%m-%d") %></span></div> <div class="ep-info-date"><%= t('e_paper.date') %>：<span><%= paper.created_at.strftime("%Y-%m-%d") %></span></div>
<div class="ep-info-description"><%= t('e_paper.description') %><span><%= paper.description %></span></div> <div class="ep-info-description"><%= t('e_paper.description') %><span><%= paper.description %></span></div>
</div> </div>