From 3b418bc44cae35afabbaf59b24ad0432117f071a Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 7 Jul 2016 16:46:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=AA=E7=99=BB=E9=99=86?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8=E6=9C=80?= =?UTF-8?q?=E4=B8=8A=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=8F=A5=EF=BC=88=E5=BF=85=E9=A1=BB=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=EF=BC=9A=E6=82=A8=E5=B0=9A=E6=9C=AA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E7=99=BB=E5=BD=95=E5=90=8E=E5=8F=AF=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E6=9B=B4=E5=A4=9A=E4=BF=A1=E6=81=AF=EF=BC=89=EF=BC=8C?= =?UTF-8?q?=E2=80=9C=E7=99=BB=E5=BD=95=E2=80=9D=E5=8F=AF=E5=81=9A=E6=88=90?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_course_file.html.erb | 8 ++++++++ app/views/files/_project_file.html.erb | 8 ++++++++ app/views/files/_subfield_files.html.erb | 8 ++++++++ app/views/syllabuses/show.html.erb | 6 +----- public/stylesheets/org.css | 14 ++++++++++++++ public/stylesheets/public.css | 14 ++++++++++++++ 6 files changed, 53 insertions(+), 5 deletions(-) diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb index 2cf43f896..946449680 100644 --- a/app/views/files/_course_file.html.erb +++ b/app/views/files/_course_file.html.erb @@ -86,6 +86,14 @@ +
+ <% unless User.current.logged? %> +
+

您尚未登录，登录 + 后可浏览更多信息 +

+
+ <% end %>
<%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %> diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb index 98b9ad514..40e5163a8 100644 --- a/app/views/files/_project_file.html.erb +++ b/app/views/files/_project_file.html.erb @@ -57,6 +57,14 @@
+
+ <% unless User.current.logged? %> +
+

您尚未登录，登录 + 后可浏览更多信息 +

+
+ <% end %>
<%= form_tag( search_project_project_files_path(@project), method: 'get',:class => "re_search",:remote=>true) do %> diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb index 516e42c68..6a60442b8 100644 --- a/app/views/files/_subfield_files.html.erb +++ b/app/views/files/_subfield_files.html.erb @@ -35,6 +35,14 @@
+
+ <% unless User.current.logged? %> +
+

您尚未登录，登录 + 后可浏览更多信息 +

+
+ <% end %>
<%= form_tag( search_files_in_subfield_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search",:remote=>true) do %> diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb index e3e6436b4..a47f3f81e 100644 --- a/app/views/syllabuses/show.html.erb +++ b/app/views/syllabuses/show.html.erb @@ -9,16 +9,12 @@

课程信息

-<% if @syllabus.des_status == 1 && @syllabus.courses.empty? %> +<% if @syllabus.des_status == 1 && @syllabus.courses.where("is_delete = 0").empty? %>
<% if User.current == @syllabus.user %>

您建立的课程还未创建班级，请 <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%>

- <% elsif User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> -

本课程下还未创建班级，请 - <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "syllabusbox_a_blue", :target => '_blank'%> -

<% else %>

本课程下还未创建班级，敬请期待。

diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 459d050e1..71c2736bb 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -181,3 +181,17 @@ a.follow-button:hover {background-color:#c1c1c1;} /*组织未登录提示*/ .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;} + +/* 未登录的提示信息 */ +.syllabusbox_tishi{ + font-size:14px; + width:733px; + color:#cb7c01; + padding:10px 0 0 15px; + background:#fff7d1; + border:1px solid #fcd9b4; + height:34px; +} +a.syllabusbox_a_blue{ + color:#3b94d6 !important; +} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 0afdf4332..a1b379f85 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -1226,3 +1226,17 @@ a:hover.comment_ding_link{ color:#269ac9;} .orig_sub:hover{ background:#297fb8;} .orig_cont_hide{ text-align:center; width:624px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:8px 0;} .orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;} + +/* 未登录的提示信息 */ +.syllabusbox_tishi{ + font-size:14px; + width:733px; + color:#cb7c01; + padding:10px 0 0 15px; + background:#fff7d1; + border:1px solid #fcd9b4; + height:34px; +} +a.syllabusbox_a_blue{ + color:#3b94d6 !important; +}