nickslowinski/discourse-custom-wizard-unlocked
1
0
Fork 0
geforkt von mirrored/discourse-custom-wizard
Code Pull-Requests Aktivität

theme_id has been pluralized

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Angus McLeod 2018-08-20 09:08:28 +10:00
Ursprung 8f4ee450ee
Commit 7303a9314d
2 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Diff-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
controllers/wizard.rb
Datei anzeigen

@ -4,7 +4,7 @@ class CustomWizard::WizardController < ::ApplicationController
requires_login requires_login
helper_method :wizard_page_title helper_method :wizard_page_title
helper_method :theme_id helper_method :theme_ids
def wizard def wizard
CustomWizard::Template.new(PluginStore.get('custom_wizard', params[:wizard_id].underscore)) CustomWizard::Template.new(PluginStore.get('custom_wizard', params[:wizard_id].underscore))
@ -14,8 +14,8 @@ class CustomWizard::WizardController < ::ApplicationController
wizard ? (wizard.name || wizard.id) : I18n.t('wizard.custom_title') wizard ? (wizard.name || wizard.id) : I18n.t('wizard.custom_title')
end end
def theme_id def theme_ids
wizard ? wizard.theme_id : nil wizard ? [wizard.theme_id] : nil
end end
def index def index

4
views/layouts/wizard.html.erb
Datei anzeigen

@ -5,7 +5,7 @@
<%= stylesheet_link_tag "wizard_composer", media: "all", "data-turbolinks-track" => "reload" %> <%= stylesheet_link_tag "wizard_composer", media: "all", "data-turbolinks-track" => "reload" %>
<%= stylesheet_link_tag "wizard_variables", media: "all", "data-turbolinks-track" => "reload" %> <%= stylesheet_link_tag "wizard_variables", media: "all", "data-turbolinks-track" => "reload" %>
<%= stylesheet_link_tag "wizard_custom_mobile", media: "all", "data-turbolinks-track" => "reload" if mobile_view?%> <%= stylesheet_link_tag "wizard_custom_mobile", media: "all", "data-turbolinks-track" => "reload" if mobile_view?%>
<%- if theme_id %> <%- if theme_ids %>
<%= discourse_stylesheet_link_tag (mobile_view? ? :mobile_theme : :desktop_theme) %> <%= discourse_stylesheet_link_tag (mobile_view? ? :mobile_theme : :desktop_theme) %>
<%- end %> <%- end %>
<%= preload_script "ember_jquery" %> <%= preload_script "ember_jquery" %>
@ -26,7 +26,7 @@
<%= server_plugin_outlet "custom_wizard" %> <%= server_plugin_outlet "custom_wizard" %>
<meta name="discourse_theme_id" content="<%= theme_id %>"> <meta name="discourse_theme_ids" content="<%= theme_ids&.join(",") %>">
<meta name="discourse-base-uri" content="<%= Discourse.base_uri %>"> <meta name="discourse-base-uri" content="<%= Discourse.base_uri %>">
<%= render partial: "layouts/head" %> <%= render partial: "layouts/head" %>