diff --git a/Capfile b/Capfile old mode 100644 new mode 100755 diff --git a/Gemfile b/Gemfile old mode 100644 new mode 100755 diff --git a/Gemfile.lock b/Gemfile.lock old mode 100644 new mode 100755 diff --git a/README.rdoc b/README.rdoc old mode 100644 new mode 100755 diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 diff --git a/app/assets/images/.keep b/app/assets/images/.keep old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_BlockContent.png b/app/assets/images/admin/content_type/type_BlockContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_BreakContent.png b/app/assets/images/admin/content_type/type_BreakContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_DownloadContent.png b/app/assets/images/admin/content_type/type_DownloadContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_DynamicContent.png b/app/assets/images/admin/content_type/type_DynamicContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_EventContent.png b/app/assets/images/admin/content_type/type_EventContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_GalleryContent.png b/app/assets/images/admin/content_type/type_GalleryContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_HtmlContent.png b/app/assets/images/admin/content_type/type_HtmlContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_ImageContent.png b/app/assets/images/admin/content_type/type_ImageContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_ImgLinkContent.png b/app/assets/images/admin/content_type/type_ImgLinkContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_LinkContent.png b/app/assets/images/admin/content_type/type_LinkContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_MapContent.png b/app/assets/images/admin/content_type/type_MapContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_TableContent.png b/app/assets/images/admin/content_type/type_TableContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_TextContent.png b/app/assets/images/admin/content_type/type_TextContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/admin/content_type/type_TitleContent.png b/app/assets/images/admin/content_type/type_TitleContent.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029801_css.png b/app/assets/images/file_types/1358029801_css.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029807_docx.png b/app/assets/images/file_types/1358029807_docx.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029820_psd.png b/app/assets/images/file_types/1358029820_psd.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029824_jpg.png b/app/assets/images/file_types/1358029824_jpg.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029827_generic.png b/app/assets/images/file_types/1358029827_generic.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029830_doc.png b/app/assets/images/file_types/1358029830_doc.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029834_aac.png b/app/assets/images/file_types/1358029834_aac.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029839_wmv.png b/app/assets/images/file_types/1358029839_wmv.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029845_raw.png b/app/assets/images/file_types/1358029845_raw.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029848_tar.png b/app/assets/images/file_types/1358029848_tar.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029854_tiff.png b/app/assets/images/file_types/1358029854_tiff.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029858_rtf.png b/app/assets/images/file_types/1358029858_rtf.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029860_rtf.png b/app/assets/images/file_types/1358029860_rtf.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029868_js.png b/app/assets/images/file_types/1358029868_js.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029872_gif.png b/app/assets/images/file_types/1358029872_gif.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029874_aiff.png b/app/assets/images/file_types/1358029874_aiff.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029878_gzip.png b/app/assets/images/file_types/1358029878_gzip.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029881_ma.png b/app/assets/images/file_types/1358029881_ma.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029885_mp.png b/app/assets/images/file_types/1358029885_mp.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029888_php.png b/app/assets/images/file_types/1358029888_php.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029892_mpeg.png b/app/assets/images/file_types/1358029892_mpeg.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029894_mov.png b/app/assets/images/file_types/1358029894_mov.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029899_html.png b/app/assets/images/file_types/1358029899_html.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029903_avi.png b/app/assets/images/file_types/1358029903_avi.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029912_wav.png b/app/assets/images/file_types/1358029912_wav.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/1358029916_generic.png b/app/assets/images/file_types/1358029916_generic.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/ai.png b/app/assets/images/file_types/ai.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/bmp.png b/app/assets/images/file_types/bmp.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/eps.png b/app/assets/images/file_types/eps.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/gif.png b/app/assets/images/file_types/gif.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/icns.png b/app/assets/images/file_types/icns.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/ico.png b/app/assets/images/file_types/ico.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/jpeg.png b/app/assets/images/file_types/jpeg.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/jpg.png b/app/assets/images/file_types/jpg.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/key.png b/app/assets/images/file_types/key.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/kth.png b/app/assets/images/file_types/kth.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/m4v.png b/app/assets/images/file_types/m4v.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/md.png b/app/assets/images/file_types/md.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/mpg.png b/app/assets/images/file_types/mpg.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/nmbtemplate.png b/app/assets/images/file_types/nmbtemplate.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/numbers.png b/app/assets/images/file_types/numbers.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/pages.png b/app/assets/images/file_types/pages.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/pdf.png b/app/assets/images/file_types/pdf.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/png.png b/app/assets/images/file_types/png.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/psd.png b/app/assets/images/file_types/psd.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/sql.png b/app/assets/images/file_types/sql.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/tar.gz.png b/app/assets/images/file_types/tar.gz.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/tar.png b/app/assets/images/file_types/tar.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/template.png b/app/assets/images/file_types/template.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/tiff.png b/app/assets/images/file_types/tiff.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/txt.png b/app/assets/images/file_types/txt.png old mode 100644 new mode 100755 diff --git a/app/assets/images/file_types/zip.png b/app/assets/images/file_types/zip.png old mode 100644 new mode 100755 diff --git a/app/assets/images/fond.jpg b/app/assets/images/fond.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/front/cc-licenses-terms.png b/app/assets/images/front/cc-licenses-terms.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/default_avatar.jpg b/app/assets/images/front/default_avatar.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/front/facebook_active.png b/app/assets/images/front/facebook_active.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/facebook_dark.png b/app/assets/images/front/facebook_dark.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/fond.jpg b/app/assets/images/front/fond.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/front/in_active.png b/app/assets/images/front/in_active.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/in_dark.png b/app/assets/images/front/in_dark.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/logo copie.png b/app/assets/images/front/logo copie.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/logo.png b/app/assets/images/front/logo.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/nicolasbally.jpg b/app/assets/images/front/nicolasbally.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/front/stumbleupon_active.png b/app/assets/images/front/stumbleupon_active.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/stumbleupon_dark.png b/app/assets/images/front/stumbleupon_dark.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/top.png b/app/assets/images/front/top.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/tumblr_active.png b/app/assets/images/front/tumblr_active.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/tumblr_dark.png b/app/assets/images/front/tumblr_dark.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/twitter_active.png b/app/assets/images/front/twitter_active.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/twitter_dark.png b/app/assets/images/front/twitter_dark.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/viadeo_active.png b/app/assets/images/front/viadeo_active.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/viadeo_dark.png b/app/assets/images/front/viadeo_dark.png old mode 100644 new mode 100755 diff --git a/app/assets/images/front/web.jpg b/app/assets/images/front/web.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/images/bx_loader.gif b/app/assets/images/images/bx_loader.gif old mode 100644 new mode 100755 diff --git a/app/assets/images/images/controls.png b/app/assets/images/images/controls.png old mode 100644 new mode 100755 diff --git a/app/assets/images/nb.png b/app/assets/images/nb.png old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/admin.coffee b/app/assets/javascripts/admin.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/admin/need_categories.coffee b/app/assets/javascripts/admin/need_categories.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/blog.js.coffee b/app/assets/javascripts/blog.js.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap-p.js b/app/assets/javascripts/bootstrap-p.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap.js b/app/assets/javascripts/bootstrap.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/affix.js b/app/assets/javascripts/bootstrap/affix.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/alert.js b/app/assets/javascripts/bootstrap/alert.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/button.js b/app/assets/javascripts/bootstrap/button.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/carousel.js b/app/assets/javascripts/bootstrap/carousel.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/collapse.js b/app/assets/javascripts/bootstrap/collapse.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/dropdown.js b/app/assets/javascripts/bootstrap/dropdown.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/modal.js b/app/assets/javascripts/bootstrap/modal.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/popover.js b/app/assets/javascripts/bootstrap/popover.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/scrollspy.js b/app/assets/javascripts/bootstrap/scrollspy.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/tab.js b/app/assets/javascripts/bootstrap/tab.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/tooltip.js b/app/assets/javascripts/bootstrap/tooltip.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap/transition.js b/app/assets/javascripts/bootstrap/transition.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/connexion.coffee b/app/assets/javascripts/connexion.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/event_form.coffee b/app/assets/javascripts/event_form.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/front/hoverIntent.js b/app/assets/javascripts/front/hoverIntent.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/front/superfish.js b/app/assets/javascripts/front/superfish.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/front/thikbox.js b/app/assets/javascripts/front/thikbox.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/image_files.js b/app/assets/javascripts/image_files.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/jquery.bxslider.js b/app/assets/javascripts/jquery.bxslider.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/manager.js b/app/assets/javascripts/manager.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/nested_fields.coffee b/app/assets/javascripts/nested_fields.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/pane_hover.js b/app/assets/javascripts/pane_hover.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/place_autocomplete.coffee b/app/assets/javascripts/place_autocomplete.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/popover.coffee b/app/assets/javascripts/popover.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/public.js.coffee b/app/assets/javascripts/public.js.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/public/cities.coffee b/app/assets/javascripts/public/cities.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/public/messages.coffee b/app/assets/javascripts/public/messages.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/public/my_account_controller.coffee b/app/assets/javascripts/public/my_account_controller.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/public/needs.coffee b/app/assets/javascripts/public/needs.coffee old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/shared/jquery.backstretch.js b/app/assets/javascripts/shared/jquery.backstretch.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/shared/jquery.strings.js b/app/assets/javascripts/shared/jquery.strings.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/shared/jquery.utils.js b/app/assets/javascripts/shared/jquery.utils.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/vendor/jquery-sortable.js b/app/assets/javascripts/vendor/jquery-sortable.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/vendor/jquery.event.drag.js b/app/assets/javascripts/vendor/jquery.event.drag.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/vendor/tmpl.min.js b/app/assets/javascripts/vendor/tmpl.min.js old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/admin.css.scss b/app/assets/stylesheets/admin.css.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/admin/need_categories.scss b/app/assets/stylesheets/admin/need_categories.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/admin_auth.css.scss b/app/assets/stylesheets/admin_auth.css.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap.scss b/app/assets/stylesheets/bootstrap.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_alerts.scss b/app/assets/stylesheets/bootstrap/_alerts.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_badges.scss b/app/assets/stylesheets/bootstrap/_badges.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_breadcrumbs.scss b/app/assets/stylesheets/bootstrap/_breadcrumbs.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_button-groups.scss b/app/assets/stylesheets/bootstrap/_button-groups.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_buttons.scss b/app/assets/stylesheets/bootstrap/_buttons.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_carousel.scss b/app/assets/stylesheets/bootstrap/_carousel.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_close.scss b/app/assets/stylesheets/bootstrap/_close.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_code.scss b/app/assets/stylesheets/bootstrap/_code.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_component-animations.scss b/app/assets/stylesheets/bootstrap/_component-animations.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_dropdowns.scss b/app/assets/stylesheets/bootstrap/_dropdowns.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_forms.scss b/app/assets/stylesheets/bootstrap/_forms.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_glyphicons.scss b/app/assets/stylesheets/bootstrap/_glyphicons.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_grid.scss b/app/assets/stylesheets/bootstrap/_grid.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_input-groups.scss b/app/assets/stylesheets/bootstrap/_input-groups.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_jumbotron.scss b/app/assets/stylesheets/bootstrap/_jumbotron.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_labels.scss b/app/assets/stylesheets/bootstrap/_labels.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_list-group.scss b/app/assets/stylesheets/bootstrap/_list-group.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_media.scss b/app/assets/stylesheets/bootstrap/_media.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_mixins.scss b/app/assets/stylesheets/bootstrap/_mixins.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_modals.scss b/app/assets/stylesheets/bootstrap/_modals.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_navbar.scss b/app/assets/stylesheets/bootstrap/_navbar.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_navs.scss b/app/assets/stylesheets/bootstrap/_navs.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_normalize.scss b/app/assets/stylesheets/bootstrap/_normalize.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_pager.scss b/app/assets/stylesheets/bootstrap/_pager.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_pagination.scss b/app/assets/stylesheets/bootstrap/_pagination.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_panels.scss b/app/assets/stylesheets/bootstrap/_panels.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_popovers.scss b/app/assets/stylesheets/bootstrap/_popovers.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_print.scss b/app/assets/stylesheets/bootstrap/_print.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_progress-bars.scss b/app/assets/stylesheets/bootstrap/_progress-bars.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_responsive-utilities.scss b/app/assets/stylesheets/bootstrap/_responsive-utilities.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_scaffolding.scss b/app/assets/stylesheets/bootstrap/_scaffolding.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_tables.scss b/app/assets/stylesheets/bootstrap/_tables.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_theme.scss b/app/assets/stylesheets/bootstrap/_theme.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_thumbnails.scss b/app/assets/stylesheets/bootstrap/_thumbnails.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_tooltip.scss b/app/assets/stylesheets/bootstrap/_tooltip.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_type.scss b/app/assets/stylesheets/bootstrap/_type.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_utilities.scss b/app/assets/stylesheets/bootstrap/_utilities.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_variables.scss b/app/assets/stylesheets/bootstrap/_variables.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/_wells.scss b/app/assets/stylesheets/bootstrap/_wells.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap/bootstrap.scss b/app/assets/stylesheets/bootstrap/bootstrap.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/connexion.scss b/app/assets/stylesheets/connexion.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/css3-mixins.scss b/app/assets/stylesheets/css3-mixins.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_animated.scss b/app/assets/stylesheets/fontawesome/_animated.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_bordered-pulled.scss b/app/assets/stylesheets/fontawesome/_bordered-pulled.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_core.scss b/app/assets/stylesheets/fontawesome/_core.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_fixed-width.scss b/app/assets/stylesheets/fontawesome/_fixed-width.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_icons.scss b/app/assets/stylesheets/fontawesome/_icons.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_larger.scss b/app/assets/stylesheets/fontawesome/_larger.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_list.scss b/app/assets/stylesheets/fontawesome/_list.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_mixins.scss b/app/assets/stylesheets/fontawesome/_mixins.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_path.scss b/app/assets/stylesheets/fontawesome/_path.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_rotated-flipped.scss b/app/assets/stylesheets/fontawesome/_rotated-flipped.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_stacked.scss b/app/assets/stylesheets/fontawesome/_stacked.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/_variables.scss b/app/assets/stylesheets/fontawesome/_variables.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fontawesome/font-awesome.scss b/app/assets/stylesheets/fontawesome/font-awesome.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/manager.scss b/app/assets/stylesheets/manager.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/pane_hover.scss b/app/assets/stylesheets/pane_hover.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/public/account.scss b/app/assets/stylesheets/public/account.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/public/affiliation.scss b/app/assets/stylesheets/public/affiliation.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/public/binary.scss b/app/assets/stylesheets/public/binary.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/public/blog.scss b/app/assets/stylesheets/public/blog.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/public/general.scss b/app/assets/stylesheets/public/general.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/public/grid.scss b/app/assets/stylesheets/public/grid.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/public/messages.scss b/app/assets/stylesheets/public/messages.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/public/need.scss b/app/assets/stylesheets/public/need.scss old mode 100644 new mode 100755 index 7a2f0af..6151d45 --- a/app/assets/stylesheets/public/need.scss +++ b/app/assets/stylesheets/public/need.scss @@ -38,11 +38,35 @@ background-color:#f0ad4e; } .offer{ + + position: relative; + padding:20px; + height:100px; + line-height:60px; display:block; background: #eeeded; - padding:10px; margin-bottom:5px; + .supplier{ + + } + .accept-offer{ + display:inline-block; + float:right; + + font-size:30px; + font-weight:bold; + } + .offer-accepted{ + + + display:inline-block; + float:right; + color:#3C763D; + font-size:20px; + font-weight:bold; + } .price{ + display:inline; font-size:25px; font-weight:bold; } @@ -60,11 +84,7 @@ padding-bottom:50px; } .counters{ - position:absolute; - left:0px; - bottom:0px; - padding-left:5px; - padding-bottom:5px; + .item{ display:inline; margin-left:0px; diff --git a/app/assets/stylesheets/public/needs.scss b/app/assets/stylesheets/public/needs.scss old mode 100644 new mode 100755 index 678f76c..515ee0b --- a/app/assets/stylesheets/public/needs.scss +++ b/app/assets/stylesheets/public/needs.scss @@ -1,3 +1,8 @@ // Place all the styles related to the public/needs controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +.need-container{ + margin-top:250px; + +} diff --git a/app/assets/stylesheets/public/popover.scss b/app/assets/stylesheets/public/popover.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/public/search.scss b/app/assets/stylesheets/public/search.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/qi_grids.scss b/app/assets/stylesheets/qi_grids.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/shared/formtastic.less b/app/assets/stylesheets/shared/formtastic.less old mode 100644 new mode 100755 diff --git a/app/controllers/admin/admin_auths_controller.rb b/app/controllers/admin/admin_auths_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/admins_controller.rb b/app/controllers/admin/admins_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/albums_controller.rb b/app/controllers/admin/albums_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/annonce_account_ribs_controller.rb b/app/controllers/admin/annonce_account_ribs_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/annonce_cats_controller.rb b/app/controllers/admin/annonce_cats_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/annonce_photos_controller.rb b/app/controllers/admin/annonce_photos_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/annonces_controller.rb b/app/controllers/admin/annonces_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/articles_controller.rb b/app/controllers/admin/articles_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/blocks_controller.rb b/app/controllers/admin/blocks_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/cibles_controller.rb b/app/controllers/admin/cibles_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/customers_controller.rb b/app/controllers/admin/customers_controller.rb old mode 100644 new mode 100755 index a407b94..e5523fc --- a/app/controllers/admin/customers_controller.rb +++ b/app/controllers/admin/customers_controller.rb @@ -12,6 +12,10 @@ class Admin::CustomersController < ApplicationController @customers = Customer.all + if(params[:q] != '') + @customers = @customers.search(params[:q]) + end + @customers = @customers.page(page).per(per_page).order("created_at DESC").all end diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/data_files_controller.rb b/app/controllers/admin/data_files_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/external_links_controller.rb b/app/controllers/admin/external_links_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/file_folders_controller.rb b/app/controllers/admin/file_folders_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/image_files_controller.rb b/app/controllers/admin/image_files_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/mail_trackings_controller.rb b/app/controllers/admin/mail_trackings_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/menu_aliases_controller.rb b/app/controllers/admin/menu_aliases_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/menu_items_controller.rb b/app/controllers/admin/menu_items_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/menu_urls_controller.rb b/app/controllers/admin/menu_urls_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/menus_controller.rb b/app/controllers/admin/menus_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/messages_controller.rb b/app/controllers/admin/messages_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/need_categories_controller.rb b/app/controllers/admin/need_categories_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/needs_controller.rb b/app/controllers/admin/needs_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/newsletters_controller.rb b/app/controllers/admin/newsletters_controller.rb index 4402606..45c8e8a 100755 --- a/app/controllers/admin/newsletters_controller.rb +++ b/app/controllers/admin/newsletters_controller.rb @@ -2,16 +2,16 @@ class Admin::NewslettersController < ApplicationController layout "admin" - + before_filter :auth_admin - + # require_permission 'newsletter.show' # require_permission 'newsletter.add', :only => [:newsletter_new, :newsletter_create] # require_permission 'newsletter.edit', :only => [:newsletter_edit, :newsletter_update] # require_permission 'newsletter.delete', :only => [:newsletter_del] # require_permission 'newsletter.send', :only => [:send_test, :send_newsletter, :select_recipients] - + def history_detail @archive_newsletter = ArchiveNewsletter.find(params[:id]) @@ -22,19 +22,19 @@ end def history @newsletter = Newsletter.find(params[:id]) end - + def index @h2 = "Lister les newsletters éxistantes" - - - + + + per_page = (params[:per_page] and params[:per_page] != "") ? params[:per_page] : 15 - page = (params[:page] and params[:page] != "") ? params[:page] : 1 - - + page = (params[:page] and params[:page] != "") ? params[:page] : 1 + + @newsletter= Newsletter.order("created_at DESC").page(page).per(per_page) end - + def new @h2 = "Creer une newsletter" @newsletter = Newsletter.new @@ -43,14 +43,14 @@ end def create @h2 = "Creer une newsletter" - + @newsletter = Newsletter.new(params.require(:newsletter).permit!) - + if @newsletter.save per_page = (params[:per_page] and params[:per_page] != "") ? params[:per_page] : 15 - page = (params[:page] and params[:page] != "") ? params[:page] : 1 - - + page = (params[:page] and params[:page] != "") ? params[:page] : 1 + + @newsletters= Newsletter.order("created_at DESC").page(page).per(per_page) #redirect_to :action => :index else @@ -68,7 +68,7 @@ end @newsletter = Newsletter.find(params[:id]) if @newsletter.update_attributes(params.require(:newsletter).permit!) flash[:notice]= "La newsletter à été mise à jour" - + else render :action => :edit end @@ -79,32 +79,32 @@ end @options = {} render :layout => "mail" end - + def destroy @newsletter = Newsletter.find(params[:id]) @newsletter.destroy flash[:notice]= "La newsletter à été supprimé avec succès" redirect_to :action => :index - + end - + def send_test @errors = [] @newsletter = Newsletter.find(params[:id]) #NewsletterMails.newsletter(@newsletter, params[:email]).deliver send_helper @newsletter, params[:email] - - + + flash[:notice]= "La newsletter a bien été envoyée à l'email de test" redirect_to :action => :index end - - + + def send_helper(newsletter, email, options = {}) - + if email and email != "" - + begin @mail_archive = MailArchive.new @mail_archive.archive_newsletter_id = @archive_newsletter.id if @archive_newsletter @@ -113,94 +113,94 @@ end @mail_archive.customer = options[:customer] @mail_archive.save - + options = options.merge({:mail_archive => @mail_archive}) - - - NewsletterMails.newsletter(newsletter, email, options).deliver if email and email != "" - - + + + NewsletterMails.newsletter(newsletter, email, options).deliver if email and email != "" + + rescue @errors << "#{email}" end end end - + def send_newsletter @errors = [] @newsletter = Newsletter.find(params[:id]) - + @archive_newsletter = ArchiveNewsletter.create :newsletter_id => @newsletter.id, :title => @newsletter.title, :content => @newsletter.content - - + + if params[:confirmed_groups] - + CustomerNewsgroup.where(:newsgroup_id => params[:confirmed_groups]).group(:customer_id).each do |aan| if aa = aan.customer - + send_helper(@newsletter, aa.email, :customer => aa) - + end - - + + end - - + + elsif params[:confirmed_sheets] - - + + @customers = Customer.where(:id => params[:confirmed_sheets]) - + @customers.each do |s| - send_helper(@newsletter, s.email, :customer => s) + send_helper(@newsletter, s.email, :customer => s) end elsif params[:all_paid] - - + + @customers = Customer.where("binary_parent_id is not null") - + @customers.each do |s| - send_helper(@newsletter, s.email, :customer => s) + send_helper(@newsletter, s.email, :customer => s) end - + elsif params[:all_non_paid_aff] - + CustomerNewsgroup.where(:newsgroup_id => 5).group(:customer_id).each do |aan| if aa = aan.customer and !aa.binary_parent_id - + send_helper(@newsletter, aa.email, :customer => aa) - + end - - + + end - + end - - + + flash[:notice]= "La newsletter a bien été envoyée à toutes les adresses mail séléctionnée" redirect_to :action => :index - + end - + def select_recipients @newsletter = Newsletter.find(params[:id]) @customers = Customer.all - - - - + + + + end - + end diff --git a/app/controllers/admin/offers_controller.rb b/app/controllers/admin/offers_controller.rb old mode 100644 new mode 100755 index 03c9fb7..087fdad --- a/app/controllers/admin/offers_controller.rb +++ b/app/controllers/admin/offers_controller.rb @@ -51,7 +51,7 @@ class Admin::OffersController < ApplicationController @offers = @offers.page(params[:page]).per(params[:r]) - + end @@ -93,9 +93,6 @@ class Admin::OffersController < ApplicationController else render :action => "edit" end - - - end def destroy @@ -117,6 +114,18 @@ class Admin::OffersController < ApplicationController end + def accepted + @offer = Offer.find(params[:id]) + end + + + def upload_devis + @accepted_offer = AcceptedOffer.find(params[:id]) + @accepted_offer.devis = params[:devis] + @accepted_offer.save + redirect_back_or_default :root + end + private diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/password_resets_controller.rb b/app/controllers/admin/password_resets_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/virement_remises_controller.rb b/app/controllers/admin/virement_remises_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/virements_controller.rb b/app/controllers/admin/virements_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/admin/wishes_controller.rb b/app/controllers/admin/wishes_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb old mode 100644 new mode 100755 index 0c1edb4..60c2a77 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -19,48 +19,35 @@ class ApplicationController < ActionController::Base end end - private - - def current_admin - - if cookies[:admin_remember_token] - if @current_admin = Admin.find_by_remember_token(cookies[:admin_remember_token]) - @current_admin = Admin.find_by_remember_token(cookies[:admin_remember_token]) - else - cookies[:admin_remember_token] =nil - end - - end - - - - end - - def current_customer - if cookies[:customer_auth_token] and Customer.exists?(:token => cookies[:customer_auth_token]) - a_c = Customer.find_by_token(cookies[:customer_auth_token]) - if !a_c.lock - @current_customer = a_c - else - cookies[:customer_auth_token] = nil - - nil - end + def current_admin + if cookies[:admin_remember_token] + if @current_admin = Admin.find_by_remember_token(cookies[:admin_remember_token]) + @current_admin = Admin.find_by_remember_token(cookies[:admin_remember_token]) else + cookies[:admin_remember_token] =nil + end + end + end + + def current_customer + if cookies[:customer_auth_token] and Customer.exists?(:token => cookies[:customer_auth_token]) + a_c = Customer.find_by_token(cookies[:customer_auth_token]) + if !a_c.lock + @current_customer = a_c + else + cookies[:customer_auth_token] = nil nil end - + else + nil end + end + def redirect_back_or_default(default = root_path, options = {}) + redirect_to (request.referer.present? ? :back : default), options + end - def redirect_back_or_default(default = root_path, options = {}) - redirect_to (request.referer.present? ? :back : default), options - end - - - - - helper_method :current_admin, :current_customer + helper_method :current_admin, :current_customer end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep old mode 100644 new mode 100755 diff --git a/app/controllers/download_data_files_controller.rb b/app/controllers/download_data_files_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/download_ribs_controller.rb b/app/controllers/download_ribs_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/block_contents_controller.rb b/app/controllers/portlet/block_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/break_contents_controller.rb b/app/controllers/portlet/break_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/download_contents_controller.rb b/app/controllers/portlet/download_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/dynamic_contents_controller.rb b/app/controllers/portlet/dynamic_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/gallery_contents_controller.rb b/app/controllers/portlet/gallery_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/gallery_images_controller.rb b/app/controllers/portlet/gallery_images_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/html_contents_controller.rb b/app/controllers/portlet/html_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/image_contents_controller.rb b/app/controllers/portlet/image_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/link_contents_controller.rb b/app/controllers/portlet/link_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/map_contents_controller.rb b/app/controllers/portlet/map_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/portlets_controller.rb b/app/controllers/portlet/portlets_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/table_cols_controller.rb b/app/controllers/portlet/table_cols_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/table_contents_controller.rb b/app/controllers/portlet/table_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/table_rows_controller.rb b/app/controllers/portlet/table_rows_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/text_contents_controller.rb b/app/controllers/portlet/text_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/portlet/title_contents_controller.rb b/app/controllers/portlet/title_contents_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/public/articles_controller.rb b/app/controllers/public/articles_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/public/cities_controller.rb b/app/controllers/public/cities_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/public/comments_controller.rb b/app/controllers/public/comments_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/public/customers_auths_controller.rb b/app/controllers/public/customers_auths_controller.rb old mode 100644 new mode 100755 index 958a096..4767c56 --- a/app/controllers/public/customers_auths_controller.rb +++ b/app/controllers/public/customers_auths_controller.rb @@ -47,18 +47,15 @@ class Public::CustomersAuthsController < ApplicationController else cookies[:customer_auth_token] = user.token end + user.last_sign_in_at = Time.now user.save(:validate => false) - if session[:for_annonce] - redirect_to new_public_annonce_path - else - redirect_to :root - end - + redirect_to :root else flash.now.alert = "Email ou mot de passe incorect" - render "new" + + render :action => "new" end end diff --git a/app/controllers/public/customers_controller.rb b/app/controllers/public/customers_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/public/events_controller.rb b/app/controllers/public/events_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/public/home_controller.rb b/app/controllers/public/home_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/public/menu_items_controller.rb b/app/controllers/public/menu_items_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/public/messages_controller.rb b/app/controllers/public/messages_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/public/my_account_controller.rb b/app/controllers/public/my_account_controller.rb old mode 100644 new mode 100755 index d18b808..0129906 --- a/app/controllers/public/my_account_controller.rb +++ b/app/controllers/public/my_account_controller.rb @@ -5,11 +5,15 @@ class Public::MyAccountController < ApplicationController before_filter :auth_customer def index + @accepted_offers = current_customer.accepted_offers.order(created_at: :desc).page(params[:page_offers]).per(5) + + @wishes = current_customer.needs.shared.page(params[:page_wishes]).per(5) + @needs = Kaminari.paginate_array(current_customer.owned_needs.order(created_at: :desc)) - .page(params[:page]) + .page(params[:page_needs]) .per(5) - @wishes = current_customer.needs.shared.page(params[:page]).per(5) + end @@ -26,8 +30,6 @@ class Public::MyAccountController < ApplicationController if params[:parrain_id] and current_customer.binary_child_ids.include?(params[:parrain_id].to_i) @parrain = Customer.find(params[:parrain_id]) - - else @parrain = current_customer end diff --git a/app/controllers/public/needs_controller.rb b/app/controllers/public/needs_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/public/offers_controller.rb b/app/controllers/public/offers_controller.rb new file mode 100755 index 0000000..272705c --- /dev/null +++ b/app/controllers/public/offers_controller.rb @@ -0,0 +1,38 @@ +class Public::OffersController < ApplicationController + layout "public" + + before_filter :auth_customer, :get_need, :check_interest, :get_offer + + + def accept + if @offer.customers.include?(current_customer) + flash[:error] = "Vous avez déjà accepter cette offre" + return redirect_back_or_default :root + end + @accepted_offer = AcceptedOffer.new + @accepted_offer.customer = current_customer + @accepted_offer.offer = @offer + if @accepted_offer.save + flash[:notice] = "Offre acceptée avec succès !" + redirect_back_or_default :root + end + end + + def get_need + @need = Need.find(params[:need_id]) + end + + def get_offer + @offer = @need.offers.find(params[:id]) + end + + + + def check_interest + + if !@need.customers.include?(current_customer) + flash[:error] = "Impossible de réaliser cette action car vous n'êtes pas intéressé par ce besoin" + redirect_back_or_default :root + end + end +end diff --git a/app/controllers/public/orders_controller.rb b/app/controllers/public/orders_controller.rb old mode 100644 new mode 100755 diff --git a/app/controllers/public/password_resets_controller.rb b/app/controllers/public/password_resets_controller.rb old mode 100644 new mode 100755 diff --git a/app/helpers/admin/need_categories_helper.rb b/app/helpers/admin/need_categories_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/document_line_helper.rb b/app/helpers/document_line_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/icon_helper.rb b/app/helpers/icon_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/menu_items_helper.rb b/app/helpers/menu_items_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/public/cities_helper.rb b/app/helpers/public/cities_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/public/messages_helper.rb b/app/helpers/public/messages_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/public/my_account_controller_helper.rb b/app/helpers/public/my_account_controller_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/public/needs_helper.rb b/app/helpers/public/needs_helper.rb old mode 100644 new mode 100755 diff --git a/app/inputs/qi_cible_select_input.rb b/app/inputs/qi_cible_select_input.rb old mode 100644 new mode 100755 diff --git a/app/inputs/qi_date_picker_input.rb b/app/inputs/qi_date_picker_input.rb old mode 100644 new mode 100755 diff --git a/app/inputs/qi_datetime_picker_input.rb b/app/inputs/qi_datetime_picker_input.rb old mode 100644 new mode 100755 diff --git a/app/inputs/qi_image_select_input.rb b/app/inputs/qi_image_select_input.rb old mode 100644 new mode 100755 diff --git a/app/inputs/qi_time_picker_input.rb b/app/inputs/qi_time_picker_input.rb old mode 100644 new mode 100755 diff --git a/app/mailers/.keep b/app/mailers/.keep old mode 100644 new mode 100755 diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb old mode 100644 new mode 100755 diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb old mode 100644 new mode 100755 diff --git a/app/mailers/customer_mailer.rb b/app/mailers/customer_mailer.rb old mode 100644 new mode 100755 diff --git a/app/mailers/newsletter_mails.rb b/app/mailers/newsletter_mails.rb old mode 100644 new mode 100755 diff --git a/app/models/.keep b/app/models/.keep old mode 100644 new mode 100755 diff --git a/app/models/accepted_offer.rb b/app/models/accepted_offer.rb new file mode 100755 index 0000000..5c612e9 --- /dev/null +++ b/app/models/accepted_offer.rb @@ -0,0 +1,39 @@ +class AcceptedOffer < ActiveRecord::Base + include Workflow + belongs_to :customer + belongs_to :offer + mount_uploader :devis, DevisUploader + validates :customer, :presence => true + validates :offer, :presence => true + + workflow_column :state + + workflow do + state :waiting_devis do + event :upload_devis, :transitions_to => :devis_available + end + state :devis_available do + event :download_devis, :transitions_to => :devis_downloaded + end + state :devis_downloaded do + event :receive_devis, :transitions_to => :devis_received + end + + state :devis_received + + end + + def human_state + case state + when 'waiting_devis' + "Création du devis en cours..." + when 'devis_available' + "Devis disponible" + when 'devis_downloaded' + "En attente de réception du devis signé" + when 'devis_received' + "Devis signé et reçu" + end + end + +end diff --git a/app/models/admin.rb b/app/models/admin.rb old mode 100644 new mode 100755 diff --git a/app/models/album.rb b/app/models/album.rb old mode 100644 new mode 100755 diff --git a/app/models/allowed_block_content.rb b/app/models/allowed_block_content.rb old mode 100644 new mode 100755 diff --git a/app/models/archive_newsletter.rb b/app/models/archive_newsletter.rb old mode 100644 new mode 100755 diff --git a/app/models/article.rb b/app/models/article.rb old mode 100644 new mode 100755 diff --git a/app/models/binary_point.rb b/app/models/binary_point.rb old mode 100644 new mode 100755 diff --git a/app/models/block.rb b/app/models/block.rb old mode 100644 new mode 100755 diff --git a/app/models/block_content.rb b/app/models/block_content.rb old mode 100644 new mode 100755 diff --git a/app/models/break_content.rb b/app/models/break_content.rb old mode 100644 new mode 100755 diff --git a/app/models/category.rb b/app/models/category.rb old mode 100644 new mode 100755 diff --git a/app/models/cel_table.rb b/app/models/cel_table.rb old mode 100644 new mode 100755 diff --git a/app/models/cible_alias.rb b/app/models/cible_alias.rb old mode 100644 new mode 100755 diff --git a/app/models/cible_url.rb b/app/models/cible_url.rb old mode 100644 new mode 100755 diff --git a/app/models/city.rb b/app/models/city.rb old mode 100644 new mode 100755 diff --git a/app/models/comment.rb b/app/models/comment.rb old mode 100644 new mode 100755 diff --git a/app/models/commission.rb b/app/models/commission.rb old mode 100644 new mode 100755 diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep old mode 100644 new mode 100755 diff --git a/app/models/count_part_com.rb b/app/models/count_part_com.rb old mode 100644 new mode 100755 diff --git a/app/models/credit.rb b/app/models/credit.rb old mode 100644 new mode 100755 diff --git a/app/models/credit_expense.rb b/app/models/credit_expense.rb old mode 100644 new mode 100755 diff --git a/app/models/credit_product.rb b/app/models/credit_product.rb old mode 100644 new mode 100755 diff --git a/app/models/customer.rb b/app/models/customer.rb old mode 100644 new mode 100755 index 0da4d18..22b56e7 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,9 +1,16 @@ class Customer < ActiveRecord::Base + + + scope :search, -> (search) { + where('name LIKE ? OR firstname LIKE ? OR organisation LIKE ?', "%#{search}%", "%#{search}%", "%#{search}%") + } + # Relationships has_many :owned_needs, foreign_key: 'author_id', class_name: 'Need' has_many :wishes, dependent: :destroy + has_many :accepted_offers, dependent: :destroy has_many :needs, -> { uniq }, through: :wishes has_many :customer_favs diff --git a/app/models/customer_newsgroup.rb b/app/models/customer_newsgroup.rb old mode 100644 new mode 100755 diff --git a/app/models/data_file.rb b/app/models/data_file.rb old mode 100644 new mode 100755 diff --git a/app/models/departement.rb b/app/models/departement.rb old mode 100644 new mode 100755 diff --git a/app/models/devise.rb b/app/models/devise.rb old mode 100644 new mode 100755 diff --git a/app/models/download_content.rb b/app/models/download_content.rb old mode 100644 new mode 100755 diff --git a/app/models/dynamic_content.rb b/app/models/dynamic_content.rb old mode 100644 new mode 100755 diff --git a/app/models/etrans_history.rb b/app/models/etrans_history.rb old mode 100644 new mode 100755 diff --git a/app/models/event.rb b/app/models/event.rb old mode 100644 new mode 100755 diff --git a/app/models/expense.rb b/app/models/expense.rb old mode 100644 new mode 100755 diff --git a/app/models/external_link.rb b/app/models/external_link.rb old mode 100644 new mode 100755 diff --git a/app/models/file_folder.rb b/app/models/file_folder.rb old mode 100644 new mode 100755 diff --git a/app/models/gallery_content.rb b/app/models/gallery_content.rb old mode 100644 new mode 100755 diff --git a/app/models/gallery_image.rb b/app/models/gallery_image.rb old mode 100644 new mode 100755 diff --git a/app/models/html_content.rb b/app/models/html_content.rb old mode 100644 new mode 100755 diff --git a/app/models/image_content.rb b/app/models/image_content.rb old mode 100644 new mode 100755 diff --git a/app/models/image_file.rb b/app/models/image_file.rb old mode 100644 new mode 100755 diff --git a/app/models/img_link_content.rb b/app/models/img_link_content.rb old mode 100644 new mode 100755 diff --git a/app/models/link_content.rb b/app/models/link_content.rb old mode 100644 new mode 100755 diff --git a/app/models/mail_archive.rb b/app/models/mail_archive.rb old mode 100644 new mode 100755 diff --git a/app/models/map_content.rb b/app/models/map_content.rb old mode 100644 new mode 100755 diff --git a/app/models/marque.rb b/app/models/marque.rb old mode 100644 new mode 100755 diff --git a/app/models/menu.rb b/app/models/menu.rb old mode 100644 new mode 100755 diff --git a/app/models/menu_alias.rb b/app/models/menu_alias.rb old mode 100644 new mode 100755 diff --git a/app/models/menu_folder.rb b/app/models/menu_folder.rb old mode 100644 new mode 100755 diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb old mode 100644 new mode 100755 diff --git a/app/models/menu_url.rb b/app/models/menu_url.rb old mode 100644 new mode 100755 diff --git a/app/models/message.rb b/app/models/message.rb old mode 100644 new mode 100755 diff --git a/app/models/mlm_point.rb b/app/models/mlm_point.rb old mode 100644 new mode 100755 diff --git a/app/models/need.rb b/app/models/need.rb old mode 100644 new mode 100755 diff --git a/app/models/need_category.rb b/app/models/need_category.rb old mode 100644 new mode 100755 diff --git a/app/models/newsgroup.rb b/app/models/newsgroup.rb old mode 100644 new mode 100755 diff --git a/app/models/offer.rb b/app/models/offer.rb old mode 100644 new mode 100755 index d18f882..b945ae2 --- a/app/models/offer.rb +++ b/app/models/offer.rb @@ -2,15 +2,12 @@ class Offer < ActiveRecord::Base acts_as_paranoid belongs_to :need - - + has_many :accepted_offers, dependent: :destroy + has_many :customers, through: :accepted_offers validates :supplier, :presence => true, length: {within: 1..128} validates :price, :presence => true, numericality: {greater_than_or_equal_to: 0} - validates :fee_percentage, - :presence => true, - numericality: {:greater_than_or_equal_to => 0, :less_than_or_equal_to => 100} end diff --git a/app/models/order.rb b/app/models/order.rb old mode 100644 new mode 100755 diff --git a/app/models/page.rb b/app/models/page.rb old mode 100644 new mode 100755 diff --git a/app/models/portlet.rb b/app/models/portlet.rb old mode 100644 new mode 100755 diff --git a/app/models/region.rb b/app/models/region.rb old mode 100644 new mode 100755 diff --git a/app/models/table_content.rb b/app/models/table_content.rb old mode 100644 new mode 100755 diff --git a/app/models/table_row.rb b/app/models/table_row.rb old mode 100644 new mode 100755 diff --git a/app/models/tag.rb b/app/models/tag.rb old mode 100644 new mode 100755 diff --git a/app/models/tag_cat.rb b/app/models/tag_cat.rb old mode 100644 new mode 100755 diff --git a/app/models/tag_taggable.rb b/app/models/tag_taggable.rb old mode 100644 new mode 100755 diff --git a/app/models/text_content.rb b/app/models/text_content.rb old mode 100644 new mode 100755 diff --git a/app/models/title_content.rb b/app/models/title_content.rb old mode 100644 new mode 100755 diff --git a/app/models/virement.rb b/app/models/virement.rb old mode 100644 new mode 100755 diff --git a/app/models/virement_remise.rb b/app/models/virement_remise.rb old mode 100644 new mode 100755 diff --git a/app/models/wish.rb b/app/models/wish.rb old mode 100644 new mode 100755 diff --git a/app/uploaders/annonce_photos_uploader.rb b/app/uploaders/annonce_photos_uploader.rb old mode 100644 new mode 100755 diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb old mode 100644 new mode 100755 diff --git a/app/uploaders/devis_uploader.rb b/app/uploaders/devis_uploader.rb new file mode 100755 index 0000000..b59dda7 --- /dev/null +++ b/app/uploaders/devis_uploader.rb @@ -0,0 +1,51 @@ +# encoding: utf-8 + +class DevisUploader < CarrierWave::Uploader::Base + + # Include RMagick or MiniMagick support: + # include CarrierWave::RMagick + # include CarrierWave::MiniMagick + + # Choose what kind of storage to use for this uploader: + storage :file + # storage :fog + + # Override the directory where uploaded files will be stored. + # This is a sensible default for uploaders that are meant to be mounted: + def store_dir + "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" + end + + # Provide a default URL as a default if there hasn't been a file uploaded: + # def default_url + # # For Rails 3.1+ asset pipeline compatibility: + # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) + # + # "/images/fallback/" + [version_name, "default.png"].compact.join('_') + # end + + # Process files as they are uploaded: + # process :scale => [200, 300] + # + # def scale(width, height) + # # do something + # end + + # Create different versions of your uploaded files: + # version :thumb do + # process :resize_to_fit => [50, 50] + # end + + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + def extension_white_list + %w(pdf doc docx) + end + + # Override the filename of the uploaded files: + # Avoid using model.id or version_name here, see uploader/store.rb for details. + # def filename + # "something.jpg" if original_filename + # end + +end diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb old mode 100644 new mode 100755 diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb old mode 100644 new mode 100755 diff --git a/app/uploaders/rib_uploader.rb b/app/uploaders/rib_uploader.rb old mode 100644 new mode 100755 diff --git a/app/views/admin/admin_auths/index.haml b/app/views/admin/admin_auths/index.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/admin_auths/new.haml b/app/views/admin/admin_auths/new.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/admins/_admin.html.haml b/app/views/admin/admins/_admin.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/admins/_form.html.haml b/app/views/admin/admins/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/admins/create.js.erb b/app/views/admin/admins/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/admins/destroy.js.erb b/app/views/admin/admins/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/admins/edit.js.erb b/app/views/admin/admins/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/admins/index.html.haml b/app/views/admin/admins/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/admins/index.js.erb b/app/views/admin/admins/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/admins/new.js.erb b/app/views/admin/admins/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/admins/update.js.erb b/app/views/admin/admins/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/albums/_album.html.haml b/app/views/admin/albums/_album.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/albums/_albums.html.haml b/app/views/admin/albums/_albums.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/albums/_albums_navbar.html.haml b/app/views/admin/albums/_albums_navbar.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/albums/create.js.erb b/app/views/admin/albums/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/albums/destroy.js.erb b/app/views/admin/albums/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/albums/edit.js.erb b/app/views/admin/albums/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/albums/new.js.erb b/app/views/admin/albums/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/albums/update.js.erb b/app/views/admin/albums/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_account_ribs/_annonce_account_rib.html.haml b/app/views/admin/annonce_account_ribs/_annonce_account_rib.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_account_ribs/_form.html.haml b/app/views/admin/annonce_account_ribs/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_account_ribs/edit.js.erb b/app/views/admin/annonce_account_ribs/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_account_ribs/index.html.haml b/app/views/admin/annonce_account_ribs/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_account_ribs/show.html.haml b/app/views/admin/annonce_account_ribs/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_account_ribs/update.js.erb b/app/views/admin/annonce_account_ribs/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_account_ribs/valid.js.erb b/app/views/admin/annonce_account_ribs/valid.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/_annonce_cat.html.haml b/app/views/admin/annonce_cats/_annonce_cat.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/_form.html.haml b/app/views/admin/annonce_cats/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/_index_block.html.haml b/app/views/admin/annonce_cats/_index_block.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/create.js.erb b/app/views/admin/annonce_cats/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/destroy.js.erb b/app/views/admin/annonce_cats/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/edit.js.erb b/app/views/admin/annonce_cats/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/index.html.haml b/app/views/admin/annonce_cats/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/index.js.erb b/app/views/admin/annonce_cats/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/new.js.erb b/app/views/admin/annonce_cats/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/reorder.js.erb b/app/views/admin/annonce_cats/reorder.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/update.js.erb b/app/views/admin/annonce_cats/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_cats/update_row.js.erb b/app/views/admin/annonce_cats/update_row.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_photos/_annonce_photo.html.haml b/app/views/admin/annonce_photos/_annonce_photo.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_photos/_form.html.haml b/app/views/admin/annonce_photos/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_photos/edit.js.erb b/app/views/admin/annonce_photos/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_photos/index.html.haml b/app/views/admin/annonce_photos/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_photos/show.html.haml b/app/views/admin/annonce_photos/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_photos/update.js.erb b/app/views/admin/annonce_photos/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonce_photos/valid.js.erb b/app/views/admin/annonce_photos/valid.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/annonces/update.js.erb b/app/views/admin/annonces/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/_article.html.haml b/app/views/admin/articles/_article.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/_form.html.haml b/app/views/admin/articles/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/_index_block.html.haml b/app/views/admin/articles/_index_block.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/_show.html.haml b/app/views/admin/articles/_show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/_tags.html.haml b/app/views/admin/articles/_tags.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/create.js.erb b/app/views/admin/articles/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/destroy.js.erb b/app/views/admin/articles/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/edit.html.haml b/app/views/admin/articles/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/edit.js.erb b/app/views/admin/articles/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/index.html.haml b/app/views/admin/articles/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/index.js.erb b/app/views/admin/articles/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/new.js.erb b/app/views/admin/articles/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/articles/update.js.erb b/app/views/admin/articles/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/blocks/_block.html.haml b/app/views/admin/blocks/_block.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/blocks/_block_allowed.html.haml b/app/views/admin/blocks/_block_allowed.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/blocks/_edit.html.haml b/app/views/admin/blocks/_edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/blocks/_form.html.haml b/app/views/admin/blocks/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/blocks/edit.html.haml b/app/views/admin/blocks/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/blocks/edit.js.erb b/app/views/admin/blocks/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/blocks/old.block b/app/views/admin/blocks/old.block old mode 100644 new mode 100755 diff --git a/app/views/admin/blocks/old.show.html.haml b/app/views/admin/blocks/old.show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/_category.html.haml b/app/views/admin/categories/_category.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/_form.html.haml b/app/views/admin/categories/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/_index_block.html.haml b/app/views/admin/categories/_index_block.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/cible.html.haml b/app/views/admin/categories/cible.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/create.js.erb b/app/views/admin/categories/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/destroy.js.erb b/app/views/admin/categories/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/edit.js.erb b/app/views/admin/categories/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/index.html.haml b/app/views/admin/categories/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/index.js.erb b/app/views/admin/categories/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/new.js.erb b/app/views/admin/categories/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/reorder.js.erb b/app/views/admin/categories/reorder.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/update.js.erb b/app/views/admin/categories/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/categories/update_row.js.erb b/app/views/admin/categories/update_row.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/cibles/_cible_place.html.haml b/app/views/admin/cibles/_cible_place.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/cibles/index.html.haml b/app/views/admin/cibles/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/cibles/index.js.erb b/app/views/admin/cibles/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/cibles/new.html.haml b/app/views/admin/cibles/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/comments/_comment.html.haml b/app/views/admin/comments/_comment.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/comments/_form.html.haml b/app/views/admin/comments/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/comments/destroy.js.erb b/app/views/admin/comments/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/comments/edit.js.erb b/app/views/admin/comments/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/comments/index.html.haml b/app/views/admin/comments/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/comments/update.js.erb b/app/views/admin/comments/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/commissions/_commission.html.haml b/app/views/admin/commissions/_commission.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/customers/_customer.html.haml b/app/views/admin/customers/_customer.html.haml old mode 100644 new mode 100755 index e84d04c..7fb2e30 --- a/app/views/admin/customers/_customer.html.haml +++ b/app/views/admin/customers/_customer.html.haml @@ -7,7 +7,9 @@ %td =customer.name =customer.firstname - + %td + -if customer.phone? + = i("phone") + " #{customer.phone}" %td =customer.city diff --git a/app/views/admin/customers/_form.html.haml b/app/views/admin/customers/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/customers/destroy.js.erb b/app/views/admin/customers/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/customers/edit.html.haml b/app/views/admin/customers/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/customers/edit.js.erb b/app/views/admin/customers/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/customers/index.html.haml b/app/views/admin/customers/index.html.haml old mode 100644 new mode 100755 index 0f6e5aa..437f4f6 --- a/app/views/admin/customers/index.html.haml +++ b/app/views/admin/customers/index.html.haml @@ -1,34 +1,49 @@ %h1 Liste des utilisateurs +.row + .col-md-10 + %table.table.table-hover.table-striped.customer_table + %thead#customer_rows_header.rows_header - -%table.table.table-hover.table-striped.customer_table - %thead#customer_rows_header.rows_header - - %tr - %th - Société - %th - Nom - - %th - Ville - %th - Email confirmé ? - %th - Email + %tr + %th + Société + %th + Nom + %th + Téléphone + %th + Ville + %th + Email confirmé ? + %th + Email - %th{:style => "width:100px;text-align:right;"} -   + %th{:style => "width:100px;text-align:right;"} +   - %tbody#customer_rows.rows + %tbody#customer_rows.rows - =render @customers + =render @customers -.pagination= paginate @customers + .pagination= paginate @customers + + .col-md-2 + = semantic_form_for :search, :html => {id: :search_form, :method => :get } do |f| + = f.inputs do + =f.input :q, :as => :search, label: "Recherche", input_html: {value: params[:q], :name => 'q' }, placeholder: "Nom, Prénom ou Société" + .clear + + + + %br + + + :javascript + diff --git a/app/views/admin/customers/show.html.haml b/app/views/admin/customers/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/customers/update.js.erb b/app/views/admin/customers/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/data_files/_data_file.html.haml b/app/views/admin/data_files/_data_file.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/data_files/_data_files_container.html.haml b/app/views/admin/data_files/_data_files_container.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/data_files/_form.html.haml b/app/views/admin/data_files/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/data_files/_index_block.html.haml b/app/views/admin/data_files/_index_block.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/data_files/_show.html.haml b/app/views/admin/data_files/_show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/data_files/create.js.erb b/app/views/admin/data_files/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/data_files/destroy.js.erb b/app/views/admin/data_files/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/data_files/index.html.haml b/app/views/admin/data_files/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/data_files/index.js.erb b/app/views/admin/data_files/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/data_files/show.js.erb b/app/views/admin/data_files/show.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/data_files/update.js.erb b/app/views/admin/data_files/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/events/_event.html.haml b/app/views/admin/events/_event.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/events/_form.html.haml b/app/views/admin/events/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/events/_index_block.html.haml b/app/views/admin/events/_index_block.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/events/_show.html.haml b/app/views/admin/events/_show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/events/create.js.erb b/app/views/admin/events/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/events/destroy.js.erb b/app/views/admin/events/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/events/edit.html.haml b/app/views/admin/events/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/events/edit.js.erb b/app/views/admin/events/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/events/index.js.erb b/app/views/admin/events/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/events/new.js.erb b/app/views/admin/events/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/events/update.js.erb b/app/views/admin/events/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/external_links/_external_link.html.haml b/app/views/admin/external_links/_external_link.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/external_links/_form.html.haml b/app/views/admin/external_links/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/external_links/cible.html.haml b/app/views/admin/external_links/cible.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/external_links/create.js.erb b/app/views/admin/external_links/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/external_links/destroy.js.erb b/app/views/admin/external_links/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/external_links/edit.html.haml b/app/views/admin/external_links/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/external_links/edit.js.erb b/app/views/admin/external_links/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/external_links/index.js.erb b/app/views/admin/external_links/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/external_links/new.js.erb b/app/views/admin/external_links/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/external_links/show.html.haml b/app/views/admin/external_links/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/external_links/update.js.erb b/app/views/admin/external_links/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/file_folders/_file_folder.html.haml b/app/views/admin/file_folders/_file_folder.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/file_folders/_file_folders.html.haml b/app/views/admin/file_folders/_file_folders.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/file_folders/_file_folders_navbar.html.haml b/app/views/admin/file_folders/_file_folders_navbar.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/file_folders/create.js.erb b/app/views/admin/file_folders/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/file_folders/destroy.js.erb b/app/views/admin/file_folders/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/file_folders/edit.js.erb b/app/views/admin/file_folders/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/file_folders/index.js.erb b/app/views/admin/file_folders/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/file_folders/new.js.erb b/app/views/admin/file_folders/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/file_folders/update.js.erb b/app/views/admin/file_folders/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/_form.html.haml b/app/views/admin/image_files/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/_image_file.html.haml b/app/views/admin/image_files/_image_file.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/_image_files_container.html.haml b/app/views/admin/image_files/_image_files_container.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/_index_block.html.haml b/app/views/admin/image_files/_index_block.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/_show.html.haml b/app/views/admin/image_files/_show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/create.js.erb b/app/views/admin/image_files/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/destroy.js.erb b/app/views/admin/image_files/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/index.html.haml b/app/views/admin/image_files/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/index.js.erb b/app/views/admin/image_files/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/rotate.js.erb b/app/views/admin/image_files/rotate.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/show.js.erb b/app/views/admin/image_files/show.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/image_files/update.js.erb b/app/views/admin/image_files/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_aliases/_form.html.haml b/app/views/admin/menu_aliases/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_aliases/_menu_alias.html.haml b/app/views/admin/menu_aliases/_menu_alias.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_aliases/edit.html.haml b/app/views/admin/menu_aliases/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/_cible_line.html.haml b/app/views/admin/menu_items/_cible_line.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/_edit_form.html.haml b/app/views/admin/menu_items/_edit_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/_form.html.haml b/app/views/admin/menu_items/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/_form_line.html.haml b/app/views/admin/menu_items/_form_line.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/_index_block.html.haml b/app/views/admin/menu_items/_index_block.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/_menu_item.html.haml b/app/views/admin/menu_items/_menu_item.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/_menu_item_content_form.html.haml b/app/views/admin/menu_items/_menu_item_content_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/_new_form.html.haml b/app/views/admin/menu_items/_new_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/_show.html.haml b/app/views/admin/menu_items/_show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/archives.html.haml b/app/views/admin/menu_items/archives.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/cible.html.haml b/app/views/admin/menu_items/cible.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/create.js.erb b/app/views/admin/menu_items/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/edit.html.haml b/app/views/admin/menu_items/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/edit.js.erb b/app/views/admin/menu_items/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/import.html.haml b/app/views/admin/menu_items/import.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/index.html.haml b/app/views/admin/menu_items/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/index.js.erb b/app/views/admin/menu_items/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/new.html.haml b/app/views/admin/menu_items/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/new.js.erb b/app/views/admin/menu_items/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/reorder.js.erb b/app/views/admin/menu_items/reorder.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/show.js.erb b/app/views/admin/menu_items/show.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/update.js.erb b/app/views/admin/menu_items/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_items/update_reorder_failled.js.erb b/app/views/admin/menu_items/update_reorder_failled.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_urls/_form.html.haml b/app/views/admin/menu_urls/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_urls/_menu_url.html.haml b/app/views/admin/menu_urls/_menu_url.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menu_urls/edit.html.haml b/app/views/admin/menu_urls/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menus/_form.html.haml b/app/views/admin/menus/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menus/_index_block.html.haml b/app/views/admin/menus/_index_block.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menus/_menu.html.haml b/app/views/admin/menus/_menu.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menus/edit.html.haml b/app/views/admin/menus/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menus/index.html.haml b/app/views/admin/menus/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menus/index.js.erb b/app/views/admin/menus/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/menus/new.html.haml b/app/views/admin/menus/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/menus/show.html.haml b/app/views/admin/menus/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/messages/_message.html.haml b/app/views/admin/messages/_message.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/messages/index.html.haml b/app/views/admin/messages/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/need_categories/_form.html.haml b/app/views/admin/need_categories/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/need_categories/_need_category.html.haml b/app/views/admin/need_categories/_need_category.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/need_categories/edit.html.haml b/app/views/admin/need_categories/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/need_categories/new.html.haml b/app/views/admin/need_categories/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/needs/_form.html.haml b/app/views/admin/needs/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/needs/_need.html.haml b/app/views/admin/needs/_need.html.haml old mode 100644 new mode 100755 index 3674eb5..49c47de --- a/app/views/admin/needs/_need.html.haml +++ b/app/views/admin/needs/_need.html.haml @@ -8,11 +8,7 @@ -if need.category =link_to need.category.name, edit_admin_need_category_path(need.category) - %td - -if need.author - =link_to need.author.organisation, edit_admin_customer_path(need.author) - -else - Administrateur + %td{style: 'text-align:center' } =link_to i(:"hand-paper-o") + " " + need.wishes.length.to_s, admin_need_wishes_path(need) diff --git a/app/views/admin/needs/_need_to_validate.html.haml b/app/views/admin/needs/_need_to_validate.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/needs/edit.html.haml b/app/views/admin/needs/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/needs/index.html.haml b/app/views/admin/needs/index.html.haml index 01f11af..14bac25 100755 --- a/app/views/admin/needs/index.html.haml +++ b/app/views/admin/needs/index.html.haml @@ -1,6 +1,7 @@ %h1 Gestion des besoins %h2 Proposition de besoin +%br -if @needs_to_validate.length < 1 Aucune proposition de besoin -else @@ -31,11 +32,41 @@ =render collection: @needs_to_validate, partial: 'need_to_validate', as: :need %br %h2 Liste des besoins -<<<<<<< HEAD +%br -if @needs.length < 1 Aucun besoin -else .row + + .col-md-10 + %table.table.admin_table.table-hover.table-striped + %thead.rows_header + + %tr + %th + Titre + %th + Catégorie + + %th{style: 'text-align:center' } + Commentaires/Intérêts + %th{style: 'text-align:center' } + Offres + %th + Statut + %th{:style => "width:100px"} +   + + %tbody.rows + + =render @needs + .clear + .pagination.pull-right= paginate @needs + + + .col-md-2 + = link_to "Créer un nouveau besoin", new_admin_need_path, class:"btn btn-primary btn-block" + %br .col-md-2 = semantic_form_for :search, :html => {id: :search_form, :method => :get } do |f| = f.inputs do @@ -51,33 +82,9 @@ = f.input :c, as: :category, selected: params[:c], input_html: {:name => 'c' }, label: 'Filtrer par catégorie', :include_blank => "Toute catégorie" , :as => :select, :collection => @tree.map{|c| [(c.level > 0 ? ('   ' * (c.level - 1)) + "|- ": "").html_safe + c.name, c.id]} .clear - .col-md-10 - %table.table.admin_table.table-hover.table-striped - %thead.rows_header - %tr - %th - Titre - %th - Catégorie - %th - Émetteur - %th{style: 'text-align:center' } - Commentaires/Intérêts - %th{style: 'text-align:center' } - Offres - %th - Statut - %th{:style => "width:100px"} -   - %tbody.rows - - =render @needs - - .pagination.pull-right= paginate @needs %br -= link_to "Créer un besoin", new_admin_need_path, class:"btn btn-primary" :javascript diff --git a/app/views/admin/needs/new.html.haml b/app/views/admin/needs/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/newsletters/_sheets_selecteds.html.haml b/app/views/admin/newsletters/_sheets_selecteds.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/newsletters/create.js.erb b/app/views/admin/newsletters/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/newsletters/history.html.haml b/app/views/admin/newsletters/history.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/newsletters/history_detail.html.haml b/app/views/admin/newsletters/history_detail.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/newsletters/new.js.erb b/app/views/admin/newsletters/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/newsletters/select_recipients.html.haml b/app/views/admin/newsletters/select_recipients.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/newsletters/select_recipients.js.erb b/app/views/admin/newsletters/select_recipients.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/newsletters/show.html.haml b/app/views/admin/newsletters/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/newsletters/update.js.erb b/app/views/admin/newsletters/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/offers/_form.html.haml b/app/views/admin/offers/_form.html.haml old mode 100644 new mode 100755 index 41def45..9218102 --- a/app/views/admin/offers/_form.html.haml +++ b/app/views/admin/offers/_form.html.haml @@ -4,6 +4,5 @@ =f.inputs do =f.input :supplier, :label => "Nom du fournisseur : " =f.input :price, :label => "Prix négocié : " - =f.input :fee_percentage, :label => "% de frais : " .actions= f.submit "Sauvegarder", :class => "btn btn-primary" diff --git a/app/views/admin/offers/_offer.html.haml b/app/views/admin/offers/_offer.html.haml old mode 100644 new mode 100755 index e136294..fd7eb5c --- a/app/views/admin/offers/_offer.html.haml +++ b/app/views/admin/offers/_offer.html.haml @@ -6,8 +6,9 @@ =offer.supplier %td =number_to_currency(offer.price, locale: :fr) - %td - =number_to_percentage(offer.fee_percentage, significant: true ) + + %td{style:"text-align:center;font-weight:bold;color:#3C763D;"} + =link_to i(:"cog") + " " + offer.customers.count.to_s + " / " + offer.need.wishes.length.to_s, accepted_admin_offer_path(offer) %td.actions{:style => "width:150px;text-align:right"} -if @need = link_to i(:"trash"), [:admin,@need, offer], :data => {:confirm => 'Voulez-vous vraiment supprimer cette offre ?'}, :method => :delete diff --git a/app/views/admin/offers/accepted.html.haml b/app/views/admin/offers/accepted.html.haml new file mode 100755 index 0000000..4472b49 --- /dev/null +++ b/app/views/admin/offers/accepted.html.haml @@ -0,0 +1,67 @@ +%h1 + = "Liste des clients intéressés par le besoin " + + = @offer.need.title + + +%h4 + = "Personnes intéressées: " + + =pluralize(@offer.need.wishes.length, "Personne") + +%h4 + = "Offres acceptées: " + + =pluralize(@offer.accepted_offers.length, "Personne") + +%h4 + = "Prix de l'offre: " + + =number_to_currency(@offer.price, locale: :fr) + +%h4 + = "Fournisseur: " + + =@offer.supplier + +%br +%table.table.admin-table.table-hover.table-striped + %thead.rows_header + %tr + %th + Société + %th + Nom/Prénom + %th + Téléphone + %th + Email + %th{style:"text-align:center"} + Offre acceptée? + %th{style:"text-align:center"} + État + %tbody.rows + -@offer.need.wishes.each do |wish| + %tr + %td + -if wish.customer.organisation + =wish.customer.organisation + %td + =wish.customer.firstname + " " + wish.customer.name + %td + -if wish.customer.phone + = i("phone") + " #{wish.customer.phone}" + %td + -if wish.customer.email + = link_to i("envelope-o") + " #{wish.customer.email}", 'mailto:' + wish.customer.email + %td{style:"text-align:center"} + -accepted_offer = @offer.accepted_offers.where(customer_id: wish.customer.id).first + -if accepted_offer + =i(:"check") + " Acceptée" + -else + \- + %td{style:"text-align:center"} + -if accepted_offer + =accepted_offer.human_state + -else + Pas encore acceptée diff --git a/app/views/admin/offers/edit.html.haml b/app/views/admin/offers/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/offers/index.html.haml b/app/views/admin/offers/index.html.haml old mode 100644 new mode 100755 index 723a7ef..2d20b8b --- a/app/views/admin/offers/index.html.haml +++ b/app/views/admin/offers/index.html.haml @@ -26,16 +26,6 @@ Aucune offre actuellement -else .row - .col-md-2 - = semantic_form_for :search, :html => {id: :search_form, :method => :get } do |f| - = f.inputs do - = f.inputs do - =f.input :q, :as => :search, label: "Recherche", input_html: {value: params[:q], :name => 'q' }, placeholder: "Besoin ou fournisseur" - .clear - = f.input :o, as: :order, selected: params[:o], input_html: {:name => 'o' }, label: "Ordre d'affichage", :include_blank => false , :as => :select, :collection => @orders - .clear - = f.input :r, as: :result, selected: params[:r], input_html: {:name => 'r' }, label: 'Résultats par page', :include_blank => false , :as => :select, :collection => [10,20,50,100] - .clear .col-md-10 %table.table.admin-table.table-hover.table-striped @@ -48,8 +38,8 @@ Fournisseur %th Prix négocié - %th - \% de frais + %th{style:"text-align:center;"} + Offres acceptées / Intéressés %th{:style => "width:100px"}   @@ -58,10 +48,23 @@ =render @offers .pagination.pull-right= paginate @offers + .col-md-2 + -if @need + =link_to "Ajouter une offre", new_admin_need_offer_path(@need),class:"btn btn-primary btn-block" + %br + = semantic_form_for :search, :html => {id: :search_form, :method => :get } do |f| + = f.inputs do + = f.inputs do + =f.input :q, :as => :search, label: "Recherche", input_html: {value: params[:q], :name => 'q' }, placeholder: "Par nom de besoin ou fournisseur" + .clear + = f.input :o, as: :order, selected: params[:o], input_html: {:name => 'o' }, label: "Ordre d'affichage", :include_blank => false , :as => :select, :collection => @orders + .clear + = f.input :r, as: :result, selected: params[:r], input_html: {:name => 'r' }, label: 'Résultats par page', :include_blank => false , :as => :select, :collection => [10,20,50,100] + .clear + %br %br --if @need - =link_to "Ajouter une offre", new_admin_need_offer_path(@need),class:"btn btn-primary" + :javascript $('#search_o').change(function(){$('#search_form').submit()}) diff --git a/app/views/admin/offers/new.html.haml b/app/views/admin/offers/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/orders/_force_form.html.haml b/app/views/admin/orders/_force_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/orders/_order.html.haml b/app/views/admin/orders/_order.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/orders/force_pref.js.erb b/app/views/admin/orders/force_pref.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/orders/index.html.haml b/app/views/admin/orders/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/orders/show.html.haml b/app/views/admin/orders/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/pages/_form.html.haml b/app/views/admin/pages/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/pages/_page.html.haml b/app/views/admin/pages/_page.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/pages/edit.html.haml b/app/views/admin/pages/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/pages/update.html.haml b/app/views/admin/pages/update.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/password_resets/edit.html.haml b/app/views/admin/password_resets/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/password_resets/new.html.haml b/app/views/admin/password_resets/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/passwords/edit.html.haml b/app/views/admin/passwords/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/passwords/new.html.haml b/app/views/admin/passwords/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/sessions/new.html.haml b/app/views/admin/sessions/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/virement_remises/_form.html.haml b/app/views/admin/virement_remises/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/virement_remises/_virement_remise.html.haml b/app/views/admin/virement_remises/_virement_remise.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/virement_remises/edit.js.erb b/app/views/admin/virement_remises/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/virement_remises/index.html.haml b/app/views/admin/virement_remises/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/virement_remises/sended.js.erb b/app/views/admin/virement_remises/sended.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/virement_remises/show.html.erb b/app/views/admin/virement_remises/show.html.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/virement_remises/update.js.erb b/app/views/admin/virement_remises/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/virements/_form.html.haml b/app/views/admin/virements/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/virements/_virement.html.haml b/app/views/admin/virements/_virement.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/virements/edit.js.erb b/app/views/admin/virements/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/virements/index.html.haml b/app/views/admin/virements/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/virements/show.html.haml b/app/views/admin/virements/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/virements/update.js.erb b/app/views/admin/virements/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/virements/valid.js.erb b/app/views/admin/virements/valid.js.erb old mode 100644 new mode 100755 diff --git a/app/views/admin/wishes/_wish.html.haml b/app/views/admin/wishes/_wish.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin/wishes/index.html.haml b/app/views/admin/wishes/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin_mailer/new_need.html.haml b/app/views/admin_mailer/new_need.html.haml old mode 100644 new mode 100755 diff --git a/app/views/admin_mailer/password_reset.text.erb b/app/views/admin_mailer/password_reset.text.erb old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/confirm.html.haml b/app/views/customer_mailer/confirm.html.haml old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/confirm_ins.html.haml b/app/views/customer_mailer/confirm_ins.html.haml old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/negociate_need.html.haml b/app/views/customer_mailer/negociate_need.html.haml old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/new_commission.old.haml b/app/views/customer_mailer/new_commission.old.haml old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/new_message.html.old.haml b/app/views/customer_mailer/new_message.html.old.haml old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/new_user.html.haml.old b/app/views/customer_mailer/new_user.html.haml.old old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/notify_ins.html.haml b/app/views/customer_mailer/notify_ins.html.haml old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/password_reset.text.erb b/app/views/customer_mailer/password_reset.text.erb old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/refuse_need.html.haml b/app/views/customer_mailer/refuse_need.html.haml old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/validate_account.html.haml b/app/views/customer_mailer/validate_account.html.haml old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/validate_ins.html.haml b/app/views/customer_mailer/validate_ins.html.haml old mode 100644 new mode 100755 diff --git a/app/views/customer_mailer/validate_need.html.haml b/app/views/customer_mailer/validate_need.html.haml old mode 100644 new mode 100755 diff --git a/app/views/forum_users/_form.haml b/app/views/forum_users/_form.haml old mode 100644 new mode 100755 diff --git a/app/views/forum_users/_forum_user.haml b/app/views/forum_users/_forum_user.haml old mode 100644 new mode 100755 diff --git a/app/views/forum_users/edit.haml b/app/views/forum_users/edit.haml old mode 100644 new mode 100755 diff --git a/app/views/forum_users/index.haml b/app/views/forum_users/index.haml old mode 100644 new mode 100755 diff --git a/app/views/forum_users/new.haml b/app/views/forum_users/new.haml old mode 100644 new mode 100755 diff --git a/app/views/forum_users/show.haml b/app/views/forum_users/show.haml old mode 100644 new mode 100755 diff --git a/app/views/kaminari/_first_page.html.haml b/app/views/kaminari/_first_page.html.haml old mode 100644 new mode 100755 diff --git a/app/views/kaminari/_gap.html.haml b/app/views/kaminari/_gap.html.haml old mode 100644 new mode 100755 diff --git a/app/views/kaminari/_last_page.html.haml b/app/views/kaminari/_last_page.html.haml old mode 100644 new mode 100755 diff --git a/app/views/kaminari/_next_page.html.haml b/app/views/kaminari/_next_page.html.haml old mode 100644 new mode 100755 diff --git a/app/views/kaminari/_page.html.haml b/app/views/kaminari/_page.html.haml old mode 100644 new mode 100755 diff --git a/app/views/kaminari/_paginator.html.haml b/app/views/kaminari/_paginator.html.haml old mode 100644 new mode 100755 diff --git a/app/views/kaminari/_prev_page.html.haml b/app/views/kaminari/_prev_page.html.haml old mode 100644 new mode 100755 diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml old mode 100644 new mode 100755 index e63d98c..3b8883d --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -39,15 +39,15 @@ - %li= link_to "Comptes utilisateurs", admin_customers_path + %li= link_to "Clients", admin_customers_path - unvalidated_need_count = Need.where(state: 'created').count -if unvalidated_need_count > 0 - %li= link_to content_tag(:span,unvalidated_need_count , class: 'badge') + " Gestion des besoins", admin_needs_path + %li= link_to content_tag(:span,unvalidated_need_count , class: 'badge') + " Besoins", admin_needs_path -else - %li= link_to " Gestion des besoins", admin_needs_path + %li= link_to " Besoins", admin_needs_path - %li= link_to " Gestion des catégories", admin_need_categories_path - %li= link_to " Gestion des offres", admin_offers_path + %li= link_to " Catégories", admin_need_categories_path + %li= link_to " Offres", admin_offers_path diff --git a/app/views/layouts/affiliation.html.haml b/app/views/layouts/affiliation.html.haml old mode 100644 new mode 100755 diff --git a/app/views/layouts/blog.html.haml b/app/views/layouts/blog.html.haml old mode 100644 new mode 100755 diff --git a/app/views/layouts/connexion.html.haml b/app/views/layouts/connexion.html.haml old mode 100644 new mode 100755 diff --git a/app/views/layouts/home.html.haml b/app/views/layouts/home.html.haml old mode 100644 new mode 100755 diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml old mode 100644 new mode 100755 diff --git a/app/views/newsletter_mails/newsletter.html.haml b/app/views/newsletter_mails/newsletter.html.haml old mode 100644 new mode 100755 diff --git a/app/views/newsletter_mails/newsletter_inscription.html.haml b/app/views/newsletter_mails/newsletter_inscription.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/block_contents/_block_content.html.haml b/app/views/portlet/block_contents/_block_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/block_contents/_form.html.haml b/app/views/portlet/block_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/break_contents/_break_content.html.haml b/app/views/portlet/break_contents/_break_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/break_contents/_form.html.haml b/app/views/portlet/break_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/download_contents/_download_content.html.haml b/app/views/portlet/download_contents/_download_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/download_contents/_form.html.haml b/app/views/portlet/download_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/dynamic_contents/_dynamic_content.html.haml b/app/views/portlet/dynamic_contents/_dynamic_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/dynamic_contents/_form.html.haml b/app/views/portlet/dynamic_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/gallery_contents/_form.html.haml b/app/views/portlet/gallery_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/gallery_contents/_gallery_content.html.haml b/app/views/portlet/gallery_contents/_gallery_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/gallery_images/_form.html.haml b/app/views/portlet/gallery_images/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/gallery_images/_gallery_image.html.haml b/app/views/portlet/gallery_images/_gallery_image.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/gallery_images/create.js.erb b/app/views/portlet/gallery_images/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/gallery_images/destroy.js.erb b/app/views/portlet/gallery_images/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/gallery_images/edit.js.erb b/app/views/portlet/gallery_images/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/gallery_images/reorder.js.erb b/app/views/portlet/gallery_images/reorder.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/gallery_images/update.js.erb b/app/views/portlet/gallery_images/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/html_contents/_form.html.haml b/app/views/portlet/html_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/html_contents/_html_content.html.haml b/app/views/portlet/html_contents/_html_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/image_contents/_form.html.haml b/app/views/portlet/image_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/image_contents/_image_content.html.haml b/app/views/portlet/image_contents/_image_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/link_contents/_form.html.haml b/app/views/portlet/link_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/link_contents/_link_content.html.haml b/app/views/portlet/link_contents/_link_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/map_contents/_form.html.haml b/app/views/portlet/map_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/map_contents/_map_content.html.haml b/app/views/portlet/map_contents/_map_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/portlets/_portlet.html.haml b/app/views/portlet/portlets/_portlet.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/portlets/new.html.haml b/app/views/portlet/portlets/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/portlets/new.js.erb b/app/views/portlet/portlets/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/portlets/update.js.erb b/app/views/portlet/portlets/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/quote_contents/_form.html.haml b/app/views/portlet/quote_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/shared/create.js.erb b/app/views/portlet/shared/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/shared/destroy.js.erb b/app/views/portlet/shared/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/shared/edit.js.erb b/app/views/portlet/shared/edit.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/shared/new.js.erb b/app/views/portlet/shared/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/shared/update.js.erb b/app/views/portlet/shared/update.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/table_cols/create.js.erb b/app/views/portlet/table_cols/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/table_cols/destroy.js.erb b/app/views/portlet/table_cols/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/table_contents/_form.html.haml b/app/views/portlet/table_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/table_contents/_table_content.html.haml b/app/views/portlet/table_contents/_table_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/table_contents/_table_content_edit_pane.html.haml b/app/views/portlet/table_contents/_table_content_edit_pane.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/table_contents/destroy_row.js.erb b/app/views/portlet/table_contents/destroy_row.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/table_rows/create.js.erb b/app/views/portlet/table_rows/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/table_rows/destroy.js.erb b/app/views/portlet/table_rows/destroy.js.erb old mode 100644 new mode 100755 diff --git a/app/views/portlet/text_contents/_form.html.haml b/app/views/portlet/text_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/text_contents/_text_content.html.haml b/app/views/portlet/text_contents/_text_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/title_contents/_form.html.haml b/app/views/portlet/title_contents/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlet/title_contents/_title_content.html.haml b/app/views/portlet/title_contents/_title_content.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/dynamic_contents/_sub_menu.html.haml b/app/views/portlets/dynamic_contents/_sub_menu.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_blockcontent.html.haml b/app/views/portlets/render_public/_blockcontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_breakcontent.html.haml b/app/views/portlets/render_public/_breakcontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_downloadcontent.html.haml b/app/views/portlets/render_public/_downloadcontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_dynamiccontent.html.haml b/app/views/portlets/render_public/_dynamiccontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_eventcontent.html.haml b/app/views/portlets/render_public/_eventcontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_gallerycontent.html.haml b/app/views/portlets/render_public/_gallerycontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_htmlcontent.html.haml b/app/views/portlets/render_public/_htmlcontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_imagecontent.html.haml b/app/views/portlets/render_public/_imagecontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_imglinkcontent.html.haml b/app/views/portlets/render_public/_imglinkcontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_linkcontent.html.haml b/app/views/portlets/render_public/_linkcontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_mapcontent.html.haml b/app/views/portlets/render_public/_mapcontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_quotecontent.html.haml b/app/views/portlets/render_public/_quotecontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_tablecontent.html.haml b/app/views/portlets/render_public/_tablecontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_textcontent.html.haml b/app/views/portlets/render_public/_textcontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/portlets/render_public/_titlecontent.html.haml b/app/views/portlets/render_public/_titlecontent.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles.old/_article.html.haml b/app/views/public/articles.old/_article.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles.old/_article_intro.html.haml b/app/views/public/articles.old/_article_intro.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles.old/_sidebar_archives.html.haml b/app/views/public/articles.old/_sidebar_archives.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles.old/_sidebar_categories.html.haml b/app/views/public/articles.old/_sidebar_categories.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles.old/_sidebar_recents.html.haml b/app/views/public/articles.old/_sidebar_recents.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles.old/_sidebar_tags.html.haml b/app/views/public/articles.old/_sidebar_tags.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles.old/feed.rss.builder b/app/views/public/articles.old/feed.rss.builder old mode 100644 new mode 100755 diff --git a/app/views/public/articles.old/index.html.haml b/app/views/public/articles.old/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles.old/show.html.haml b/app/views/public/articles.old/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles/_article.html.haml b/app/views/public/articles/_article.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles/_article_img.html.haml b/app/views/public/articles/_article_img.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles/_article_intro.html.haml b/app/views/public/articles/_article_intro.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles/_sidebar_archives.html.haml b/app/views/public/articles/_sidebar_archives.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles/_sidebar_categories.html.haml b/app/views/public/articles/_sidebar_categories.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles/_sidebar_recents.html.haml b/app/views/public/articles/_sidebar_recents.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles/_sidebar_tags.html.haml b/app/views/public/articles/_sidebar_tags.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles/feed.rss.builder b/app/views/public/articles/feed.rss.builder old mode 100644 new mode 100755 diff --git a/app/views/public/articles/index.html.haml b/app/views/public/articles/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles/old.show.html.haml b/app/views/public/articles/old.show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/articles/show.html.haml b/app/views/public/articles/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/blocks/_block.html.haml b/app/views/public/blocks/_block.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/cities/_search.html.haml b/app/views/public/cities/_search.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/cities/_search.old.html.haml b/app/views/public/cities/_search.old.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/cities/index.html.haml b/app/views/public/cities/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/cities/index.js.erb b/app/views/public/cities/index.js.erb old mode 100644 new mode 100755 diff --git a/app/views/public/cities/search.js.erb b/app/views/public/cities/search.js.erb old mode 100644 new mode 100755 diff --git a/app/views/public/cities/untitled.txt b/app/views/public/cities/untitled.txt old mode 100644 new mode 100755 diff --git a/app/views/public/comments/_comment.html.haml b/app/views/public/comments/_comment.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/comments/_form.html.haml b/app/views/public/comments/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/comments/create.js.erb b/app/views/public/comments/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/public/commissions/_commission.html.haml b/app/views/public/commissions/_commission.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/commissions/index.html.haml b/app/views/public/commissions/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/credit_products/_credit_product.html.haml b/app/views/public/credit_products/_credit_product.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/credit_products/index.html.haml b/app/views/public/credit_products/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/credits/_credit.html.haml b/app/views/public/credits/_credit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/credits/index.html.haml b/app/views/public/credits/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/_annonce_account.haml b/app/views/public/customers/_annonce_account.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/_annonce_account_binary.haml b/app/views/public/customers/_annonce_account_binary.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/_annonce_account_binary_nil.haml b/app/views/public/customers/_annonce_account_binary_nil.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/_binary_table.haml b/app/views/public/customers/_binary_table.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/_filleul.haml b/app/views/public/customers/_filleul.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/_find_parrain.html.haml b/app/views/public/customers/_find_parrain.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/_form.haml b/app/views/public/customers/_form.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/_index_binary.haml b/app/views/public/customers/_index_binary.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/_new_form.haml b/app/views/public/customers/_new_form.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/edit.haml b/app/views/public/customers/edit.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/find_parrain.js.erb b/app/views/public/customers/find_parrain.js.erb old mode 100644 new mode 100755 diff --git a/app/views/public/customers/index.haml b/app/views/public/customers/index.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/mail.haml b/app/views/public/customers/mail.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/new.haml b/app/views/public/customers/new.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/show.haml b/app/views/public/customers/show.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers/show_details.haml b/app/views/public/customers/show_details.haml old mode 100644 new mode 100755 diff --git a/app/views/public/customers_auths/new.haml b/app/views/public/customers_auths/new.haml old mode 100644 new mode 100755 index 7223bca..d489cba --- a/app/views/public/customers_auths/new.haml +++ b/app/views/public/customers_auths/new.haml @@ -1,14 +1,14 @@ -=render :partial => "public/shared/annonce_menu" if params[:for_annonce] + .row .col-md-6 .connexion_form %h1 Vous avez déjà un compte ? - + = form_tag public_customers_auths_path do =hidden_field_tag :for_annonce, params[:for_annonce] - + %p = label_tag :email, "email :" @@ -24,13 +24,12 @@ = label_tag :remember_me, "Rester connecté ?" %p{:style => "text-align:center"} - - = submit_tag "Se connecter", :class => "btn btn-primary" + + = submit_tag "Se connecter", :class => "btn btn-primary" %p{:style => "text-align:center"} =link_to "Mot de passe perdu ?", new_public_password_reset_path, :class => "btn" - - + + .col-md-6 - + =render :partial => "public/customers/new_form" - \ No newline at end of file diff --git a/app/views/public/events/_event.haml b/app/views/public/events/_event.haml old mode 100644 new mode 100755 diff --git a/app/views/public/events/index.html.haml b/app/views/public/events/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/events/show.html.haml b/app/views/public/events/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/expenses/_expense.html.haml b/app/views/public/expenses/_expense.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/home/_details.html.haml b/app/views/public/home/_details.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/home/_link.haml b/app/views/public/home/_link.haml old mode 100644 new mode 100755 diff --git a/app/views/public/home/affiliation.html.haml b/app/views/public/home/affiliation.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/home/home.html.haml b/app/views/public/home/home.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/menu_items/show.html.haml b/app/views/public/menu_items/show.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/_address.html.haml b/app/views/public/my_account/_address.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/_binary_form.html.haml b/app/views/public/my_account/_binary_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/_menu.haml b/app/views/public/my_account/_menu.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/_note_pays.html.haml b/app/views/public/my_account/_note_pays.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/_solde_credits.html.haml b/app/views/public/my_account/_solde_credits.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/_sond.html.haml b/app/views/public/my_account/_sond.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/_step2.html.haml b/app/views/public/my_account/_step2.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/_step3.html.haml b/app/views/public/my_account/_step3.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/_text_pays.html.haml b/app/views/public/my_account/_text_pays.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/binary.haml b/app/views/public/my_account/binary.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/edit_infos.html.haml b/app/views/public/my_account/edit_infos.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/favoris.html.haml b/app/views/public/my_account/favoris.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/filleuls.haml b/app/views/public/my_account/filleuls.haml old mode 100644 new mode 100755 diff --git a/app/views/public/my_account/index.html.haml b/app/views/public/my_account/index.html.haml index df28c20..73c4553 100755 --- a/app/views/public/my_account/index.html.haml +++ b/app/views/public/my_account/index.html.haml @@ -45,12 +45,33 @@ #{ current_customer.full_address} %p =link_to "Modifier mes infos", public_edit_infos_path, :class => "btn btn-primary" + .padding.center.white + %h3 + Mes offres acceptées + %div.alert.alert-info + %p + Voici la liste de toutes les offres que vous avez acceptées + + -if @accepted_offers.length > 0 + =render "public/needs/accepted_offers_index", accepted_offers: @accepted_offers + .pagination= paginate @accepted_offers, param_name: 'page_offers' + -else + %p + Vous n'avez pas encore accepté d'offre .padding.center.white %h3 Ma liste de souhait + %div.alert.alert-info + %p + Votre liste de souhait comprend tout les besoins pour lesquels vous avez signalé un intérêt. + %p + Signaler votre intérêt vous permet d'acceder à des offres intéressantes si nous décidons de négocier ce besoin auprès de nos fournisseurs. + %p + Signaler un intérêt ne vous engage en rien, vous serez engagé seulement après avoir accepté une offre de notre part. + -if @wishes.length > 0 =render "public/needs/wishes_index", wishes: @wishes - .pagination= paginate @wishes + .pagination= paginate @wishes , param_name: 'page_wishes' -else %p Vous n'êtes encore intéressé par aucun besoin @@ -63,9 +84,10 @@ %br Votre proposition sera alors soumise à une courte validation par l'un de nos modérateurs. %br - Vous serez informer par courriel dès l'acceptation de votre proposition. + Vous serez informé par courriel dès l'acceptation de votre proposition. -if @needs.length > 0 =render "public/needs/index", needs: @needs + .pagination= paginate @needs , param_name: 'page_needs' -else %p Vous n'avez pas encore proposé de besoin diff --git a/app/views/public/my_account/my_annonces.html.haml b/app/views/public/my_account/my_annonces.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/needs/_accepted_offer.html.haml b/app/views/public/needs/_accepted_offer.html.haml new file mode 100755 index 0000000..917b0e4 --- /dev/null +++ b/app/views/public/needs/_accepted_offer.html.haml @@ -0,0 +1,17 @@ +-if(accepted_offer.devis_received?) + -class_name="success" +-else + -class_name="warning" + + + +%tr{class: class_name} + %td + =link_to accepted_offer.offer.need.title, public_need_path(accepted_offer.offer.need) + %td + =number_to_currency(accepted_offer.offer.price, locale: :fr) + %td + =accepted_offer.offer.supplier + %td{style: 'text-align:center'} + =accepted_offer.human_state + %td{style: 'text-align:right'} diff --git a/app/views/public/needs/_accepted_offers_index.html.haml b/app/views/public/needs/_accepted_offers_index.html.haml new file mode 100755 index 0000000..5f97fb9 --- /dev/null +++ b/app/views/public/needs/_accepted_offers_index.html.haml @@ -0,0 +1,15 @@ +%table.table.public-table.table-striped + %thead + %tr + %th + Titre du besoin + %th + Prix négocié + %th + Fournisseur + %th{style: 'text-align:center'} + État + %th{style: 'text-align:right'} + Devis + %tbody + =render partial: "public/needs/accepted_offer", collection: @accepted_offers, as: :accepted_offer diff --git a/app/views/public/needs/_form.html.haml b/app/views/public/needs/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/needs/_index.html.haml b/app/views/public/needs/_index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/needs/_message.html.haml b/app/views/public/needs/_message.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/needs/_need.html.haml b/app/views/public/needs/_need.html.haml old mode 100644 new mode 100755 index 5505de0..13196fd --- a/app/views/public/needs/_need.html.haml +++ b/app/views/public/needs/_need.html.haml @@ -10,7 +10,7 @@ =link_to need.title, public_need_path(need) %td -if need.category - =need.category.name + = i(:"tag") + " " + need.category.name %td =state %td.actions{:style => "width:150px;text-align:right"} diff --git a/app/views/public/needs/_need_item.html.haml b/app/views/public/needs/_need_item.html.haml old mode 100644 new mode 100755 index c339c95..72e771f --- a/app/views/public/needs/_need_item.html.haml +++ b/app/views/public/needs/_need_item.html.haml @@ -11,7 +11,7 @@ .top-left-info -if need.category - =i(:"tag") + " " + need.category_path + =i(:"tag") + " " + need.category.name -else Non catégorisé -if need.verified? @@ -45,14 +45,23 @@ .item=i(:"hand-paper-o") + " " + need.wishes.length.to_s .item=i(:"comment-o") + " " + need.messages.length.to_s - - -if(need.customers.include?(current_customer)) - -if(need.verified? or need.negociating?) + -if(need.verified?) + -if(need.customers.include?(current_customer)) =link_to i(:"check") + " Intéressé", wish_public_need_path(need) , class: "btn btn-success pull-right" - -elsif(need.negociated?) - =link_to "J'en profite!", public_need_path(need), class: "btn btn-success pull-right" + -else + =link_to i(:"hand-paper-o") + " Ça m'intéresse", wish_public_need_path(need) , class: "btn btn-primary pull-right" + -elsif(need.negociating?) + -if(need.customers.include?(current_customer)) + =link_to "Négociation en cours...", public_need_path(need), class: "btn btn-warning pull-right" + -else + =link_to i(:"times-circle") + " Trop tard pour vous !", public_need_path(need) , class: "btn btn-danger pull-right" + + -elsif(need.negociated?) + -if(need.customers.include?(current_customer)) + =link_to i(:"download") +" Voir les offres", public_need_path(need), class: "btn btn-success pull-right" + -else + =link_to i(:"times-circle") + " Trop tard pour vous !", public_need_path(need) , class: "btn btn-danger pull-right" + - -else - =link_to i(:"hand-paper-o") + " Ça m'intéresse !", wish_public_need_path(need) , class: "btn btn-primary pull-right" .clear diff --git a/app/views/public/needs/_wish.html.haml b/app/views/public/needs/_wish.html.haml old mode 100644 new mode 100755 index ffddb8c..6f27220 --- a/app/views/public/needs/_wish.html.haml +++ b/app/views/public/needs/_wish.html.haml @@ -1,10 +1,18 @@ +-if(wish.verified?) + -class_name="info" +-elsif(wish.negociating?) + -class_name="warning" +-elsif(wish.negociated?) + -class_name="success" +-elsif(wish.failed?) + -class_name="danger" -%tr{:id => wish.id} +%tr{:id => wish.id, class: class_name} %td =link_to wish.title, public_need_path(wish) %td -if wish.category - =wish.category.name + = i(:"tag") + " " + wish.category.name %td =wish.human_state %td{style: 'text-align:center' } @@ -12,4 +20,6 @@ %td{style: 'text-align:center'} =i(:"comment-o") + " " + wish.messages.length.to_s %td.actions{:style => "width:150px;text-align:right"} - =link_to i(:"remove"), wish_public_need_path(wish),title:"Je ne suis plus intéressé", class: 'btn btn-danger btn-square' + =link_to i(:"eye"), public_need_path(wish),title:"Voir la ficher du besoin", class: 'btn btn-primary btn-square' + -if wish.verified? + =link_to i(:"remove"), wish_public_need_path(wish),title:"Je ne suis plus intéressé", class: 'btn btn-danger btn-square' diff --git a/app/views/public/needs/_wishes_index.html.haml b/app/views/public/needs/_wishes_index.html.haml old mode 100644 new mode 100755 index a86192f..5a558ba --- a/app/views/public/needs/_wishes_index.html.haml +++ b/app/views/public/needs/_wishes_index.html.haml @@ -2,7 +2,7 @@ %thead %tr %th - Titre + Titre du besoin %th Catégorie %th diff --git a/app/views/public/needs/edit.html.haml b/app/views/public/needs/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/needs/index.html.haml b/app/views/public/needs/index.html.haml old mode 100644 new mode 100755 index f890bbe..0efd787 --- a/app/views/public/needs/index.html.haml +++ b/app/views/public/needs/index.html.haml @@ -11,7 +11,7 @@ .row.col-md-3 .white.side-menu =link_to "Proposer un nouveau besoin", new_public_need_path,style:'display:block', class: 'btn btn-primary' - .white.side-menu + %br = semantic_form_for :search, :html => {id: :search_form, :method => :get } do |f| = f.inputs do =f.input :q, :as => :search, label: "Recherche", input_html: {value: params[:q], :name => 'q' }, placeholder: "Rechercher un besoin" diff --git a/app/views/public/needs/new.html.haml b/app/views/public/needs/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/needs/show.html.haml b/app/views/public/needs/show.html.haml old mode 100644 new mode 100755 index df865de..9a64c58 --- a/app/views/public/needs/show.html.haml +++ b/app/views/public/needs/show.html.haml @@ -39,46 +39,104 @@ %p.description= @need.description - .clear + -if @need.verified? + -if @need.customers.include?(current_customer) + .alert.alert-success + %h3= i(:"check") + ' Vous êtes intéressé par ce besoin' + %p Marquer votre interêt pour un besoin vous permettra d'accéder à des offres intéressantes si nous décidons par la suite de négocier ce besoin auprès de nos fournisseurs. + -else + .alert.alert-info + %h3 Vous avez aussi ce besoin ? signalez-le nous ! + %p Vous pouvez marquer votre interêt pour ce besoin en cliquant sur le bouton Ça m'intéresse ! + %p Si il y a un nombre suffisant de personnes avec ce même besoin, une négociation sera entamée auprès de nos fournisseurs afin de vous faire une offre au meilleur prix. + %p Vous ensuite libre d'accepter ou non l'offre + + -elsif @need.negociating? + -if @need.customers.include?(current_customer) + .alert.alert-warning + %h3 Négociation en cours... + %p Ce besoin a suscité un interêt suffisant pour que nous engagions une négociation afin de vous proposer cet article au meilleur prix. + %p Vous avez marqué votre interêt pour ce besoin et vous serez donc prevenu dès que la négociation sera terminée. + %p Une ou plusieurs offres vous seront faites et vous serez libre de les accepter ou non. + %p Attention, accepter l'offre vous engage à payer. + -else + .alert.alert-warning + %h3 Négociation en cours... + %p Ce besoin a suscité un interêt suffisant pour que nous engagions une négociation afin de vous proposer cet article au meilleur prix. + .alert.alert-danger + %p Malheureusement vous n'avez pas marqué votre interêt pour ce besoin pendant la période de sondage, vous ne pourrez donc pas profiter de cette négociation. + -elsif @need.negociated? + -if @need.customers.include?(current_customer) + .alert.alert-success + %h3 Négociation terminée + %p= "Nous avons négocié ce besoin à partir de #{number_to_currency(offers.first.price, locale: :fr)}" + %p Vous avez maintenant le choix d'accepter ou refuser les offres proposées. + %p Attention, accepter l'offre vous engage à payer. + -else + .alert.alert-success + %h3 Négociation terminée + %p= "Nous avons négocié ce besoin à partir de #{number_to_currency(offers.first.price, locale: :fr)}" + .alert.alert-danger + %p= "Malheureusement, vous n'avez pas marqué votre interêt pour ce besoin pendant la période de sondage, vous ne pouvez donc pas profiter de cette négociation." + -elsif @need.failed? + .alert.alert-danger + %h3 Négociation échouée + %p= "Désolé, nous n'avons pas été en mesure de négocier un prix acceptable pour ce besoin." + .clear .counters -if(@need.wishes.length > 0) .item=i(:"hand-paper-o") + " " + " #{pluralize(@need.wishes.length, 'utilisateur')} #{"intéressé".pluralize(@need.wishes.length)} par ce besoin" -else .item=i(:"hand-paper-o") + " Aucun utilisateur n'est intéressé par ce besoin" - -if @need.verified? or @need.negociating? + -if @need.verified? -if(@need.customers.include?(current_customer)) =link_to i(:"check") + " Intéressé", wish_public_need_path(@need) , :class => "btn btn-square btn-lg btn-success pull-right" -else =link_to i(:"hand-paper-o") + " Ça m'intéresse !", wish_public_need_path(@need) , :class => "btn btn-square btn-lg btn-primary pull-right" + -elsif @need.negociating? + -elsif @need.negociated? -if @need.offers.length > 0 - %h2 Les offres négociées + %h2= i(:"gift") + " Les offres négociées" -@need.offers.each do |offer| .offer - .supplier - Négocié avec le fournisseur - %strong= offer.supplier + .price =number_to_currency(offer.price, locale: :fr) - =link_to "Acheter", "", class: "btn btn-success pull-right" + .supplier{style: "position:absolute;bottom:-5px;"} + ="Avec #{offer.supplier}" + + -if !offer.customers.include?(current_customer) + .accept-offer + =link_to i(:"check") + " Accepter l'offre", accept_public_need_offer_path(@need, offer), data: {confirm: "Voulez-vous vraiment accepter cette offre ? Attention, cette action vous engage à payer la somme proposée."}, class: "btn btn-lg btn-success " + -else + .offer-accepted + =i(:"check") + " Offre Acceptée" .clear %hr + %h2= i(:"comments") + " Fil de discussion" = semantic_form_for [:public, @need, @comment ], :html => {id: :message_form, :method => :post } do |f| - %h4 Poster un commentaire - = f.inputs do - = f.input :content, as: :text, label: false, rows: 5, :input_html => {:style => "height:100px;"} - =f.submit "Envoyer", :class => "btn btn-square btn-primary pull-right" + + -if(@need.customers.include?(current_customer)) + %h4 Écrire un nouveau message + = f.inputs do + = f.input :content, as: :text, label: false, rows: 5, :input_html => {:style => "height:100px;"} + + =f.submit "Envoyer", :class => "btn btn-square btn-primary pull-right" + -else + .alert.alert-danger + %p= "L'envoi de message est ouvert seulement aux personnes intéressés par le besoin" .clear - %h4= i(:"comment-o") + " #{pluralize(@need.messages.count, 'Commentaire')} pour ce besoin" + %h4= " #{pluralize(@need.messages.count, 'Message')} actuellement" =render collection: @comments, partial: 'message' diff --git a/app/views/public/orders/_billing.html.haml b/app/views/public/orders/_billing.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/orders/_new.html.haml b/app/views/public/orders/_new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/orders/bill_print.html.haml b/app/views/public/orders/bill_print.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/orders/billing.js.erb b/app/views/public/orders/billing.js.erb old mode 100644 new mode 100755 diff --git a/app/views/public/orders/bills.html.haml b/app/views/public/orders/bills.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/orders/create.js.erb b/app/views/public/orders/create.js.erb old mode 100644 new mode 100755 diff --git a/app/views/public/orders/e_trans_cancel.html.haml b/app/views/public/orders/e_trans_cancel.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/orders/e_trans_effectue.html.haml b/app/views/public/orders/e_trans_effectue.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/orders/e_trans_refuse.html.haml b/app/views/public/orders/e_trans_refuse.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/orders/new.js.erb b/app/views/public/orders/new.js.erb old mode 100644 new mode 100755 diff --git a/app/views/public/orders/paid.html.haml b/app/views/public/orders/paid.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/password_resets/edit.html.haml b/app/views/public/password_resets/edit.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/password_resets/new.html.haml b/app/views/public/password_resets/new.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/shared/_bottom.html.haml b/app/views/public/shared/_bottom.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/shared/_categories.html.haml b/app/views/public/shared/_categories.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/shared/_first_menu.html.haml b/app/views/public/shared/_first_menu.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/shared/_ga.html.erb b/app/views/public/shared/_ga.html.erb old mode 100644 new mode 100755 diff --git a/app/views/public/shared/_menu.html.haml b/app/views/public/shared/_menu.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/virements/_form.html.haml b/app/views/public/virements/_form.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/virements/confirm.html.haml b/app/views/public/virements/confirm.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/virements/index.html.haml b/app/views/public/virements/index.html.haml old mode 100644 new mode 100755 diff --git a/app/views/public/virements/new.html.haml b/app/views/public/virements/new.html.haml old mode 100644 new mode 100755 diff --git a/cities.csv b/cities.csv old mode 100644 new mode 100755 diff --git a/code_postaux_v201410.csv b/code_postaux_v201410.csv old mode 100644 new mode 100755 diff --git a/config.ru b/config.ru old mode 100644 new mode 100755 diff --git a/config/application.rb b/config/application.rb old mode 100644 new mode 100755 diff --git a/config/boot.rb b/config/boot.rb old mode 100644 new mode 100755 diff --git a/config/database.yml b/config/database.yml old mode 100644 new mode 100755 diff --git a/config/deploy.rb b/config/deploy.rb old mode 100644 new mode 100755 diff --git a/config/environment.rb b/config/environment.rb old mode 100644 new mode 100755 diff --git a/config/environments/development.rb b/config/environments/development.rb old mode 100644 new mode 100755 diff --git a/config/environments/production.rb b/config/environments/production.rb old mode 100644 new mode 100755 diff --git a/config/environments/test.rb b/config/environments/test.rb old mode 100644 new mode 100755 diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb old mode 100644 new mode 100755 diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb old mode 100644 new mode 100755 diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb old mode 100644 new mode 100755 diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb old mode 100644 new mode 100755 diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb old mode 100644 new mode 100755 diff --git a/config/initializers/formtastic.rb b/config/initializers/formtastic.rb old mode 100644 new mode 100755 diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb old mode 100644 new mode 100755 diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb old mode 100644 new mode 100755 diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb old mode 100644 new mode 100755 diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb old mode 100644 new mode 100755 diff --git a/config/initializers/to_slug.rb b/config/initializers/to_slug.rb old mode 100644 new mode 100755 diff --git a/config/initializers/wicked_pdf.rb b/config/initializers/wicked_pdf.rb old mode 100644 new mode 100755 diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb old mode 100644 new mode 100755 diff --git a/config/locales/en.yml b/config/locales/en.yml old mode 100644 new mode 100755 diff --git a/config/locales/fr.yml b/config/locales/fr.yml old mode 100644 new mode 100755 diff --git a/config/nginx.conf b/config/nginx.conf old mode 100644 new mode 100755 diff --git a/config/routes.rb b/config/routes.rb old mode 100644 new mode 100755 index 7974439..fa0b276 --- a/config/routes.rb +++ b/config/routes.rb @@ -88,8 +88,14 @@ Rails.application.routes.draw do get 'my_account/my_annonces', :as => "my_annonces" get 'my_account/reconfirm', :as => "reconfirm_email" + resources :needs do resources :messages + resources :offers do + member do + get :accept + end + end member do get 'wish', as: 'wish' end @@ -244,7 +250,9 @@ Rails.application.routes.draw do resources :needs do resources :messages resources :wishes - resources :offers + resources :offers do + + end member do get :validate get :refuse @@ -253,7 +261,11 @@ Rails.application.routes.draw do get :reject end end - resources :offers + resources :offers do + member do + get :accepted + end + end resources :customers do member do diff --git a/config/secrets.yml b/config/secrets.yml old mode 100644 new mode 100755 diff --git a/config/unicorn.rb b/config/unicorn.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0001_create_admins.rb b/db/migrate/0001_create_admins.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0003_create_menu.rb b/db/migrate/0003_create_menu.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0004_menu_items.rb b/db/migrate/0004_menu_items.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0005_create_menu_aliases.rb b/db/migrate/0005_create_menu_aliases.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0006_create_menu_urls.rb b/db/migrate/0006_create_menu_urls.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0010_create_pages.rb b/db/migrate/0010_create_pages.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0065_create_blocks.rb b/db/migrate/0065_create_blocks.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0070_create_portlets.rb b/db/migrate/0070_create_portlets.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0074_create_block_contents.rb b/db/migrate/0074_create_block_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0075_create_title_contents.rb b/db/migrate/0075_create_title_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0076_create_text_contents.rb b/db/migrate/0076_create_text_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0077_create_image_contents.rb b/db/migrate/0077_create_image_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0078_create_link_contents.rb b/db/migrate/0078_create_link_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0079_create_break_contents.rb b/db/migrate/0079_create_break_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0080_create_html_contents.rb b/db/migrate/0080_create_html_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0081_create_download_contents.rb b/db/migrate/0081_create_download_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0082_create_gallery_contents.rb b/db/migrate/0082_create_gallery_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0090_create_external_links.rb b/db/migrate/0090_create_external_links.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0101_create_gallery_images.rb b/db/migrate/0101_create_gallery_images.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0102_create_dynamic_contents.rb b/db/migrate/0102_create_dynamic_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0105_create_map_contents.rb b/db/migrate/0105_create_map_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0110_create_table_contents.rb b/db/migrate/0110_create_table_contents.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0112_create_table_rows.rb b/db/migrate/0112_create_table_rows.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0114_create_cel_tables.rb b/db/migrate/0114_create_cel_tables.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0200_create_albums.rb b/db/migrate/0200_create_albums.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0210_create_image_files.rb b/db/migrate/0210_create_image_files.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0300_create_file_folders.rb b/db/migrate/0300_create_file_folders.rb old mode 100644 new mode 100755 diff --git a/db/migrate/0310_create_data_files.rb b/db/migrate/0310_create_data_files.rb old mode 100644 new mode 100755 diff --git a/db/migrate/1010_create_tags.rb b/db/migrate/1010_create_tags.rb old mode 100644 new mode 100755 diff --git a/db/migrate/1020_create_tag_taggables.rb b/db/migrate/1020_create_tag_taggables.rb old mode 100644 new mode 100755 diff --git a/db/migrate/1030_create_categories.rb b/db/migrate/1030_create_categories.rb old mode 100644 new mode 100755 diff --git a/db/migrate/1040_create_articles.rb b/db/migrate/1040_create_articles.rb old mode 100644 new mode 100755 diff --git a/db/migrate/1050_create_comments.rb b/db/migrate/1050_create_comments.rb old mode 100644 new mode 100755 diff --git a/db/migrate/1051_add_sessions_table.rb b/db/migrate/1051_add_sessions_table.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20141030163836_create_mail_archives.rb b/db/migrate/20141030163836_create_mail_archives.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20141030173048_create_archive_newsletters.rb b/db/migrate/20141030173048_create_archive_newsletters.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20150308194213_create_customers.rb b/db/migrate/20150308194213_create_customers.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20150730175359_create_newsgroups.rb b/db/migrate/20150730175359_create_newsgroups.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20150730183145_create_customer_newsgroups.rb b/db/migrate/20150730183145_create_customer_newsgroups.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151118213358_add_account_validated_to_customers.rb b/db/migrate/20151118213358_add_account_validated_to_customers.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151130111157_add_location_to_customers.rb b/db/migrate/20151130111157_add_location_to_customers.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151130121325_create_needs.rb b/db/migrate/20151130121325_create_needs.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151130124831_add_author_reference_to_need.rb b/db/migrate/20151130124831_add_author_reference_to_need.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151130173626_add_delete_at_to_needs.rb b/db/migrate/20151130173626_add_delete_at_to_needs.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151201090113_add_state_field_to_needs.rb b/db/migrate/20151201090113_add_state_field_to_needs.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151202165807_create_wishes.rb b/db/migrate/20151202165807_create_wishes.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151203131412_add_index_to_need.rb b/db/migrate/20151203131412_add_index_to_need.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151203185210_create_messages.rb b/db/migrate/20151203185210_create_messages.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151207100030_create_need_categories.rb b/db/migrate/20151207100030_create_need_categories.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151207162817_add_category_to_need.rb b/db/migrate/20151207162817_add_category_to_need.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151209125427_create_offers.rb b/db/migrate/20151209125427_create_offers.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20151210134428_add_deleteted_at_to_offers.rb b/db/migrate/20151210134428_add_deleteted_at_to_offers.rb old mode 100644 new mode 100755 diff --git a/db/migrate/20160215170354_accepted_offers.rb b/db/migrate/20160215170354_accepted_offers.rb new file mode 100755 index 0000000..cc4405b --- /dev/null +++ b/db/migrate/20160215170354_accepted_offers.rb @@ -0,0 +1,13 @@ +class AcceptedOffers < ActiveRecord::Migration + def change + create_table :accepted_offers do |t| + + t.timestamps null: false + t.references :offer, index: true + t.references :customer, index: true + t.string :devis, default: nil + t.string :state, :string + end + + end +end diff --git a/db/schema.rb b/db/schema.rb old mode 100644 new mode 100755 index 119cf00..53c35a0 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,20 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20151210134428) do +ActiveRecord::Schema.define(version: 20160215170354) do + + create_table "accepted_offers", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "offer_id", limit: 4 + t.integer "customer_id", limit: 4 + t.string "devis", limit: 255 + t.string "state", limit: 255 + t.string "string", limit: 255 + end + + add_index "accepted_offers", ["customer_id"], name: "index_accepted_offers_on_customer_id", using: :btree + add_index "accepted_offers", ["offer_id"], name: "index_accepted_offers_on_offer_id", using: :btree create_table "admins", force: :cascade do |t| t.string "name", limit: 255 @@ -415,7 +428,7 @@ ActiveRecord::Schema.define(version: 20151210134428) do add_index "needs", ["author_id"], name: "index_needs_on_author_id", using: :btree add_index "needs", ["category_id"], name: "index_needs_on_category_id", using: :btree add_index "needs", ["deleted_at"], name: "index_needs_on_deleted_at", using: :btree - add_index "needs", ["title"], name: "index_needs_on_title", length: {"title"=>191}, using: :btree + add_index "needs", ["title"], name: "index_needs_on_title", using: :btree create_table "newsgroups", force: :cascade do |t| t.string "name", limit: 255 diff --git a/db/seeds.rb b/db/seeds.rb old mode 100644 new mode 100755 diff --git a/departements.csv b/departements.csv old mode 100644 new mode 100755 diff --git a/lib/assets/.keep b/lib/assets/.keep old mode 100644 new mode 100755 diff --git a/lib/tasks/.keep b/lib/tasks/.keep old mode 100644 new mode 100755 diff --git a/log/.keep b/log/.keep old mode 100644 new mode 100755 diff --git a/new_cities.csv b/new_cities.csv old mode 100644 new mode 100755 diff --git a/public/404.html b/public/404.html old mode 100644 new mode 100755 diff --git a/public/422.html b/public/422.html old mode 100644 new mode 100755 diff --git a/public/500.html b/public/500.html old mode 100644 new mode 100755 diff --git a/public/F7224B9DB39FC7AB26BE8E18408A3426.txt b/public/F7224B9DB39FC7AB26BE8E18408A3426.txt old mode 100644 new mode 100755 diff --git a/public/affiliation/1.jpg b/public/affiliation/1.jpg old mode 100644 new mode 100755 diff --git a/public/affiliation/1.png b/public/affiliation/1.png old mode 100644 new mode 100755 diff --git a/public/affiliation/10.png b/public/affiliation/10.png old mode 100644 new mode 100755 diff --git a/public/affiliation/11.png b/public/affiliation/11.png old mode 100644 new mode 100755 diff --git a/public/affiliation/12.jpg b/public/affiliation/12.jpg old mode 100644 new mode 100755 diff --git a/public/affiliation/13.png b/public/affiliation/13.png old mode 100644 new mode 100755 diff --git a/public/affiliation/14.png b/public/affiliation/14.png old mode 100644 new mode 100755 diff --git a/public/affiliation/15.png b/public/affiliation/15.png old mode 100644 new mode 100755 diff --git a/public/affiliation/16.png b/public/affiliation/16.png old mode 100644 new mode 100755 diff --git a/public/affiliation/17.png b/public/affiliation/17.png old mode 100644 new mode 100755 diff --git a/public/affiliation/18.png b/public/affiliation/18.png old mode 100644 new mode 100755 diff --git a/public/affiliation/19.png b/public/affiliation/19.png old mode 100644 new mode 100755 diff --git a/public/affiliation/2.jpg b/public/affiliation/2.jpg old mode 100644 new mode 100755 diff --git a/public/affiliation/3.jpg b/public/affiliation/3.jpg old mode 100644 new mode 100755 diff --git a/public/affiliation/4.jpg b/public/affiliation/4.jpg old mode 100644 new mode 100755 diff --git a/public/affiliation/5.jpg b/public/affiliation/5.jpg old mode 100644 new mode 100755 diff --git a/public/affiliation/6.png b/public/affiliation/6.png old mode 100644 new mode 100755 diff --git a/public/affiliation/7.png b/public/affiliation/7.png old mode 100644 new mode 100755 diff --git a/public/affiliation/8.jpg b/public/affiliation/8.jpg old mode 100644 new mode 100755 diff --git a/public/affiliation/9.png b/public/affiliation/9.png old mode 100644 new mode 100755 diff --git a/public/affiliation/AdobeStock_36494302_WM.jpeg b/public/affiliation/AdobeStock_36494302_WM.jpeg old mode 100644 new mode 100755 diff --git a/public/affiliation/AdobeStock_45886703_WM.jpeg b/public/affiliation/AdobeStock_45886703_WM.jpeg old mode 100644 new mode 100755 diff --git a/public/affiliation/automne - copie.jpg b/public/affiliation/automne - copie.jpg old mode 100644 new mode 100755 diff --git a/public/affiliation/automne.jpg b/public/affiliation/automne.jpg old mode 100644 new mode 100755 diff --git a/public/affiliation/fond.png b/public/affiliation/fond.png old mode 100644 new mode 100755 diff --git a/public/black_logo.png b/public/black_logo.png old mode 100644 new mode 100755 diff --git a/public/close.png b/public/close.png old mode 100644 new mode 100755 diff --git a/public/connexion.jpg b/public/connexion.jpg old mode 100644 new mode 100755 diff --git a/public/credit.png b/public/credit.png old mode 100644 new mode 100755 diff --git a/public/default-nill.png b/public/default-nill.png old mode 100644 new mode 100755 diff --git a/public/default.png b/public/default.png old mode 100644 new mode 100755 diff --git a/public/default_avatar.jpg b/public/default_avatar.jpg old mode 100644 new mode 100755 diff --git a/public/essai-fond.jpg b/public/essai-fond.jpg old mode 100644 new mode 100755 diff --git a/public/essai-fond2.jpg b/public/essai-fond2.jpg old mode 100644 new mode 100755 diff --git a/public/facebook-logo.png b/public/facebook-logo.png old mode 100644 new mode 100755 diff --git a/public/favicon.ico b/public/favicon.ico old mode 100644 new mode 100755 diff --git a/public/fond-mail.jpg b/public/fond-mail.jpg old mode 100644 new mode 100755 diff --git a/public/fond.jpg b/public/fond.jpg old mode 100644 new mode 100755 diff --git a/public/fond1.jpg b/public/fond1.jpg old mode 100644 new mode 100755 diff --git a/public/fond2.jpg b/public/fond2.jpg old mode 100644 new mode 100755 diff --git a/public/fonts/FontAwesome.otf b/public/fonts/FontAwesome.otf old mode 100644 new mode 100755 diff --git a/public/fonts/fontawesome-webfont.eot b/public/fonts/fontawesome-webfont.eot old mode 100644 new mode 100755 diff --git a/public/fonts/fontawesome-webfont.svg b/public/fonts/fontawesome-webfont.svg old mode 100644 new mode 100755 diff --git a/public/fonts/fontawesome-webfont.ttf b/public/fonts/fontawesome-webfont.ttf old mode 100644 new mode 100755 diff --git a/public/fonts/fontawesome-webfont.woff b/public/fonts/fontawesome-webfont.woff old mode 100644 new mode 100755 diff --git a/public/fonts/fontawesome-webfont.woff2 b/public/fonts/fontawesome-webfont.woff2 old mode 100644 new mode 100755 diff --git a/public/gandi.png b/public/gandi.png old mode 100644 new mode 100755 diff --git a/public/logo.png b/public/logo.png old mode 100644 new mode 100755 diff --git a/public/logo_mail.png b/public/logo_mail.png old mode 100644 new mode 100755 diff --git a/public/nb.png b/public/nb.png old mode 100644 new mode 100755 diff --git a/public/new_commission.png b/public/new_commission.png old mode 100644 new mode 100755 diff --git a/public/new_user.png b/public/new_user.png old mode 100644 new mode 100755 diff --git a/public/olwen-b.png b/public/olwen-b.png old mode 100644 new mode 100755 diff --git a/public/robots.txt b/public/robots.txt old mode 100644 new mode 100755 diff --git a/public/tracking.png b/public/tracking.png old mode 100644 new mode 100755 diff --git a/public/urgent.png b/public/urgent.png old mode 100644 new mode 100755 diff --git a/regions.csv b/regions.csv old mode 100644 new mode 100755 diff --git a/remises/untitled.txt b/remises/untitled.txt old mode 100644 new mode 100755 diff --git a/test/controllers/.keep b/test/controllers/.keep old mode 100644 new mode 100755 diff --git a/test/controllers/admin/need_categories_controller_test.rb b/test/controllers/admin/need_categories_controller_test.rb old mode 100644 new mode 100755 diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb old mode 100644 new mode 100755 diff --git a/test/controllers/public/cities_controller_test.rb b/test/controllers/public/cities_controller_test.rb old mode 100644 new mode 100755 diff --git a/test/controllers/public/messages_controller_test.rb b/test/controllers/public/messages_controller_test.rb old mode 100644 new mode 100755 diff --git a/test/controllers/public/my_account_controller_controller_test.rb b/test/controllers/public/my_account_controller_controller_test.rb old mode 100644 new mode 100755 diff --git a/test/controllers/public/needs_controller_test.rb b/test/controllers/public/needs_controller_test.rb old mode 100644 new mode 100755 diff --git a/test/controllers/publicmessages_controller_test.rb b/test/controllers/publicmessages_controller_test.rb old mode 100644 new mode 100755 diff --git a/test/fixtures/.keep b/test/fixtures/.keep old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_account_favs.yml b/test/fixtures/annonce_account_favs.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_account_newsgroups.yml b/test/fixtures/annonce_account_newsgroups.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_account_ribs.yml b/test/fixtures/annonce_account_ribs.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_accounts.yml b/test/fixtures/annonce_accounts.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_antiquities.yml b/test/fixtures/annonce_antiquities.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_autos.yml b/test/fixtures/annonce_autos.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_campings.yml b/test/fixtures/annonce_campings.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_caravs.yml b/test/fixtures/annonce_caravs.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_cats.yml b/test/fixtures/annonce_cats.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_draws.yml b/test/fixtures/annonce_draws.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_gites.yml b/test/fixtures/annonce_gites.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_graphics.yml b/test/fixtures/annonce_graphics.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_habs.yml b/test/fixtures/annonce_habs.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_highs.yml b/test/fixtures/annonce_highs.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_hotels.yml b/test/fixtures/annonce_hotels.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_infs.yml b/test/fixtures/annonce_infs.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_messages.yml b/test/fixtures/annonce_messages.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_motos.yml b/test/fixtures/annonce_motos.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_nauts.yml b/test/fixtures/annonce_nauts.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_nums.yml b/test/fixtures/annonce_nums.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_offices.yml b/test/fixtures/annonce_offices.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_option_logs.yml b/test/fixtures/annonce_option_logs.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_option_types.yml b/test/fixtures/annonce_option_types.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_pdvs.yml b/test/fixtures/annonce_pdvs.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_pets.yml b/test/fixtures/annonce_pets.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_photos.yml b/test/fixtures/annonce_photos.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_plays.yml b/test/fixtures/annonce_plays.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_sculptures.yml b/test/fixtures/annonce_sculptures.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_tag_cats.yml b/test/fixtures/annonce_tag_cats.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_tels.yml b/test/fixtures/annonce_tels.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonce_utils.yml b/test/fixtures/annonce_utils.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/annonces.yml b/test/fixtures/annonces.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/binary_points.yml b/test/fixtures/binary_points.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/cities.yml b/test/fixtures/cities.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/commissions.yml b/test/fixtures/commissions.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/count_part_coms.yml b/test/fixtures/count_part_coms.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/credit_expenses.yml b/test/fixtures/credit_expenses.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/credit_products.yml b/test/fixtures/credit_products.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/credits.yml b/test/fixtures/credits.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/departements.yml b/test/fixtures/departements.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/devises.yml b/test/fixtures/devises.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/etrans_histories.yml b/test/fixtures/etrans_histories.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/expenses.yml b/test/fixtures/expenses.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/marques.yml b/test/fixtures/marques.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/mlm_points.yml b/test/fixtures/mlm_points.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/need_categories.yml b/test/fixtures/need_categories.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/needs.yml b/test/fixtures/needs.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/newsgroups.yml b/test/fixtures/newsgroups.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/offers.yml b/test/fixtures/offers.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/regions.yml b/test/fixtures/regions.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/tag_cats.yml b/test/fixtures/tag_cats.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/virement_remises.yml b/test/fixtures/virement_remises.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/virements.yml b/test/fixtures/virements.yml old mode 100644 new mode 100755 diff --git a/test/fixtures/wishes.yml b/test/fixtures/wishes.yml old mode 100644 new mode 100755 diff --git a/test/helpers/.keep b/test/helpers/.keep old mode 100644 new mode 100755 diff --git a/test/integration/.keep b/test/integration/.keep old mode 100644 new mode 100755 diff --git a/test/mailers/.keep b/test/mailers/.keep old mode 100644 new mode 100755 diff --git a/test/mailers/annonce_account_test.rb b/test/mailers/annonce_account_test.rb old mode 100644 new mode 100755 diff --git a/test/mailers/previews/annonce_account_preview.rb b/test/mailers/previews/annonce_account_preview.rb old mode 100644 new mode 100755 diff --git a/test/models/.keep b/test/models/.keep old mode 100644 new mode 100755 diff --git a/test/models/annonce_account_fav_test.rb b/test/models/annonce_account_fav_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_account_newsgroup_test.rb b/test/models/annonce_account_newsgroup_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_account_rib_test.rb b/test/models/annonce_account_rib_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_account_test.rb b/test/models/annonce_account_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_antiquity_test.rb b/test/models/annonce_antiquity_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_auto_test.rb b/test/models/annonce_auto_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_camping_test.rb b/test/models/annonce_camping_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_carav_test.rb b/test/models/annonce_carav_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_cat_test.rb b/test/models/annonce_cat_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_draw_test.rb b/test/models/annonce_draw_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_gite_test.rb b/test/models/annonce_gite_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_graphic_test.rb b/test/models/annonce_graphic_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_hab_test.rb b/test/models/annonce_hab_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_high_test.rb b/test/models/annonce_high_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_hotel_test.rb b/test/models/annonce_hotel_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_inf_test.rb b/test/models/annonce_inf_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_message_test.rb b/test/models/annonce_message_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_moto_test.rb b/test/models/annonce_moto_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_naut_test.rb b/test/models/annonce_naut_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_num_test.rb b/test/models/annonce_num_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_office_test.rb b/test/models/annonce_office_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_option_log_test.rb b/test/models/annonce_option_log_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_option_type_test.rb b/test/models/annonce_option_type_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_pdv_test.rb b/test/models/annonce_pdv_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_pet_test.rb b/test/models/annonce_pet_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_photo_test.rb b/test/models/annonce_photo_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_play_test.rb b/test/models/annonce_play_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_sculpture_test.rb b/test/models/annonce_sculpture_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_tag_cat_test.rb b/test/models/annonce_tag_cat_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_tel_test.rb b/test/models/annonce_tel_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_test.rb b/test/models/annonce_test.rb old mode 100644 new mode 100755 diff --git a/test/models/annonce_util_test.rb b/test/models/annonce_util_test.rb old mode 100644 new mode 100755 diff --git a/test/models/binary_point_test.rb b/test/models/binary_point_test.rb old mode 100644 new mode 100755 diff --git a/test/models/city_test.rb b/test/models/city_test.rb old mode 100644 new mode 100755 diff --git a/test/models/commission_test.rb b/test/models/commission_test.rb old mode 100644 new mode 100755 diff --git a/test/models/count_part_com_test.rb b/test/models/count_part_com_test.rb old mode 100644 new mode 100755 diff --git a/test/models/credit_expense_test.rb b/test/models/credit_expense_test.rb old mode 100644 new mode 100755 diff --git a/test/models/credit_product_test.rb b/test/models/credit_product_test.rb old mode 100644 new mode 100755 diff --git a/test/models/credit_test.rb b/test/models/credit_test.rb old mode 100644 new mode 100755 diff --git a/test/models/departement_test.rb b/test/models/departement_test.rb old mode 100644 new mode 100755 diff --git a/test/models/devise_test.rb b/test/models/devise_test.rb old mode 100644 new mode 100755 diff --git a/test/models/etrans_history_test.rb b/test/models/etrans_history_test.rb old mode 100644 new mode 100755 diff --git a/test/models/expense_test.rb b/test/models/expense_test.rb old mode 100644 new mode 100755 diff --git a/test/models/marque_test.rb b/test/models/marque_test.rb old mode 100644 new mode 100755 diff --git a/test/models/message_test.rb b/test/models/message_test.rb old mode 100644 new mode 100755 diff --git a/test/models/mlm_point_test.rb b/test/models/mlm_point_test.rb old mode 100644 new mode 100755 diff --git a/test/models/need_category_test.rb b/test/models/need_category_test.rb old mode 100644 new mode 100755 diff --git a/test/models/need_test.rb b/test/models/need_test.rb old mode 100644 new mode 100755 diff --git a/test/models/newsgroup_test.rb b/test/models/newsgroup_test.rb old mode 100644 new mode 100755 diff --git a/test/models/offer_test.rb b/test/models/offer_test.rb old mode 100644 new mode 100755 diff --git a/test/models/order_test.rb b/test/models/order_test.rb old mode 100644 new mode 100755 diff --git a/test/models/region_test.rb b/test/models/region_test.rb old mode 100644 new mode 100755 diff --git a/test/models/tag_cat_test.rb b/test/models/tag_cat_test.rb old mode 100644 new mode 100755 diff --git a/test/models/virement_remise_test.rb b/test/models/virement_remise_test.rb old mode 100644 new mode 100755 diff --git a/test/models/virement_test.rb b/test/models/virement_test.rb old mode 100644 new mode 100755 diff --git a/test/models/wish_test.rb b/test/models/wish_test.rb old mode 100644 new mode 100755 diff --git a/test/test_helper.rb b/test/test_helper.rb old mode 100644 new mode 100755 diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep old mode 100644 new mode 100755 diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep old mode 100644 new mode 100755