Merge branch 'dev'

gitlabhq
2 parents 0d4128bf 49bced3a
Showing 23 changed files with 194 additions and 142 deletions Show diff stats
app/assets/javascripts/note.js
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/style.scss
app/controllers/issues_controller.rb
app/helpers/issues_helper.rb
app/views/admin/users/_form.html.haml
app/views/admin/users/index.html.haml
app/views/issues/_form.html.haml
app/views/issues/_issues.html.haml
app/views/issues/_show.html.haml
app/views/issues/create.js.haml
app/views/issues/index.html.haml
app/views/issues/index.js.haml
app/views/keys/_form.html.haml
app/views/notes/_form.html.haml
app/views/profile/password.html.haml
app/views/profile/show.html.haml
app/views/projects/_form.html.haml
app/views/projects/new.html.erb
app/views/projects/new.html.haml
@@ -42,8 +42,10 @@ replace:
  
 prepend:
   function(id, html) {
-    this.last_id = id;
-    $("#notes-list").prepend(html);
+    if(id != this.last_id) { 
+      this.last_id = id;
+      $("#notes-list").prepend(html);
+    }
   },
  
 getNew:
@@ -276,6 +276,9 @@ input.ssh_project_url {
 /** FORM INPUTS **/
  
 .user_new,
+.new_key,
+.new_issue,
+.new_note,
 .edit_user,
 .new_project,
 .new_snippet,
@@ -676,6 +679,30 @@ body.project-page table .commit {
   }
 }
  
+#notes-list .note .delete-note { display:none; }
+#notes-list .note:hover .delete-note { display:block; }
+
+#issues-table-holder .issue .action-links {
+  display:none; 
+  a { 
+    margin-left:10px;
+  }
+}
+  
+.issue-number {
+  float: left;
+  border-radius: 5px;
+  text-shadow: none;
+  background: rgba(0, 0, 0, 0.12);
+  text-align: center;
+  padding: 14px 8px;
+  width: 40px;
+  margin-right: 10px;
+  color: #444;
+}
+
+#issues-table-holder .issue:hover .action-links { display:block; }
+
 body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
 body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
 body.project-page #notes-list .note img{float: left; margin-right: 10px;}
@@ -683,3 +710,14 @@ body.project-page #notes-list .note span.note-title{display: block;}
 body.project-page #notes-list .note span.note-title{margin-bottom: 10px}
 body.project-page #notes-list .note span.note-author{color: #999; font-weight: normal; font-style: italic;}
 body.project-page #notes-list .note span.note-author strong{font-weight: bold; font-style: normal;}
+
+
+/** NEW PROJECT **/
+.new-project-hodler { 
+  .icon span { 
+    background-position: -31px -70px;
+  }
+  td {
+    border-bottom: 1px solid #DEE2E3;
+  }
+}
@@ -87,6 +87,17 @@ h2{margin: 1.5em 0}
 /* Forms */
 input[type="text"]:focus, input[type="password"]:focus {  outline: none; }
 input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: 10px}
+
+.form-row{
+	padding: 0px 0px 10px 0px;	
+}
+
+.form-row label{
+	font-weight:bold;
+	display: inline-block;
+	padding: 0px 0px 5px 0px;
+}
+
 /* eo Forms */
  
 /* Tables */
@@ -47,6 +47,7 @@ class IssuesController &lt; ApplicationController
   def create
     @issue = @project.issues.new(params[:issue])
     @issue.author = current_user
+
     if @issue.save && @issue.assignee != current_user
       Notify.new_issue_email(@issue).deliver
     end
 module IssuesHelper
+  def sort_class
+    if can?(current_user, :admin_issue, @project) && (!params[:f] || params[:f] == "0")
+      "handle"
+    end
+  end
 end
@@ -7,44 +7,42 @@
           - @admin_user.errors.full_messages.each do |msg|
             %li= msg
  
-    .span-24
-      .span-11.colborder
-        .field
-          = f.label :name
-          %br
-          = f.text_field :name
-        .field
-          = f.label :email
-          %br
-          = f.text_field :email
-        .field
-          = f.label :password
-          %br
-          = f.password_field :password
-        .field
-          = f.label :password_confirmation
-          %br
-          = f.password_field :password_confirmation
-        .field.prepend-top
-          = f.check_box :admin
-          = f.label :admin
-      .span-11
-        .field.prepend-top
-          = f.text_field :projects_limit, :class => "small_input"
-          = f.label :projects_limit
+    .form-row
+      = f.label :name
+      %br
+      = f.text_field :name
+    .form-row
+      = f.label :email
+      %br
+      = f.text_field :email
+    .form-row
+      = f.label :password
+      %br
+      = f.password_field :password
+    .form-row
+      = f.label :password_confirmation
+      %br
+      = f.password_field :password_confirmation
+    .form-row
+      = f.check_box :admin
+      = f.label :admin
  
-        .field
-          = f.label :skype
-          %br
-          = f.text_field :skype
-        .field
-          = f.label :linkedin
-          %br
-          = f.text_field :linkedin
-        .field
-          = f.label :twitter
-          %br
-          = f.text_field :twitter
+    .form-row
+      = f.text_field :projects_limit, :class => "small_input"
+      = f.label :projects_limit
+
+    .form-row
+      = f.label :skype
+      %br
+      = f.text_field :skype
+    .form-row
+      = f.label :linkedin
+      %br
+      = f.text_field :linkedin
+    .form-row
+      = f.label :twitter
+      %br
+      = f.text_field :twitter
     .clear
     %br
     .actions
@@ -21,4 +21,5 @@
 %br
  
 = paginate @admin_users
+
 = link_to 'New User', new_admin_user_path
@@ -5,24 +5,21 @@
         - @issue.errors.full_messages.each do |msg|
           %li= msg
  
-    .span-8
+    .form-row
       = f.label :title
       = f.text_area :title, :style => "width:450px; height:100px", :maxlength => 255
-    -#.span-8
-      -#= f.label :content
-      -#= f.text_area :content, :style => "width:450px; height:130px"
-    .span-8.append-bottom
+    .form-row
       = f.label :assignee_id
       = f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
-    .span-1
+    .form-row
       = f.label :critical, "Critical"
       %br
       = f.check_box :critical
     - unless @issue.new_record?
-      .span-2.right
+      .form-row
         = f.label :closed
         %br
         = f.check_box :closed
     %hr
-    .span-6
+    .form-row
       = f.submit 'Save', :class => "lbutton vm"
-%table.round-borders#issues-table
-  %thead
-    - if can?(current_user, :admin_issue, @project) && !params[:f] || params[:f] == "0"
-      %th
-    %th Assignee
-    %th ID
-    %th Title
-    %th Closed?
+- @issues.critical.each do |issue|
+  = render(:partial => 'show', :locals => {:issue => issue})
  
-  - @issues.critical.each do |issue|
-    = render(:partial => 'show', :locals => {:issue => issue})
-
-  - @issues.non_critical.each do |issue|
-    = render(:partial => 'show', :locals => {:issue => issue})
+- @issues.non_critical.each do |issue|
+  = render(:partial => 'show', :locals => {:issue => issue})
 %tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(@project, issue) }
-  - if can?(current_user, :admin_issue, @project) && (!params[:f] || params[:f] == "0")
-    %td
-      = image_tag "move.png" , :class => [:handle, :left]
   %td
-    = image_tag gravatar_icon(issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
-    = issue.assignee.name
-  %td ##{issue.id}
-  %td
-    = truncate(html_escape(issue.title), :length => 200)
+    %strong.issue-number{:class => sort_class}= "##{issue.id}"
+    %span
+      = truncate(html_escape(issue.title), :length => fixed_mode? ? 100 : 200)
     %br
     %br
-    - if issue.critical
-      %span.tag.high critical
-    - if issue.today?
-      %span.tag.today today
-
-    .right
-      - if can?(current_user, :admin_issue, @project) || issue.author == current_user
-        = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray", :remote => true
-      - if can?(current_user, :admin_issue, @project) || issue.author == current_user
-        &nbsp;
-        = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}"
-
-    -#- if issue.author == current_user
-      -#%span.tag.yours yours
-    -#- if issue.notes.count > 0
-      -#%span.tag.notes
-        -#= issue.notes.count
-        -#notes
-  %td
-    - if can? current_user, :write_issue, @project
-      = form_for([@project, issue], :remote => true) do |f|
-        = f.check_box :closed, :onclick => "$(this).parent().submit();"
-        = hidden_field_tag :status_only, true
-    - else
-      = check_box_tag "closed", 1, issue.closed, :disabled => true
+    %div.note-author
+      %strong= issue.assignee.name
+      %cite.cgray
+        = time_ago_in_words(issue.updated_at)
+        ago
+      - if issue.critical
+        %span.tag.high critical
+      - if issue.today?
+        %span.tag.today today
+      .right.action-links
+        - if can? current_user, :write_issue, issue
+          - if issue.closed
+            = link_to 'Reopen', project_issue_path(@project, issue, :issue => {:closed => false }, :status_only => true), :method => :put,  :class => "cgray", :remote => true
+          - else 
+            = link_to 'Resolve', project_issue_path(@project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "cgray", :remote => true
+        - if can? current_user, :write_issue, issue
+          = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray edit-issue-link", :remote => true
+        - if can?(current_user, :admin_issue, @project) || issue.author == current_user
+          = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}"
 - if @issue.valid?
   :plain
     $("#new_issue_dialog").dialog("close");
+    $("#issues-table").prepend("#{escape_javascript(render(:partial => 'show', :locals => {:issue => @issue} ))}");
     $.ajax({type: "GET", url: location.href, dataType: "script"});
 - else
   :plain
-%div
-  .top_panel_issues
-    - if can? current_user, :write_issue, @project
-      %div{:class => "left", :style => "margin-right: 10px;" }
-        = link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
-    = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :left, :id => "issue_search_form" do
-      = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
-      = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
+%div#issues-table-holder
+  %table.round-borders#issues-table
+    %thead
+      %th
+        .top_panel_issues
+          - if can? current_user, :write_issue, @project
+            %div{:class => "left", :style => "margin-right: 10px;" }
+              = link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
+          = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :left, :id => "issue_search_form" do
+            = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
+            = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
  
-    .right.issues_filter
-      = form_tag project_issues_path(@project), :method => :get do
-        .left
-          = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
-          = label_tag "open_issues","Open"
-        .left
-          = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
-          = label_tag "closed_issues","Closed"
-        .left
-          = radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
-          = label_tag "my_issues","To Me"
-        .left
-          = radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
-          = label_tag "all_issues","All"
+          .right.issues_filter
+            = form_tag project_issues_path(@project), :method => :get do
+              .left
+                = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
+                = label_tag "open_issues","Open"
+              .left
+                = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
+                = label_tag "closed_issues","Closed"
+              .left
+                = radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
+                = label_tag "my_issues","To Me"
+              .left
+                = radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
+                = label_tag "all_issues","All"
  
-  #issues-table-holder= render "issues"
+    = render "issues"
   %br
 :javascript
   var href       = $('.issue_search').parent().attr('action');
@@ -37,7 +40,7 @@
  
       if (terms.length >= 2 || terms.length == 0) {
         $.get(href, { 'status': status, 'terms': terms, project: project_id  }, function(response) {
-          $('#issues-table').html(response);
+          $('#issues-table tbody').html(response);
           setSortable();
         });
       }
 :plain
-  $('#issues-table-holder').html("#{escape_javascript(render('issues'))}");
+  $('#issues-table tbody').html("#{escape_javascript(render('issues'))}");
   setSortable();
@@ -5,12 +5,12 @@
         - @key.errors.full_messages.each do |msg|
           %li= msg
  
-    .span-6
+    .form-row
       = f.label :title
       = f.text_field :title, :style => "width:300px"
-    .span-6
+    .form-row
       = f.label :key
       = f.text_area :key, :style => "width:300px; height:130px"
-    .span-6
+    .form-row
       = f.submit 'Save', :class => "lbutton vm"
  
@@ -10,13 +10,16 @@
  
     %div
       = f.label :note
-      %cite
+      %cite.cgray markdown supported
+      %br
       %br
       = f.text_area :note,  :size => 255
-
+     
     %div.attach_holder
+      %br
       = f.label :attachment
-      %cite (less than 10 MB)
+      %cite.cgray (less than 10 MB)
+      %br
       %br
       = f.file_field :attachment
  
@@ -7,11 +7,11 @@
         - @user.errors.full_messages.each do |msg|
           %li= msg
  
-  .div
+  .form-row
     = f.label :password
     %br
     = f.password_field :password
-  .div
+  .form-row
     = f.label :password_confirmation
     %br
     = f.password_field :password_confirmation
@@ -16,15 +16,15 @@
         - @user.errors.full_messages.each do |msg|
           %li= msg
  
-  .div
+  .form-row
     = f.label :skype
     %br
     = f.text_field :skype
-  .div
+  .form-row
     = f.label :linkedin
     %br
     = f.text_field :linkedin
-  .div
+  .form-row
     = f.label :twitter
     %br
     = f.text_field :twitter
 = form_for(@project, :remote => true) do |f|
   %div.form_content
     - unless @project.new_record?
-      %h1 Edit Project
+      %h2.icon  
+        %span
+        = @project.name
     - if @project.errors.any?
       #error_explanation
         %h2
@@ -10,7 +12,7 @@
         %ul
           - @project.errors.full_messages.each do |msg|
             %li= msg
-    %table.round-borders
+    %table
       %tr
         %td= f.label :name
         %td= f.text_field :name, :placeholder => "Example Project"
@@ -29,15 +31,13 @@
       %tr
         %td= f.label :tag_list
         %td= f.text_area :tag_list, :placeholder => "project tags", :style => "height:50px", :id => :tag_field
+      %tr
+        %td= f.label :description
+        %td= f.text_area :description, :placeholder => "project description", :style => "height:50px"
  
-    .field
-      = f.label :description
-      %br/
-      = f.text_area :description, :style => "height:140px;width:932px;"
-    .clear
-      %hr.prepend-top
+    %br
     .actions
-      = f.submit :class => "lbutton vm"
+      = f.submit :class => "button"
  
   %div{ :class => "ajax_loader",  :style => "display:none;height:200px;"}
     %center
@@ -1 +0,0 @@
-<%= render 'form' %>
@@ -0,0 +1,8 @@
+.new-project-hodler
+  .container_4
+    %h2.icon  
+      %span
+      New Project
+
+    %div.clear
+    = render 'form' 
@@ -0,0 +1,4 @@
+[Dolphin]
+ShowPreview=true
+Timestamp=2011,11,6,21,7,47
+Version=2
@@ -169,6 +169,7 @@ describe &quot;Issues&quot; do
         :assignee => @user,
         :project => project
       visit project_issues_path(project)
+      page.execute_script("$('.action-links').css('display', 'block');")
       click_link "Edit"
     end
  
@@ -59,7 +59,7 @@
 .ui-widget { font-family: "Helvetica Neue",Arial,Helvetica,sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #dddddd; background: #ffffff url(ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content { border: 1px solid #474D57; background: #ffffff url(ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
 .ui-widget-content a { color: #222222; }
 .ui-widget-header { color: #222222; font-weight: bold; }
 .ui-widget-header a { color: #222222; }
@@ -445,8 +445,8 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
  * http://docs.jquery.com/UI/Dialog#theming
  */
 .ui-dialog { position: absolute; padding: 0; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  background: #F7F7F7; color:#555; }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0;} 
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  background: #474D57; color:#eee; }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; text-shadow: none;} 
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; background:#eaeaea}
 .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
...	...	@@ -42,8 +42,10 @@ replace:
42	42
43	43	prepend:
44	44	function(id, html) {
45		- this.last_id = id;
46		- $("#notes-list").prepend(html);
	45	+ if(id != this.last_id) {
	46	+ this.last_id = id;
	47	+ $("#notes-list").prepend(html);
	48	+ }
47	49	},
48	50
49	51	getNew:
...	...
...	...	@@ -276,6 +276,9 @@ input.ssh_project_url {
276	276	/ FORM INPUTS /
277	277
278	278	.user_new,
	279	+.new_key,
	280	+.new_issue,
	281	+.new_note,
279	282	.edit_user,
280	283	.new_project,
281	284	.new_snippet,
...	...	@@ -676,6 +679,30 @@ body.project-page table .commit {
676	679	}
677	680	}
678	681
	682	+#notes-list .note .delete-note { display:none; }
	683	+#notes-list .note:hover .delete-note { display:block; }
	684	+
	685	+#issues-table-holder .issue .action-links {
	686	+ display:none;
	687	+ a {
	688	+ margin-left:10px;
	689	+ }
	690	+}
	691	+
	692	+.issue-number {
	693	+ float: left;
	694	+ border-radius: 5px;
	695	+ text-shadow: none;
	696	+ background: rgba(0, 0, 0, 0.12);
	697	+ text-align: center;
	698	+ padding: 14px 8px;
	699	+ width: 40px;
	700	+ margin-right: 10px;
	701	+ color: #444;
	702	+}
	703	+
	704	+#issues-table-holder .issue:hover .action-links { display:block; }
	705	+
679	706	body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
680	707	body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
681	708	body.project-page #notes-list .note img{float: left; margin-right: 10px;}
...	...	@@ -683,3 +710,14 @@ body.project-page #notes-list .note span.note-title{display: block;}
683	710	body.project-page #notes-list .note span.note-title{margin-bottom: 10px}
684	711	body.project-page #notes-list .note span.note-author{color: #999; font-weight: normal; font-style: italic;}
685	712	body.project-page #notes-list .note span.note-author strong{font-weight: bold; font-style: normal;}
	713	+
	714	+
	715	+/ NEW PROJECT /
	716	+.new-project-hodler {
	717	+ .icon span {
	718	+ background-position: -31px -70px;
	719	+ }
	720	+ td {
	721	+ border-bottom: 1px solid #DEE2E3;
	722	+ }
	723	+}
...	...
...	...	@@ -87,6 +87,17 @@ h2{margin: 1.5em 0}
87	87	/* Forms */
88	88	input[type="text"]:focus, input[type="password"]:focus { outline: none; }
89	89	input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: 10px}
	90	+
	91	+.form-row{
	92	+ padding: 0px 0px 10px 0px;
	93	+}
	94	+
	95	+.form-row label{
	96	+ font-weight:bold;
	97	+ display: inline-block;
	98	+ padding: 0px 0px 5px 0px;
	99	+}
	100	+
90	101	/* eo Forms */
91	102
92	103	/* Tables */
...	...
...	...	@@ -47,6 +47,7 @@ class IssuesController < ApplicationController
47	47	def create
48	48	@issue = @project.issues.new(params[:issue])
49	49	@issue.author = current_user
	50	+
50	51	if @issue.save && @issue.assignee != current_user
51	52	Notify.new_issue_email(@issue).deliver
52	53	end
...	...
1	1	module IssuesHelper
	2	+ def sort_class
	3	+ if can?(current_user, :admin_issue, @project) && (!params[:f] \|\| params[:f] == "0")
	4	+ "handle"
	5	+ end
	6	+ end
2	7	end
...	...
...	...	@@ -7,44 +7,42 @@
7	7	- @admin_user.errors.full_messages.each do \|msg\|
8	8	%li= msg
9	9
10		- .span-24
11		- .span-11.colborder
12		- .field
13		- = f.label :name
14		- %br
15		- = f.text_field :name
16		- .field
17		- = f.label :email
18		- %br
19		- = f.text_field :email
20		- .field
21		- = f.label :password
22		- %br
23		- = f.password_field :password
24		- .field
25		- = f.label :password_confirmation
26		- %br
27		- = f.password_field :password_confirmation
28		- .field.prepend-top
29		- = f.check_box :admin
30		- = f.label :admin
31		- .span-11
32		- .field.prepend-top
33		- = f.text_field :projects_limit, :class => "small_input"
34		- = f.label :projects_limit
	10	+ .form-row
	11	+ = f.label :name
	12	+ %br
	13	+ = f.text_field :name
	14	+ .form-row
	15	+ = f.label :email
	16	+ %br
	17	+ = f.text_field :email
	18	+ .form-row
	19	+ = f.label :password
	20	+ %br
	21	+ = f.password_field :password
	22	+ .form-row
	23	+ = f.label :password_confirmation
	24	+ %br
	25	+ = f.password_field :password_confirmation
	26	+ .form-row
	27	+ = f.check_box :admin
	28	+ = f.label :admin
35	29
36		- .field
37		- = f.label :skype
38		- %br
39		- = f.text_field :skype
40		- .field
41		- = f.label :linkedin
42		- %br
43		- = f.text_field :linkedin
44		- .field
45		- = f.label :twitter
46		- %br
47		- = f.text_field :twitter
	30	+ .form-row
	31	+ = f.text_field :projects_limit, :class => "small_input"
	32	+ = f.label :projects_limit
	33	+
	34	+ .form-row
	35	+ = f.label :skype
	36	+ %br
	37	+ = f.text_field :skype
	38	+ .form-row
	39	+ = f.label :linkedin
	40	+ %br
	41	+ = f.text_field :linkedin
	42	+ .form-row
	43	+ = f.label :twitter
	44	+ %br
	45	+ = f.text_field :twitter
48	46	.clear
49	47	%br
50	48	.actions
...	...
...	...	@@ -21,4 +21,5 @@
21	21	%br
22	22
23	23	= paginate @admin_users
	24	+
24	25	= link_to 'New User', new_admin_user_path
...	...
...	...	@@ -5,24 +5,21 @@
5	5	- @issue.errors.full_messages.each do \|msg\|
6	6	%li= msg
7	7
8		- .span-8
	8	+ .form-row
9	9	= f.label :title
10	10	= f.text_area :title, :style => "width:450px; height:100px", :maxlength => 255
11		- -#.span-8
12		- -#= f.label :content
13		- -#= f.text_area :content, :style => "width:450px; height:130px"
14		- .span-8.append-bottom
	11	+ .form-row
15	12	= f.label :assignee_id
16	13	= f.select(:assignee_id, @project.users.all.collect {\|p\| [ p.name, p.id ] }, { :include_blank => "Select user" })
17		- .span-1
	14	+ .form-row
18	15	= f.label :critical, "Critical"
19	16	%br
20	17	= f.check_box :critical
21	18	- unless @issue.new_record?
22		- .span-2.right
	19	+ .form-row
23	20	= f.label :closed
24	21	%br
25	22	= f.check_box :closed
26	23	%hr
27		- .span-6
	24	+ .form-row
28	25	= f.submit 'Save', :class => "lbutton vm"
...	...
1		-%table.round-borders#issues-table
2		- %thead
3		- - if can?(current_user, :admin_issue, @project) && !params[:f] \|\| params[:f] == "0"
4		- %th
5		- %th Assignee
6		- %th ID
7		- %th Title
8		- %th Closed?
	1	+- @issues.critical.each do \|issue\|
	2	+ = render(:partial => 'show', :locals => {:issue => issue})
9	3
10		- - @issues.critical.each do \|issue\|
11		- = render(:partial => 'show', :locals => {:issue => issue})
12		-
13		- - @issues.non_critical.each do \|issue\|
14		- = render(:partial => 'show', :locals => {:issue => issue})
	4	+- @issues.non_critical.each do \|issue\|
	5	+ = render(:partial => 'show', :locals => {:issue => issue})
...	...
1	1	%tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(@project, issue) }
2		- - if can?(current_user, :admin_issue, @project) && (!params[:f] \|\| params[:f] == "0")
3		- %td
4		- = image_tag "move.png" , :class => [:handle, :left]
5	2	%td
6		- = image_tag gravatar_icon(issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
7		- = issue.assignee.name
8		- %td ##{issue.id}
9		- %td
10		- = truncate(html_escape(issue.title), :length => 200)
	3	+ %strong.issue-number{:class => sort_class}= "##{issue.id}"
	4	+ %span
	5	+ = truncate(html_escape(issue.title), :length => fixed_mode? ? 100 : 200)
11	6	%br
12	7	%br
13		- - if issue.critical
14		- %span.tag.high critical
15		- - if issue.today?
16		- %span.tag.today today
17		-
18		- .right
19		- - if can?(current_user, :admin_issue, @project) \|\| issue.author == current_user
20		- = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray", :remote => true
21		- - if can?(current_user, :admin_issue, @project) \|\| issue.author == current_user
22		-
23		- = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}"
24		-
25		- -#- if issue.author == current_user
26		- -#%span.tag.yours yours
27		- -#- if issue.notes.count > 0
28		- -#%span.tag.notes
29		- -#= issue.notes.count
30		- -#notes
31		- %td
32		- - if can? current_user, :write_issue, @project
33		- = form_for([@project, issue], :remote => true) do \|f\|
34		- = f.check_box :closed, :onclick => "$(this).parent().submit();"
35		- = hidden_field_tag :status_only, true
36		- - else
37		- = check_box_tag "closed", 1, issue.closed, :disabled => true
	8	+ %div.note-author
	9	+ %strong= issue.assignee.name
	10	+ %cite.cgray
	11	+ = time_ago_in_words(issue.updated_at)
	12	+ ago
	13	+ - if issue.critical
	14	+ %span.tag.high critical
	15	+ - if issue.today?
	16	+ %span.tag.today today
	17	+ .right.action-links
	18	+ - if can? current_user, :write_issue, issue
	19	+ - if issue.closed
	20	+ = link_to 'Reopen', project_issue_path(@project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "cgray", :remote => true
	21	+ - else
	22	+ = link_to 'Resolve', project_issue_path(@project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "cgray", :remote => true
	23	+ - if can? current_user, :write_issue, issue
	24	+ = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray edit-issue-link", :remote => true
	25	+ - if can?(current_user, :admin_issue, @project) \|\| issue.author == current_user
	26	+ = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}"
...	...