From d1435e07d407fcb6660de09de902fa4c84ff2c32 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 09:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=9A=90=E8=97=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81=20#1152=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A=E5=B0=86=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=89=AB=E7=A0=81=E4=BD=9C=E4=B8=BA=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=9A=84=E8=BF=9E=E6=8E=A5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E9=9A=90=E8=97=8F=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/index.html.erb   | 12 ------------
 app/views/welcome/_wei_xin.html.erb |  4 ++++
 app/views/welcome/contest.html.erb  |  5 +----
 app/views/welcome/course.html.erb   |  5 +----
 app/views/welcome/index.html.erb    |  9 +++------
 5 files changed, 9 insertions(+), 26 deletions(-)
 create mode 100644 app/views/welcome/_wei_xin.html.erb

diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb
index 60608fd89..c166f73ab 100644
--- a/app/views/contests/index.html.erb
+++ b/app/views/contests/index.html.erb
@@ -7,10 +7,6 @@
 			<td rowspan="2">
 			<% if User.current.logged? %>
                 <% unless User.current.user_extensions.identity == 1 %>
-                 <!--
-                    modified by longjun
-                    <%=link_to l(:label_newtype_contest), :controller => 'contests', :action => 'new_contest' %>
-                -->
                     <%= link_to(l(:label_newtype_contest), contest_new_contest_path, :class => 'icon icon-add', :target => "_blank") %>
                 <!-- end longjun -->
                   <% end %>
@@ -27,20 +23,12 @@
 		<tr>
 			<td style="padding-left: 8px">
               <a>
-                <!--
-                    modified by longjun
-                    <%=link_to request.host()+"/contests", :controller => 'contests', :action => 'index' %>
-                -->
                 <%= link_to request.host()+"/contests", contests_path %>
                 <!-- end longjun  -->
               </a>
             </td>
 	        <td >
               <%=link_to l(:field_homepage), home_path %> >
-              <!--
-                    modified by longjun
-                    <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
-                -->
               <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
                 <!-- end longjun -->
             </td>
diff --git a/app/views/welcome/_wei_xin.html.erb b/app/views/welcome/_wei_xin.html.erb
new file mode 100644
index 000000000..39902cf89
--- /dev/null
+++ b/app/views/welcome/_wei_xin.html.erb
@@ -0,0 +1,4 @@
+<div id="identifier-pannel" style="display:none">
+  <%= image_tag '/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" %>
+  <div class="weixin-content">微信扫码</div>
+</div>
\ No newline at end of file
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 73c09c6ec..dbc2d8f1b 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -120,10 +120,7 @@
 })();
 </script>
 <div class='top_bar'>
-	<div id="identifier-pannel" style="display:none">
-		<%= image_tag '/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" %>
-		<div class="weixin-content"><%=l(:label_weixin)%></div>
-	</div>
+  <%#= render partial: 'wei_xin' %>
 	<div class="main-content-bar" id="main-content-bar">
 	<!--文字-->
 		<div style="float: left;padding-left:15px;">
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 9ec745f87..a94998639 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -32,10 +32,7 @@
 </script>
 
 <div class='top_bar'>
-  <div id="identifier-pannel" style="display:none">
-    <%= image_tag '/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" %>
-    <div class="weixin-content">微信扫码</div>
-  </div>
+  <%#= render partial: 'wei_xin' %>
   <div class="main-content-bar" id="main-content-bar">
     <div style="float: left;padding-left:15px">
       <%= image_tag(@logoLink, width:@course_page.image_width,height: @course_page.image_height) %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index b73f0970f..83d1fef28 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -29,10 +29,7 @@
 </script>
 
 <div class='top_bar'>
-	<div id="identifier-pannel" style="display:none">
-		<%= link_to image_tag('/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" ), home_path %>
-		<div class="weixin-content">微信扫码</div>
-	</div>
+  <%#= render partial: 'wei_xin' %>
 	<div class="main-content-bar" id="main-content-bar">
 		<div style="float: left;padding-left:15px ">
           <!-- <#%= image_tag(get_project_avatar(@first_page), size: "75x75") %>  -->
@@ -42,7 +39,7 @@
               <%= image_tag '/images/transparent.png', width:@first_page.image_width,height: @first_page.image_height %>
           <% end %>
 
-		</div>		
+		</div>
 	<div class="welcome_left" id="welcome_left">
       <% unless @first_page.nil? %>
 		<!-- <span class="font_welcome_trustie"><#%= @first_page.title %></span> <span class="font_welcome_tdescription">, <#%= @first_page.description %></span> -->
@@ -50,7 +47,7 @@
       <% end %>
 	</div>
 	<div class="search-bar" id="search-bar">
-		<%= render :partial => "search_project", :locals => {:project_type => 0}%>	
+		<%= render :partial => "search_project", :locals => {:project_type => 0}%>
 	</div>
 	<div style="clear: both;"></div>
 	</div>