From 268dc1acce6ec75b340ff834b0b4ccfca6bc9d20 Mon Sep 17 00:00:00 2001 From: z9hang Date: Thu, 8 May 2014 17:37:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=90=A7=E5=8A=A8=E6=80=81=E5=89=8D=E6=98=BE=E7=A4=BA=E5=90=A7?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 2 +- app/views/welcome/index.html.erb | 2 +- db/schema.rb | 11 ----------- public/stylesheets/welcome.css | 10 ++++++++++ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 677416a6d..72e7ce221 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -19,7 +19,7 @@

<%= f.text_area :content, :required => true, :id => 'editor02' %>


-

+

<%= l(:label_attachment_plural) %>
<%= render :partial => 'attachments/form', :locals => {:container => @memo} %>

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 3fdee2a97..0a69b1f78 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -100,7 +100,7 @@ <% find_new_forum_topics(7).each do |topic|%>
  • - <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %> + <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
    diff --git a/db/schema.rb b/db/schema.rb index fe23a1caa..2477e5a3b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -755,11 +755,6 @@ ActiveRecord::Schema.define(:version => 20140428013546) do add_index "time_entries", ["project_id"], :name => "time_entries_project_id" add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" - create_table "tmp", :force => true do |t| - t.string "name" - t.string "part_number" - end - create_table "tokens", :force => true do |t| t.integer "user_id", :default => 0, :null => false t.string "action", :limit => 30, :default => "", :null => false @@ -966,10 +961,4 @@ ActiveRecord::Schema.define(:version => 20140428013546) do add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status" add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id" - create_table "yans", :force => true do |t| - t.string "name" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - end diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css index cdfacf9ed..2533305f7 100644 --- a/public/stylesheets/welcome.css +++ b/public/stylesheets/welcome.css @@ -405,6 +405,16 @@ a.attachments_list_color { background: url('../images/list-icon.png') no-repeat scroll left center; font-size: 10pt; } + /*帖子标题前吧名*/ + .memo_activity .memo_Bar_title{ + display: inline-block; + /*color: #59ceff;*/ + color: #e8770d; + font-weight: bold; + margin-bottom: 3px; + padding-left: 0px; + font-size: 10pt; + } /*帖子的各种属性*/ .memo_activity .memo_attr{ margin-left: 20px; From 7a341972e7bd43de0d45ca813e7eccd75959d956 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 9 May 2014 11:47:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?course=E7=BD=91=E7=AB=99=E4=B8=AD=E5=A4=A7?= =?UTF-8?q?=E5=AD=A6=E5=90=8D=E5=8A=A0=E4=B8=8A=E8=AF=A5=E5=A4=A7=E5=AD=A6?= =?UTF-8?q?=E5=9C=A8=E6=9C=AC=E7=AB=99=E7=9A=84=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/course.html.erb | 4 ++-- public/stylesheets/welcome.css | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index b8b755b58..f2ae619d8 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -23,7 +23,7 @@ <%= image_tag(@logoLink, size:'75x75') %>
    -
    +

    <% if params[:school_id].nil? and User.current.user_extensions.school.nil? %> <% else%> @@ -33,7 +33,7 @@ <%= School.find(User.current.user_extensions.school.id).name %>
    <% else %> - <%= School.find(params[:school_id]).name %> + <%= link_to School.find(params[:school_id]).name,options={:action => 'course',:school_id => params[:school_id]}, html_options={:class => 'font_welcome_school',:method => 'get'}%>
    <% end %> <% end %> diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css index 2533305f7..f7756e5b8 100644 --- a/public/stylesheets/welcome.css +++ b/public/stylesheets/welcome.css @@ -452,4 +452,15 @@ a.attachments_list_color { font-size: 10pt; } - /************************** 贴吧动态 结束 **************************** \ No newline at end of file + /************************** 贴吧动态 结束 ****************************/ + /************************** 学校课程 开始 ****************************/ + .course{ + + } + .course .font_welcome_school{ + font-family: Tahoma,"Microsoft YaHei"; + font-weight: bold; + font-size: 20px; + color:#e8770d; +} +/************************** 学校课程 结束 ****************************/ \ No newline at end of file From 425e2bb11ea76d27cd056b8cb65565cd816a2ed6 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 9 May 2014 14:18:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?course=E7=BD=91=E7=AB=99=E4=B8=AD=E6=9C=AA?= =?UTF-8?q?=E9=80=89=E5=AD=A6=E6=A0=A1=EF=BC=8C=E6=9C=89=E7=99=BB=E9=99=86?= =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E4=B8=94=E7=99=BB=E9=99=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=B7=B2=E5=A1=AB=E5=AD=A6=E6=A0=A1=E6=97=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/course.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index f2ae619d8..40df3d077 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -30,10 +30,10 @@ <% if params[:school_id] == "0" %> <% else %> <% if params[:school_id].nil? %> - <%= School.find(User.current.user_extensions.school.id).name %> + <%= link_to School.find(User.current.user_extensions.school.id).name, options={:action => 'course',:school_id => User.current.user_extensions.school.id}, html_options={:class => 'font_welcome_school',:method => 'get'}%>
    <% else %> - <%= link_to School.find(params[:school_id]).name,options={:action => 'course',:school_id => params[:school_id]}, html_options={:class => 'font_welcome_school',:method => 'get'}%> + <%= link_to School.find(params[:school_id]).name ,options={:action => 'course',:school_id => params[:school_id]}, html_options={:class => 'font_welcome_school',:method => 'get'}%>
    <% end %> <% end %> From 2077b1e8b8f14ec61f75b1ba23f5df1bde4ab6ba Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 9 May 2014 14:49:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=EF=BC=8C=E7=AB=9E?= =?UTF-8?q?=E8=B5=9B=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E5=89=8D=E6=B7=BB=E5=8A=A0=E5=90=A7=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/contest.html.erb | 4 ++-- app/views/welcome/course.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index daeca6de4..a51046957 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -183,8 +183,8 @@ <% find_new_forum_topics(11).each do |topic|%>
  • -       - <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %> +       + <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
    <%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前 diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 40df3d077..14277afed 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -113,8 +113,8 @@ <% find_new_forum_topics(10).each do |topic|%>
  • -       - <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %> +       + <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
    <%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前