From b222b7a8ede13888841009f34ef5c94c8bc80345 Mon Sep 17 00:00:00 2001 From: zhuhao Date: Mon, 24 Nov 2014 09:21:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E8=AE=A8?= =?UTF-8?q?=E8=AE=BA=E5=8C=BA=E5=8F=91=E5=B8=96=E6=8C=89=E9=92=AE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/boards/_project_show.html.erb | 5 +++-- app/views/tags/_tag.html.erb | 5 +++-- public/stylesheets/application.css | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index 8128797c0..81b1f6a8f 100644 --- a/app/views/boards/_project_show.html.erb +++ b/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} %>

- - <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'whiteButton m3p10' %>

+ + <%= l(:button_submit)%> + <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'ButtonColor m3p10' %>

<% end %>
<% end %> diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb index 63592d91a..c0217c925 100644 --- a/app/views/tags/_tag.html.erb +++ b/app/views/tags/_tag.html.erb @@ -1,3 +1,4 @@ +
<%#begin 1 代表是user类型 @@ -76,9 +77,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 => "ButtonAddTags" %> + <%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();',:class=>'ButtonColor'%> - <% end %>
<% end %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1b1580d8c..140b8e5d3 100644 --- a/public/stylesheets/application.css +++ b/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 { From 6b98c2995a16b573c42dcc74ffeb54ff81258c63 Mon Sep 17 00:00:00 2001 From: zhuhao Date: Mon, 24 Nov 2014 15:27:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/tags/_tag.html.erb | 13 +++++++++---- public/stylesheets/nyan.css | 3 +-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb index c0217c925..c0ecf5c84 100644 --- a/app/views/tags/_tag.html.erb +++ b/app/views/tags/_tag.html.erb @@ -1,4 +1,9 @@ - +
<%#begin 1 代表是user类型 @@ -77,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" %> - - <%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();',:class=>'ButtonColor'%> + + <%= l(:button_project_tags_add)%> + <%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();',:class=>'ButtonColor m3p10'%> <% end %>
<% end %> diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index 1ef7c8dd7..bdec84b4c 100644 --- a/public/stylesheets/nyan.css +++ b/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; From 636320878147b9cd55f52bad2e2eeef1c9a4ec89 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Mon, 24 Nov 2014 15:29:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9base=5Fuser=20Signed-off-?= =?UTF-8?q?by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users.html.erb | 1 + public/javascripts/application.js | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 1e0811039..32c4c3755 100644 --- a/app/views/layouts/base_users.html.erb +++ b/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 }) ; diff --git a/public/javascripts/application.js b/public/javascripts/application.js index fcc2455f9..2fb50528f 100644 --- a/public/javascripts/application.js +++ b/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');})} }); }