Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/boards/_project_show.html.erb

@@ -18,8 +18,9 @@
       <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
           <%= render :partial => 'messages/form', :locals => {:f => f} %>
           <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 %>
       <div id="preview" class="wiki"></div>
   <% end %>

app/views/layouts/base_users.html.erb

@@ -30,6 +30,7 @@
               $.ajax({
               url: '<%= update_score_user_path(:format => 'js') %>',
               type: 'get',
+              beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
               data: 'id=<%= @user.id %>',
               remote: true
               }) ;

app/views/tags/_tag.html.erb

@@ -1,3 +1,9 @@
+<script type="text/javascript">
+    function formSubmit()
+    {
+        document.getElementById("tag_for_save").submit()
+    }
+</script>
 <div id="tags">
 	<%#begin
 	 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 :object_id,:value=> obj.id,: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 %>
 		</div>
 <% end %>

public/javascripts/application.js

@@ -457,7 +457,6 @@ function randomKey(size) {
 function updateIssueFrom(url) {
     $.ajax({
         url: url,
-        beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
         type: 'post',
         data: $('#issue-form').serialize()
     });
@@ -466,7 +465,6 @@ function updateIssueFrom(url) {
 function updateBulkEditFrom(url) {
     $.ajax({
         url: url,
-        beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
         type: 'post',
         data: $('#bulk_edit_form').serialize()
     });
@@ -545,7 +543,6 @@ function initMyPageSortable(list, url) {
             $.ajax({
                 url: url,
                 type: 'post',
-                beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
                 data: {'blocks': $.map($('#list-'+list).children(), function(el){return $(el).attr('id');})}
             });
         }

public/stylesheets/application.css

@@ -1580,7 +1580,7 @@ form {display: inline;}
 /*added by bai*/
 input[type="submit"].bid_btn {
     padding-bottom: 5px;
-    width: 50px;
+    width: auto;
     height: 25px;
     text-align: center;
     font-family: '微软雅黑', Arial, Helvetica, sans-serif;
@@ -1607,12 +1607,13 @@ input[type="submit"].ButtonAddTags {
     text-align: center ;
     margin:0 auto;
     border-radius: 0px !important;
-    background: #15bccf;
+    background: #15bccf ;
     border: 0px solid #15bccf !important;
     position: relative;
     top:3px;
 
 
+
 }
 
 input[type="button"].bid_btn {

public/stylesheets/nyan.css

@@ -483,7 +483,6 @@ input[class~='ButtonClolr'],.ButtonColor{
     font-family: '微软雅黑',Arial,Helvetica,sans-serif;
     font-size: 15px;
     text-align: center;
-    padding: 0px;
     background: #15bccf !important;
     border: 0px solid #15bccf ;
     display:inline-block
@@ -540,7 +539,7 @@ input[class~='whiteButton']:active, .whiteButton:active {
 
 input[class~='m3p10'], .m3p10 {
     margin: 0;
-    padding: 3px 10px;
+    padding: 3px 10px !important;
     height: 20px;
     display: inline-block;
     color: #ffffff;