Download as
Browse Code »

Commit 18bda87e8783fd80cc0ceddaa06b741a8aee5862

Authored by Braulio Bhavamitra
1 parent 88e6388f
Exists in staging and in 28 other branches all_pending_tasks_api, api_roles, comments_permissions, elasticsearch, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, follower_permition, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, profile_api_improvements, user_mention

responsive: fix missed conflicts

Showing 3 changed files with 0 additions and 59 deletions   Show diff stats
plugins/responsive/lib/ext/boxes_helper.rb
  Diff comments   View file @18bda87
... ... @@ -62,16 +62,7 @@ module BoxesHelper
62 62 end
63 63  
64 64 include ResponsiveChecks
65   -<<<<<<< HEAD
66   - if RUBY_VERSION >= '2.0.0'
67   - prepend ResponsiveMethods
68   - else
69   - extend ActiveSupport::Concern
70   - included { include ResponsiveMethods }
71   - end
72   -=======
73 65 prepend ResponsiveMethods
74   ->>>>>>> 2ef3a43... responsive: fix html_safe issues
75 66  
76 67 end
77 68  
... ...
plugins/responsive/lib/ext/forms_helper.rb
  Diff comments   View file @18bda87
... ... @@ -11,10 +11,6 @@ module FormsHelper
11 11 return super unless theme_responsive?
12 12  
13 13 options[:id] ||= 'radio-' + FormsHelper.next_id_number
14   -<<<<<<< HEAD
15   - content_tag( 'label', radio_button_tag( name, value, checked, options ) + ' ' +
16   - human_name, for: options[:id], class: 'radio-inline' )
17   -=======
18 14 content_tag :div, class:'radio-inline' do
19 15 content_tag :label, for: options[:id] do
20 16 [
... ... @@ -24,7 +20,6 @@ module FormsHelper
24 20 ].safe_join
25 21 end
26 22 end
27   ->>>>>>> 2ef3a43... responsive: fix html_safe issues
28 23 end
29 24  
30 25 # add -inline class
... ... @@ -32,10 +27,6 @@ module FormsHelper
32 27 return super unless theme_responsive?
33 28  
34 29 options[:id] ||= 'checkbox-' + FormsHelper.next_id_number
35   -<<<<<<< HEAD
36   - hidden_field_tag(name, '0') +
37   - content_tag( 'label', check_box_tag( name, value, checked, options ) + ' ' + human_name, for: options[:id], class: 'checkbox-inline')
38   -=======
39 30 [
40 31 hidden_field_tag(name, '0'),
41 32 content_tag(:div, class:'checkbox-inline') do
... ... @@ -48,7 +39,6 @@ module FormsHelper
48 39 end
49 40 end
50 41 ].safe_join
51   ->>>>>>> 2ef3a43... responsive: fix html_safe issues
52 42 end
53 43  
54 44 def submit_button(type, label, html_options = {})
... ... @@ -69,29 +59,13 @@ module FormsHelper
69 59  
70 60 html_options.delete(:cancel)
71 61 bt_submit = button_tag(label, html_options.merge(class: the_class))
72   -<<<<<<< HEAD
73   -=======
74 62  
75 63 [bt_submit + bt_cancel].safe_join
76 64 end
77   ->>>>>>> 2ef3a43... responsive: fix html_safe issues
78 65  
79 66 bt_submit + bt_cancel
80 67 end
81 68  
82   -<<<<<<< HEAD
83   - %w[select select_tag text_field_tag number_field_tag password_field_tag].each do |method|
84   - define_method method do |*args, &block|
85   - #return super(*args, &block) unless theme_responsive?
86   -
87   - options = args.extract_options!
88   - if options['class']
89   - options['class'] = "#{options['class']} form-control"
90   - else
91   - options[:class] = "#{options[:class]} form-control"
92   - end
93   - super(*(args << options), &block)
94   -=======
95 69 %w[
96 70 select_tag
97 71 text_field_tag text_area_tag
... ... @@ -101,22 +75,12 @@ module FormsHelper
101 75 define_method method do |name, value=nil, options={}, &block|
102 76 responsive_add_field_class! options
103 77 super(name, value, options, &block).html_safe
104   ->>>>>>> 2ef3a43... responsive: fix html_safe issues
105 78 end
106 79 end
107 80 %w[select_month select_year].each do |method|
108 81 define_method method do |date, options={}, html_options={}|
109   -<<<<<<< HEAD
110   - if html_options['class']
111   - html_options['class'] = "#{html_options['class']} form-control"
112   - else
113   - html_options[:class] = "#{html_options[:class]} form-control"
114   - end
115   - super date, options, html_options
116   -=======
117 82 responsive_add_field_class! html_options
118 83 super(date, options, html_options).html_safe
119   ->>>>>>> 2ef3a43... responsive: fix html_safe issues
120 84 end
121 85 end
122 86  
... ...
plugins/responsive/lib/ext/input_helper.rb
  Diff comments   View file @18bda87
... ... @@ -4,29 +4,15 @@ module InputHelper
4 4 protected
5 5  
6 6 def input_group_addon addon, options = {}, &block
7   -<<<<<<< HEAD
8   - content_tag :div,
9   - content_tag(:span, addon, class: 'input-group-addon') + yield,
10   - class: 'input-group'
11   -=======
12 7 content_tag :div, class: 'input-group' do
13 8 [
14 9 content_tag(:span, addon, class: 'input-group-addon'),
15 10 capture(&block),
16 11 ].safe_join
17 12 end
18   ->>>>>>> 2ef3a43... responsive: fix html_safe issues
19 13 end
20 14  
21 15 end
22 16  
23   -<<<<<<< HEAD
24   -module ApplicationHelper
25   -
26   - include InputHelper
27   -
28   -end
29   -=======
30 17 ApplicationHelper.include InputHelper
31   ->>>>>>> 2ef3a43... responsive: fix html_safe issues
32 18  
... ...