From 04f125c7a6e55b9ec46d5d453b38d3eb3ef14cb7 Mon Sep 17 00:00:00 2001
From: zhangshenjerry <1375181337@qq.com>
Date: Mon, 6 Jul 2015 11:42:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=A0=E7=94=B3=E4=BF=AE=E6=94=B9=E7=9A=84bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_newcontest.html.erb      |  5 +++--
 app/views/users/show.html.erb                   |  2 +-
 app/views/users/user_activities.html.erb        |  2 +-
 .../redpenny-master/stylesheets/application.css | 17 +++++++++++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 26015d536..cef5c0955 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -66,7 +66,8 @@
                                                 <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => 'regexName1();', :width => "125px", :style=>"float:left" %>
                                                 <%= hidden_field_tag 'project_type', params[:project_type] %>
                                                 <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-                                              <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
+                                              <!--<a href="#" onclick="submitSerch();" class="ButtonColor"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px; padding-left:8px;" >-->
+                                              <a href="#" onclick="submitSerch();" class="enterprise" style="padding-top: 3px; margin: 0px;padding-bottom:0px; margin-top: 1px; margin-left: 3px; background:#15bccf repeat">
                                                 <%= l(:label_search)%>
                                               </a>
                                                 <br />
@@ -80,7 +81,7 @@
                                       <%=link_to l(:field_homepage), home_path %> >
                                       <a href="http://<%= Setting.host_contest %>" class="link_other_item">
                                         <%=l(:label_contests_management_platform)%>
-                                      
+
                                       </a> >
                                       <span title="<%= @contest.name%>">
                                         <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), contest_contestnotifications_path(@contest) %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index fadffc9f6..496211e82 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -387,7 +387,7 @@
                                                   <%= l(:label_i_new_activity) %>
                                                 </span>
                                 &nbsp;
-                                <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %>
+                                <%= link_to format_activity_title(" #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %>
                               </td>
                           <% else %>
                               <td colspan="2" valign="top">
diff --git a/app/views/users/user_activities.html.erb b/app/views/users/user_activities.html.erb
index 9165e6f2e..32915245f 100644
--- a/app/views/users/user_activities.html.erb
+++ b/app/views/users/user_activities.html.erb
@@ -28,7 +28,7 @@
     <td colspan="2" valign="top" width="50" ><img src="/images/new/news.png" width="40" height="40"/></td>
     <td><table width="580" border="0">
       <tr>
-        <td colspan="2" valign="top"><strong> <%= content_tag('span', h(e.project), :class => 'project') %></strong> <span class="font_lighter"><%= l(:label_new_activity) %></span>
+        <td colspan="2" valign="top"><strong> <%= content_tag('span', h(e.project), :class => 'project') %></strong>
           <% if e.event_type.eql?("message") || e.event_type.eql?("reply")  %>
               <%= link_to format_activity_title(e.event_title), e.board.project ? project_boards_path(e.board.project,:topic_id => e.id):course_boards_path(e.board.course,:topic_id => e.id) %>
           <%else %>
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 02626f440..4a23e59c5 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -1698,6 +1698,23 @@ div.project-search {
 }
 
 /*huang*/
+/*zhangshen*/
+a.enterprise {
+    float:left;
+    text-align: center;
+    width: 40px;
+    height: 18px;
+    font-family: '微软雅黑',Arial,Helvetica,sans-serif;
+    font-size: 12px;
+    color:#fff;
+    padding: 0px;
+    border-radius:4px;
+    border: 1px solid rgb(148, 148, 148);
+    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.1), 0px 0px 0px rgb(255, 255, 255);
+    cursor: pointer;
+}
+
 input.enterprise[type="button"] {
   padding-bottom: 5px;
   width: 55px;