summaryrefslogtreecommitdiff
path: root/app/views/admin
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/admin
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/admin')
-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
7 files changed, 18 insertions, 22 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