",
"
",
- " ",
+ " ",
"
",
"
",
@@ -2278,7 +2278,7 @@ the specific language governing permissions and limitations under the Apache Lic
}).html([
"
",
"
",
diff --git a/app/assets/stylesheets/public/articles.css.scss b/app/assets/stylesheets/public/articles.css.scss
index d139f97..08fa18a 100644
--- a/app/assets/stylesheets/public/articles.css.scss
+++ b/app/assets/stylesheets/public/articles.css.scss
@@ -68,10 +68,10 @@
}
-
-.blog_content_show{
- margin-left:342px;
-
+.article_inner{
+ max-width:800px;
+ margin:auto;
+ width:90%;
}
.blog_sidebar_bottom{
@@ -398,7 +398,6 @@
.article_content{
background:white;
- margin-top:20px;
padding-bottom:50px;
h1{
margin-top: 0;
diff --git a/app/controllers/public/banners_controller.rb b/app/controllers/public/banners_controller.rb
new file mode 100644
index 0000000..e9cdff4
--- /dev/null
+++ b/app/controllers/public/banners_controller.rb
@@ -0,0 +1,15 @@
+class Public::BannersController < ApplicationController
+
+ layout "public"
+
+ def remove_banner
+ session[:no_banner] = true
+ render :inline => "ok"
+ end
+
+ def add_banner
+ session[:no_banner] = nil
+ render :inline => "ok"
+ end
+
+end
\ No newline at end of file
diff --git a/app/models/article.rb b/app/models/article.rb
index 6fc785c..4ea6cac 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -1,8 +1,8 @@
require 'elasticsearch/model'
class Article < ActiveRecord::Base
- include Elasticsearch::Model
- include Elasticsearch::Model::Callbacks
+ #include Elasticsearch::Model
+ #include Elasticsearch::Model::Callbacks
has_many :question_juridiques
@@ -91,7 +91,7 @@ class Article < ActiveRecord::Base
end
after_update do
- logger.debug ["Updating document... ", __elasticsearch__.delete_document, __elasticsearch__.index_document].join
+ #logger.debug ["Updating document... ", __elasticsearch__.delete_document, __elasticsearch__.index_document].join
# after_destroy { logger.debug ["Deleting document... ", delete_document].join }
end
diff --git a/app/models/export_hist.rb b/app/models/export_hist.rb
deleted file mode 100644
index 76473f0..0000000
--- a/app/models/export_hist.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class ExportHist < ActiveRecord::Base
- validates :piece, :presence => true, :uniqueness => true
-
-end
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 391a8c6..00c0913 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -161,9 +161,111 @@
.clear
-
+ =link_to add_banner_public_banners_path(), :remote => true, :onclick => "$('#banner').show();$('#small_banner').closest('#small_banner').hide();" do
+ #small_banner{:style => ("display:none;" if !session[:no_banner])}
+ %span{:style => "font-size:20px;"}
+ =ic(:warning)
+ %br
+ Informations
+ %br
+ COVID-2019
+ #banner{:style => ("display:none;" if session[:no_banner])}
+ .left
+ %span{:style => "font-size:25px;"}=ic(:warning)
+ %br
+ COVID-2019
+ .right
+ %p
+ %strong Jipé continue à produire
+ en prenant les mesures nécessaires pour
+ %strong
+ assurer la sécurité
+ de ses
+ %strong collaborateurs,
+ de ses
+ %strong prestataires
+ et
+ %strong fournisseurs.
+ %p
+ Après avoir fourni des
+ %strong structures pour faire face à l’urgence,
+ nous pouvons
+ %strong dès maintenant
+ vous proposer des
+ %strong solutions pour gérer l’après confinement
+ (salles externes, douches de décontamination, sanitaires, lieux d’isolement…)
+
+ %p.actions
+ =link_to "En savoir plus", "/fr/blog/covid-19-jipe-continue-a-produire-et-propose-des-solutions.html"
+
+ =link_to "Nous contacter", "/fr/contact.html"
+
+
+
+ .close_banner=link_to ic(:times)+" Ne plus afficher cette info", remove_banner_public_banners_path(), :remote => true, :onclick => "$(this).closest('#banner').hide();$('#small_banner').show();"
+ .clear
+
+ :scss
+ #small_banner{
+ position:absolute;
+ top:50px;
+ left:0;
+
+ background:#ffedcd;
+ color:#333f48;
+ color:#BF2F2A;
+ font-size:14px;
+ text-align:center;
+ padding:10px 30px;
+ z-index:10;
+ font-weight:bold;
+
+ }
+
+
+ #banner{
+ background:#ffedcd;
+ color:#333f48;
+ padding:20px 20px;
+ font-size:14px;
+ position:relative;
+ p{
+ margin:5px 0;
+ }
+
+ .actions{
+ a{
+ padding:4px 8px;
+ border:1px solid #BF2F2A;
+ display:inline-block;
+ margin-right:8px;
+ margin-top:8px;
+ }
+
+ }
+ .close_banner{
+ position:absolute;
+ bottom:5px;right:5px;
+ }
+
+ .right{
+ margin-left:200px;
+
+ }
+
+ .left{
+ color:#BF2F2A;
+ font-size:18px;
+ float:left;
+ text-align:center;
+ width:200px;
+ margin-left:-10px;
+ padding-top:30px;
+ }
+
+ }
-if @menu_item and @menu_item.id != 1
-if @menu_item.ancestors.reverse[0]
@@ -288,6 +390,9 @@
});
+
+
+
=yield
:scss
#sub_menu_top.home_sub_menu{
diff --git a/app/views/public/articles/show.html.haml b/app/views/public/articles/show.html.haml
index 7370034..95d362b 100644
--- a/app/views/public/articles/show.html.haml
+++ b/app/views/public/articles/show.html.haml
@@ -1,4 +1,3 @@
-=render :partial => "public/articles/intro_blog"
-if @lang_article.image_file
-img_url = @lang_article.image_file.file.large.url
@@ -15,23 +14,16 @@
-
-
-.blog_sidebar_top
- .blog_sidebar.left{:style => "float:left;"}=render :partial => "public/articles/sidebar"
.blog_content_show
- .inner{:style => "width:100%;float:left"}
-
- .article_content
-
- .article_top{:style => "background-image:url('#{img_url}');", :class => ("with_img" if img_url)}
- -if !@article.gradient_cached
- =#.gradient
+
+ .article_content
-
+ .article_top{:style => "background-image:url('#{img_url}');", :class => ("with_img" if img_url)}
+
+ .article_inner
-if !@article.title_cached
%h1
@@ -41,58 +33,20 @@
=@lang_article.title
%p.date
- =("le " if @lang.id != 2).to_s+l(@article.published_at, :format => :human_date)
- ="-"
- =link_to "#comments" do
- %span.coms=i(:"comment-o")+" "+@article.comments.where(:enabled => true).count.to_s
-
- =render @article.blocks.find_by_lang_site_id(@lang.id)
- -if @article.article_author
- .center
- .author
- =@article.article_author.title if @article.article_author.title
- =@article.article_author.name
-
- -if @article.juridique
- .article_comments_container
- #question_juridiques
- .article_comments
- %h3 Vos questions à notre avocate
- %br
- %center
- =link_to ic(:plus)+" Posez votre question", new_public_question_juridique_path(:article_id => @article.id), :remote => true, :class => "ask_button"
-
- %br
-
- #question_juridique_form
-
-
-
- =render @article.question_juridiques.enableds.before(Time.now.end_of_day).order("created_at DESC").all
-
+ le
+ =l(@article.published_at, :format => :human_date)
-
- -elsif @article.commentable
- .article_comments_container
- .article_comments
-
- #comments
- %h3=qit "comments-title", "Commentaires"
- =render :partial => "public/comments/comment", :collection => @article.comments.where(:enabled => true, :parent_id => nil).order("created_at DESC")
- #comment_form
- .form_place=render :partial => "public/comments/form"
+ =render @article.blocks.find_by_lang_site_id(@lang.id)
+
-
-
- -if current_admin
- .admin_panel
- =link_to "Modifier cet article", edit_admin_article_path(:id => @article.id, :lang => @lang.slug), :class => "btn btn-primary"
- =link_to "Télécharger l'image de bandeau", @article.image_file.file.large.url, :class => "btn btn-primary" if @article.image_file
-.blog_sidebar_bottom
- .blog_sidebar=render :partial => "public/articles/sidebar"
+ -if current_admin
+ .admin_panel
+ =link_to "Modifier cet article", edit_admin_article_path(:id => @article.id, :lang => @lang.slug), :class => "btn btn-primary"
+ =link_to "Télécharger l'image de bandeau", @article.image_file.file.large.url, :class => "btn btn-primary" if @article.image_file
+
diff --git a/config/routes.rb b/config/routes.rb
index 7403e82..c12bb0b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,6 @@
Rails.application.routes.draw do
+
+
get "cirques-pre" => "public/home#cirques", :lang => "fr"
@@ -73,7 +75,13 @@ Rails.application.routes.draw do
namespace :public do
-
+
+ resources :banners do
+ collection do
+ get :remove_banner
+ get :add_banner
+ end
+ end
resources :contacts
get 'label_site/index'
@@ -488,6 +496,18 @@ end
namespace :admin do
+
+ get "navision/index" => "navision#index"
+ get "navision/show" => "navision#show"
+
+
+ get "navision/export_sale" => "navision#export_sale"
+ get "navision/export_purchase" => "navision#export_purchase"
+
+ get "navision/get_account" => "navision#get_account"
+
+
+
resources :exports do
collection do
post :prepare_file
diff --git a/db/migrate/20190613184241_create_export_hists.rb b/db/migrate/20190613184241_create_export_hists.rb
deleted file mode 100644
index 4f691ad..0000000
--- a/db/migrate/20190613184241_create_export_hists.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class CreateExportHists < ActiveRecord::Migration
- def change
- create_table :export_hists do |t|
- t.string :piece
-
- t.timestamps null: false
- end
- end
-end