Skip to content

Commit 7d0fd6c

Browse files
medhiwidjajamedhiwidjaja
committed
Convert views with tabs to spaces
1 parent 3be9bd8 commit 7d0fd6c

22 files changed

Lines changed: 265 additions & 699 deletions

‎app/views/alternatives/_fields.html.slim‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
.control-group
2-
= form.label :title, for: 'alternative_title', class: "control-label"
3-
.controls
4-
= form.text_field :title, class: 'input-xxlarge'
2+
= form.label :title, for: 'alternative_title', class: "control-label"
3+
.controls
4+
= form.text_field :title, class: 'input-xxlarge'
55
.control-group
6-
= form.label 'Short name', for: 'alternative_abbrev', class: "control-label"
7-
.controls
8-
= form.text_field :abbrev, class: 'input-xxlarge'
6+
= form.label 'Short name', for: 'alternative_abbrev', class: "control-label"
7+
.controls
8+
= form.text_field :abbrev, class: 'input-xxlarge'
99
.control-group
10-
= form.label :description, class: "control-label"
11-
.controls
12-
= form.text_area :description, class: 'input-xxlarge tinymce', rows: 10
10+
= form.label :description, class: "control-label"
11+
.controls
12+
= form.text_area :description, class: 'input-xxlarge tinymce', rows: 10
1313

1414
= tinymce

‎app/views/alternatives/_property.html.slim‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tr.property-row
2-
td = f.text_field :name
3-
td = f.text_field :value, class: 'input-small'
4-
td = f.text_field :unit, class: 'input-small'
5-
td = remove_child_link "Delete row", f, class:'btn btn-small btn-warning'
2+
td = f.text_field :name
3+
td = f.text_field :value, class: 'input-small'
4+
td = f.text_field :unit, class: 'input-small'
5+
td = remove_child_link "Delete row", f, class:'btn btn-small btn-warning'

‎app/views/alternatives/edit.html.slim‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22

33
= article_menu @article
44
- content_for :left_frame do
5-
= render 'sidepanel'
5+
= render 'sidepanel'
66

77
= render 'shared/flash_messages'
88
.widget
9-
.widget-header
10-
i.icon-list-ul
11-
h3 Editing alternative
12-
.well.well-widget-content
13-
.widget-content-title Alternative
14-
15-
= form_with model: @alternative do |alt_form|
16-
== render partial: 'fields', locals: { form: alt_form }
17-
18-
#toolbar.button-toolbar
19-
= alt_form.submit 'Save', class:"btn btn-primary"
9+
.widget-header
10+
i.icon-list-ul
11+
h3 Editing alternative
12+
.well.well-widget-content
13+
.widget-content-title Alternative
14+
15+
= form_with model: @alternative do |alt_form|
16+
== render partial: 'fields', locals: { form: alt_form }
17+
18+
#toolbar.button-toolbar
19+
= alt_form.submit 'Save', class:"btn btn-primary"
2020

21-
= link_to '<i class="icon-remove"></i> Cancel'.html_safe,
22-
alternative_path(@alternative),
23-
class: "btn always"
24-
= link_to '<i class="icon-trash"></i> Delete'.html_safe,
25-
alternative_path(@alternative),
26-
method: :delete,
27-
class: "btn btn-danger pull-right always",
28-
data: {confirm: "Deleting alternatives will also delete all related scores and evaluations. You and other participants (if any) will have to redo all ratings previously done.\n\nAre you sure to proceed?"}
21+
= link_to '<i class="icon-remove"></i> Cancel'.html_safe,
22+
alternative_path(@alternative),
23+
class: "btn always"
24+
= link_to '<i class="icon-trash"></i> Delete'.html_safe,
25+
alternative_path(@alternative),
26+
method: :delete,
27+
class: "btn btn-danger pull-right always",
28+
data: {confirm: "Deleting alternatives will also delete all related scores and evaluations. You and other participants (if any) will have to redo all ratings previously done.\n\nAre you sure to proceed?"}
2929

3030

3131

‎app/views/alternatives/index.html.slim‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,3 @@
1818
#toolbar.button-toolbar
1919
= conditional_link_to new_article_alternative_path(@article), can?(:update, @article), class: "btn btn-primary"
2020
| Add new alternative
21-
22-

‎app/views/alternatives/new.html.slim‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
= article_menu @article
44
- content_for :left_frame do
5-
= render 'sidepanel'
5+
= render 'sidepanel'
66

77
= render 'shared/flash_messages'
88
.widget
9-
.widget-header
10-
i.icon-list-ul
11-
h3 Add new
12-
.well.well-widget-content
13-
.widget-content-title New alternative
14-
15-
= form_with model: [@article, @alternative] do |f|
16-
== render partial: 'fields', locals: { form: f }
17-
#toolbar.button-toolbar
18-
= f.submit 'Save', class:"btn btn-primary"
19-
= link_to '<i class="icon-remove"></i> Cancel'.html_safe,
20-
article_alternatives_path(@article),
21-
class:"btn"
9+
.widget-header
10+
i.icon-list-ul
11+
h3 Add new
12+
.well.well-widget-content
13+
.widget-content-title New alternative
14+
15+
= form_with model: [@article, @alternative] do |f|
16+
== render partial: 'fields', locals: { form: f }
17+
#toolbar.button-toolbar
18+
= f.submit 'Save', class:"btn btn-primary"
19+
= link_to '<i class="icon-remove"></i> Cancel'.html_safe,
20+
article_alternatives_path(@article),
21+
class:"btn"

‎app/views/articles/edit.html.slim‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
= article_menu @article
44

55
- content_for :left_frame do
6-
= render partial: 'sidepanel'
6+
= render partial: 'sidepanel'
77

88
#content-box
9-
= render 'shared/flash_messages'
10-
.widget
11-
.widget-header
12-
i.icon-edit
13-
h3 Edit Article
14-
.well.well-widget-content
15-
.widget-content-title
16-
| Editing article
9+
= render 'shared/flash_messages'
10+
.widget
11+
.widget-header
12+
i.icon-edit
13+
h3 Edit Article
14+
.well.well-widget-content
15+
.widget-content-title
16+
| Editing article
1717

18-
== render partial: 'form'
18+
== render partial: 'form'
1919

2020

‎app/views/articles/new.html.slim‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
= article_menu
44
- content_for :left_frame do
5-
= render partial: 'shared/user_profile', locals: { user: current_user }
5+
= render partial: 'shared/user_profile', locals: { user: current_user }
66

77
#content-box
8-
= render 'shared/flash_messages'
9-
.widget
10-
.widget-header
11-
i.icon-file
12-
h3 New article
13-
.well.well-widget-content
14-
.widget-content-title Create new article
8+
= render 'shared/flash_messages'
9+
.widget
10+
.widget-header
11+
i.icon-file
12+
h3 New article
13+
.well.well-widget-content
14+
.widget-content-title Create new article
1515

16-
== render partial: 'form'
17-
16+
== render partial: 'form'

‎app/views/articles/show.html.slim‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
= article_menu @article
33

44
- content_for :left_frame do
5-
= render partial: 'sidepanel'
5+
= render partial: 'sidepanel'
66

77
#container-box
8-
= render 'shared/flash_messages'
9-
= render 'article_content'
8+
= render 'shared/flash_messages'
9+
= render 'article_content'

‎app/views/criteria/_fields.html.slim‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
-if @criterion.errors.any?
2-
.alert.alert-error
3-
a.close data-dismiss="alert" ×
4-
| Error. Please check the indicated #{inflectize(@criterion.errors.count, "field")} below.
2+
.alert.alert-error
3+
a.close data-dismiss="alert" ×
4+
| Error. Please check the indicated #{inflectize(@criterion.errors.count, "field")} below.
55

66
.row-fluid
7-
.span4
8-
.control-group
9-
= form.label :title, class: "control-label"
10-
.controls
11-
= form.text_field :title, id: 'title'
12-
.span2
13-
.control-group
14-
= form.label :abbrev, 'Short title', class: "control-label"
15-
.controls
16-
= form.text_field :abbrev
7+
.span4
8+
.control-group
9+
= form.label :title, class: "control-label"
10+
.controls
11+
= form.text_field :title, id: 'title'
12+
.span2
13+
.control-group
14+
= form.label :abbrev, 'Short title', class: "control-label"
15+
.controls
16+
= form.text_field :abbrev
1717

1818
= form.hidden_field :parent_id, value: parent_id
1919
= form.hidden_field :article_id, value: @presenter.article.id
2020
.control-group
21-
= form.label :description, class: 'control-label'
22-
= form.text_area :description, class: 'input-xxlarge wysihtml5', rows: 10
21+
= form.label :description, class: 'control-label'
22+
= form.text_area :description, class: 'input-xxlarge wysihtml5', rows: 10
2323

2424
.widget-divider
2525
.widget-content-title Comparison method to use for all participants
2626
.control-group
27-
= form.label "Comparison method to be used by all participants at this node:", class: 'control-label'
28-
.controls.pop-over
29-
= form.label :appraisal_method_magiqcomparison, class:'radio'
30-
= form.radio_button :appraisal_method, 'MagiqComparison'
31-
span rel='popover' data-content='Assign weights by ranking using Multi-Attribute Global Inference of Quality method' data-original-title='MAGIC Method'
32-
| MAGIQ method
33-
.controls.pop-over
34-
= form.label :appraisal_method_directcomparison, class:'radio'
35-
= form.radio_button :appraisal_method, 'DirectComparison'
36-
span rel='popover' data-content='Directly assign weights to each sub-criteria using Simple Multi-Attribute Rating Technique' data-original-title='SMART method'
37-
| SMART method
38-
.controls.pop-over
39-
= form.label :appraisal_method_pairwisecomparison, class:'radio'
40-
= form.radio_button :appraisal_method, 'PairwiseComparison'
41-
span rel='popover' data-content='Assign weights by making pairwise comparisons using Analytic Hierarchy Process' data-original-title='AHP Pairwise method'
42-
| AHP Pairwise method
43-
.controls.pop-over
44-
= form.label :appraisal_method, class:'radio'
45-
= form.radio_button :appraisal_method, nil
46-
span rel='popover' data-content='Each participant is free to choose any of the above method. Note that combining results of different methods may not give meaningfull answer.' data-original-title="No assigned method" data-html=true
47-
| No assigned method
27+
= form.label "Comparison method to be used by all participants at this node:", class: 'control-label'
28+
.controls.pop-over
29+
= form.label :appraisal_method_magiqcomparison, class:'radio'
30+
= form.radio_button :appraisal_method, 'MagiqComparison'
31+
span rel='popover' data-content='Assign weights by ranking using Multi-Attribute Global Inference of Quality method' data-original-title='MAGIC Method'
32+
| MAGIQ method
33+
.controls.pop-over
34+
= form.label :appraisal_method_directcomparison, class:'radio'
35+
= form.radio_button :appraisal_method, 'DirectComparison'
36+
span rel='popover' data-content='Directly assign weights to each sub-criteria using Simple Multi-Attribute Rating Technique' data-original-title='SMART method'
37+
| SMART method
38+
.controls.pop-over
39+
= form.label :appraisal_method_pairwisecomparison, class:'radio'
40+
= form.radio_button :appraisal_method, 'PairwiseComparison'
41+
span rel='popover' data-content='Assign weights by making pairwise comparisons using Analytic Hierarchy Process' data-original-title='AHP Pairwise method'
42+
| AHP Pairwise method
43+
.controls.pop-over
44+
= form.label :appraisal_method, class:'radio'
45+
= form.radio_button :appraisal_method, nil
46+
span rel='popover' data-content='Each participant is free to choose any of the above method. Note that combining results of different methods may not give meaningfull answer.' data-original-title="No assigned method" data-html=true
47+
| No assigned method
4848

4949
-if cost
50-
= form.hidden_field :cost, value: true
50+
= form.hidden_field :cost, value: true
5151

‎app/views/criteria/_toolbar.html.slim‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,3 @@
2222
data: {confirm: "This will delete all comparisons related to this criterion.\n\nAre you sure to proceed?"} do
2323
i.icon-trash
2424
| Delete
25-
26-

0 commit comments

Comments
 (0)