Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
This commit is contained in:
commit
45c234bf9c
|
@ -32,7 +32,6 @@
|
||||||
<%= f.text_field :subject,
|
<%= f.text_field :subject,
|
||||||
:class => "w583",
|
:class => "w583",
|
||||||
:maxlength => 255,
|
:maxlength => 255,
|
||||||
:required => true,
|
|
||||||
:style => "font-size:small",
|
:style => "font-size:small",
|
||||||
:no_label => true
|
:no_label => true
|
||||||
%>
|
%>
|
||||||
|
|
|
@ -4,45 +4,46 @@
|
||||||
<%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
|
<%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
|
||||||
|
|
||||||
<%= labelled_form_for @issue, :url => project_issues_path(@project),
|
<%= labelled_form_for @issue, :url => project_issues_path(@project),
|
||||||
:html => {:id => 'issue-form', :multipart => true} do |f| %>
|
:html => {:id => 'issue-form', :multipart => true} do |f| %>
|
||||||
<%= error_messages_for 'issue' %>
|
<%= error_messages_for 'issue' %>
|
||||||
<%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %>
|
<%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %>
|
||||||
<div>
|
<div>
|
||||||
<%= render :partial => 'issues/form', :locals => {:f => f} %>
|
<%= render :partial => 'issues/form', :locals => {:f => f} %>
|
||||||
</div>
|
</div>
|
||||||
<div class="newpro_box02 ">
|
<div class="newpro_box02 ">
|
||||||
<% if @issue.safe_attribute? 'watcher_user_ids' -%>
|
<% if @issue.safe_attribute? 'watcher_user_ids' -%>
|
||||||
<div>
|
<div>
|
||||||
<label class="label" > <%= l(:label_issue_watchers) %>:</label>
|
<label class="label"> <%= l(:label_issue_watchers) %>:</label>
|
||||||
<input id="" name="" size="22" class="fl mb10 h26" type="text" placeholder="搜索添加跟踪者" >
|
<input id="" name="" size="22" class="fl mb10 h26" type="text" placeholder="搜索添加跟踪者">
|
||||||
<span class="search_for_watchers">
|
<span class="search_for_watchers">
|
||||||
<%= link_to "",
|
<%= link_to "",
|
||||||
{:controller => 'watchers', :action => 'new', :project_id => @issue.project},
|
{:controller => 'watchers', :action => 'new', :project_id => @issue.project},
|
||||||
:remote => true,
|
:remote => true,
|
||||||
:method => 'get',
|
:method => 'get',
|
||||||
:class=>"pic_sch mt5 ml5" %>
|
:class => "pic_sch mt5 ml5" %>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<%= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user=> @available_watchers, :format => 'js',:flag => 'ture') }')" %>
|
<%= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user => @available_watchers, :format => 'js', :flag => 'ture') }')" %>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<span id="watchers_inputs">
|
<span id="watchers_inputs">
|
||||||
<%= watchers_checkboxes(@issue, @available_watchers) %>
|
<%= watchers_checkboxes(@issue, @available_watchers) %>
|
||||||
</span>
|
</span>
|
||||||
<div class="cl"></div>
|
|
||||||
<div id="watchers_inputs">
|
|
||||||
|
|
||||||
</div>
|
<div class="cl"></div>
|
||||||
<div class="cl"></div>
|
<div id="watchers_inputs">
|
||||||
|
|
||||||
</ul>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<% end %>
|
|
||||||
<a href="#" class="blue_btn fl ml80" onclick="$('#issue-form').submit();">
|
|
||||||
<%= l(:button_create)%>
|
|
||||||
</a>
|
|
||||||
<%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form','preview',{:class => "blue_btn fl ml10"}%>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
</ul>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<% end %>
|
||||||
|
<a href="#" class="blue_btn fl ml80" onclick="$('#issue-form').submit();">
|
||||||
|
<%= l(:button_create) %>
|
||||||
|
</a>
|
||||||
|
<%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %>
|
||||||
|
</div>
|
||||||
|
<!--<%= javascript_tag "$('#issue_subject').focus();" %>-->
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<div id="preview" class="wiki"></div>
|
<div id="preview" class="wiki"></div>
|
||||||
|
|
Loading…
Reference in New Issue