Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality

app/views/calendars/show.html.erb

@@ -1,4 +1,4 @@
-<div class="project_r_h">
+<div class="project_r_h" style="width:730px;">
   <h2 class="project_h2"><%= @query.new_record? ? l(:label_calendar) : h(@query.name) %></h2>
 </div>
 
@@ -40,3 +40,7 @@
 <% end %>
 
 <% html_title(l(:label_calendar)) -%>
+
+<script>
+  $("#RSide").css("width","730px");
+</script>

app/views/gantts/show.html.erb

@@ -1,4 +1,4 @@
-<div class="project_r_h">
+<div class="project_r_h" style="width:730px;">
   <h2 class="project_h2"><% @gantt.view = self %>
     <%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
 </div>
@@ -320,3 +320,7 @@
     $("#draw_progress_line").change(drawGanttHandler);
   });
 <% end %>
+
+<script>
+  $("#RSide").css("width","730px");
+</script>

app/views/projects/_history.html.erb

@@ -3,7 +3,7 @@
         <% for journal in journals %>
             <div class="ping_C" id='word_li_<%= journal.id.to_s %>'>
               <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %></div>
-              <div class="ping_discon" style="width: 610px;" onmouseover="$('#delete_reply_<%=journal.id %>').show();" onmouseout="$('#delete_reply_<%=journal.id %>').hide();">
+              <div class="ping_discon" style="width: 670px;" onmouseover="$('#delete_reply_<%=journal.id %>').show();" onmouseout="$('#delete_reply_<%=journal.id %>').hide();">
                 <div class="ping_distop f14">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span><%= link_to journal.user.show_name, user_path(journal.user), :class => 'c_blue fb fl mb10 f14', :target => "_blank" %>

app/views/projects/_project_jours.html.erb

@@ -15,7 +15,7 @@
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
 <% end %>
 
-<div class="msg_box" id='leave-message' nhname='new_message' style="height:auto;">
+<div class="msg_box" id='leave-message' nhname='new_message' style="height:auto; width:728px;">
   <% reply_allow = JournalsForMessage.create_by_user? User.current %>
   <h4><%= l(:label_user_response) %></h4>
   <% if !User.current.logged?%>
@@ -27,7 +27,7 @@
   <% else %>
       <%= form_for('new_form', :method => :post, :html => {:id => 'project_feedback_form', :multipart => true},
                    :url => {:controller => 'words', :action => 'leave_project_message'}) do |f|%>
-          <%= f.text_area 'project_message', :rows => 3, :cols => 65,
+          <%= f.text_area 'project_message', :rows => 3, :cols => 65, :style => "width:718px",
                           :placeholder => "#{l(:label_welcome_my_respond)}",:nhname=>'new_message_textarea' %>
           <p nhname="contentmsg"></p>
           <div class="fl mt10" style="padding-top:5px;" nhname="toolbar_container"></div>

app/views/projects/feedback.html.erb

@@ -1,4 +1,4 @@
-<div class="project_r_h">
+<div class="project_r_h" style="width:730px;">
   <h2 class="project_h2"><%= l(:label_project_tool_response)%></h2>
 </div>
 <% reply_allow = JournalsForMessage.create_by_user? User.current %>
@@ -48,3 +48,7 @@ function checkMaxLength() {
 </script>
 
 <% html_title(l(:label_project_tool_response)) -%>
+
+<script>
+  $("#RSide").css("width","730px");
+</script>

app/views/projects/settings.html.erb

@@ -16,15 +16,16 @@
           <% end%>
         <% end%>
         $("div[nhname='pro_setting']").show();
+        $("#RSide").css('width',"730px");
     });
 </script>
 
-<div class="project_r_h">
+<div class="project_r_h" style="width:730px;">
   <h2 class="project_h2">配置</h2>
 </div>
 
 <!--通过admin界面配置，不同角色显示不同的模块-->
-<div class=" pro_setting" nhname="pro_setting" style="display:none;">
+<div nhname="pro_setting" style="display:none; width:730px;">
   <div id="pro_st_tb_" class="pro_st_tb_">
     <ul>
       <% show_memu = show_project_memu User.current%>

app/views/repositories/changes.html.erb

@@ -1,6 +1,6 @@
 <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
 
-<div class="project_r_h">
+<div class="project_r_h" style="width:730px;">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
 </div>
 
@@ -23,3 +23,7 @@
 <% end %>
 
 <% html_title(l(:label_change_plural)) -%>
+
+<script>
+  $("#RSide").css("width","730px");
+</script>

app/views/repositories/show.html.erb

@@ -1,5 +1,5 @@
 <%#= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
-<div class="project_r_h">
+<div class="project_r_h" style="width:730px;">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
   <% unless @entries.nil? %>
       <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
@@ -48,7 +48,7 @@
       <% end %>
       <div class="cl"></div>
 
-      <div class="recordBanner mt10">
+      <div class="recordBanner mt10" style="width:730px;">
         <% if @changesets && !@changesets.empty? %>
             <% if !user_commit_rep(@changesets_latest_coimmit.author_email).nil? %>
                 <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
@@ -91,3 +91,7 @@
 <%# end %>
 
 <% html_title(l(:label_repository)) -%>
+
+<script>
+  $("#RSide").css("width","730px");
+</script>

app/views/versions/index.html.erb

@@ -1,4 +1,4 @@
-<div class="project_r_h">
+<div class="project_r_h" style="width:730px;">
   <h2 class="project_h2"><%= l(:label_roadmap) %></h2>
 </div>
 <div class="roadmap">
@@ -24,7 +24,7 @@
   <% else %>
       <% @versions.each do |version| %>
 
-          <div class="roadmap_box">
+          <div class="roadmap_box" style="width:710px;">
             <p><a href="javascript:void(0)" class=" f16 fb c_dblue " target="_blank">
               <a href="javascript:void(0)" class=" f16 fb c_dblue " target="_blank"><%= version_anchor(version)%></a>
               <%#= link_to_version_show version, :name => version_anchor(version) %>
@@ -72,3 +72,7 @@
 <% html_title(l(:label_roadmap)) %>
 
 <%= context_menu issues_context_menu_path %>
+
+<script>
+  $("#RSide").css("width","730px");
+</script>

app/views/words/_journal_reply_items.html.erb

@@ -11,7 +11,7 @@
             <%= image_tag url_to_avatar(nil),:width => '30',:height => '30' %>
         <% end %>
       </div>
-      <div class="recall_con f14">
+      <div class="recall_con f14" style="width:650px;">
         <% id = 'project_respond_form_'+ reply.id.to_s %>
         <%= link_to reply.user.show_name, user_path(reply.user) %>
         <%= l(:label_reply_to)%>