Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
This commit is contained in:
commit
c4e64f29da
|
@ -18,8 +18,9 @@
|
||||||
<%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
|
<%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
|
||||||
<%= render :partial => 'messages/form', :locals => {:f => f} %>
|
<%= render :partial => 'messages/form', :locals => {:f => f} %>
|
||||||
<p>
|
<p>
|
||||||
<input type="button" onclick="submitProjectBoard();" class = "whiteButton m3p10 h30" value="<%= l(:button_submit)%>">
|
<!--<input type="button" onclick="submitProjectBoard();" class = "ButtonColor m3p10" value="<%= l(:button_submit)%>">-->
|
||||||
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'whiteButton m3p10' %></p>
|
<a herf="#" onclick="submitProjectBoard();" class="ButtonColor m3p10"><%= l(:button_submit)%></a>
|
||||||
|
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'ButtonColor m3p10' %></p>
|
||||||
<% end %>
|
<% end %>
|
||||||
<div id="preview" class="wiki"></div>
|
<div id="preview" class="wiki"></div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -1,3 +1,9 @@
|
||||||
|
<script type="text/javascript">
|
||||||
|
function formSubmit()
|
||||||
|
{
|
||||||
|
document.getElementById("tag_for_save").submit()
|
||||||
|
}
|
||||||
|
</script>
|
||||||
<div id="tags">
|
<div id="tags">
|
||||||
<%#begin
|
<%#begin
|
||||||
1 代表是user类型
|
1 代表是user类型
|
||||||
|
@ -76,9 +82,9 @@
|
||||||
<%= f.text_field :name ,:id => "tags_name",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length %>
|
<%= f.text_field :name ,:id => "tags_name",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length %>
|
||||||
<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
|
<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
|
||||||
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
|
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
|
||||||
<%= f.submit l(:button_project_tags_add),:class => "ButtonAddTags" %>
|
<!--<%#= f.submit l(:button_project_tags_add),:class => "ButtonColor m3p10" %>-->
|
||||||
<%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();',:class=>'ButtonColor'%>
|
<a href="#" onclick='$("form").submit()' class="ButtonColor m3p10" ><%= l(:button_project_tags_add)%></a>
|
||||||
|
<%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();',:class=>'ButtonColor m3p10'%>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -1580,7 +1580,7 @@ form {display: inline;}
|
||||||
/*added by bai*/
|
/*added by bai*/
|
||||||
input[type="submit"].bid_btn {
|
input[type="submit"].bid_btn {
|
||||||
padding-bottom: 5px;
|
padding-bottom: 5px;
|
||||||
width: 50px;
|
width: auto;
|
||||||
height: 25px;
|
height: 25px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-family: '微软雅黑', Arial, Helvetica, sans-serif;
|
font-family: '微软雅黑', Arial, Helvetica, sans-serif;
|
||||||
|
@ -1607,12 +1607,13 @@ input[type="submit"].ButtonAddTags {
|
||||||
text-align: center ;
|
text-align: center ;
|
||||||
margin:0 auto;
|
margin:0 auto;
|
||||||
border-radius: 0px !important;
|
border-radius: 0px !important;
|
||||||
background: #15bccf;
|
background: #15bccf ;
|
||||||
border: 0px solid #15bccf !important;
|
border: 0px solid #15bccf !important;
|
||||||
position: relative;
|
position: relative;
|
||||||
top:3px;
|
top:3px;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type="button"].bid_btn {
|
input[type="button"].bid_btn {
|
||||||
|
|
|
@ -483,7 +483,6 @@ input[class~='ButtonClolr'],.ButtonColor{
|
||||||
font-family: '微软雅黑',Arial,Helvetica,sans-serif;
|
font-family: '微软雅黑',Arial,Helvetica,sans-serif;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 0px;
|
|
||||||
background: #15bccf !important;
|
background: #15bccf !important;
|
||||||
border: 0px solid #15bccf ;
|
border: 0px solid #15bccf ;
|
||||||
display:inline-block
|
display:inline-block
|
||||||
|
@ -540,7 +539,7 @@ input[class~='whiteButton']:active, .whiteButton:active {
|
||||||
|
|
||||||
input[class~='m3p10'], .m3p10 {
|
input[class~='m3p10'], .m3p10 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 3px 10px;
|
padding: 3px 10px !important;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
|
|
Loading…
Reference in New Issue