From 92137b7bebb2b6f9c5225776e3f30d0e5dfab9e6 Mon Sep 17 00:00:00 2001
From: randx <dmitriy.zaporozhets@gmail.com>
Date: Thu, 30 Aug 2012 20:00:16 +0300
Subject: [PATCH] Removed class 'small' for some buttons. Fixed issue creation

---
 app/assets/stylesheets/sections/merge_requests.scss | 1 +
 app/controllers/issues_controller.rb                | 8 +++++++-
 app/views/admin/users/_form.html.haml               | 6 +++---
 app/views/issues/index.html.haml                    | 2 +-
 app/views/keys/index.html.haml                      | 2 +-
 app/views/merge_requests/index.html.haml            | 2 +-
 app/views/refs/_tree_item.html.haml                 | 2 +-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index 3a134531b48..73171915fcc 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -38,6 +38,7 @@
     background: #CEB;
 
     .accept_merge_request { 
+      font-size:13px;
       float:left;
     }
     .remove_branch_holder { 
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 889a7d98033..e90fad9c836 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -60,7 +60,13 @@ class IssuesController < ApplicationController
     @issue.save
 
     respond_to do |format|
-      format.html { redirect_to project_issue_path(@project, @issue) }
+      format.html do
+        if @issue.valid? 
+          redirect_to project_issue_path(@project, @issue)
+        else
+          render :new
+        end
+      end
       format.js
     end
   end
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 2014472375b..7010c2727c6 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -73,8 +73,8 @@
       .span6
       .span6
     .actions
-      = f.submit 'Save', class: "btn primary"
+      = f.submit 'Save', class: "btn save-btn"
       - if @admin_user.new_record?
-        = link_to 'Cancel', admin_users_path, class: "btn"
+        = link_to 'Cancel', admin_users_path, class: "btn cancel-btn"
       - else
-        = link_to 'Cancel', admin_user_path(@admin_user), class: "btn"
+        = link_to 'Cancel', admin_user_path(@admin_user), class: "btn cancel-btn"
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index a6836fd4fd1..010b8856d65 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -6,7 +6,7 @@
     .right
       .span5
         - if can? current_user, :write_issue, @project
-          = link_to new_project_issue_path(@project), class: "right btn small", title: "New Issue", remote: true do
+          = link_to new_project_issue_path(@project), class: "right btn", title: "New Issue", remote: true do
             %i.icon-plus
             New Issue
         = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right  do
diff --git a/app/views/keys/index.html.haml b/app/views/keys/index.html.haml
index 04e9e4cbc33..9b5663ed93e 100644
--- a/app/views/keys/index.html.haml
+++ b/app/views/keys/index.html.haml
@@ -1,6 +1,6 @@
 %h3.page_title
   SSH Keys
-  = link_to "Add new", new_key_path, class: "btn small right"
+  = link_to "Add new", new_key_path, class: "btn right"
 
 %hr
 %p.slead 
diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml
index 4ad6e5c18ce..e7a432510c3 100644
--- a/app/views/merge_requests/index.html.haml
+++ b/app/views/merge_requests/index.html.haml
@@ -1,7 +1,7 @@
 %h3.page_title
   Merge Requests
   - if can? current_user, :write_issue, @project
-    = link_to new_project_merge_request_path(@project), class: "right btn small", title: "New Merge Request" do
+    = link_to new_project_merge_request_path(@project), class: "right btn", title: "New Merge Request" do
       New Merge Request
 
 %br
diff --git a/app/views/refs/_tree_item.html.haml b/app/views/refs/_tree_item.html.haml
index 2e6bbf6221b..d4c4ee8de49 100644
--- a/app/views/refs/_tree_item.html.haml
+++ b/app/views/refs/_tree_item.html.haml
@@ -2,7 +2,7 @@
 %tr{ class: "tree-item #{tree_hex_class(content)}", url: tree_file_project_ref_path(@project, @ref, file) }
   %td.tree-item-file-name
     = tree_icon(content)
-    = link_to truncate(content.name, length: 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), remote: :true
+    %strong= link_to truncate(content.name, length: 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), remote: :true
   %td.tree_time_ago.cgray
     - if index == 1
       %span.log_loading