diff --git a/app/controllers/default_widget_controller.rb b/app/controllers/default_widget_controller.rb index 1f9e1d9..332e19b 100644 --- a/app/controllers/default_widget_controller.rb +++ b/app/controllers/default_widget_controller.rb @@ -58,6 +58,7 @@ class DefaultWidgetController< OrbitWidgetController @frontend_field_names = @page_part.frontend_field_name @frontend_classes = @page_part.frontend_class @frontend_sat_to_links = @page_part.frontend_sat_to_link + @widget_title = @page_part.title_translations[I18n.locale.to_s] @data_limit = @page_part.frontend_data_count.is_a?(Fixnum) ? @page_part.frontend_data_count : (@page_part.frontend_data_count.to_i rescue 3) @paginate = true @@ -95,6 +96,9 @@ class DefaultWidgetController< OrbitWidgetController when "typeC" @tag_class = 'default_widget_typeC' @partial = "typeC" + when "typeD" + @tag_class = 'default_widget_typeC' + @partial = "typeD" end end end diff --git a/app/views/admin/pages/_default_front.html.erb b/app/views/admin/pages/_default_front.html.erb index 4481ec6..7ea505c 100644 --- a/app/views/admin/pages/_default_front.html.erb +++ b/app/views/admin/pages/_default_front.html.erb @@ -35,6 +35,13 @@ <%= t("default_widget.caption.typeC") %> <% end %> + <% if @enabled_styles.include?("typeD") %> +
  • + <%= radio_button_tag "page[frontend_style]", "typeD", @checked_style ? @checked_style.eql?("typeD") : false, class: "d-theme" %> + <%= image_tag 'module/default_widgets/style05.png'%> + <%= t("default_widget.caption.typeD") %> +
  • + <% end %> diff --git a/app/views/default_widget/_typeD.html.erb b/app/views/default_widget/_typeD.html.erb new file mode 100644 index 0000000..4b64235 --- /dev/null +++ b/app/views/default_widget/_typeD.html.erb @@ -0,0 +1,91 @@ +
    + <% @data.each do |row_data| %> +
    +
    + <% @frontend_field_names.each_with_index do |field,index| %> + <% if index == 0 %> + + <%= link_to_field(row_data,field, @frontend_sat_to_links[index],{orig_page: @page_id.to_s}) unless field.blank? %> + + <% else %> + <%= row_data.title %> + <% end %> + <% end %> +
    + +
    +<% end %> +
    + + \ No newline at end of file diff --git a/built_in_extensions.rb b/built_in_extensions.rb index a235a14..a176aac 100644 --- a/built_in_extensions.rb +++ b/built_in_extensions.rb @@ -15,3 +15,4 @@ gem 'personal_patent', '0.0.1', :git => 'git@gitlab.tp.rulingcom.com:root/orbit- gem 'personal_project', '0.0.1', :git => 'git@gitlab.tp.rulingcom.com:root/orbit-personalproject.git' gem 'personal_research', '0.0.1', :git => 'git@gitlab.tp.rulingcom.com:root/orbit-personalresearch.git' gem 'web_resource', '0.0.1', :git => 'git@gitlab.tp.rulingcom.com:root/orbit-webresource.git' +gem 'faq', '0.0.1', :path => '/Users/H4RRY/github/modules/orbit-faq' \ No newline at end of file