From 3f51128e24e1ca3247169066aa6a03090df98dd6 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 17 Jun 2013 01:26:35 -0700 Subject: start of new ui - css changes, layout changes, navigation changes. --- config/defaults.yml | 4 ++-- config/locales/en.yml | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/defaults.yml b/config/defaults.yml index f3b92c0..25537fe 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -17,7 +17,7 @@ development: <<: *dev_ca <<: *cert_options admins: [admin, admin2] - domain: develop.me + domain: example.org secret_token: '550df064dbc5052d9e192b324c1c5a1095c85a2195f88bd6f6829c63b74d8dffa4556494a2e8cc44345a1926be8b6cb17aa4b3f3102d826f5679c3fb57bb7100' test: @@ -30,4 +30,4 @@ test: production: <<: *cert_options admins: [] - domain: deploy.me + domain: example.net diff --git a/config/locales/en.yml b/config/locales/en.yml index fc61c31..40cdb4a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4,3 +4,10 @@ en: hello: "Hello world" no_such_thing: "No such %{thing}." + + overview: "Overview" + user_control_panel: "user control panel" + + created: "Created" + updated: "Updated" + -- cgit v1.2.3 From 93d55912c5965b2214c337b95c2480db16793e12 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 19 Jun 2013 00:34:27 -0700 Subject: set pagination size via config file --- config/defaults.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config/defaults.yml b/config/defaults.yml index 25537fe..6317082 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -19,6 +19,7 @@ development: admins: [admin, admin2] domain: example.org secret_token: '550df064dbc5052d9e192b324c1c5a1095c85a2195f88bd6f6829c63b74d8dffa4556494a2e8cc44345a1926be8b6cb17aa4b3f3102d826f5679c3fb57bb7100' + pagination_size: 30 test: <<: *dev_ca @@ -26,8 +27,10 @@ test: admins: [admin, admin2] domain: test.me secret_token: '550df064dbc5052d9e192b324c1c5a1095c85a2195f88bd6f6829c63b74d8dffa4556494a2e8cc44345a1926be8b6cb17aa4b3f3102d826f5679c3fb57bb7100' + pagination_size: 30 production: <<: *cert_options admins: [] domain: example.net + pagination_size: 30 \ No newline at end of file -- cgit v1.2.3 From e37d1b1d621530dbec7b5b3b7ed17c24a48a727b Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 19 Jun 2013 00:35:22 -0700 Subject: i18n - added a few strongs to app, fixed language at english for now. --- config/initializers/i18n.rb | 2 ++ config/locales/en.yml | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 config/initializers/i18n.rb (limited to 'config') diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb new file mode 100644 index 0000000..574d169 --- /dev/null +++ b/config/initializers/i18n.rb @@ -0,0 +1,2 @@ + +I18n.available_locales = ['en'] diff --git a/config/locales/en.yml b/config/locales/en.yml index 40cdb4a..f4e35f2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -9,5 +9,14 @@ en: user_control_panel: "user control panel" created: "Created" + created_by_on: "Created by %{user} on %{time}" updated: "Updated" + none: "None" + unknown: "Unknown" + admin: "Admin" + anonymous: "Anonymous" + save: "Save" + + changes_saved: "Changes saved successfully." + thing_was_successfully_created: "%{thing} was successfully created." \ No newline at end of file -- cgit v1.2.3 From 38544a07de7988eee91343c1491dae1e08ce5034 Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 23 Jun 2013 22:12:54 -0700 Subject: added 'thin' and 'quiet_assets' gems to make development mode much nicer. --- config/application.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index 957bb0d..5e52c7b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -59,11 +59,18 @@ module LeapWeb # parameters by using an attr_accessible or attr_protected declaration. # config.active_record.whitelist_attributes = true + ## + ## ASSETS + ## + # Enable the asset pipeline config.assets.enabled = true config.assets.initialize_on_precompile = false # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' + + # Set to false in order to see asset requests in the log + config.quiet_assets = true end end -- cgit v1.2.3 From 7d2163263c8e5af7f4d7a2d40cd55eefac188e58 Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 23 Jun 2013 22:21:55 -0700 Subject: moved app locales to core gem. --- config/locales/en.yml | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'config') diff --git a/config/locales/en.yml b/config/locales/en.yml index f4e35f2..63f1c3e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,22 +1 @@ -# Sample localization file for English. Add more files in this directory for other locales. -# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. - en: - hello: "Hello world" - no_such_thing: "No such %{thing}." - - overview: "Overview" - user_control_panel: "user control panel" - - created: "Created" - created_by_on: "Created by %{user} on %{time}" - updated: "Updated" - - none: "None" - unknown: "Unknown" - admin: "Admin" - anonymous: "Anonymous" - save: "Save" - - changes_saved: "Changes saved successfully." - thing_was_successfully_created: "%{thing} was successfully created." \ No newline at end of file -- cgit v1.2.3 From 7aa12e35ba7eef298bf3ca0856c7d8960d1a1789 Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 4 Jul 2013 03:39:11 -0700 Subject: add 'blue' to admins in dev mode. --- config/defaults.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/defaults.yml b/config/defaults.yml index 6317082..54c5a23 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -16,7 +16,7 @@ cert_options: &cert_options development: <<: *dev_ca <<: *cert_options - admins: [admin, admin2] + admins: [blue, admin, admin2] domain: example.org secret_token: '550df064dbc5052d9e192b324c1c5a1095c85a2195f88bd6f6829c63b74d8dffa4556494a2e8cc44345a1926be8b6cb17aa4b3f3102d826f5679c3fb57bb7100' pagination_size: 30 -- cgit v1.2.3