From 897eabd57a7e5cb6c1633ab3931bfe871e0706f8 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 13 Jan 2016 16:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=AB=E6=8D=B7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=E5=8F=8A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb   |  2 +-
 app/views/files/_subfield_files.html.erb      |  2 +-
 .../files/_upload_subfield_file.html.erb      | 16 +++---
 app/views/layouts/_user_courses.html.erb      | 51 +++++++++++++------
 app/views/layouts/_user_projects.html.erb     |  6 +--
 app/views/layouts/new_base_user.html.erb      |  2 +-
 config/routes.rb                              |  2 +-
 public/stylesheets/share.css                  |  1 +
 8 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 465bf1208..6bd6ecbf0 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -23,7 +23,7 @@ class OrgSubfieldsController < ApplicationController
     @organization = Organization.find(params[:id])
     @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
         "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+
-        " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:name]}'").first
+        " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first
     if @org_subfield.field_type == 'Post'
       redirect_to organization_path(@organization, :org_subfield_id => @org_subfield.id)
     end
diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb
index 1a222780e..6da0caccb 100644
--- a/app/views/files/_subfield_files.html.erb
+++ b/app/views/files/_subfield_files.html.erb
@@ -78,7 +78,7 @@
 <script>
   function org_upload_files(org_subfield_id){
       $.ajax({
-          url :"/org_subfields/" + org_subfield_id + "/files/subfield_upload_file?in_org=1",
+          url :"/org_subfields/" + org_subfield_id + "/files/subfield_upload_file",
           type :'post'
       });
   }
diff --git a/app/views/files/_upload_subfield_file.html.erb b/app/views/files/_upload_subfield_file.html.erb
index 20c29f238..3f8f1359a 100644
--- a/app/views/files/_upload_subfield_file.html.erb
+++ b/app/views/files/_upload_subfield_file.html.erb
@@ -7,16 +7,12 @@
       <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
 
       <%= form_tag(org_subfield_files_path(org_subfield, :in_org => params[:in_org]), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
-          <% if params[:in_org] %>
-              <div class="c_dark">
-                <input name="org_subfield_attachment_type[]" type="checkbox" value="2" checked class="c_dblue">软件</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
-                <input name="org_subfield_attachment_type[]" type="checkbox" value="3" class="c_dblue">媒体</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
-                <input name="org_subfield_attachment_type[]" type="checkbox" value="4" class="c_dblue">代码</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
-                <input name="org_subfield_attachment_type[]" type="checkbox" value="5" class="c_dblue">其他</input></a>
-              </div>
-          <% else %>
-              <input type="hidden" name="org_subfield_attachment_type" value="<%= org_subfield_attachment_type %>">
-          <% end %>
+          <div class="c_dark">
+            <input name="org_subfield_attachment_type[]" type="checkbox" value="2" checked class="c_dblue">软件</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+            <input name="org_subfield_attachment_type[]" type="checkbox" value="3" class="c_dblue">媒体</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+            <input name="org_subfield_attachment_type[]" type="checkbox" value="4" class="c_dblue">代码</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+            <input name="org_subfield_attachment_type[]" type="checkbox" value="5" class="c_dblue">其他</input></a>
+          </div>
           <!--<input type="hidden" name="org_subfield_attachment_type" value="<%#= org_subfield_attachment_type%>">-->
           <%= render :partial => 'files/org_subfield_upload_attachment_list', :locals => {:container => org_subfield}%>
           <div class="cl"></div>
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 3d60a2727..0450d9081 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -1,28 +1,47 @@
 <% courses.each do |course|%>
     <li class="homepageLeftMenuCoursesLine pr">
+      <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
       <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
                   :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+course.time.to_s+course.term+"）"%>
         <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
         <ul class="<%= count > 0 ? 'shild shildP':'subNavArrow'%>">
           <li>
             <ul class="subNavMenu boxShadow">
+              <% if is_teacher %>
+                  <li class="subNavRow">
+                    <%= link_to "作业",homework_common_index_path(:course => course.id), :class => 'fl fontGrey2 w48', :target => '_blank' %>
+                    <%= link_to '+',homework_common_index_path(:course => course.id,:is_new => 1), :class => 'fr fb', :title => '发布作业',:target => '_blank' %>
+                    <div class="cl"></div>
+                  </li>
+                  <li class="subNavRow">
+                    <%= link_to "通知", course_news_index_path(course), :class => 'fl w48',:target => '_blank' %>
+                    <%= link_to "+", new_course_news_path(course,:is_new=>1), :class => 'fr fb', :title => '发布通知',:target => '_blank' %>
+                    <div class="cl"></div>
+                  </li>
+              <% else %>
+                  <li class="subNavRow">
+                    <%= link_to "作业",homework_common_index_path(:course => course.id), :target => '_blank' %>
+                    <div class="cl"></div>
+                  </li>
+                  <li class="subNavRow">
+                    <%= link_to "通知", course_news_index_path(course),:target => '_blank' %>
+                    <div class="cl"></div>
+                  </li>
+              <% end %>
+              <% if is_teacher || (course.publish_resource == 1  && User.current.member_of_course?(course)) %>
+                  <li class="subNavRow">
+                    <%= link_to "资源",course_files_path(course), :class => 'fl w48',:target => '_blank' %>
+                    <%= link_to "+",upload_files_menu_path(:course_id => course.id), :class => 'fr fb',:remote => true, :title => '上传资源' %>
+                    <div class="cl"></div>
+                  </li>
+              <% else %>
+                  <li class="subNavRow">
+                    <%= link_to "资源",course_files_path(course),:target => '_blank' %>
+                    <div class="cl"></div>
+                  </li>
+              <% end %>
               <li class="subNavRow">
-                <%= link_to "作业",homework_common_index_path(:course => course.id), :class => 'fl fontGrey2', :target => '_blank' %>
-                <%= link_to '+',homework_common_index_path(:course => course.id,:is_new => 1), :class => 'fr fb', :title => '发布作业',:target => '_blank' %>
-                <div class="cl"></div>
-              </li>
-              <li class="subNavRow">
-                <%= link_to "通知", course_news_index_path(course), :class => 'fl',:target => '_blank' %>
-                <%= link_to "+", new_course_news_path(course,:is_new=>1), :class => 'fr fb', :title => '发布通知',:target => '_blank' %>
-                <div class="cl"></div>
-              </li>
-              <li class="subNavRow">
-                <%= link_to "资源",course_files_path(course), :class => 'fl',:target => '_blank' %>
-                <%= link_to "+",upload_files_menu_path(:course_id => course.id), :class => 'fr fb',:remote => true, :title => '上传资源' %>
-                <div class="cl"></div>
-              </li>
-              <li class="subNavRow">
-                <%= link_to "论坛",course_boards_path(course), :class => 'fl',:target => '_blank' %>
+                <%= link_to "论坛",course_boards_path(course), :class => 'fl w48',:target => '_blank' %>
                 <%= link_to "+",course_boards_path(course, :flag => true, :is_new => 1), :class => 'fr fb', :title => '发布帖子',:target => '_blank' %>
                 <div class="cl"></div>
               </li>
diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb
index aa38bb51a..552ff94e0 100644
--- a/app/views/layouts/_user_projects.html.erb
+++ b/app/views/layouts/_user_projects.html.erb
@@ -11,18 +11,18 @@
                 <div class="cl"></div>
               </li>
               <li class="subNavRow">
-                <%=link_to "资源", project_files_path(project),:remote => true,:class => 'fl fontGrey2' %>
+                <%=link_to "资源", project_files_path(project),:remote => true,:class => 'fl fontGrey2 w48' %>
                 <%=link_to "+", upload_files_menu_path(:project_id => project.id),:remote => true,:class => 'fr fb',:title => '上传资源'%>
                 <div class="cl"></div>
               </li>
               <li class="subNavRow">
-                <%=link_to "论坛", project_boards_path(project),:class => 'fl fontGrey2', :target => '_blank'%>
+                <%=link_to "论坛", project_boards_path(project),:class => 'fl fontGrey2 w48', :target => '_blank'%>
                 <%=link_to "+", project_boards_path(project, :flag => true),:class => 'fr fb', :target => '_blank',:title => '发布帖子'%>
                 <div class="cl"></div>
               </li>
               <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, project)) && rep_is_gitlab?(project) %>
                   <li class="subNavRow">
-                    <%= link_to '版本库', url_for(:controller => 'projects', :action => 'settings', :id => project.id, :tab=>'repositories') , :target => '_blank',:class => "fl",:title => '版本库' %>
+                    <%= link_to '版本库', url_for(:controller => 'projects', :action => 'settings', :id => project.id, :tab=>'repositories') , :target => '_blank',:class => "fl w48",:title => '版本库' %>
                     <div class="cl"></div>
                   </li>
               <% end %>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index b2c19d763..de898a733 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -104,7 +104,7 @@
           <% end%>
         </div>
         <div class="fl ml10">
-          <p class="homepageImageName hidden db mb5">
+          <p class="homepageImageName hidden db mb5" style="margin-left:0px;margin-right:0px;">
             <%= @user.realname.blank? ? @user.login : @user.realname %>
           </p>
           <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
diff --git a/config/routes.rb b/config/routes.rb
index 24c17e997..7c3511895 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -54,7 +54,7 @@ RedmineApp::Application.routes.draw do
       post 'logout'
       post 'apply_subdomain'
       get  'org_resources_subfield'
-      get '/:name', :to => 'org_subfields#show', :as => 'show_org_subfield'
+      get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_org_subfield'
     end
     collection do
       get 'check_uniq'
diff --git a/public/stylesheets/share.css b/public/stylesheets/share.css
index 0c0597507..8a4b38b65 100644
--- a/public/stylesheets/share.css
+++ b/public/stylesheets/share.css
@@ -30,6 +30,7 @@ ul.shild:hover li ul {display:block;}
 ul.subNavArrow:hover li ul {display:block;}
 .subNavMenu {line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:20px; top:-10px; padding:5px 0px; display:none; z-index:999;}
 .subNavRow {padding:0px 15px; width:70px;}
+.w48 {width:48px;}
 
 a.mesIcon {background:url(../images/mes_icon.png) -5px -73px no-repeat; padding-left:23px;}
 a.personalIcon {background:url(../images/mes_icon.png) -6px -16px no-repeat; padding-left:23px;}