diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb index cc3fbe1a1..7e86b098b 100644 --- a/app/views/attachments/_form.html.erb +++ b/app/views/attachments/_form.html.erb @@ -49,7 +49,7 @@ <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %> - <%= button_tag "文件浏览", :class => 'sub_btn', :type => "button", :onclick => "_file.click()", :onmouseover => 'this.focus()', :style => ie8? ? 'display:none' : '' %> + <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %> <%= file_field_tag 'attachments[dummy][file]', :id => '_file', :class => 'file_selector', diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb index 52e487f08..4b23897d3 100644 --- a/app/views/issues/_action_menu.html.erb +++ b/app/views/issues/_action_menu.html.erb @@ -4,7 +4,7 @@ <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %> <% if (@issue.author == User.current) || (User.current.admin?) %> - <%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? %> + <%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("all_attributes", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? %> <% else %> <%= link_to l(:label_user_newfeedback), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? %> <% end %> \ No newline at end of file diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index a6afea438..14e2d0201 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -3,11 +3,11 @@ <%= render :partial => 'conflict' if @conflict %> <% if @edit_allowed || !@allowed_statuses.empty? %> -
+ <% end %> - +
<% if @journals.present? %> diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index 81da316b7..ddabbd89e 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -91,7 +91,6 @@ <%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
-
<%= render :partial => 'issues/attributes' %>
@@ -108,9 +107,9 @@ <%= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user => @available_watchers, :format => 'js', :flag => 'ture') }')" %>
- + <%= watchers_checkboxes(@issue, @available_watchers) %> - +
<%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %> diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb index 13b0c09f0..9bd068fcd 100644 --- a/app/views/issues/new.html.erb +++ b/app/views/issues/new.html.erb @@ -10,36 +10,6 @@
<%= render :partial => 'issues/form', :locals => {:f => f} %>
-
- <% if @issue.safe_attribute? 'watcher_user_ids' -%> -
- - - - <%= link_to "", - {:controller => 'watchers', :action => 'new', :project_id => @issue.project}, - :remote => true, - :method => 'get', - :class => "pic_sch mt5 ml5" %> - -
- <%= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user => @available_watchers, :format => 'js', :flag => 'ture') }')" %> -
- - <%= watchers_checkboxes(@issue, @available_watchers) %> - - -
-
-
-
-
- <% end %> - - <%= l(:button_create) %> - - <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %> -
<% end %> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index ac63fdaa8..175ba23c0 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -99,8 +99,8 @@ <%= l(:label_search)%> -
- +
+ <% end %> diff --git a/public/javascripts/project.js b/public/javascripts/project.js index 1f3117a06..f1b696ce5 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -1,8 +1,8 @@ //验证搜索时输入字 -function regexName() { +function regexName(content) { var name = $.trim($("#name").val()); if (name.length == 0) { - $("#project_name_span").text("<%= l(:label_search_conditions_not_null) %>"); + $("#project_name_span").text(content); $("#project_name_span").css('color', '#ff0000'); $("#project_name_span").focus(); return false; @@ -13,6 +13,12 @@ function regexName() { } } +function submitSerch(content) +{ + if(regexName(content)){$("#project_search_form").submit();} +} + + // 项目描述超过展开 //$(function(){ // $(".subNav").click(function(){ @@ -202,3 +208,11 @@ $(document).ready(function(){ // $(".jstEditor").css("margin-left ","80px"); //issue_project_id }); + +function showAndScrollTo(id, focus) { + $('#'+id).show(); + if (focus !== null) { + $('#'+focus).focus(); + } + $('html, body').animate({scrollTop: $('#'+id).offset().top}, 400); +} \ No newline at end of file diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 9d6e00c6f..bfe2a6f02 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -203,7 +203,7 @@ a:hover.ping_sub{ background:#14a8b9;} .ping_hovertab { color:#656767; font-weight:bold; border-bottom:3px solid #15bccf; } .ping_dis{display:block; } .ping_undis{display:none;} -.ping_C{border-bottom:1px dashed #CCC; padding:10px 0 0px;} +.ping_C{border-bottom:1px dashed #CCC; padding:10px 0 10px;} .ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;} .ping_dispic a:hover{border:1px solid #15bccf;} .ping_discon{ float:left; width:610px; margin-left:10px; } @@ -328,7 +328,7 @@ a:hover.st_add{ color:#ff8e15;} .newpro_box ul li{ } .newpro_box input{ height:26px; float:left; margin-bottom:10px;} .newpro_box textarea{ height:150px; float:left; margin-bottom:10px;} -.newpro_box select{ height:26px; float:left; margin-bottom:10px;} +.newpro_box select{ height:29px; float:left; margin-bottom:10px;} .label{ width:80px; text-align:right; font-size:14 background-image: url(../images/true.png); } .icon-reload { background-image: url(../images/reload.png); } .icon {