odania_core 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61ed856180e939491b2083a9b5e74fb1b1bd7798
-  data.tar.gz: 7bd04630e902690fb8ab84a45732037c099f8bc9
+  metadata.gz: 08bde9bd3cf95dd5043372bd8c71fb67c38681b3
+  data.tar.gz: 1859007e23882e4720046914b0a86408adea3b4f
 SHA512:
-  metadata.gz: 0da684e9a7298c90a391038cecbbb06280ae55370e82aca0f00e15213aad539df683a38562ec902a0f633105934887194335367800f3db1d8e9d835ff08f64da
-  data.tar.gz: 3f47d19dfd36045385b8d7ea3b07919bcddd8b126a90ac5546d167b6a9bc2087ee85017c4176ee517de1488ea51084321a46b047758552fe29b875c8905e9de0
+  metadata.gz: 89ed4e710a7eb2f9a8e7168f4f2f04e4af7e4c92eb029547f2e2af4d063ea0d1a271f306c06da7fb46d6ce83e134cff6e806aef28949f1cdea325c5c6057b1e8
+  data.tar.gz: 30931e03f7befd466a51ffb8d906c046afc7b7103212c1624ee04d614d10fd73e345c3fc84ebf11eba182b193b06afcb16dcbef2c8a8b32f242d3d06bde60901

data/app/assets/javascripts/odania/info.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

data/app/assets/javascripts/odania_core_protected/application.js

@@ -0,0 +1,16 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require bootstrap
+//= require_tree .

data/app/assets/stylesheets/odania/info.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the odania/info controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

data/app/assets/stylesheets/odania_core_protected/application.css

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */

data/app/assets/stylesheets/odania_core_protected/style.css.scss

@@ -0,0 +1 @@
+@import "bootstrap";

data/app/controllers/admin/odania/menu_items_controller.rb

@@ -85,6 +85,6 @@ class Admin::Odania::MenuItemsController < AdminController
 
 	# Parameter for target data
 	def odania_target_data_params
-		params.require(:target_data)
+		params[:target_data].nil? ? {} : params[:target_data]
 	end
 end

data/app/controllers/admin/odania/sites_controller.rb

@@ -55,6 +55,7 @@ class Admin::Odania::SitesController < AdminController
 	# Only allow a trusted parameter "white list" through.
 	def admin_site_params
 		params.require(:odania_site).permit(:name, :host, :is_active, :is_default, :tracking_code, :description,
+														:default_from_email, :notify_email_address, :imprint, :terms_and_conditions,
 														:redirect_to_id, :template, :default_language_id, :language_ids => [])
 	end
 end

data/app/controllers/admin_controller.rb

@@ -4,7 +4,7 @@ class AdminController < ApplicationController
 	layout :set_admin_layout
 
 	def set_admin_layout
-		current_user.admin_layout || Odania.admin.admin_templates.keys.first || 'odania_core/admin'
+		current_user.admin_layout || Odania.admin.templates.keys.first || 'odania_core/admin'
 	end
 
 	def choose_site

data/app/controllers/odania/info_controller.rb

@@ -0,0 +1,35 @@
+class Odania::InfoController < ApplicationController
+	before_action :valid_site!
+
+	def imprint
+	end
+
+	def terms_and_conditions
+	end
+
+	def contact
+		set_post_name
+	end
+
+	def contact_send
+		set_post_name
+
+		return redirect_to :action => 'index' if params[@contact_post_name].nil?
+
+		# Send Mail
+		Odania::Notify.contact_form(current_site, params[@contact_post_name]).deliver!
+
+		# Remove cookie
+		cookies[:contact_post_name] = nil
+	end
+
+	private
+
+	def set_post_name
+		if cookies[:contact_post_name].nil? or cookies[:contact_post_name].empty?
+			cookies[:contact_post_name] = "contact"+rand(100000).to_s
+		end
+
+		@contact_post_name = cookies[:contact_post_name]
+	end
+end

data/app/controllers/protected/dashboard_controller.rb

@@ -0,0 +1,4 @@
+class Protected::DashboardController < ProtectedController
+	def index
+	end
+end

data/app/controllers/protected_controller.rb

@@ -0,0 +1,9 @@
+class ProtectedController < ApplicationController
+	before_action :authenticate_user!, :require_admin_role!
+	skip_before_filter :valid_site!
+	layout :set_protected_layout
+
+	def set_protected_layout
+		Odania.protected.templates.keys.first || 'odania_core/protected'
+	end
+end

data/app/helpers/odania/info_helper.rb

@@ -0,0 +1,2 @@
+module Odania::InfoHelper
+end

data/app/mailers/odania/notify.rb

@@ -0,0 +1,13 @@
+class Odania::Notify < ActionMailer::Base
+	def contact_form(site, data)
+		@data = data
+		@site = site
+		mail(to: site.notify_email_address, subject: "Contact form: #{data['contact_name']} (#{site.name})", from: site.default_from_email)
+	end
+
+	def notify_admin(site, msg)
+		@msg = msg
+		@site = site
+		mail(to: site.notify_email_address, subject: "[AdminNotify]: #{msg} (#{site.name})", from: site.default_from_email)
+	end
+end

data/app/views/admin/odania/contents/_form.html.erb

@@ -1,15 +1,5 @@
 <%= form_for([:admin, @odania_menu, @admin_content]) do |f| %>
-	<% if @admin_content.errors.any? %>
-		<div id="error_explanation">
-			<h2><%= pluralize(@admin_content.errors.count, "error") %> prohibited this admin_content from being saved:</h2>
-
-			<ul>
-				<% @admin_content.errors.full_messages.each do |msg| %>
-					<li><%= msg %></li>
-				<% end %>
-			</ul>
-		</div>
-	<% end %>
+	<%= render partial: 'odania/shared/errors', locals: {obj: @admin_content} %>
 
 	<div class="field">
 		<%= f.label :site_id %>

data/app/views/admin/odania/contents/index.html.erb

@@ -1,6 +1,6 @@
 <h1>Listing admin_contents</h1>
 
-<table>
+<table class="table">
 	<thead>
 	<tr>
 		<th>Title</th>
@@ -26,6 +26,6 @@
 	</tbody>
 </table>
 
-<br>
+<br/>
 
 <%= link_to 'New Content', new_admin_odania_menu_odania_content_path(@odania_menu) %>

data/app/views/admin/odania/languages/_form.html.erb

@@ -1,25 +1,14 @@
 <%= form_for([:admin, @admin_language]) do |f| %>
-	<% if @admin_language.errors.any? %>
-		<div id="error_explanation">
-			<h2><%= pluralize(@admin_language.errors.count, "error") %> prohibited this admin_language from being
-				saved:</h2>
-
-			<ul>
-				<% @admin_language.errors.full_messages.each do |msg| %>
-					<li><%= msg %></li>
-				<% end %>
-			</ul>
-		</div>
-	<% end %>
+	<%= render partial: 'odania/shared/errors', locals: {obj: @admin_language} %>
 
 	<div class="field">
 		<%= f.label :name %>
-		<br>
+		<br/>
 		<%= f.text_field :name %>
 	</div>
 	<div class="field">
 		<%= f.label :iso_639_1 %>
-		<br>
+		<br/>
 		<%= f.text_field :iso_639_1 %>
 	</div>
 	<div class="actions">

data/app/views/admin/odania/languages/index.html.erb

@@ -1,6 +1,6 @@
 <h1>Listing admin_languages</h1>
 
-<table>
+<table class="table">
 	<thead>
 	<tr>
 		<th>Name</th>
@@ -24,6 +24,6 @@
 	</tbody>
 </table>
 
-<br>
+<br/>
 
 <%= link_to 'New Language', new_admin_odania_language_path %>

data/app/views/admin/odania/menu_items/_form.html.erb

@@ -1,38 +1,30 @@
 <%= form_for([:admin, @odania_menu, @odania_menu_item]) do |f| %>
-	<% if @odania_menu_item.errors.any? %>
-		<div id="error_explanation">
-			<h2><%= pluralize(@odania_menu_item.errors.count, "error") %> prohibited this odania_menu_item from being
-				saved:</h2>
-
-			<ul>
-				<% @odania_menu_item.errors.full_messages.each do |msg| %>
-					<li><%= msg %></li>
-				<% end %>
-			</ul>
-		</div>
-	<% end %>
+	<%= render partial: 'odania/shared/errors', locals: {obj: @odania_menu_item} %>
 
 	<div class="field">
 		<%= f.label :title %>
-		<br>
+		<br/>
 		<%= f.text_field :title %>
 	</div>
 	<div class="field">
 		<%= f.label :published %>
-		<br>
+		<br/>
 		<%= f.check_box :published %>
 	</div>
 	<div class="field">
 		<%= f.label :target_type %>
-		<br>
+		<br/>
 		<%= f.select :target_type, Odania::TargetType.targets.keys %>
 	</div>
 
-	<%= render partial: Odania::TargetType.targets[@odania_menu_item.target_type][:selector], locals: {menu_item: @odania_menu_item} %>
+
+	<% unless Odania::TargetType.targets[@odania_menu_item.target_type][:selector].blank? %>
+		<%= render partial: Odania::TargetType.targets[@odania_menu_item.target_type][:selector], locals: {menu_item: @odania_menu_item} %>
+	<% end %>
 
 	<div class="field">
 		<%= f.label :parent_id %>
-		<br>
+		<br/>
 		<%= f.collection_select :parent_id, Odania::MenuItem.order('title ASC'), :id, :title, {include_blank: true} %>
 	</div>
 	<div class="actions">

data/app/views/admin/odania/menu_items/index.html.erb

@@ -1,6 +1,6 @@
 <h1>Listing odania_menu_items</h1>
 
-<table>
+<table class="table">
 	<thead>
 	<tr>
 		<th></th>
@@ -32,6 +32,6 @@
 	</tbody>
 </table>
 
-<br>
+<br/>
 
 <%= link_to 'New Menu item', new_admin_odania_menu_odania_menu_item_path %>

data/app/views/admin/odania/menus/_form.html.erb

@@ -1,34 +1,24 @@
 <%= form_for([:admin, @admin_menu]) do |f| %>
-	<% if @admin_menu.errors.any? %>
-		<div id="error_explanation">
-			<h2><%= pluralize(@admin_menu.errors.count, "error") %> prohibited this admin_menu from being saved:</h2>
-
-			<ul>
-				<% @admin_menu.errors.full_messages.each do |msg| %>
-					<li><%= msg %></li>
-				<% end %>
-			</ul>
-		</div>
-	<% end %>
+	<%= render partial: 'odania/shared/errors', locals: {obj: @admin_menu} %>
 
 	<div class="field">
 		<%= f.label :title %>
-		<br>
+		<br/>
 		<%= f.text_field :title %>
 	</div>
 	<div class="field">
 		<%= f.label :published %>
-		<br>
+		<br/>
 		<%= f.check_box :published %>
 	</div>
 	<div class="field">
 		<%= f.label :site %>
-		<br>
+		<br/>
 		<%= f.collection_select :site_id, Odania::Site.order('name ASC'), :id, :name %>
 	</div>
 	<div class="field">
 		<%= f.label :language_id %>
-		<br>
+		<br/>
 		<%= f.collection_select :language_id, Odania::Language.order('name ASC'), :id, :name %>
 	</div>
 	<div class="actions">

data/app/views/admin/odania/menus/index.html.erb

@@ -1,6 +1,6 @@
 <h1>Listing admin_menus</h1>
 
-<table>
+<table class="table">
 	<thead>
 	<tr>
 		<th>Title</th>
@@ -28,6 +28,6 @@
 	</tbody>
 </table>
 
-<br>
+<br/>
 
 <%= link_to 'New Menu', new_admin_odania_menu_path %>

data/app/views/admin/odania/shared/_menu.html.erb

@@ -13,7 +13,7 @@
 
 	<div class="nav-collapse">
 		<ul class="nav nav-list">
-			<% Odania.admin.admin_pages.each do |admin_page| %>
+			<% Odania.admin.pages.each do |admin_page| %>
 				<li><%= link_to admin_page[:name], admin_page[:path] %></li>
 			<% end %>
 		</ul>

data/app/views/admin/odania/sites/_form.html.erb

@@ -1,61 +1,71 @@
 <%= form_for([:admin, @admin_site]) do |f| %>
-	<% if @admin_site.errors.any? %>
-		<div id="error_explanation">
-			<h2><%= pluralize(@admin_site.errors.count, "error") %> prohibited this admin_site from being saved:</h2>
-
-			<ul>
-				<% @admin_site.errors.full_messages.each do |msg| %>
-					<li><%= msg %></li>
-				<% end %>
-			</ul>
-		</div>
-	<% end %>
+	<%= render partial: 'odania/shared/errors', locals: {obj: @admin_site} %>
 
 	<div class="field">
 		<%= f.label :name %>
-		<br>
+		<br/>
 		<%= f.text_field :name %>
 	</div>
 	<div class="field">
 		<%= f.label :host %>
-		<br>
+		<br/>
 		<%= f.text_field :host %>
 	</div>
 	<div class="field">
 		<%= f.label :is_active %>
-		<br>
+		<br/>
 		<%= f.check_box :is_active %>
 	</div>
 	<div class="field">
 		<%= f.label :is_default %>
-		<br>
+		<br/>
 		<%= f.check_box :is_default %>
 	</div>
-	<div class="field">
-		<%= f.label :tracking_code %>
-		<br>
-		<%= f.text_area :tracking_code %>
-	</div>
 	<div class="field">
 		<%= f.label :description %>
-		<br>
+		<br/>
 		<%= f.text_area :description %>
 	</div>
 	<div class="field">
 		<%= f.label :default_language_id %>
-		<br>
+		<br/>
 		<%= f.collection_select :default_language_id, Odania::Language.order('name ASC'), :id, :name %>
 	</div>
+	<div class="field">
+		<%= f.label :default_from_email %>
+		<br/>
+		<%= f.text_field :default_from_email %>
+	</div>
+	<div class="field">
+		<%= f.label :notify_email_address %>
+		<br/>
+		<%= f.text_field :notify_email_address %>
+	</div>
 	<div class="field">
 		<%= f.label :redirect_to_id %>
-		<br>
+		<br/>
 		<%= f.collection_select :redirect_to_id, Odania::Site.order('name ASC'), :id, :name, {include_blank: true} %>
 	</div>
 	<div class="field">
 		<%= f.label :template %>
-		<br>
+		<br/>
 		<%= f.select :template, Odania.templates_for_select, {include_blank: true} %>
 	</div>
+	<div class="field">
+		<%= f.label :tracking_code %>
+		<br/>
+		<%= f.text_area :tracking_code %>
+	</div>
+	<div class="field">
+		<%= f.label :imprint %>
+		<br/>
+		<%= f.text_area :imprint %>
+	</div>
+	<div class="field">
+		<%= f.label :terms_and_conditions %>
+		<br/>
+		<%= f.text_area :terms_and_conditions %>
+	</div>
 	<div class="actions">
 		<%= f.submit %>
 	</div>