Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/zipdown_controller.rb

@@ -180,17 +180,14 @@ class ZipdownController < ApplicationController
 
 
   def zipping(zip_name_refer, files_paths, output_path, is_attachment=false, not_exist_file=[])
-    ic = Iconv.new('GBK//IGNORE', 'UTF-8//IGNORE')
-
     rename_zipfile = zip_name_refer ||= "#{Time.now.to_i.to_s}.zip"
     zipfile_name = "#{output_path}/#{rename_zipfile}"
-    Zip.unicode_names = true
 
     Dir.mkdir(File.dirname(zipfile_name)) unless File.exist?(File.dirname(zipfile_name))
     Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
       files_paths.each do |filename|
-        rename_file = ic.iconv( (File.basename(filename)) ).to_s
-        rename_file = ic.iconv( filename_to_real( File.basename(filename))).to_s if is_attachment
+        rename_file = File.basename(filename)
+        rename_file = filename_to_real( File.basename(filename)) if is_attachment
 
         begin
           zipfile.add(rename_file, filename)

app/helpers/application_helper.rb

@@ -326,7 +326,7 @@ module ApplicationHelper
   end
 
   def thumbnail_issue_tag(attachment)
-    imagesize = attachment.thumbnail(:size => "50*50")
+    imagesize = attachment.thumbnail(:size => "200*200")
     imagepath = named_attachment_path(attachment, attachment.filename)
     if imagesize
       link_to image_tag(thumbnail_path(attachment), height: '73', width: '100'),

app/views/bids/_alert_anonyoms.html.erb

@@ -66,10 +66,10 @@
         </p>
     <% end %>
     <div class="ni_btn">
-      <a href="javascript:" class="tijiao" onclick="clickOK();" >
+      <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 20px;" >
         确&nbsp;&nbsp;定
       </a>
-      <a href="javascript:" class="tijiao" onclick="clickCanel();">
+      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">
         取&nbsp;&nbsp;消
       </a>
     </div>

app/views/bids/alert_anonymous_comment.js.erb

@@ -1,6 +1,6 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'alert_anonyoms', locals: { bid: @bid, totle_size:@totle_size, cur_size:@cur_size, percent:@percent}) %>');
 showModal('ajax-modal', '500px');
-$('#ajax-modal').css('height','180px');
+//$('#ajax-modal').css('height','180px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");

app/views/boards/_project_show.html.erb

@@ -1,12 +1,3 @@
-<script type="text/javascript" xmlns="http://www.w3.org/1999/html">
-    function submitProjectBoard()
-    {
-        if(regexSubject()&&regexContent())
-        {
-            $("#message-form").submit();
-        }
-    }
-</script>
 <div class="project_r_h">
   <h2 class="project_h2">
     <% if User.current.language == "zh"%>
@@ -16,20 +7,6 @@
     <% end %>
   </h2>
 </div>
-<div id="add-message" class="talk_new ml15" style="display:<%= !@flag.nil?&&@flag=='true' ? '' : 'none' %>;">
-  <% if User.current.logged? %>
-      <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
-          <p class="talk_top"><%= l(:project_module_boards_post) %></p>
-          <%= render :partial => 'messages/form_project', :locals => {:f => f} %>
-          <p>
-            <a href="javascript:void(0)" onclick="submitProjectBoard();" class="blue_btn fl ml55" style="margin-left: 55px"><%= l(:button_submit)%></a>
-            <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'grey_btn ml10 fl' %>
-          </p>
-      <% end %>
-      <div id="preview" class="wiki"></div>
-      <br/><br/>
-  <% end %>
-</div>
 
 <!--display the board-->
 <% if !User.current.logged? %>

app/views/files/_show_quote_resource_project.html.erb

@@ -1,6 +1,6 @@
 <div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
   <div class="upload_con">
-    <h2>将此文件件引入我的资源库</h2>
+    <h2>将此文件引入我的资源库</h2>
     <% if error == '403' %>
         <div class="upload_box">
           <div style="color: red;">您没有权限引用此资源</div>

app/views/layouts/_base_development_group.html.erb

@@ -23,7 +23,7 @@
             <a  class="subnav_num">(<%= @project.boards.first.topics.count %>)</a>
         <% end %>
         <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+            <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %>
         <% end %>
       </div>
   <% end%>

app/views/layouts/_base_friend_group.html.erb

@@ -12,7 +12,7 @@
             <a  class="subnav_num">(<%= @project.boards.first.topics.count %>)</a>
         <% end %>
         <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+            <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %>
         <% end %>
       </div>
   <% end%>

app/views/layouts/_base_research_team.html.erb

@@ -23,7 +23,7 @@
             <a  class="subnav_num">(<%= @project.boards.first.topics.count %>)</a>
         <% end %>
         <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+            <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %>
         <% end %>
       </div>
   <% end%>

app/views/layouts/_join_exit_project.html.erb

@@ -16,8 +16,8 @@
       <%= link_to "<span class='#{typeclass}'></span>#{text}".html_safe,"javascript:void(0)" ,:onClick => "show_window();", :class => "pr_join_a",:id => "setting_project_type"%>
   <% end %>
   <!--退出项目-->
-  <% if (User.current.member_of? @project) && User.current.login? &&
-     Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.first.to_s != "Manager" %>
+  <% if (User.current.member_of? @project) && User.current.login? && !User.current.admin &&
+     !Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.first.to_s.include?("Manager") %>
       <%= exit_project_link(@project) %>
   <% end %>
 

app/views/messages/_project_new_topic.html.erb

@@ -0,0 +1,28 @@
+<div class="project_r_h">
+  <h2 class="project_h2">
+    <% if User.current.language == "zh"%>
+        <%= h @board.name %>
+    <% else %>
+        <%= l(:project_module_boards) %>
+    <% end %>
+  </h2>
+</div>
+<div id="cancel-message" class="talk_new ml15">
+<% if User.current.logged? %>
+    <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
+          <p class="talk_top"><%= l(:project_module_boards_post) %></p>
+          <%= render :partial => 'messages/form_project', :locals => {:f => f} %>
+          <p>
+            <a href="javascript:void(0)" onclick="submitProjectBoard();" class="blue_btn fl ml55" style="margin-left: 55px"><%= l(:button_submit)%></a>
+            <%= link_to l(:button_cancel), project_boards_path(@project), :class => 'grey_btn ml10 fl' %>
+          </p>
+      <% end %>
+    <div id="preview" class="wiki"></div>
+    <br/><br/>
+<% else %>
+    <div class="c_grey f14">
+      <%= l(:label_user_login_project_board) %>
+      <%= link_to l(:label_user_login_new), signin_path, :class => "c_blue ml5" %>
+    </div>
+<% end %>
+</div>

app/views/messages/new.html.erb

@@ -1,16 +1,5 @@
 <% if @project %>
-    <h3>
-      <%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %>
-      &#187;
-      <%= l(:label_message_new) %>
-    </h3>
-    <%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
-        <%= render :partial => 'form', :locals => {:f => f,:is_new => true} %>
-        <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-        <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form' ,target='preview',{:class => 'whiteButton m3p10'} )%>
-    <% end %>
-
-    <div id="preview" class="wiki"></div>
+    <%= render :partial => 'project_new_topic' %>
 <% elsif @course %>
     <%= render :partial => 'course_new' %>
 <% end %>

app/views/projects/settings/_new_members.html.erb

@@ -18,19 +18,19 @@
             <li >
               <%= link_to_user_header member.principal,false,:class => "w140_h c_setting_blue fl" %>
               <span class="w180_h fl">
-        <%= h member.roles.sort.collect(&:to_s).join(', ') %>
-                <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
-                                      :method => :put,
-                                      :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
+              <%= h member.roles.sort.collect(&:to_s).join(', ') %>
+              <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
+                                :method => :put,
+                                :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
                     ) do |f| %>
-            <% roles.each do |role| %>
+              <% roles.each do |role| %>
                 <ul style="text-align: left;" >
                   <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                     :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
                   <label ><%= h role %></label>
                 </ul>
                 <!--<br/>-->
-            <% end %>
+              <% end %>
                     <%= hidden_field_tag 'membership[role_ids][]', '' %>
                     <div>
                       <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
@@ -41,7 +41,7 @@
                       </a>
                     </div>
         <% end %>
-      </span>
+              </span>
               <% unless member.user_id == @project.user_id %>
                   <a href="javascript:void(0) " class="c_setting_blue ml30 fl" onclick="$('#member-<%= member.id%>-roles-form').show();$(this).parent().height(110);">编辑</a>
                   <%= delete_link membership_path(member),

app/views/words/destroy.js.erb

@@ -1,7 +1,7 @@
 <% if @journal_destroyed.nil? %>
 	alert('<%=l(:notice_failed_delete)%>');
 <% elsif (['Principal','Project','Course', 'Bid', 'Contest', 'Softapplication'].include? @journal_destroyed.jour_type)%>
-  <% if @bid && @@jours_count %>
+  <% if @bid && @jours_count %>
     $('#jours_count').html("<%= @jours_count %>");
   <% elsif @course && @jours_count%>
     $('#course_jour_count').html("(<%= @jours_count %>)");

public/javascripts/project.js

@@ -306,4 +306,13 @@ $(document).ready(function () {
             $("pre").addClass("break_word");
         }
 
-    });
+    });
+
+//论坛提交
+function submitProjectBoard()
+{
+    if(regexSubject()&&regexContent())
+    {
+        $("#message-form").submit();
+    }
+}