summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2011-10-26 18:46:25 +0500
committerNihad Abbasov <narkoz.2008@gmail.com>2011-10-26 18:46:25 +0500
commitd62200cad430565bd9f80befaf329297120330b5 (patch)
tree6217dd41e6f86e657513b509ed7a3f2bfdfa70ab /app/views
parentf6a67fbad5119e3d95e33cfd4f4e4992707d5ba0 (diff)
downloadgitlab-ce-d62200cad430565bd9f80befaf329297120330b5.tar.gz
clean-up code
* Remove trailing whitespace * Converts hard-tabs into two-space soft-tabs * Remove consecutive blank lines
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/mailer/preview.html.haml15
-rw-r--r--app/views/admin/projects/show.html.haml8
-rw-r--r--app/views/admin/team_members/index.html.haml4
-rw-r--r--app/views/admin/team_members/show.html.haml1
-rw-r--r--app/views/admin/users/_form.html.haml2
-rw-r--r--app/views/admin/users/new.html.haml1
-rw-r--r--app/views/admin/users/show.html.haml9
-rw-r--r--app/views/commits/_diff.html.haml4
-rw-r--r--app/views/commits/_index.html.haml2
-rw-r--r--app/views/commits/_text_file.html.haml4
-rw-r--r--app/views/commits/show.js.haml2
-rw-r--r--app/views/devise/confirmations/new.html.erb2
-rw-r--r--app/views/devise/passwords/edit.html.erb2
-rw-r--r--app/views/devise/shared/_links.erb2
-rw-r--r--app/views/devise/unlocks/new.html.erb2
-rw-r--r--app/views/issues/_issues.html.haml2
-rw-r--r--app/views/issues/_show.html.haml4
-rw-r--r--app/views/issues/index.html.haml8
-rw-r--r--app/views/issues/show.html.haml15
-rw-r--r--app/views/issues/show.js.haml2
-rw-r--r--app/views/issues/update.js.haml2
-rw-r--r--app/views/keys/index.html.haml4
-rw-r--r--app/views/layouts/_flash.html.haml6
-rw-r--r--app/views/layouts/_head_panel.html.erb1
-rw-r--r--app/views/notes/_form.html.haml2
-rw-r--r--app/views/notes/_notes.html.haml11
-rw-r--r--app/views/notes/create.js.haml2
-rw-r--r--app/views/notify/new_issue_email.html.haml4
-rw-r--r--app/views/notify/new_user_email.html.haml2
-rw-r--r--app/views/notify/note_issue_email.html.haml6
-rw-r--r--app/views/notify/note_wall_email.html.haml2
-rw-r--r--app/views/projects/_form.html.haml10
-rw-r--r--app/views/projects/_list.html.haml2
-rw-r--r--app/views/projects/_projects_top_menu.html.haml2
-rw-r--r--app/views/projects/_recent_commits.html.haml4
-rw-r--r--app/views/projects/_team.html.haml4
-rw-r--r--app/views/projects/empty.html.erb2
-rw-r--r--app/views/projects/index.html.haml2
-rw-r--r--app/views/projects/tree.js.haml2
-rw-r--r--app/views/projects/wall.html.haml2
-rw-r--r--app/views/projects/wall.js.haml2
-rw-r--r--app/views/snippets/_form.html.haml2
-rw-r--r--app/views/snippets/index.html.haml4
-rw-r--r--app/views/team_members/_show.html.haml4
-rw-r--r--app/views/team_members/show.html.haml1
45 files changed, 84 insertions, 92 deletions
diff --git a/app/views/admin/mailer/preview.html.haml b/app/views/admin/mailer/preview.html.haml
index 7b723cb8021..60e24588487 100644
--- a/app/views/admin/mailer/preview.html.haml
+++ b/app/views/admin/mailer/preview.html.haml
@@ -1,29 +1,28 @@
%p This is page with preview for all system emails that are sent to user
-%p Email previews built based on existing Project/Commit/Issue base - so some preview maybe unavailable unless object appear in system
+%p Email previews built based on existing Project/Commit/Issue base - so some preview maybe unavailable unless object appear in system
#accordion
%h3
%a New user
- %div
+ %div
%iframe{ :src=> admin_mailer_preview_user_new_path, :width=>"100%", :height=>"350"}
%h3
%a New issue
- %div
+ %div
%iframe{ :src=> admin_mailer_preview_issue_new_path, :width=>"100%", :height=>"350"}
- %h3
+ %h3
%a Commit note
%div
%iframe{ :src=> admin_mailer_preview_note_path(:type => "Commit"), :width=>"100%", :height=>"350"}
%h3
%a Issue note
- %div
+ %div
%iframe{ :src=> admin_mailer_preview_note_path(:type => "Issue"), :width=>"100%", :height=>"350"}
%h3
%a Wall note
- %div
+ %div
%iframe{ :src=> admin_mailer_preview_note_path(:type => "Wall"), :width=>"100%", :height=>"350"}
-
-:javascript
+:javascript
$(function() {
$( "#accordion" ).accordion(); });
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 6891894122c..fc2e63241ae 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -1,7 +1,7 @@
%p#notice= notice
.span-8.colborder
- %h2= @admin_project.name
+ %h2= @admin_project.name
%p
%b Name:
@@ -22,16 +22,16 @@
.span-14
- %h2 Team
+ %h2 Team
%table.round-borders
%tr
%th Name
- %th Added
+ %th Added
%th Web
%th Git
%th Admin
- %th
+ %th
- @admin_project.users_projects.each do |tm|
%tr
diff --git a/app/views/admin/team_members/index.html.haml b/app/views/admin/team_members/index.html.haml
index bbd7a6c0af8..5aa4b597878 100644
--- a/app/views/admin/team_members/index.html.haml
+++ b/app/views/admin/team_members/index.html.haml
@@ -7,8 +7,8 @@
%th Read
%th Git
%th Manage
- %th Added
- %th
+ %th Added
+ %th
%th
%th
- members.each do |tm|
diff --git a/app/views/admin/team_members/show.html.haml b/app/views/admin/team_members/show.html.haml
index bd30c7b0e6c..29d1160ce5f 100644
--- a/app/views/admin/team_members/show.html.haml
+++ b/app/views/admin/team_members/show.html.haml
@@ -11,7 +11,6 @@
%b Since:
= @admin_team_member.updated_at
-
.span-10
.span-6
%b Access:
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index aa9df298e11..51b5d5c76eb 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -44,7 +44,7 @@
.field
= f.label :twitter
%br
- = f.text_field :twitter
+ = f.text_field :twitter
.clear
%br
.actions
diff --git a/app/views/admin/users/new.html.haml b/app/views/admin/users/new.html.haml
index cec6e3e188c..b188d2ab320 100644
--- a/app/views/admin/users/new.html.haml
+++ b/app/views/admin/users/new.html.haml
@@ -2,5 +2,4 @@
= render 'form'
-
= link_to 'Back', admin_users_path, :class => "right lbutton"
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index aee73c38ee7..5bc5bf9ab83 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -19,28 +19,27 @@
= @admin_user.skype
%p
%b LinkedIn:
- = @admin_user.linkedin
+ = @admin_user.linkedin
%p
%b Twitter:
= @admin_user.twitter
-
.clear
= link_to 'Edit', edit_admin_user_path(@admin_user)
\|
= link_to 'Back', admin_users_path
.span-14
- %h2 Projects
+ %h2 Projects
%table.round-borders
%tr
%th Name
- %th Added
+ %th Added
%th Web
%th Git
%th Admin
- %th
+ %th
- @admin_user.users_projects.each do |tm|
- project = tm.project
diff --git a/app/views/commits/_diff.html.haml b/app/views/commits/_diff.html.haml
index 2807e0903da..e385d9ddf3c 100644
--- a/app/views/commits/_diff.html.haml
+++ b/app/views/commits/_diff.html.haml
@@ -8,7 +8,7 @@
.diff_file_header
- if diff.deleted_file
%strong{:id => "#{diff.b_path}"}= diff.a_path
- - else
+ - else
= link_to tree_file_project_path(@project, @commit.id, diff.b_path) do
%strong{:id => "#{diff.b_path}"}= diff.b_path
%br/
@@ -19,5 +19,5 @@
.diff_file_content_image
%img{:src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
- else
- %p
+ %p
%center No preview for this file type
diff --git a/app/views/commits/_index.html.haml b/app/views/commits/_index.html.haml
index e4c9cc6e83c..f1e4c7eb3f1 100644
--- a/app/views/commits/_index.html.haml
+++ b/app/views/commits/_index.html.haml
@@ -6,4 +6,4 @@
%h1 Listing commits
%div{:id => dom_id(@project)}
= render "commits"
-%br/ \ No newline at end of file
+%br/
diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index 67033adea7e..db71c387ecd 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -12,10 +12,10 @@
= diff_line(line, line_new, line_old)
- if line[0] == "+"
- line_new += 1
- - elsif
+ - elsif
- line[0] == "-"
- line_old += 1
- - else
+ - else
- line_new += 1
- line_old += 1
diff --git a/app/views/commits/show.js.haml b/app/views/commits/show.js.haml
index cec1fe28348..9831bb29576 100644
--- a/app/views/commits/show.js.haml
+++ b/app/views/commits/show.js.haml
@@ -4,5 +4,5 @@
side.html("#{escape_javascript(render "commits/show")}");
$("##{dom_id(@project)}").parent().append(side);
$("##{dom_id(@project)}").addClass("span-14");
-:plain
+:plain
$("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index b7ae403caa5..5399a961570 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -9,4 +9,4 @@
<div><%= f.submit "Resend confirmation instructions" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %> \ No newline at end of file
+<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index e75c937101a..ff76588c144 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -13,4 +13,4 @@
<div><%= f.submit "Change my password" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %> \ No newline at end of file
+<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
index eab783a4c92..33b1120f992 100644
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -22,4 +22,4 @@
<%- resource_class.omniauth_providers.each do |provider| %>
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
<% end -%>
-<% end -%> \ No newline at end of file
+<% end -%>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
index c6cdcfe51ce..b787e648ca2 100644
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -9,4 +9,4 @@
<div><%= f.submit "Resend unlock instructions" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %> \ No newline at end of file
+<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml
index 42e8371a0ba..11e4c38e088 100644
--- a/app/views/issues/_issues.html.haml
+++ b/app/views/issues/_issues.html.haml
@@ -1,7 +1,7 @@
%table.round-borders#issues-table
%tr
- if can?(current_user, :admin_issue, @project) && !params[:f] || params[:f] == "0"
- %th
+ %th
%th Assignee
%th ID
%th Title
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index fcac006e81c..afcd2b6e7c5 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -21,10 +21,10 @@
-#notes
%td
- if can? current_user, :write_issue, @project
- = form_for([@project, issue], :remote => true) do |f|
+ = form_for([@project, issue], :remote => true) do |f|
= f.check_box :closed, :onclick => "$(this).parent().submit();"
= hidden_field_tag :status_only, true
- - else
+ - else
= check_box_tag "closed", 1, issue.closed, :disabled => true
%td
- if can?(current_user, :admin_issue, @project) || issue.author == current_user
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index 6f4548a8066..46a15ef169d 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -12,7 +12,7 @@
.span-2
= radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues"
= label_tag "my_issues","To Me"
-
+
.span-2
= radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues"
= label_tag "all_issues","All"
@@ -20,9 +20,9 @@
#issues-table-holder= render "issues"
%br
:javascript
- $('.delete-issue').live('ajax:success', function() {
- $(this).closest('tr').fadeOut(); });
-
+ $('.delete-issue').live('ajax:success', function() {
+ $(this).closest('tr').fadeOut(); });
+
function setSortable(){
$('#issues-table>tbody').sortable({
axis: 'y',
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 199c80c8617..29b6f3f7b84 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -8,24 +8,24 @@
.span-8
- if @issue.closed
%center.success Closed
- - else
+ - else
%center.error Open
%table.round-borders
%tr
- %td Title:
+ %td Title:
%td
= truncate html_escape(@issue.title)
%tr
- %td Project
+ %td Project
%td
%strong= @issue.project.name
%tr
- %td Author:
+ %td Author:
%td
= image_tag gravatar_icon(@issue.author.email), :class => "left", :width => 40, :style => "padding:0 5px;"
= @issue.author.name
%tr
- %td Assignee:
+ %td Assignee:
%td
= image_tag gravatar_icon(@issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
= @issue.assignee.name
@@ -33,12 +33,11 @@
%td Closed?
%td
- if can? current_user, :write_issue, @project
- = form_for([@project, @issue]) do |f|
+ = form_for([@project, @issue]) do |f|
= f.check_box :closed, :onclick => "$(this).parent().submit();"
= hidden_field_tag :status_only, true
- - else
+ - else
= check_box_tag "closed", 1, @issue.closed, :disabled => true
-
.clear
diff --git a/app/views/issues/show.js.haml b/app/views/issues/show.js.haml
index 5b9a34c0a9c..ae2ff32cc6c 100644
--- a/app/views/issues/show.js.haml
+++ b/app/views/issues/show.js.haml
@@ -1,2 +1,2 @@
-:plain
+:plain
$("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
diff --git a/app/views/issues/update.js.haml b/app/views/issues/update.js.haml
index c365c3f5d55..30fca38c38e 100644
--- a/app/views/issues/update.js.haml
+++ b/app/views/issues/update.js.haml
@@ -2,7 +2,7 @@
- if @issue.valid?
:plain
$("##{dom_id(@issue)}").fadeOut();
-- else
+- else
- if @issue.valid?
:plain
$("#edit_issue_dialog").dialog("close");
diff --git a/app/views/keys/index.html.haml b/app/views/keys/index.html.haml
index 416ae8f8f95..279b125f53c 100644
--- a/app/views/keys/index.html.haml
+++ b/app/views/keys/index.html.haml
@@ -10,6 +10,6 @@
= render(:partial => 'show', :locals => {:key => key})
:javascript
- $('.delete-key').live('ajax:success', function() {
- $(this).closest('tr').fadeOut(); });
+ $('.delete-key').live('ajax:success', function() {
+ $(this).closest('tr').fadeOut(); });
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml
index 4b6eb2b500e..4011485c55d 100644
--- a/app/views/layouts/_flash.html.haml
+++ b/app/views/layouts/_flash.html.haml
@@ -6,9 +6,9 @@
%h4= text
:javascript
$(function(){
- $("#flash_container").slideDown("slow");
- $("#flash_container").click(function(){
- $(this).slideUp("slow");
+ $("#flash_container").slideDown("slow");
+ $("#flash_container").click(function(){
+ $(this).slideUp("slow");
});
setTimeout("hideFlash()",2000);
});
diff --git a/app/views/layouts/_head_panel.html.erb b/app/views/layouts/_head_panel.html.erb
index 047f708b6df..07de8de4c2a 100644
--- a/app/views/layouts/_head_panel.html.erb
+++ b/app/views/layouts/_head_panel.html.erb
@@ -22,7 +22,6 @@
</div>
</div>
-
<% if current_user %>
<%= javascript_tag do %>
$(function() {
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index ca56a2450a0..14e74fa694f 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -22,7 +22,7 @@
= check_box_tag :notify, 1, true
= label_tag :notify, "Notify project team about your note"
-
+
.clear
%br
= f.submit 'Add note', :class => "lbutton vm", :id => "submit_note"
diff --git a/app/views/notes/_notes.html.haml b/app/views/notes/_notes.html.haml
index 2d110162eca..e7cc2360758 100644
--- a/app/views/notes/_notes.html.haml
+++ b/app/views/notes/_notes.html.haml
@@ -1,7 +1,7 @@
- if controller.action_name == "wall"
%ul#notes-list= render "notes/notes_list"
-- else
+- else
%ul#notes-list= render "notes/notes_list"
%br
%br
@@ -9,17 +9,16 @@
= render "notes/form"
:javascript
- $('.delete-note').live('ajax:success', function() {
- $(this).closest('li').fadeOut(); });
+ $('.delete-note').live('ajax:success', function() {
+ $(this).closest('li').fadeOut(); });
$("#new_note").live("ajax:before", function(){
- $("#submit_note").attr("disabled", "disabled");
+ $("#submit_note").attr("disabled", "disabled");
})
$("#new_note").live("ajax:complete", function(){
- $("#submit_note").removeAttr("disabled");
+ $("#submit_note").removeAttr("disabled");
})
-
- if ["issues", "projects"].include?(controller.controller_name)
:javascript
diff --git a/app/views/notes/create.js.haml b/app/views/notes/create.js.haml
index 15371dbce2b..a04130e8a75 100644
--- a/app/views/notes/create.js.haml
+++ b/app/views/notes/create.js.haml
@@ -7,5 +7,5 @@
:plain
$("#new_note").replaceWith("#{escape_javascript(render('form'))}");
-:plain
+:plain
$("#submit_note").removeAttr("disabled");
diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
index 213a73796cf..1a5a603a590 100644
--- a/app/views/notify/new_issue_email.html.haml
+++ b/app/views/notify/new_issue_email.html.haml
@@ -10,9 +10,9 @@
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:align => "left", :style => "padding: 20px 0 0;"}
%h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
- = link_to project_issue_url(@project, @issue) do
+ = link_to project_issue_url(@project, @issue) do
= "Issue ##{@issue.id.to_s}"
- = truncate(@issue.title, :length => 45)
+ = truncate(@issue.title, :length => 45)
%br
%cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
= @issue.content
diff --git a/app/views/notify/new_user_email.html.haml b/app/views/notify/new_user_email.html.haml
index 969ea7e5298..2d3abf2e55d 100644
--- a/app/views/notify/new_user_email.html.haml
+++ b/app/views/notify/new_user_email.html.haml
@@ -4,7 +4,7 @@
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:align => "left", :style => "padding: 20px 0 0;"}
%h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
- Hi #{@user.name}!
+ Hi #{@user.name}!
%p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
Administrator created account for you. Now you are a member of company gitlab application.
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
diff --git a/app/views/notify/note_issue_email.html.haml b/app/views/notify/note_issue_email.html.haml
index 242c97bf25f..7d8e215609e 100644
--- a/app/views/notify/note_issue_email.html.haml
+++ b/app/views/notify/note_issue_email.html.haml
@@ -4,10 +4,10 @@
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:align => "left", :style => "padding: 20px 0 0;"}
%h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
- New comment -
- = link_to project_issue_url(@project, @issue, :anchor => "note_#{@note.id}") do
+ New comment -
+ = link_to project_issue_url(@project, @issue, :anchor => "note_#{@note.id}") do
= "Issue ##{@issue.id.to_s}"
- = truncate(@issue.title, :length => 35)
+ = truncate(@issue.title, :length => 35)
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%tr
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
diff --git a/app/views/notify/note_wall_email.html.haml b/app/views/notify/note_wall_email.html.haml
index c9fdae12677..a2bd5a76601 100644
--- a/app/views/notify/note_wall_email.html.haml
+++ b/app/views/notify/note_wall_email.html.haml
@@ -4,7 +4,7 @@
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:align => "left", :style => "padding: 20px 0 0;"}
%h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
- New message on
+ New message on
= link_to "Project Wall", wall_project_url(@project, :anchor => "note_#{@note.id}")
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%tr
diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml
index 00ca98efa08..164f1d45f32 100644
--- a/app/views/projects/_form.html.haml
+++ b/app/views/projects/_form.html.haml
@@ -21,7 +21,7 @@
%td
= f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
%tr
- %td
+ %td
.left= f.label :code
%cite.right http://yourserver/
%td= f.text_field :code, :placeholder => "example"
@@ -39,10 +39,10 @@
= image_tag "ajax-loader.gif", :class => "append-bottom"
- if @project.new_record?
%h3.prepend-top Creating project &amp; repository. Please wait for few minutes
- - else
+ - else
%h3.prepend-top Updating project &amp; repository. Please wait for few minutes
:javascript
- $('.new_project, .edit_project').bind('ajax:before', function() {
- $(this).find(".form_content").hide();
+ $('.new_project, .edit_project').bind('ajax:before', function() {
+ $(this).find(".form_content").hide();
$('.ajax_loader').show();
- });
+ });
diff --git a/app/views/projects/_list.html.haml b/app/views/projects/_list.html.haml
index aec61ffbbe1..65f0b7fd5b5 100644
--- a/app/views/projects/_list.html.haml
+++ b/app/views/projects/_list.html.haml
@@ -16,7 +16,7 @@
%td= check_box_tag "read", 1, project.readers.include?(current_user), :disabled => :disabled
%td= check_box_tag "commit", 1, project.writers.include?(current_user), :disabled => :disabled
%td= check_box_tag "admin", 1, project.admins.include?(current_user), :disabled => :disabled
- %td
+ %td
-if can? current_user, :admin_project, project
= link_to 'Edit', edit_project_path(project), :class => "lbutton positive"
%br
diff --git a/app/views/projects/_projects_top_menu.html.haml b/app/views/projects/_projects_top_menu.html.haml
index f80f28a8bbb..9e199183b15 100644
--- a/app/views/projects/_projects_top_menu.html.haml
+++ b/app/views/projects/_projects_top_menu.html.haml
@@ -11,7 +11,7 @@
$(".list").toggle();
if($(".tile").is(":visible")){
$.cookie('project_view', 'tile', { expires: 14 });
- } else {
+ } else {
$.cookie('project_view', 'list', { expires: 14 });
}
}
diff --git a/app/views/projects/_recent_commits.html.haml b/app/views/projects/_recent_commits.html.haml
index 3157c356862..b34470d6741 100644
--- a/app/views/projects/_recent_commits.html.haml
+++ b/app/views/projects/_recent_commits.html.haml
@@ -6,8 +6,8 @@
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
%p{:style => "margin-bottom: 3px;"}
%strong
- = link_to truncate(commit.safe_message, :length => 60), project_commit_path(@project, :id => commit.id)
-
+ = link_to truncate(commit.safe_message, :length => 60), project_commit_path(@project, :id => commit.id)
+
%span
%span.author
= commit.author.name.force_encoding("UTF-8")
diff --git a/app/views/projects/_team.html.haml b/app/views/projects/_team.html.haml
index bb9063369c3..4001c7a255c 100644
--- a/app/views/projects/_team.html.haml
+++ b/app/views/projects/_team.html.haml
@@ -14,5 +14,5 @@
= render(:partial => 'team_members/show', :locals => {:member => up})
:javascript
- $('.delete-team-member').live('ajax:success', function() {
- $(this).closest('tr').fadeOut(); });
+ $('.delete-team-member').live('ajax:success', function() {
+ $(this).closest('tr').fadeOut(); });
diff --git a/app/views/projects/empty.html.erb b/app/views/projects/empty.html.erb
index 4c60facde8c..ffc1ebfa281 100644
--- a/app/views/projects/empty.html.erb
+++ b/app/views/projects/empty.html.erb
@@ -40,7 +40,7 @@ eos
<p>
Be careful! <br/>
Project cant be recovered after destroy.</p>
- <%= link_to 'Destroy', @project,
+ <%= link_to 'Destroy', @project,
:confirm => 'Are you sure?', :method => :delete,
:class => "left button negative span-6", :style => "text-align:center" %>
<div class="clear"></div>
diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml
index 888a72b6811..4b9457c161c 100644
--- a/app/views/projects/index.html.haml
+++ b/app/views/projects/index.html.haml
@@ -3,7 +3,7 @@
= render "tile"
%div{:class => "list", :style => view_mode_style("list")}
= render "list"
-- else
+- else
%center.prepend-top
%h2
%cite Nothing here
diff --git a/app/views/projects/tree.js.haml b/app/views/projects/tree.js.haml
index 60cbd199165..eb08adb1ddd 100644
--- a/app/views/projects/tree.js.haml
+++ b/app/views/projects/tree.js.haml
@@ -1,5 +1,5 @@
:plain
- $("#tree-holder table").hide("slide", { direction: "left" }, 150, function(){
+ $("#tree-holder table").hide("slide", { direction: "left" }, 150, function(){
$("#tree-holder").html("#{escape_javascript(render(:partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree}))}");
$("#tree-holder table").show("slide", { direction: "right" }, 150);
});
diff --git a/app/views/projects/wall.html.haml b/app/views/projects/wall.html.haml
index ed22478c924..63c9613a852 100644
--- a/app/views/projects/wall.html.haml
+++ b/app/views/projects/wall.html.haml
@@ -20,7 +20,7 @@
%hr
= render "notes/notes"
-:javascript
+:javascript
$(function(){
$("#note_note").live("click", function(){
$(this).css("height", "100px");
diff --git a/app/views/projects/wall.js.haml b/app/views/projects/wall.js.haml
index 5b9a34c0a9c..ae2ff32cc6c 100644
--- a/app/views/projects/wall.js.haml
+++ b/app/views/projects/wall.js.haml
@@ -1,2 +1,2 @@
-:plain
+:plain
$("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
index 571e2b063c1..7a34ae8e03f 100644
--- a/app/views/snippets/_form.html.haml
+++ b/app/views/snippets/_form.html.haml
@@ -17,6 +17,6 @@
= f.label :content, "Code"
%br
= f.text_area :content, :style => "height:240px;width:932px;"
-
+
.actions.prepend-top
= f.submit 'Save', :class => "lbutton vm"
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 6e5dbde5bb1..fe5e617044b 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -10,5 +10,5 @@
%th
= render @snippets
:javascript
- $('.delete-snippet').live('ajax:success', function() {
- $(this).closest('tr').fadeOut(); });
+ $('.delete-snippet').live('ajax:success', function() {
+ $(this).closest('tr').fadeOut(); });
diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index b9a68e6cfb0..88260cca537 100644
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -7,11 +7,11 @@
%td= truncate user.email, :lenght => 16
- if can? current_user, :admin_project, @project
- = form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
+ = form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
%td= f.check_box :read, :onclick => "$(this.form).submit();"
%td= f.check_box :write, :onclick => "$(this.form).submit();"
%td= f.check_box :admin, :onclick => "$(this.form).submit();"
- - else
+ - else
%td= check_box_tag "read", 1, member.read, :disabled => :disabled
%td= check_box_tag "commit", 1, member.write, :disabled => :disabled
%td= check_box_tag "admin", 1, member.admin, :disabled => :disabled
diff --git a/app/views/team_members/show.html.haml b/app/views/team_members/show.html.haml
index d07c54f8b68..4a093ee1d5b 100644
--- a/app/views/team_members/show.html.haml
+++ b/app/views/team_members/show.html.haml
@@ -25,4 +25,3 @@
%b Twitter:
= user.twitter
-