Merge branch 'cxt_course' into develop

Conflicts:
	public/stylesheets/courses.css

app/views/tags/_show_users.html.erb

@@ -2,7 +2,7 @@
 	<% if users_results.try(:size).to_i > 0 %>
 	<hr />
 	<% users_results.each do |user| %>
-	<p class="font_description2">
+	<p class="font_description2" style="padding: 10px 5px">
 		<strong><%= l(:label_tags_user_name) %><%= link_to ("#{user.name}"),
 		:controller => "users",:action => "show",:id => user.id%></strong>
 		<br />

app/views/tags/index.html.erb

@@ -16,7 +16,7 @@
 <% content_for :content do %>
 <div>
 	<h3><strong><%= l(:label_tags_search_result) %></strong></h3>
-	<div align="right">
+	<div class="mb5">
 		<%= l(:label_tags_numbers) %>：
 		<%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) |
 		<%= l(:label_project_plural) %>(<%= @projects_tags_num %>) |

public/stylesheets/courses.css

@@ -1429,3 +1429,4 @@ a.pages-big{ width:50px;}
 .W600{ width:600px;}
 
 .syllabus_input {width: 290px; border: 1px solid #64bdd9; height: 30px;}
+.syllabus_input option {max-width:260px;}