Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Conflicts:
	app/views/contests/show_attendingcontest.html.erb

app/helpers/application_helper.rb

@@ -335,7 +335,7 @@ module ApplicationHelper
         # set the project environment to please macros.
         @course = course
         if (ancestors.empty? )#|| course.is_descendant_of?(ancestors.last))
-          s << "<ul class=courses'>\n"
+          s << "<ul class=courses>\n"
         else
           ancestors.pop
           s << "</li>"

app/views/courses/new.html.erb

@@ -1,3 +1,7 @@
+<% @nav_dispaly_course_all_label = 1
+   @nav_dispaly_forum_label = 1
+   @nav_dispaly_course_label = nil
+   @nav_dispaly_store_all_label = 1 %>
 <%= labelled_form_for @course do |f| %>
     <h3><%=l(:label_course_new)%></h3>
     <div class="box tabular">

app/views/layouts/_base_header.html.erb

@@ -41,6 +41,7 @@
 			<%=link_to_user(User.current)%>
 			<ul class="sub_menu">
 				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
+                 <% hasCourse=true%>
 				<li  id="course_loggedas_li"><%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %>
                   <ul class="course_sub_menu">
                     <% User.current.courses.each do |course| %>
@@ -52,8 +53,13 @@
                 </li>
 				<% end -%>
               <li id="project_loggedas_li"><%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %>
-                <ul class="project_sub_menu">
-                  <% User.current.projects.each do |project| %>
+
+                <% if hasCourse %>
+                    <ul class="project_sub_menu" style="top: 35px">
+                <% else %>
+                    <ul class="project_sub_menu">
+                <% end %>
+                <% User.current.projects.each do |project| %>
                       <li><%= link_to project.name.truncate(10, omission: '...'), {:controller => 'projects', :action => 'show',id: project.id, host: Setting.project_domain } %></li>
                   <% end %>
                  </ul>

app/views/welcome/contest.html.erb

@@ -170,7 +170,7 @@
 				</div>
 				
 				<div  style="float: left;margin:5px; margin-left: 12px; margin-bottom: 2px; width: 380px;">
-					<span class='font_lighter' title =<%=contest.description.to_s%>><%=contest.description.to_s%></span>
+					<span class='font_lighter' title ='<%=contest.description%>'><%=contest.description.truncate(100, omission: '...')%></span>
 				</div><br />
 				
 				<div style="padding-left: 57px; clear: left;">

app/views/welcome/index.html.erb

@@ -75,7 +75,7 @@
 					 (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>) 			
 				</div>
 				<div  style=" float: left;margin:5px; margin-left: 10px; width: 380px;">
-					<span class='font_lighter' title =<%=project.description.to_s%>><%=project.description%></span>
+					<span class='font_lighter' title ='<%=project.short_description%>'><%=project.description.truncate(100, omission: '...')%></span>
 				</div>
 				<div >
                   <%# issue_count = project.issues.count %>

public/stylesheets/application.css

@@ -696,7 +696,6 @@ ul.user_course_sort li{list-style-type:none;
     height:auto;}
 
 
-
 .info-break{
 	word-wrap: break-word;
 	word-break: break-all;	
@@ -1765,6 +1764,22 @@ input#content_comments {width: 99%}
 
 p.pagination {margin-top:8px; font-size: 90%}
 
+
+ul.courses {margin:0px; padding-left:0em;}
+ul.courses ul {padding-left:1.6em;}
+ul.courses.root {margin:0; padding:0;}
+
+ul.courses li {list-style-type:none;}
+
+ul.courses li {list-style-type:none;}
+#courses-index ul.courses ul.courses { border-left: 3px solid #e0e0e0; padding-left:1em;}
+#courses-index ul.courses li.root {margin-bottom: 1em;}
+#courses-index ul.courses li.child {margin-top: 1em;}
+#courses-index ul.courses div.root a.course {font-family:'微软雅黑', "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 14px; margin: 0 0 10px 0; }
+.my-course { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
+
+
+
 /***** Tabular forms ******/
 .tabular p{
   margin: 0;