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

app/controllers/issues_controller.rb

@@ -17,7 +17,6 @@
 
 class IssuesController < ApplicationController
   layout 'base_projects'#Added by young
-  menu_item :new_issue, :only => [:new, :create]
   default_search_scope :issues
 
   before_filter :find_issue, :only => [:show, :edit, :update]

app/views/account/register.html.erb

@@ -22,12 +22,12 @@
           <p><%= f.password_field :password, :size => 25, :required => true %>
             <em class="info" style="color: #acaeb1"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em>
           </p>
-          <p><%= f.password_field :password_confirmation, :size => 25, :required => true %><span id="valid_password"></span></p>
+          <p><%= f.password_field :password_confirmation, :size => 25, :required => true %><span id="valid_password" style="padding-left: 10px;"></span></p>
       <% end %>
 
       <p>
         <%= f.text_field :mail,:size => 25, :required => true %>
-        <span id="valid_user_mail"></span>
+        <span id="valid_user_mail" ></span>
       </p>
       <p>
         <em class="info" style="color: #acaeb1">

app/views/admin/search.html.erb

@@ -54,7 +54,7 @@
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="created_on" align="center" title='<%=format_time(user.created_on)%>'><%= format_time(user.created_on) %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="last_login_on" align="center" title='<%= format_time(user.last_login_on)%>'><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
               <td  class="buttons"> <%= change_status_link(user) %>
-                <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
+                <%= delete_link user_path(user, :back_url => admin_search_path(params)) unless User.current == user %> </td>
             </tr>
         <% end -%>
         </tbody>

app/views/issues/new.html.erb

@@ -41,9 +41,9 @@
     <% end %>
   </div>
 
-  <%= submit_tag l(:button_create) %>
+    <%= submit_tag l(:button_create), :class => "ButtonAddTags"%>
-  <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+    <%= submit_tag l(:button_create_and_continue), :class => 'ButtonAddTags' %>
-  <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form' %>
+    <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form','preview',{:class => "ButtonColor"}%>
 
   <%= javascript_tag "$('#issue_subject').focus();" %>
 <% end %>

app/views/tags/_tag.html.erb

@@ -76,8 +76,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 => "small" %>
+			<%= f.submit l(:button_project_tags_add),:class => "ButtonAddTags" %>
-			<%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();'%>
+            <%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();',:class=>'ButtonColor'%>
+
 			<% end %>
 		</div>
 <% end %>

public/stylesheets/application.css

@@ -1277,7 +1277,7 @@ input#openid_url { background: url(../images/openid-bg.gif) no-repeat; backgroun
 .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
 
 /***** Links *****/
-a, a:link, a:visited{ color: #169; text-decoration: none; }
+a, a:link, a:visited{ color: #169 ; text-decoration: none; }
 a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
 a img{ border: 0; }
 
@@ -1580,13 +1580,15 @@ form {display: inline;}
 /*added by bai*/
 input[type="submit"].bid_btn {
     padding-bottom: 5px;
-    width: 55px;
+    width: 50px;
     height: 25px;
+    text-align: center;
     font-family: '微软雅黑', Arial, Helvetica, sans-serif;
     font-size: 12px;
     color: #fff;
-    padding: 0px;
+    padding: 8px;
     background: #15bccf;
+    text-align: center;
     border-radius: 4px;
     border: 1px solid #15bccf;
     box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
@@ -1594,6 +1596,25 @@ input[type="submit"].bid_btn {
     cursor: pointer;
 }
 
+input[type="submit"].ButtonAddTags {
+    color: #fffbff ;
+    padding-bottom:5px ;
+    width:auto ;
+    height: 25px ;
+    font-family: '微软雅黑',Arial,Helvetica,sans-serif ;
+    font-size: 15px ;
+    font-weight: normal;
+    text-align: center ;
+    margin:0 auto;
+    border-radius: 0px !important;
+    background: #15bccf;
+    border: 0px solid #15bccf !important;
+    position: relative;
+    top:3px;
+
+
+}
+
 input[type="button"].bid_btn {
     /*padding-bottom: 5px;*/
     width: 55px;
@@ -1603,6 +1624,7 @@ input[type="button"].bid_btn {
     color: #fff;
     padding: 0px;
     background: #15bccf;
+    text-align: center;
     border-radius: 4px;
     border: 1px solid #15bccf;
     box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;

public/stylesheets/nyan.css

@@ -15,7 +15,7 @@ span[id^=valid_user] {
 }
 
 .red {
-    color: red;margin-left: 10px;margin-right: 10px;text-align: right;
+    color: red;margin-right: 10px;text-align: right;
 }
 
 .green {
@@ -475,19 +475,21 @@ body {
     top: 1px;
 }
 input[class~='ButtonClolr'],.ButtonColor{
+
     color: #fffbff !important;
-    padding-bottom: 5px;
+    padding: 5px;
-    width: 40px;
+    width: auto;
-    height: 20px;
+    height: 24px ;
     font-family: '微软雅黑',Arial,Helvetica,sans-serif;
     font-size: 15px;
-
+    text-align: center;
     padding: 0px;
-    background: #15bccf;
+    background: #15bccf !important;
-    border: 1px solid #15bccf;
+    border: 0px solid #15bccf ;
-
+    display:inline-block
 }
 
+
 input[class~='whiteButton'], .whiteButton {
     -moz-box-shadow: inset 0px 1px 0px 0px #ffffff;
     -webkit-box-shadow: inset 0px 1px 0px 0px #ffffff;
@@ -541,7 +543,6 @@ input[class~='m3p10'], .m3p10 {
     padding: 3px 10px;
     height: 20px;
     display: inline-block;
-    text-align: center;
     color: #ffffff;
 }
 
@@ -648,14 +649,14 @@ input[class='nyan-clean-gray']:active, .nyan-clean-gray:active {
 }
 
 .tools a:visited {
-    color: #116699;
+    color: #fffbff;
     text-decoration: none;
     padding: 3px 5px 0px 5px;
     width: 100px;
 }
 
 .tools a:hover {
-    color: white;
+    color: #fffbff;
     padding: 3px 3px 0px 20px;
     width: 88px;
     text-decoration: none;