Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit.

app/assets/stylesheets/common.scss

@@ -294,13 +294,7 @@ nav.main_menu {
   @include shade;
   .count { 
     margin-left:3px;
-    color: #332;
+    color: #aaa;
-    background: white;
-    padding: 1px 6px 2px;
-    font-weight: bold;
-    -webkit-border-radius: 9px;
-    -moz-border-radius: 9px;
-    border-radius: 9px;
   }
   .label { 
     background:$hover;
@@ -351,8 +345,8 @@ nav.main_menu {
 
 img.avatar { 
   float:left;
-  margin-right:10px;
+  margin-right:15px;
-  width:35px;
+  width:40px;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -378,7 +372,7 @@ img.lil_av {
 
 .wll { 
   background-color: #FFF;
-  padding: 6px 10px;
+  padding: 10px 5px;
   min-height: 20px;
   border-bottom: 1px solid #eee;
   border-bottom: 1px solid rgba(0, 0, 0, 0.05);
@@ -1004,21 +998,8 @@ p.time {
   margin: 2px;
 }
 
-/* Issues Changed */
+/* Fix for readme code (stopped it from being yellow) */
-/* Could probably rewrite this, a bit sloppy */
+.readme {
-.well {
-  .issue_status.span2 {
-    width:116px;
-    
-    .alert-message {
-      width:34px;
-      margin: 0 0 0 auto;
-      
-      .error {
-        width: 40px;
-      }
-    }
-  }
   pre {
     background: white !important;
     
@@ -1028,8 +1009,13 @@ p.time {
   }
 }
 
-/* Fix for readme code (stopped it from being yellow) */
+.issue_box, 
-.readme {
+.merge_request_box{ 
+  @extend .padded;
+  @extend .borders;
+  @extend .prepend-top-20;
+  @extend .append-bottom-20;
+
   pre {
     background: white !important;
     
@@ -1089,7 +1075,7 @@ p.time {
   }
 }
 
-.issue_notes {
+.new_note {
   .input-file {
     font: 500px monospace;
     opacity:0;

app/assets/stylesheets/tree.scss

@@ -175,5 +175,6 @@
     float: left;
     position: relative;
     left: -10px;
+    padding:0;
   }
 }

app/controllers/issues_controller.rb

@@ -80,7 +80,13 @@ class IssuesController < ApplicationController
 
     respond_to do |format|
       format.js
-      format.html { redirect_to [@project, @issue]}
+      format.html do 
+        if @issue.valid?
+          redirect_to [@project, @issue]
+        else
+          render :edit
+        end
+      end
     end
   end
 

app/models/issue.rb

@@ -26,7 +26,6 @@ class Issue < ActiveRecord::Base
             :length   => { :within => 0..255 }
             
   validates :description,
-            :presence => true,
             :length   => { :within => 0..2000 }
 
   scope :critical, where(:critical => true)

app/views/issues/_form.html.haml

@@ -10,7 +10,7 @@
 
     .clearfix
       = f.label :title, "Issue Subject"
-      .input= f.text_field :title, :maxlength => 255
+      .input= f.text_field :title, :maxlength => 255, :class => "xxlarge"
       
     .clearfix
       = f.label :description, "Issue Details"

app/views/issues/show.html.haml

@@ -1,9 +1,5 @@
-.back_link
-= link_to project_issues_path(@project) do 
-  ← To issues list
-
 %h3
-  #{@issue.title}
+  Issue ##{@issue.id}
   %small
     created at 
     = @issue.created_at.stamp("Aug 21, 2011")
@@ -22,11 +18,21 @@
     - if @issue.upvotes > 0
       .upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}"
 
+.back_link
+  = link_to project_issues_path(@project) do 
+    ← To issues list
+
+.issue_box
+  .merge_request_status_holder
+    %h5
+      - if @issue.closed
+        .alert-message.error.status_info Closed
+      - else 
+        .alert-message.success.status_info Open
+      = @issue.title
 
   %hr
-
+  %div
-
-%div.well
     %div.row
       %div.issue_meta.span13
         %cite.cgray Created by
@@ -37,16 +43,9 @@
         = image_tag gravatar_icon(@issue.assignee_email), :width => 16, :class => "lil_av"
         %strong.author= link_to_issue_assignee(@issue)
       
-    %div.issue_status.span2
-      - if @issue.closed
-        .alert-message.error Closed
-      - else 
-        .alert-message.success Open
-
-  %hr
-    
     %div
-    - if @project.description.present?
+      - if @issue.description
+        %hr
         = markdown @issue.description
 
 

app/views/merge_requests/show.html.haml

@@ -17,15 +17,18 @@
           Edit
 
         %br
+        %small= link_to "Show how to merge", "#", :class => "vlink how_to_merge_link", :title => "How To Merge"
+    %br
     - if @merge_request.upvotes > 0
       .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
 
+= render "merge_requests/how_to_merge"
 .back_link
   = link_to project_merge_requests_path(@project) do 
     ← To merge requests
 
 
-%hr
+.merge_request_box
   .merge_request_status_holder
     - if @merge_request.closed
       %h5
@@ -42,11 +45,10 @@
     - else 
       %h5
         .alert-message.success.status_info Open
-      = link_to "How to merge", "#", :class => "vlink how_to_merge_link", :title => "How To Merge"
+        = @merge_request.title
 
-= render "merge_requests/how_to_merge"
 
-%div.well.prettyprint
+  %div
     %div
       %cite.cgray Created by
       = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
@@ -56,11 +58,8 @@
       = image_tag gravatar_icon(@merge_request.assignee_email), :width => 16, :class => "lil_av"
       %strong.author= link_to_merge_request_assignee(@merge_request)
       
-    %hr
 
 
-  %div= simple_format @merge_request.title
-
 = render "merge_requests/commits"
 
 - unless @commits.empty?

app/views/notes/_form.html.haml

@@ -25,9 +25,9 @@
     .span8
       %h5 Attachment:
       .clearfix
-        .attachments.breadcrumb
+        .attachments.entry
           %div.file_name File name...
-          %button.file_upload.btn.primary Upload File
+          %button.file_upload.btn.primary.small Upload File
           .input= f.file_field :attachment, :class => "input-file"
         %span Any file less then 10 MB
 

db/schema.rb

@@ -27,7 +27,6 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
 
   create_table "issues", :force => true do |t|
     t.string   "title"
-    t.text     "description"
     t.integer  "assignee_id"
     t.integer  "author_id"
     t.integer  "project_id"
@@ -37,6 +36,7 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
     t.integer  "position",    :default => 0
     t.boolean  "critical",    :default => false, :null => false
     t.string   "branch_name"
+    t.text     "description"
   end
 
   add_index "issues", ["project_id"], :name => "index_issues_on_project_id"