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

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

Signed-off-by: alan <547533434@qq.com>

app/views/contests/index.html.erb

@@ -7,20 +7,8 @@
 			<td rowspan="2">
 			<% if User.current.logged? %>
                 <% unless User.current.user_extensions.identity == 1 %>
-<<<<<<< HEAD
+
-                 <!--
-                    modified by longjun
-                    <%#link_to l(:label_newtype_contest), :controller => 'contests', :action => 'new_contest' %>
-                -->
-                    <%= link_to(l(:label_newtype_contest),
-                                contest_new_contests_path,
-                                :class => 'icon icon-add',
-                                :target => "_blank")
-                    %>
-=======
                     <%= link_to(l(:label_newtype_contest),  new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %>
->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc
-                <!-- end longjun -->
                   <% end %>
 			<% end %>
 			</td>
@@ -38,26 +26,13 @@
 		<tr>
 			<td style="padding-left: 8px">
               <a>
-<<<<<<< HEAD
-                <!--modified by longjun-->
-=======
->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc
                 <%= link_to request.host()+"/contests", contests_path %>
-                <!-- end longjun  -->
               </a>
             </td>
 	        <td >
               <%=link_to l(:field_homepage), home_path %> >
-<<<<<<< HEAD
-              <!--
-                    modified by longjun
-                    <%#link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
-                -->
               <%=link_to l(:label_contest_innovate), contests_path %>
-=======
               <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
->>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc
-                <!-- end longjun -->
             </td>
 		</tr>
 	</table>
@@ -75,3 +50,4 @@
 <% end %>
 
 <% html_title l(:label_contest_list)%>
+s