Skud
496c070efd
Tweaked layout of crop page sidebar
2014-10-19 14:14:24 +01:00
Skud
f468a8b77b
Changed all h1 to content_for :title
2014-10-19 14:04:55 +01:00
Skud
16677a3b86
Removed underline on header area
2014-10-19 14:04:32 +01:00
Skud
41566d39f3
Added map to member profile page
2014-10-19 13:50:43 +01:00
Miles Gould
e613907506
Check status codes on page visits.
2014-10-19 13:21:30 +01:00
Skud
82a61387a3
Improved layout of member profile page
...
In doing this, I added some content areas for all pages on the site:
1) subtitle
2) buttonbar
These are intended to help standardise the layout of all pages. On the
member page, the subtitle is the location, and the buttonbar has links
like "edit profile", "upgrade account", etc (or if looking at someone
else's page, then "send message" etc).
I also implemented subtitle/buttonbar on the crop detail page (the
subtitle is the default scientific name).
The rest is just refactoring and tests. I've removed some view tests
and put them in feature tests instead.
2014-10-19 12:23:19 +01:00
Miles Gould
29d53a8f8b
Test for notices in altname CRUD features.
2014-10-19 12:02:31 +01:00
Miles Gould
d0f7169c59
Put alternate name features in their own file.
2014-10-19 11:50:21 +01:00
Miles Gould
3a797d4434
Use content_for :title in scientific names index.
2014-10-19 11:42:49 +01:00
Miles Gould
1d3c24ae27
Use content_for :title on altname index page.
2014-10-19 11:28:51 +01:00
Miles Gould
006bc54f3f
Oops, add the altname index HAML file.
2014-10-18 18:13:04 +01:00
Miles Gould
792062e0d2
Make add-altname test more featurey.
2014-10-18 18:02:59 +01:00
Miles Gould
52fd2b86d6
Test altname deletion end-to-end.
2014-10-18 18:01:54 +01:00
Miles Gould
110ae99d83
Fix and test altname index page.
2014-10-18 17:55:56 +01:00
Miles Gould
c447c1cb3a
Make edit-altname test more featurey.
2014-10-18 17:49:13 +01:00
Miles Gould
0ae68737c3
Use login_as helper method in altname feature tests.
2014-10-18 17:43:59 +01:00
Miles Gould
96d2fa1cb6
Put alternate names controller in standard order.
2014-10-18 17:41:52 +01:00
Miles Gould
8a97aa1a9b
Delete redundant old-style test.
2014-10-18 17:34:33 +01:00
Miles Gould
dc2cf5275c
Fix model tests for alternate names.
2014-10-18 17:30:22 +01:00
Miles Gould
c7c85aaa66
Creation and deletion of alternate names
2014-10-18 17:03:54 +01:00
Cesy Avon
edf2f36bcd
Upgrading to ruby 2.1.2
2014-10-18 16:58:23 +01:00
Miles Gould
b009603581
Fix link to crop on alternate name page
2014-10-18 16:54:02 +01:00
Miles Gould
eacfadae20
Make editing alternate names actually do something.
2014-10-18 16:51:43 +01:00
Miles Gould
37eb2a0e34
Show alternate names on their own page.
2014-10-18 16:49:27 +01:00
Miles Gould
10f6214c6c
Views for adding/editing alternate names.
2014-10-18 16:34:38 +01:00
Skud
29a5fe07c2
use rails paths when visiting pages
2014-10-18 16:01:00 +01:00
Miles Gould
77d1d067fa
Crop wranglers can add alternate names
2014-10-18 15:35:57 +01:00
Miles Gould
cdf6d4b09a
Delete alternate name button on crops page.
2014-10-18 15:29:21 +01:00
Miles Gould
7e4b51d1cb
Add "Edit" link for alternate names on crops page.
2014-10-18 15:18:23 +01:00
Skud
864ce95f11
Merge pull request #430 from Skud/tomatoes
...
Added some additional hierarchy around cherry tomatoes
2014-10-18 14:40:02 +01:00
Skud
ae27a0a5b5
Added some additional hierarchy around cherry tomatoes
2014-10-18 14:38:00 +01:00
Miles Gould
627587ee1b
Show alternate names on crop page
2014-10-18 14:34:53 +01:00
Skud
9ededef54d
Added tests for content of planting reminder email
2014-10-18 14:00:22 +01:00
Miles Gould
83fa291060
Fetch alternate names for a crop.
2014-10-18 13:50:28 +01:00
Miles Gould
e85cb4598d
Add alternate name model.
2014-10-18 12:38:44 +01:00
Skud
f18feaa131
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
2014-10-18 11:23:30 +01:00
pozorvlak
41d63f8f92
Merge pull request #417 from tygriffin/I18n
...
I18n
2014-10-18 11:11:25 +01:00
pozorvlak
7c783ecda3
Merge pull request #428 from tygriffin/finish-plantings-javascript
...
Finish plantings javascript
2014-10-18 10:54:50 +01:00
pozorvlak
26e592db88
Merge pull request #429 from Skud/tomatoes
...
Tomatoes - scientific name upload bugfix
2014-10-18 10:35:50 +01:00
Taylor Griffin
2515d34277
add teardown to reset locale to default en
2014-10-16 08:09:20 +11:00
Taylor Griffin
8994bcf28c
ok, we'll just remove all references to environment
2014-10-16 07:14:03 +11:00
Taylor Griffin
d627d8394e
forgot which env I was in
2014-10-16 06:56:39 +11:00
Taylor Griffin
a4e7f93421
Merge branch 'dev' of https://github.com/Growstuff/growstuff into I18n
2014-10-16 06:39:10 +11:00
Taylor Griffin
0f75a96944
write spec to test that setting a different locale fundamentally works
2014-10-16 06:37:50 +11:00
Taylor Griffin
6a7c935d43
try setting locale from query parameter first
2014-10-16 06:37:02 +11:00
Skud
a3e02a3e61
Actually delete Crop.random, don't just comment it out
2014-10-15 16:47:43 +01:00
Skud
8e6a57c442
Attempt at writing tests for planting reminder email
...
(Test are broken)
OK, so I decided to use the capybara_email gem to write these tests.
It's basically working but there's a problem with the has_link matcher.
Basically the emails sent by ActionMailer have URLs like
http://localhost:8080 ... whereas the tests asking for planting_url() or
similar are looking for http://example.com ...
I don't understand AT ALL why there is this discrepancy, but it looks
like ActionMailer is using the settings from the development
environment, instead of the testing environment.
WHYYYYYY???
I'm pushing this up so that maybe someone else can figure it out,
because I'm stumped.
2014-10-15 15:52:13 +01:00
Skud
e4cf636bef
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
...
Conflicts:
app/models/harvest.rb
db/schema.rb
spec/models/harvest_spec.rb
2014-10-15 14:20:16 +01:00
Skud
75e076cef5
Merge branch 'dev' of https://github.com/Growstuff/growstuff into tomatoes
...
Conflicts:
spec/models/crop_spec.rb
2014-10-15 14:07:03 +01:00
Skud
1d81064ced
removed unused Crop.random method
2014-10-15 14:03:00 +01:00
