Merge branch 'dev_new_head' of http://git.trustie.net/jacknudt/trustieforge into dev_new_head

app/controllers/homes_controller.rb

@@ -8,15 +8,15 @@ class HomesController < ApplicationController
     @dynamic_news = DynamicNew.desc.limit(4)
 
     @companies = WebFooterCompany.dedicators
-    # @partners = WebFooterCompany.partners
-    
+    @partners = WebFooterCompany.opensources
+
     @first_companies_group = Array(@companies.slice(0, 5))
     @second_companies_group = Array(@companies.slice(5, 8))
     @third_companies_group = Array(@companies.slice(13, 5))
   end
 
   def partners
-    @companies = WebFooterCompany.all.group_by {|company| company.key }
+    @companies = WebFooterCompany.where(key: ['opensource', 'dedicator']).group_by(&:key).sort { |a, b|  b[0]<=>a[0] }
   end
 
   def news

app/controllers/web_footer_companies_controller.rb

@@ -4,18 +4,27 @@ class WebFooterCompaniesController < ApplicationController
   menu_item :plugins, :only => :plugins
   menu_item :info, :only => :info
   before_filter :require_admin
-  before_filter :get_type
   before_filter :find_company, :except => [:index, :new, :create]
 
   def index
+    @key = params[:key] || 'opensource'
     scope =
-      if @type == WebFooterCompany::RELATION_TYPE[1]
-        WebFooterCompany.dedicators
-      else
+      case @key
+      when 'partner'
         WebFooterCompany.partners
+      when 'dedicator'
+        WebFooterCompany.dedicators
+      when 'opensource'
+        WebFooterCompany.opensources
       end
 
-    @pages, @companies = paginate scope, :per_page => 25
+    @companies = paginateHelper scope, 25
+    @page = (params['page'] || 1).to_i - 1
+
+    respond_to do |format|
+      format.js
+      format.html
+    end
   end
 
   def new
@@ -23,19 +32,17 @@ class WebFooterCompaniesController < ApplicationController
   end
 
   def create
-    logger.info ""
     @company = WebFooterCompany.new(params[:web_footer_company])
-    @company.key = (@type == WebFooterCompany::RELATION_TYPE[1]) ? WebFooterCompany::RELATION_TYPE[1] : WebFooterCompany::RELATION_TYPE[0]
-    if @company.save
+    @key = params[:web_footer_company][:key]
+    if @company.save!
       flash[:notice] = l(:notice_successful_create)
-      redirect_to web_footer_companies_url(type: @type)
+      redirect_to web_footer_companies_url(key: @key)
     else
       flash[:error] = "#{l :web_footer_company_create_fail}: #{@company.errors.full_messages[0]}"
       respond_to do |format|
-        format.html {  redirect_to new_web_footer_company_path(type: @type) }
+        format.html {  redirect_to new_web_footer_company_path(key: @key) }
         format.api  { render_validation_errors(@company) }
       end
-
     end
   end
 
@@ -72,8 +79,4 @@ class WebFooterCompaniesController < ApplicationController
     @company = WebFooterCompany.find(params[:id])
   end
 
-  def get_type
-    @type = params[:type].to_s.strip
-  end
-
 end

app/helpers/homes_helper.rb

@@ -23,9 +23,9 @@ module HomesHelper
 
   def render_pool_name poll
     case poll
+    when 'opensource' then '合作共建开源'
     when 'partner' then '合作机构'
-    when 'dedicator' then '合作共建平台'
-    else '合作机构'
+    when 'dedicator' then '技术合作单位'
     end
   end
 end

app/helpers/web_footer_companies_helper.rb

@@ -14,4 +14,8 @@ module WebFooterCompaniesHelper
   def label_edit_button_name type
     (@type == WebFooterCompany::RELATION_TYPE[1]) ? l(:label_new_open_source_company) : l(:label_edit_company)
   end
+
+  def hash_company_types
+    { "首页合作共建开源" => "opensource", "首页技术合作单位" => "dedicator", "网站页脚合作单位" => "partner" }
+  end
 end

app/models/web_footer_company.rb

@@ -1,16 +1,19 @@
 class WebFooterCompany < ActiveRecord::Base
-  # dedicator: 首页技术合作单位； partner：与平台的合作单位, opensource: 首页共建开源单位
+  # key字段说明：
+  # partner：网站页脚合作单位(管理员页面页脚), dedicator: 首页技术合作单位； opensource: 首页共建开源单位
   RELATION_TYPE = %w(partner dedicator opensource)
   acts_as_list
-  attr_accessible :logo_size, :name, :url, :position, :move_to
+  attr_accessible :logo_size, :name, :url, :position, :move_to, :key
   validates :name, presence: true, length: { maximum: 500 }
+  validates :key, inclusion: { in: %w(partner dedicator opensource), message: "%{value} is not a valid value." }
   validates :url,  length: { maximum: 500 },
             format: { with: /(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:\/~\+#]*[\w\-\@?^=%&amp;\/~\+#])?/,
                       message: :invalid
             }
 
-  scope :partners,   -> { desc.where(:key => WebFooterCompany::RELATION_TYPE[0]) }
-  scope :dedicators, -> { desc.where(:key => WebFooterCompany::RELATION_TYPE[1]) }
-  scope :desc,       -> { order('position ASC') }
+  scope :desc,        -> { order('position ASC') }
+  scope :partners,    -> { desc.where(:key => 'partner') }
+  scope :dedicators,  -> { desc.where(:key => 'dedicator') }
+  scope :opensources, -> { desc.where(:key => 'opensource') }
 
 end

app/views/admin/web_footer_made.html.erb

@@ -6,8 +6,7 @@
       <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
     </p>
     <%= render 'tab_partial' %>
-    <div style="float:right"><%= link_to l(:label_cooperation_compnay), web_footer_companies_path %></div>
-    <div style="float:right; margin-right: 10px"><%= link_to l(:label_open_source_compnay), web_footer_companies_path(type: WebFooterCompany::RELATION_TYPE[1]) %></div>
+    <div style="float:right;"><%= link_to l(:label_cooperation_compnay), web_footer_companies_path %></div>
     <h4><%=l(:label_web_footer_page)%></h4>
 
     <p style="margin-left:60px;padding-right: 20px;">

app/views/homes/_partners.html.erb

@@ -1,8 +1,3 @@
-<%# <% partners.each do |partner| %>
-  <%#= link_to image_tag(url_to_avatar(partner),:alt=> partner.name ), partner.url, :target => "_blank" %>
-<%# end %>
-<a href="https://www.openi.org.cn/" target="_blank"><img src="/images/partner/main/p_5.png"></a>
-<a href="https://www.ihub.org.cn/" target="_blank"><img src="/images/partner/main/p_2.png"></a>
-<a href="http://opengcc.org/" target="_blank"><img src="/images/partner/main/p_1.png"></a>
-<a href="http://111.186.57.55/" target="_blank"><img src="/images/partner/main/p_3.png"></a>
-<a href="http://111.186.57.55/" target="_blank"><img src="/images/partner/main/p_6.png"></a>
+<% partners.each do |partner| %>
+  <%= link_to image_tag(url_to_avatar(partner),:alt=> partner.name ), partner.url, :target => "_blank" %>
+<% end %>

app/views/homes/partners.html.erb

@@ -3,6 +3,7 @@
     <a href="<%= homes_path %>" class="c_grey02">首页</a><span class="c_grey02 ml3 mr3">&gt;</span>
     <span>开源生态</span>
   </p>
+
   <% @companies.each do |pool, coms| %>
     <p class="f28 lh24 mb20"><%= render_pool_name(pool) %></p>
       <ul class="partnerList clearfix mb30">

app/views/users/_user_show_left.html.erb

@@ -14,18 +14,26 @@
     <% end%>
   </p>
 </div>
-<div class="l_backlog">
-  <% if @user == User.current %>
-    <li class="l_backlog_title">
-      <%= link_to "<p class='color-grey3 f28'>#{@user.count_undo_items}</p><p class='f18 fontGrey4'>待办事项</p>".html_safe, unsolved_issues_list_user_path(@user),remote: true %>
+
+<% if @user == User.current %>
+  <ul class="l_backlog">
+    <li class="l_backlog_title clearfix">
+      <%= link_to "<p class='color-orange f24 fr'>#{@user.count_undo_items}</p><p class='f18 fontGrey4 fl mt4'><i class='iconfont icon-shixunguanqia f18 mr8'></i>待办事项</p>".html_safe, unsolved_issues_list_user_path(@user),remote: true %>
     </li>
-  <% end %>
+  </ul>
+<% end %>
+
+<div class="l_backlog">
   <% if @user.get_user_projects.size > 0 %>
     <ul class="l_backlog_list">
-      <li><%= @user.check_user_him(User.current.id) %>的项目</li>
+      <li class="f18 clearfix fontGrey4">
+        <i class="iconfont icon-base mr8"></i><%= @user.check_user_him(User.current.id) %>的项目
+        <span class="fr fontGrey4 f16">20</span>
+      </li>
       <% @user.get_user_projects.each do |project| %>
-        <li class="l_backlog_list_item">
+        <li class="l_backlog_list_item clearfix">
           <%= link_to project.name, project, target: "_blank" %>
+          <span class="fr mt23"><i class="iconfont icon-youjiantou f12 fontGrey fr"></i></span>
         </li>
       <% end %>
     </ul>
@@ -35,6 +43,9 @@
   <li><%= link_to "#{@user.check_user_him(User.current.id)}发布的issue",user_manage_issues_user_path(@user), target: "_blank" %></li>
   <li><%= link_to "#{@user.check_user_him(User.current.id)}收到的issue", user_receive_issues_user_path(@user), target: "_blank" %></li>
 </div>
+<p class="fontGrey4 f12 mb5 clearfix ml4"><i class="iconfont icon-weizhi mr8 fl mt1"></i>湖南长沙</p>
+<p class="fontGrey4 f12 mb5 clearfix ml4"><i class="iconfont icon-shijian mr8 f11 fl mt3 ml1"></i>2016-06-13开始使用</p>
+<p class="fontGrey4 f12 mb20 clearfix ml4"><i class="iconfont icon-liulanyan mr8 fl mt2"></i>13115次访问（自2016年5月）</p>
 
 <script>
   $(function () {

app/views/web_footer_companies/_list.html.erb

@@ -0,0 +1,13 @@
+<% companies.each do |company| %>
+  <tr class="<%= cycle("odd", "even")%>" align="center">
+    <td> <%= link_to image_tag(url_to_avatar(company),:size=>"30x30",:alt=>company.name),company.url, :target => "_blank" %> </td>
+    <td style="vertical-align: middle;"><%= company.name %></td>
+    <td style="width:15%; vertical-align: middle;">
+      <%= reorder_links('company', {:action => 'move', :id => company, type: @type}, :put) %>
+    </td>
+    <td class="buttons" style="vertical-align: middle;">
+      <%= link_to l(:button_edit),edit_web_footer_company_path(company, type: @type) %>
+      <%= delete_link web_footer_company_path(company, type: @type) %>
+    </td>
+  </tr>
+<% end %>

app/views/web_footer_companies/edit.html.erb

@@ -4,6 +4,7 @@
     <input type="hidden" name="type" value="<%= @type %>" />
     <div>
       <div class="box tabular">
+        <p><%= f.select :key, options_for_select(hash_company_types, @company.key), :required => true %></p>
         <p><%= f.text_field :name, :required => true %></p>
         <p><%= f.text_field :url, :required => true %></p>
         <p><%= l(:label_url_prompt) %></p>

app/views/web_footer_companies/index.html.erb

@@ -1,6 +1,16 @@
-<div class="contextual"><%= link_to label_new_button_name(@type), new_web_footer_company_path(type: @type),:class => "icon icon-add" %></div>
+<div class="contextual"><%= link_to label_new_button_name(@type), new_web_footer_company_path,:class => "icon icon-add" %></div>
 <h3><%= label_title_name(@type) %></h3>
 
+<%= form_tag({}, :method => :get, :remote => true) do %>
+  <fieldset>
+    <label for='status'>
+      类别 :
+    </label>
+    <%= select_tag 'key', options_for_select(hash_company_types), :class => "small", :onchange => "remote_search();", :id => "company_type"  %>
+  </fieldset>
+<% end %>
+&nbsp;
+
 <table class="list">
   <thead><tr>
     <th>LOGO</th>
@@ -8,23 +18,25 @@
     <th>排序</th>
   <th></th>
   </tr></thead>
-  <tbody>
-    <% @companies.each do |company| %>
-      <tr class="<%= cycle("odd", "even")%>" align="center">
-        <td> <%= link_to image_tag(url_to_avatar(company),:size=>"30x30",:alt=>company.name),company.url, :target => "_blank" %> </td>
-        <td style="vertical-align: middle;"><%= company.name %></td>
-        <td style="width:15%; vertical-align: middle;">
-          <%= reorder_links('company', {:action => 'move', :id => company, type: @type}, :put) %>
-        </td>
-        <td class="buttons" style="vertical-align: middle;">
-          <%= link_to l(:button_edit),edit_web_footer_company_path(company, type: @type) %>
-          <%= delete_link web_footer_company_path(company, type: @type) %>
-        </td>
-      </tr>
-    <% end %>
+  <tbody id="web_footer_companies_list">
+    <%= render :partial => 'list', :locals => {:companies => @companies} %>
   </tbody>
 </table>
-
-<div class="pagination"><%= pagination_links_full @pages %></div>
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count ,:per_page_links => false, :remote => true, :flag => true, :is_new => true %>
+</div>
 
 <% html_title(l(:label_role_plural)) -%>
+
+<script type="text/javascript">
+  function remote_search(){
+    var options=$("#company_type option:selected");
+    $.ajax({
+      type: "get",
+      url: "<%= web_footer_companies_path %>",
+      data: {key: options.val()},
+      success: function (data) {
+      }
+    });
+  }
+</script>

app/views/web_footer_companies/index.js.erb

@@ -0,0 +1,2 @@
+$("#web_footer_companies_list").html("<%=escape_javascript(render :partial => 'list', :locals => {:companies => @companies}) %>")
+$(".pagination").html('<%= pagination_links_full @obj_pages, @obj_count ,:per_page_links => false, :remote => true, :flag => true, :is_new => true %>');

app/views/web_footer_companies/new.html.erb

@@ -4,6 +4,7 @@
     <input type="hidden" name="type" value="<%= @type %>" />
     <div>
       <div class="box tabular">
+        <p><%= f.select :key, options_for_select(hash_company_types), :required => true %></p>
         <p><%= f.text_field :name, :required => true %></p>
         <p><%= f.text_field :url, :required => true %></p>
         <p><%= l(:label_url_prompt) %></p>

config/locales/zh.yml

@@ -178,6 +178,7 @@ zh:
   field_hide_mail: 隐藏我的邮件地址
   field_comments: 注释
   field_url: 路径
+  field_key: 类别
   field_logo_size: logo大小
   field_start_page: 起始页
   field_subproject: 子项目

public/stylesheets/application.css

@@ -2876,3 +2876,9 @@ a:hover.Blue-btn{ background:#3598db; color:#fff;}
 
 .lab_left{width: 80px;text-align: center;line-height: 30px;display: block;float: left}
 .input_center{height: 30px;line-height: 30px;border-radius: 3px;margin:0px 20px;border:1px solid #ddd;padding-left: 5px ;box-sizing: border-box;width: 200px; }
+
+.pagination .active {
+  background-color: #3b94d6;
+  border: 1px solid #3b94d6;
+  color: #fff;
+}

public/stylesheets/css/common.css

@@ -53,9 +53,10 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
 .f14{font-size:14px;}
 .f_14{ font-size:14px;}
 .f16{font-size:16px;}
-.f18{font-size:18px;}
+.f18{font-size:18px!important;}
 .f20{font-size:20px!important;}
 .f22{font-size:22px!important;}
+.f24{font-size:24px!important;}
 .f26{font-size:26px;}
 .f28{font-size:28px;}
 .f32{font-size:32px!important;}
@@ -101,7 +102,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
 .markInput { outline:none; border:1px solid #e6e6e6; height:30px; width:50px; color:#3d3c3c; margin-bottom:10px; text-align:center; margin-right:5px; padding-left:0;}
 .markPercentage {margin:10px 0; border:1px solid #e6e6e6; width:70px; height:30px; outline:none; font-size:12px; color:#3d3c3c;}
 /* Spacing */
-.ml2{ margin-left:2px;}.ml3{ margin-left:3px;}.ml4{ margin-left:4px;}.ml5{ margin-left:5px;}.ml7 {margin-left:7px;}.ml8{ margin-left:8px;}.ml9{ margin-left:9px;}
+.ml1{ margin-left:1px;}.ml2{ margin-left:2px;}.ml3{ margin-left:3px;}.ml4{ margin-left:4px;}.ml5{ margin-left:5px;}.ml7 {margin-left:7px;}.ml8{ margin-left:8px;}.ml9{ margin-left:9px;}
 .ml10{ margin-left:10px;}.ml14{ margin-left:14px;}.ml15{ margin-left:15px;}.ml16{ margin-left:16px;}.ml18{ margin-left:18px;}.ml20{ margin-left:20px;}.ml21{ margin-left:21px;}
 .ml24{margin-left:24px;}.ml25{margin-left:25px;}.ml30{margin-left:30px !important;}.ml35{margin-left: 35px;}.ml36{ margin-left:36px; }.ml38{ margin-left:38px;}
 .ml39{ margin-left:39px;}.ml40{ margin-left:40px;}.ml41{ margin-left:41px;}.ml42{ margin-left:42px;}.ml45{ margin-left:45px;}.ml48{ margin-left:48px;}.ml50{ margin-left: 50px;}
@@ -119,7 +120,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
 .mt-20 {margin-top:-20px;}.mt-10 {margin-top:-10px;}.mt-4 {margin-top:-4px;}.mt-5 {margin-top:-5px;}.mt-2 {margin-top:-2px;}.mt0 {margin-top: 0px !important;}
 .mt1{margin-top: 1px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px!important;}.mt4{ margin-top:4px!important;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7 {margin-top:7px!important;}
 .mt8{ margin-top:8px !important;}.mt9{ margin-top:9px !important;}.mt10{ margin-top:10px !important;}.mt12 { margin-top:12px !important;}.mt14 {margin-top:14px;}
-.mt15 {margin-top:15px;}.mt16{ margin-top:16px !important;}.mt18{ margin-top:18px !important;}.mt19 {margin-top:19px !important;}.mt20{margin-top: 20px;}.mt28 {margin-top:28px;}.mt30{ margin-top: 30px;}
+.mt15 {margin-top:15px;}.mt16{ margin-top:16px !important;}.mt18{ margin-top:18px !important;}.mt19 {margin-top:19px !important;}.mt20{margin-top: 20px;}.mt23{margin-top: 23px;}.mt28 {margin-top:28px;}.mt30{ margin-top: 30px;}
 .mt35 {margin-top:35px;}.mt40{ margin-top: 40px;}.mt45{ margin-top: 45px;}.mt50{ margin-top:50px;}.mt60{ margin-top:60px;}.mt100{ margin-top:100px;}.mb0 {margin-bottom: 0px !important;}.mb4{ margin-bottom:4px;}
 .mb5{ margin-bottom:5px;}.mb8 {margin-bottom:8px !important;}.pb5{ padding-bottom: 5px;}.mb10{ margin-bottom:10px !important;}.mb12 {margin-bottom:12px !important;}
 .mb15{margin-bottom: 15px;}.mb20{ margin-bottom:20px;}.mb25{ margin-bottom:25px;}.mb30 {margin-bottom:30px;}.mb40 {margin-bottom:40px;}.pl5{ padding-left:5px;}
@@ -521,7 +522,8 @@ a:hover.btn_green_64_width{ background: #14ad5a; color: #fff;}
 
 .padding10{padding:10px;box-sizing: border-box}
 .padding20{padding:20px;box-sizing: border-box}
-.f12 {font-size:12px;}
+.f11 {font-size:11px!important;}
+.f12 {font-size:12px!important;}
 .f13 {font-size:13px;}
 .f14 {font-size:14px;}
 .f15 {font-size:15px;}
@@ -568,7 +570,7 @@ a:hover.btn_green_64_width{ background: #14ad5a; color: #fff;}
 .c-white {color:#ffffff;}
 .c-black {color:#333}
 .color-orange {
-    color: #ff6800!important;
+    color: #E67E21!important;
 }
 .padding30-20{padding:30px 20px;}
 .bor-bottom-greyE{border-bottom: 1px solid #eee;}

public/stylesheets/css/iconfont/demo_index.html

@@ -1080,6 +1080,12 @@
                 <div class="code-name">&amp;#xe669;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe800;</span>
+                <div class="name">复制</div>
+                <div class="code-name">&amp;#xe800;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe7f9;</span>
                 <div class="name">更多</div>
@@ -1206,6 +1212,12 @@
                 <div class="code-name">&amp;#xe604;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe6d3;</span>
+                <div class="name">主页</div>
+                <div class="code-name">&amp;#xe6d3;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe6a3;</span>
                 <div class="name">yunweijiankong</div>
@@ -2987,6 +2999,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-fuzhi1"></span>
+            <div class="name">
+              复制
+            </div>
+            <div class="code-name">.icon-fuzhi1
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-gengduo1"></span>
             <div class="name">
@@ -3176,6 +3197,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-zhuye"></span>
+            <div class="name">
+              主页
+            </div>
+            <div class="code-name">.icon-zhuye
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-yunweijiankong"></span>
             <div class="name">
@@ -4839,6 +4869,14 @@
                 <div class="code-name">#icon-xiajiang</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fuzhi1"></use>
+                </svg>
+                <div class="name">复制</div>
+                <div class="code-name">#icon-fuzhi1</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-gengduo1"></use>
@@ -5007,6 +5045,14 @@
                 <div class="code-name">#icon-tianjiadaohang</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhuye"></use>
+                </svg>
+                <div class="name">主页</div>
+                <div class="code-name">#icon-zhuye</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yunweijiankong"></use>

public/stylesheets/css/iconfont/iconfont.json

@@ -1230,6 +1230,13 @@
       "unicode": "e669",
       "unicode_decimal": 58985
     },
+    {
+      "icon_id": "5255211",
+      "name": "复制",
+      "font_class": "fuzhi1",
+      "unicode": "e800",
+      "unicode_decimal": 59392
+    },
     {
       "icon_id": "5291605",
       "name": "更多",
@@ -1377,6 +1384,13 @@
       "unicode": "e604",
       "unicode_decimal": 58884
     },
+    {
+      "icon_id": "8361866",
+      "name": "主页",
+      "font_class": "zhuye",
+      "unicode": "e6d3",
+      "unicode_decimal": 59091
+    },
     {
       "icon_id": "9219273",
       "name": "yunweijiankong",

public/stylesheets/css/iconfont/iconfont.svg

@@ -545,6 +545,9 @@ Created by iconfont
     <glyph glyph-name="xiajiang" unicode="&#58985;" d="M803.4 242.6c37.2 31.8 10.9 86-41.9 86H617.1V760.5c0 18.7-15.3 34-34 34H440.8c-18.7 0-34-15.3-34-34v-431.8H261.5c-52.7 0-79.1-54.3-41.9-86l249.6-259.9c23.3-19.4 61.2-19.4 84.5 0l249.7 259.8z m0 0"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="fuzhi1" unicode="&#59392;" d="M869.864727 849.454545A107.706182 107.706182 0 0 0 977.454545 741.888v-599.412364A107.706182 107.706182 0 0 0 869.864727 34.909091H721.454545v-8.797091A107.682909 107.682909 0 0 0 613.888-81.454545H154.112A107.682909 107.682909 0 0 0 46.545455 26.112V625.524364A107.682909 107.682909 0 0 0 154.112 733.090909H302.545455v8.797091A107.706182 107.706182 0 0 0 410.135273 849.454545h459.729454zM154.135273-11.636364h459.729454A37.841455 37.841455 0 0 1 651.636364 26.112V625.524364c0 20.805818-16.942545 37.748364-37.748364 37.748363H154.135273C133.329455 663.272727 116.363636 646.330182 116.363636 625.524364v-599.412364C116.363636 5.282909 133.329455-11.636364 154.135273-11.636364zM907.636364 142.475636V741.888C907.636364 762.693818 890.670545 779.636364 869.864727 779.636364H410.135273C389.329455 779.636364 372.363636 762.693818 372.363636 741.888V733.090909h241.524364A107.682909 107.682909 0 0 0 721.454545 625.524364V104.727273h148.410182c20.805818 0 37.771636 16.919273 37.771637 37.748363zM523.636364 523.636364a34.909091 34.909091 0 0 0 0-69.818182h-279.272728a34.909091 34.909091 0 0 0 0 69.818182h279.272728z m0-162.909091a34.909091 34.909091 0 0 0 0-69.818182h-279.272728a34.909091 34.909091 0 0 0 0 69.818182h279.272728z m-93.090909-162.909091a34.909091 34.909091 0 0 0 0-69.818182h-186.181819a34.909091 34.909091 0 0 0 0 69.818182h186.181819z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="gengduo1" unicode="&#59385;" d="M104 376m-104 0a104 104 0 1 1 208 0 104 104 0 1 1-208 0ZM920 376m-104 0a104 104 0 1 1 208 0 104 104 0 1 1-208 0ZM512 384m-160 0a160 160 0 1 1 320 0 160 160 0 1 1-320 0Z"  horiz-adv-x="1024" />
 
     
@@ -608,6 +611,9 @@ Created by iconfont
     <glyph glyph-name="tianjiadaohang" unicode="&#58884;" d="M448 896h128v-1024H448V896zM0 448h1024v-128H0V448z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="zhuye" unicode="&#59091;" d="M981.929813 371.370667c-9.756444 0-19.626667 3.413333-27.534222 10.211555L538.395591 741.034667l-4.494222 4.124444a31.488 31.488 0 0 1-43.320889 0c-1.251556-1.28-2.816-2.702222-4.494222-4.124444L69.944036 381.582222a42.097778 42.097778 0 0 0-59.676445 4.551111 42.723556 42.723556 0 0 0 4.522667 60.017778L430.761813 805.660444c0.284444 0.284444 1.137778 0.995556 1.422223 1.422223a115.484444 115.484444 0 0 0 159.687111 0l1.422222-1.422223L1009.23648 446.179556c17.777778-15.36 19.768889-42.183111 4.522667-60.046223-8.192-9.671111-20.024889-14.791111-31.857778-14.791111zM769.023147-99.555556h-77.027556c-61.354667 0-111.303111 50.261333-111.303111 112.014223V133.973333a27.192889 27.192889 0 0 1-26.652444 26.851556H477.040924a26.823111 26.823111 0 0 1-26.652444-26.851556v-121.514666c0-61.752889-49.948444-112.014222-111.303111-112.014223H256.283591c-61.354667 0-111.303111 50.261333-111.303111 112.014223v392.248889a42.382222 42.382222 0 0 0 42.325333 42.609777 42.382222 42.382222 0 0 0 42.325334-42.609777v-392.248889c0-14.791111 11.975111-26.823111 26.652444-26.823111h82.801778a26.823111 26.823111 0 0 1 26.652444 26.823111V133.973333c0 61.781333 49.948444 112.014222 111.303111 112.014223h77.027556c61.354667 0 111.303111-50.232889 111.303111-112.014223v-121.514666c0-14.791111 11.975111-26.823111 26.652445-26.823111h77.027555a26.823111 26.823111 0 0 1 26.652445 26.823111v392.248889a42.382222 42.382222 0 0 0 42.325333 42.609777 42.382222 42.382222 0 0 0 42.325333-42.609777v-392.248889c0-61.752889-49.948444-112.014222-111.303111-112.014223z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="yunweijiankong" unicode="&#59043;" d="M624.64 233.472c6.144 0 10.24-4.096 10.24-10.24s-4.096-10.24-10.24-10.24H92.16c-22.528 0-40.96 18.432-40.96 40.96v419.84c0 22.528 18.432 40.96 40.96 40.96h675.84c22.528 0 40.96-18.432 40.96-40.96v-276.48c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24v276.48c0 11.264-9.216 20.48-20.48 20.48H92.16c-11.264 0-20.48-9.216-20.48-20.48v-419.84c0-11.264 9.216-20.48 20.48-20.48h532.48M602.112 73.728c8.192 0 15.36 7.168 15.36 15.36s-7.168 15.36-15.36 15.36h-317.44c-8.192 0-15.36-7.168-15.36-15.36s7.168-15.36 15.36-15.36h317.44m0-20.48h-317.44c-19.456 0-35.84 16.384-35.84 35.84s16.384 35.84 35.84 35.84h317.44c19.456 0 35.84-16.384 35.84-35.84s-16.384-35.84-35.84-35.84zM425.984 223.232h20.48v-119.808h-20.48V223.232M230.4 394.24l-14.336 14.336s67.584 66.56 105.472 105.472l14.336-14.336L230.4 394.24m124.928 112.64l13.312 15.36c11.264-9.216 26.624-22.528 41.984-34.816 14.336-12.288 29.696-25.6 43.008-36.864L440.32 435.2l-43.008 36.864-41.984 34.816m174.08-76.8l-14.336 14.336c34.816 34.816 96.256 95.232 96.256 95.232l14.336-14.336-96.256-95.232M378.88 264.192c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24h1.024c6.144 0 10.24-4.096 10.24-10.24s-4.096-10.24-10.24-10.24H378.88m41.984 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24h1.024c6.144 0 10.24-4.096 10.24-10.24s-4.096-10.24-10.24-10.24h-1.024m41.984 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24h1.024c6.144 0 10.24-4.096 10.24-10.24s-4.096-10.24-10.24-10.24h-1.024m41.984 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24h1.024c6.144 0 10.24-4.096 10.24-10.24s-4.096-10.24-10.24-10.24h-1.024M819.2 79.872c73.728 0 133.12 59.392 133.12 132.096s-59.392 132.096-133.12 132.096-133.12-59.392-133.12-132.096 59.392-132.096 133.12-132.096m0-20.48c-84.992 0-153.6 68.608-153.6 152.576s68.608 152.576 153.6 152.576 153.6-68.608 153.6-152.576-68.608-152.576-153.6-152.576zM819.2 158.72c29.696 0 53.248 23.552 53.248 53.248 0 29.696-23.552 53.248-53.248 53.248-29.696 0-53.248-23.552-53.248-53.248 0-28.672 23.552-53.248 53.248-53.248m0-20.48c-40.96 0-73.728 32.768-73.728 73.728s32.768 73.728 73.728 73.728 73.728-32.768 73.728-73.728c0-39.936-32.768-73.728-73.728-73.728zM665.6 202.752v20.48h295.936v-20.48H665.6M809.984 365.568h20.48v-294.912h-20.48V365.568M204.8 353.28c13.312 0 23.552 10.24 23.552 23.552 0 13.312-10.24 23.552-23.552 23.552s-23.552-10.24-23.552-23.552c0-13.312 10.24-23.552 23.552-23.552m416.768 174.08c7.168 0 12.288 5.12 12.288 12.288s-5.12 12.288-12.288 12.288-12.288-5.12-12.288-12.288c0-6.144 5.12-12.288 12.288-12.288M204.8 332.8c-24.576 0-44.032 19.456-44.032 44.032s19.456 44.032 44.032 44.032 44.032-19.456 44.032-44.032S229.376 332.8 204.8 332.8z m416.768 174.08c-18.432 0-32.768 14.336-32.768 32.768 0 18.432 14.336 32.768 32.768 32.768 18.432 0 32.768-14.336 32.768-32.768 0-17.408-14.336-32.768-32.768-32.768zM476.16 385.024c18.432 0 32.768 15.36 32.768 33.792 0 18.432-15.36 33.792-32.768 33.792s-32.768-15.36-32.768-33.792c-1.024-18.432 14.336-33.792 32.768-33.792M336.896 516.096c6.144 0 11.264 5.12 11.264 12.288s-5.12 12.288-11.264 12.288c-6.144 0-11.264-5.12-11.264-12.288-1.024-7.168 4.096-12.288 11.264-12.288m139.264-151.552c-29.696 0-53.248 24.576-53.248 54.272s23.552 54.272 53.248 54.272 53.248-24.576 53.248-54.272-23.552-54.272-53.248-54.272zM336.896 495.616c-17.408 0-31.744 14.336-31.744 32.768s14.336 32.768 31.744 32.768c17.408 0 31.744-14.336 31.744-32.768s-14.336-32.768-31.744-32.768z"  horiz-adv-x="1024" />
 
     

public/stylesheets/css/structure.css

@@ -866,6 +866,7 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
 }
 .l_img{
     margin-bottom: 25px;
+    position: relative;
 }
 .l_img > a > img,.l_img > img{
     width: 134px;
@@ -895,7 +896,7 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
 .l_backlog_list li{
     height: 60px;
     line-height: 60px;
-    color:#666;
+    color:#999;
     font-size: 16px;
     padding:0px 20px;
     cursor: pointer;