summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-31 01:27:02 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-31 01:27:02 +0200
commit16eb3ac360df60469cc9b1a93870c0273c7fe78f (patch)
tree9aff8fff986e9868b1500001d00968f469f73067 /app/views/admin
parent2ecf83191d4ae7a158d70f8cfa11ec9f2744b0ce (diff)
downloadgitlab-ce-16eb3ac360df60469cc9b1a93870c0273c7fe78f.tar.gz
Update form classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/broadcast_messages/index.html.haml20
-rw-r--r--app/views/admin/groups/edit.html.haml12
-rw-r--r--app/views/admin/groups/new.html.haml8
-rw-r--r--app/views/admin/hooks/index.html.haml4
-rw-r--r--app/views/admin/projects/index.html.haml20
-rw-r--r--app/views/admin/projects/show.html.haml8
-rw-r--r--app/views/admin/users/_form.html.haml48
7 files changed, 60 insertions, 60 deletions
diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml
index 043ce4fd817..220bf759cea 100644
--- a/app/views/admin/broadcast_messages/index.html.haml
+++ b/app/views/admin/broadcast_messages/index.html.haml
@@ -11,30 +11,30 @@
.alert.alert-error
- @broadcast_message.errors.full_messages.each do |msg|
%p= msg
- .control-group
+ .form-group
= f.label :message
- .controls
+ .col-sm-10
= f.text_area :message, class: "input-xxlarge", rows: 2, required: true
%div
= link_to '#', class: 'js-toggle-colors-link' do
Customize colors
- .control-group.js-toggle-colors-container.gl-hide
+ .form-group.js-toggle-colors-container.gl-hide
= f.label :color, "Background Color"
- .controls
+ .col-sm-10
= f.text_field :color, placeholder: "#AA33EE"
.light Hex values as 3 double digit numbers, starting with a # sign.
- .control-group.js-toggle-colors-container.gl-hide
+ .form-group.js-toggle-colors-container.gl-hide
= f.label :font, "Font Color"
- .controls
+ .col-sm-10
= f.text_field :font, placeholder: "#224466"
.light Hex values as 3 double digit numbers, starting with a # sign.
- .control-group
+ .form-group
= f.label :starts_at
- .controls.datetime-controls
+ .col-sm-10.datetime-controls
= f.datetime_select :starts_at
- .control-group
+ .form-group
= f.label :ends_at
- .controls.datetime-controls
+ .col-sm-10.datetime-controls
= f.datetime_select :ends_at
.form-actions
= f.submit "Add broadcast message", class: "btn btn-create"
diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml
index 3918bf981a2..c7d87448f1d 100644
--- a/app/views/admin/groups/edit.html.haml
+++ b/app/views/admin/groups/edit.html.haml
@@ -4,21 +4,21 @@
- if @group.errors.any?
.alert.alert-error
%span= @group.errors.full_messages.first
- .control-group.group_name_holder
+ .form-group.group_name_holder
= f.label :name do
Group name
- .controls
+ .col-sm-10
= f.text_field :name, placeholder: "Example Group", class: "input-xxlarge"
- .control-group.group-description-holder
+ .form-group.group-description-holder
= f.label :description, "Details"
- .controls
+ .col-sm-10
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
- .control-group.group_name_holder
+ .form-group.group_name_holder
= f.label :path do
%span.cred Group path
- .controls
+ .col-sm-10
= f.text_field :path, placeholder: "example-group", class: "input-xxlarge danger"
%ul.cred
%li Changing group path can have unintended side effects.
diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml
index cfbe6b5ee5a..76e49dbbcde 100644
--- a/app/views/admin/groups/new.html.haml
+++ b/app/views/admin/groups/new.html.haml
@@ -4,14 +4,14 @@
- if @group.errors.any?
.alert.alert-error
%span= @group.errors.full_messages.first
- .control-group
+ .form-group
= f.label :name do
Group name
- .controls
+ .col-sm-10
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
- .control-group.group-description-holder
+ .form-group.group-description-holder
= f.label :description, "Details"
- .controls
+ .col-sm-10
= f.text_area :description, maxlength: 250, class: "input-xxlarge js-gfm-input", rows: 4
.form-actions
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 84546a75142..681ba14f3d5 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -13,9 +13,9 @@
.alert.alert-error
- @hook.errors.full_messages.each do |msg|
%p= msg
- .control-group
+ .form-group
= f.label :url, "URL:"
- .controls
+ .col-sm-10
= f.text_field :url, class: "text_field input-xxlarge input-xpadding"
&nbsp;
= f.submit "Add System Hook", class: "btn btn-create"
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index dad75678ddb..3e66dbe56b5 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -2,32 +2,32 @@
.col-md-4
.admin-filter
= form_tag admin_projects_path, method: :get, class: 'form-inline' do
- .control-group
+ .form-group
= label_tag :name, 'Name:', class: 'control-label'
- .controls
+ .col-sm-10
= text_field_tag :name, params[:name], class: "span2"
- .control-group
+ .form-group
= label_tag :owner_id, 'Owner:', class: 'control-label'
- .controls
+ .col-sm-10
= users_select_tag :owner_id, selected: params[:owner_id], class: 'input-large input-clamp'
- .control-group.visibility-levels
+ .form-group.visibility-levels
= label_tag :visibility_level, 'Visibility Levels', class: 'control-label'
- Project.visibility_levels.each do |label, level|
- .controls
+ .col-sm-10
= check_box_tag 'visibility_levels[]', level, params[:visibility_levels].present? && params[:visibility_levels].include?(level.to_s)
%span.descr
= visibility_level_icon(level)
= label
- .control-group
+ .form-group
= label_tag :with_push, 'Not empty', class: 'control-label'
- .controls
+ .col-sm-10
= check_box_tag :with_push, 1, params[:with_push]
&nbsp;
%span.light Projects with push events
- .control-group
+ .form-group
= label_tag :abandoned, 'Abandoned', class: 'control-label'
- .controls
+ .col-sm-10
= check_box_tag :abandoned, 1, params[:abandoned]
&nbsp;
%span.light No activity over 6 month
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 0a90655cd24..786482eee2e 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -80,13 +80,13 @@
Transfer project
.body
= form_for @project, url: transfer_admin_project_path(@project), method: :put do |f|
- .control-group
+ .form-group
= f.label :namespace_id, "Namespace"
- .controls
+ .col-sm-10
= namespace_select_tag :namespace_id, selected: params[:namespace_id], class: 'input-large'
- .control-group
- .controls
+ .form-group
+ .col-sm-10
= f.submit 'Transfer', class: 'btn btn-primary'
.col-md-6
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 6e3b7337ab3..fc9b2d250a5 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -8,28 +8,28 @@
%fieldset
%legend Account
- .control-group
+ .form-group
= f.label :name
- .controls
+ .col-sm-10
= f.text_field :name, required: true, autocomplete: "off"
%span.help-inline * required
- .control-group
+ .form-group
= f.label :username
- .controls
+ .col-sm-10
= f.text_field :username, required: true, autocomplete: "off"
%span.help-inline * required
- .control-group
+ .form-group
= f.label :email
- .controls
+ .col-sm-10
= f.text_field :email, required: true, autocomplete: "off"
%span.help-inline * required
- if @user.new_record?
%fieldset
%legend Password
- .control-group
+ .form-group
= f.label :password
- .controls
+ .col-sm-10
%strong
A temporary password will be generated and sent to user.
%br
@@ -37,29 +37,29 @@
- else
%fieldset
%legend Password
- .control-group
+ .form-group
= f.label :password
- .controls= f.password_field :password, disabled: f.object.force_random_password
- .control-group
+ .col-sm-10= f.password_field :password, disabled: f.object.force_random_password
+ .form-group
= f.label :password_confirmation
- .controls= f.password_field :password_confirmation, disabled: f.object.force_random_password
+ .col-sm-10= f.password_field :password_confirmation, disabled: f.object.force_random_password
%fieldset
%legend Access
.row
.col-md-8
- .control-group
+ .form-group
= f.label :projects_limit
- .controls= f.number_field :projects_limit
+ .col-sm-10= f.number_field :projects_limit
- .control-group
+ .form-group
= f.label :can_create_group
- .controls= f.check_box :can_create_group
+ .col-sm-10= f.check_box :can_create_group
- .control-group
+ .form-group
= f.label :admin do
%strong.cred Administrator
- .controls= f.check_box :admin
+ .col-sm-10= f.check_box :admin
.col-md-4
- unless @user.new_record?
.alert.alert-error
@@ -71,15 +71,15 @@
= link_to 'Block User', block_admin_user_path(@user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-small btn-remove"
%fieldset
%legend Profile
- .control-group
+ .form-group
= f.label :skype
- .controls= f.text_field :skype
- .control-group
+ .col-sm-10= f.text_field :skype
+ .form-group
= f.label :linkedin
- .controls= f.text_field :linkedin
- .control-group
+ .col-sm-10= f.text_field :linkedin
+ .form-group
= f.label :twitter
- .controls= f.text_field :twitter
+ .col-sm-10= f.text_field :twitter
.form-actions
- if @user.new_record?