From 12b3be983e1a087297a2713508780acdf5caca82 Mon Sep 17 00:00:00 2001 From: echarp Date: Tue, 10 Dec 2013 23:49:01 +0100 Subject: [PATCH] =?UTF-8?q?Cit=C3=A9s=20et=20r=C3=A9gions=20initialis?= =?UTF-8?q?=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 62 +++++++++--------- app/admin/city.rb | 3 + app/admin/dashboard.rb | 45 ++++++------- app/admin/region.rb | 17 +++++ app/assets/images/baby_gnu_adl.png | Bin 0 -> 14304 bytes app/assets/stylesheets/all.css.sass | 51 +++++++++++++- app/assets/stylesheets/list.css.sass | 24 ++++++- app/assets/stylesheets/scaffolds.css.sass | 25 ------- app/controllers/cities_controller.rb | 5 ++ app/views/cities/show.html.haml | 4 +- app/views/layouts/application.html.haml | 8 ++- config/locales/en.yml | 4 ++ config/locales/fr.yml | 9 +++ .../assets/javascripts/active_admin.js.coffee | 0 .../assets/stylesheets/active_admin.css.sass | 1 - 15 files changed, 168 insertions(+), 90 deletions(-) create mode 100644 app/admin/city.rb create mode 100644 app/admin/region.rb create mode 100644 app/assets/images/baby_gnu_adl.png rename {app => vendor}/assets/javascripts/active_admin.js.coffee (100%) rename {app => vendor}/assets/stylesheets/active_admin.css.sass (97%) diff --git a/Gemfile.lock b/Gemfile.lock index 384b0e65..fbd40f33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/gregbell/active_admin.git - revision: 5b4353edc262bcb9df84f5d6f3e35392194d783a + revision: 81af5ec7e3ee780f5bf170938fc64e36e96adfe6 specs: activeadmin (1.0.0.pre) arbre (~> 1.0) @@ -19,25 +19,25 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.1) - actionpack (= 4.0.1) + actionmailer (4.0.2) + actionpack (= 4.0.2) mail (~> 2.5.4) - actionpack (4.0.1) - activesupport (= 4.0.1) + actionpack (4.0.2) + activesupport (= 4.0.2) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.1) - activesupport (= 4.0.1) + activemodel (4.0.2) + activesupport (= 4.0.2) builder (~> 3.1.0) - activerecord (4.0.1) - activemodel (= 4.0.1) + activerecord (4.0.2) + activemodel (= 4.0.2) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.1) + activesupport (= 4.0.2) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.1) + activesupport (4.0.2) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) @@ -75,7 +75,7 @@ GEM railties (>= 3.2.6, < 5) thread_safe (~> 0.1) warden (~> 1.2.3) - devise-i18n (0.10.0) + devise-i18n (0.10.2) em-websocket (0.5.0) eventmachine (>= 0.12.9) http_parser.rb (~> 0.5.3) @@ -98,7 +98,7 @@ GEM guard-bundler (2.0.0) bundler (~> 1.0) guard (~> 2.2) - guard-livereload (2.0.1) + guard-livereload (2.1.0) em-websocket (~> 0.5) guard (~> 2.0) multi_json (~> 1.8) @@ -107,21 +107,21 @@ GEM minitest (>= 3.0) haml (4.0.4) tilt - haml-rails (0.5.1) - actionpack (~> 4.0.0) - activesupport (~> 4.0.0) + haml-rails (0.5.2) + actionpack (~> 4.0.1) + activesupport (~> 4.0.1) haml (>= 3.1, < 5.0) - railties (~> 4.0.0) + railties (~> 4.0.1) has_scope (0.6.0.rc) actionpack (>= 3.2, < 5) activesupport (>= 3.2, < 5) hike (1.2.3) http_parser.rb (0.5.3) - i18n (0.6.5) + i18n (0.6.9) inherited_resources (1.4.1) has_scope (~> 0.6.0.rc) responders (~> 1.0.0.rc) - jbuilder (1.5.2) + jbuilder (1.5.3) activesupport (>= 3.0.0) multi_json (>= 1.2.0) jquery-rails (3.0.4) @@ -136,7 +136,7 @@ GEM kaminari (0.15.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - listen (2.2.0) + listen (2.4.0) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -160,20 +160,20 @@ GEM rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.1) - actionmailer (= 4.0.1) - actionpack (= 4.0.1) - activerecord (= 4.0.1) - activesupport (= 4.0.1) + rails (4.0.2) + actionmailer (= 4.0.2) + actionpack (= 4.0.2) + activerecord (= 4.0.2) + activesupport (= 4.0.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.1) + railties (= 4.0.2) sprockets-rails (~> 2.0.0) rails-i18n (4.0.0) i18n (~> 0.6) rails (~> 4.0.0) - railties (4.0.1) - actionpack (= 4.0.1) - activesupport (= 4.0.1) + railties (4.0.2) + actionpack (= 4.0.2) + activesupport (= 4.0.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.1.0) @@ -214,10 +214,10 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - turbolinks (1.3.1) + turbolinks (2.0.0) coffee-rails tzinfo (0.3.38) - uglifier (2.3.1) + uglifier (2.3.2) execjs (>= 0.3.0) json (>= 1.8.0) warden (1.2.3) diff --git a/app/admin/city.rb b/app/admin/city.rb new file mode 100644 index 00000000..af058a22 --- /dev/null +++ b/app/admin/city.rb @@ -0,0 +1,3 @@ +ActiveAdmin.register City do + permit_params :name, :majname, :postalcode, :inseecode, :regioncode, :latitude, :longitude +end diff --git a/app/admin/dashboard.rb b/app/admin/dashboard.rb index 60837575..c7ce6a00 100644 --- a/app/admin/dashboard.rb +++ b/app/admin/dashboard.rb @@ -3,31 +3,26 @@ ActiveAdmin.register_page "Dashboard" do menu :priority => 1, :label => proc{ I18n.t("active_admin.dashboard") } content :title => proc{ I18n.t("active_admin.dashboard") } do - div :class => "blank_slate_container", :id => "dashboard_default_message" do - span :class => "blank_slate" do - span I18n.t("active_admin.dashboard_welcome.welcome") - small I18n.t("active_admin.dashboard_welcome.call_to_action") + columns do + column do + panel "Contributeurs" do + ul do + User.all.map do |user| + li link_to(user, user) + end + end + end + end + + column do + panel "Contributeurs" do + ul do + User.all.map do |user| + li link_to(user.login, user) + end + end + end end end - - # Here is an example of a simple dashboard with columns and panels. - # - # columns do - # column do - # panel "Recent Posts" do - # ul do - # Post.recent(5).map do |post| - # li link_to(post.title, admin_post_path(post)) - # end - # end - # end - # end - - # column do - # panel "Info" do - # para "Welcome to ActiveAdmin." - # end - # end - # end - end # content + end end diff --git a/app/admin/region.rb b/app/admin/region.rb new file mode 100644 index 00000000..cbaf1371 --- /dev/null +++ b/app/admin/region.rb @@ -0,0 +1,17 @@ +ActiveAdmin.register Region do + + + # See permitted parameters documentation: + # https://github.com/gregbell/active_admin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters + # + # permit_params :list, :of, :attributes, :on, :model + # + # or + # + # permit_params do + # permitted = [:permitted, :attributes] + # permitted << :other if resource.something? + # permitted + # end + +end diff --git a/app/assets/images/baby_gnu_adl.png b/app/assets/images/baby_gnu_adl.png new file mode 100644 index 0000000000000000000000000000000000000000..d540afbf0d642dfe12366ed650c4e8f746430cf9 GIT binary patch literal 14304 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass index bc66201f..f88c12b9 100644 --- a/app/assets/stylesheets/all.css.sass +++ b/app/assets/stylesheets/all.css.sass @@ -1,7 +1,56 @@ @import "compass" +@import "font-awesome" * + margin: 0 + padding: 0 + line-height: 1em @include transition-duration(0.5s) [class^="fa-"], [class*=" fa-"] - font-family: FontAwesome, Arial, Helvetica, sans-serif !important + font-family: FontAwesome, georgia, serif !important + &:before + font-style: normal + font-weight: normal !important + +html + color: #000000 + line-height: 1.3em + font-family: georgia, serif + background-color: #9CC5EE + +body + margin: 5px 5px 0 + padding: 10px + text-align: center + background: url("baby_gnu_adl.png") no-repeat scroll 30px 10px #FFFFFF + -moz-border-bottom-colors: none + -moz-border-left-colors: none + -moz-border-right-colors: none + -moz-border-top-colors: none + border-image: none + border-width: 1px 1px 0 + border-style: solid solid none + border-color: #68A6E5 #68A6E5 -moz-use-text-color + +a:link, a:visited + color: #336699 + font-weight: bold + text-decoration: none + +header.top + h1 + margin: 10px 5px 5px + padding: 0 + font-size: 2.1em + line-height: 1em + letter-spacing: 2px + h2 + font-size: 0.8em + margin-top: 10px + font-style: italic + font-weight: normal + padding-bottom: 5px + +main h1 + margin-top: 1em diff --git a/app/assets/stylesheets/list.css.sass b/app/assets/stylesheets/list.css.sass index 51293165..b7e13f4c 100644 --- a/app/assets/stylesheets/list.css.sass +++ b/app/assets/stylesheets/list.css.sass @@ -1,12 +1,32 @@ +@import "compass" + +table + margin: 1em auto + padding: 1em + border-spacing: 0 + @include border-radius(2em, 2em) + @include box-shadow(2px 2px 4px black, 0 0 1em gray) + th + padding: 0.3em 0.6em + border-bottom: solid thin grey + td + padding: 0.3em 0.6em + text-align: left + tr:nth-child(even) td + border-bottom: solid thin #ddf + tr:nth-child(odd) td + border-bottom: solid thin #fdd + .view_link:link, .edit_link:link, .delete_link:link font-size: 0 + font-weight: normal text-decoration: none + &:hover + text-shadow: 0px 0px 16px black &:before padding: 0.5em font-size: 20px font-family: FontAwesome - &:hover - text-shadow: 0px 0px 16px black .view_link:link:before content: '' .edit_link:link:before diff --git a/app/assets/stylesheets/scaffolds.css.sass b/app/assets/stylesheets/scaffolds.css.sass index b35eb619..f5531d5f 100644 --- a/app/assets/stylesheets/scaffolds.css.sass +++ b/app/assets/stylesheets/scaffolds.css.sass @@ -1,28 +1,3 @@ -body - background-color: #fff - color: #333 - font-family: verdana, arial, helvetica, sans-serif - font-size: 13px - line-height: 18px - -p, ol, ul, td - font-family: verdana, arial, helvetica, sans-serif - font-size: 13px - line-height: 18px - -pre - background-color: #eee - padding: 10px - font-size: 11px - -a - color: #000 - &:visited - color: #666 - &:hover - color: #fff - background-color: #000 - div &.field, &.actions margin-bottom: 10px diff --git a/app/controllers/cities_controller.rb b/app/controllers/cities_controller.rb index 761dddbd..0d11954b 100644 --- a/app/controllers/cities_controller.rb +++ b/app/controllers/cities_controller.rb @@ -1,2 +1,7 @@ class CitiesController < InheritedResources::Base + protected + # Never trust parameters from the scary internet, only allow the white list through. + def permitted_params + params.permit city: [:name, :majname, :postalcode, :inseecode, :regioncode, :latitude, :longitude] + end end diff --git a/app/views/cities/show.html.haml b/app/views/cities/show.html.haml index ff16d03b..7ad351b2 100644 --- a/app/views/cities/show.html.haml +++ b/app/views/cities/show.html.haml @@ -22,6 +22,6 @@ %b Longitude: = @city.longitude -= link_to 'Edit', edit_city_path(@city) += link_to t('Edit'), edit_city_path(@city) \| -= link_to 'Back', cities_path += link_to t('Back'), cities_path diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 437b397a..eba1331c 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -2,7 +2,7 @@ /[if IE] %html(lang="#{I18n.locale}") %head - %title AgendaDuLibreRails + %title L'Agenda du Libre %meta(http-equiv='Content-Type' content='text/html; charset=utf-8') @@ -33,9 +33,11 @@ = render 'layouts/flash', flash: flash if flash.present? %header.top - %h1= link_to 'Agenda du libre', root_url + %h1= link_to "L'Agenda du Libre", root_url + %h2 L'agenda des évènements du Logiciel Libre en France - = yield + %main + = yield %footer.bottom %nav diff --git a/config/locales/en.yml b/config/locales/en.yml index b42030e7..10d25ef5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -32,7 +32,11 @@ en: activerecord: models: + admin_user: Admin + comment: Comment user: Contributor + city: City + region: Region attributes: user: login: Id diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 525a586c..ac55d05b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -11,7 +11,11 @@ fr: activerecord: models: + admin_user: Admin + comment: Commentaire user: Contributeur + city: Cité + region: Région attributes: user: login: Identifiant @@ -20,6 +24,11 @@ fr: lastname: Nom firstname: Prénom + helpers: + submit: + create: "Créer %{model}" + update: "Mettre à jour %{model}" + layouts: application: login: Authentication diff --git a/app/assets/javascripts/active_admin.js.coffee b/vendor/assets/javascripts/active_admin.js.coffee similarity index 100% rename from app/assets/javascripts/active_admin.js.coffee rename to vendor/assets/javascripts/active_admin.js.coffee diff --git a/app/assets/stylesheets/active_admin.css.sass b/vendor/assets/stylesheets/active_admin.css.sass similarity index 97% rename from app/assets/stylesheets/active_admin.css.sass rename to vendor/assets/stylesheets/active_admin.css.sass index cc4b9cde..33941972 100644 --- a/app/assets/stylesheets/active_admin.css.sass +++ b/vendor/assets/stylesheets/active_admin.css.sass @@ -12,7 +12,6 @@ @import "active_admin/base" @import "font-awesome" @import "list" -@import "all" // Overriding any non-variable SASS must be done after the fact. // For example, to change the default status-tag color: