Commit Graph

1227 Commits

Author SHA1 Message Date
Mateusz Konieczny
c0b58acc3a add or improve attributions 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
60253d2a79 better description of historic map 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
19770cd343 add outline for historic map on top of it 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
8f1a03222c new historic map example 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
374a34e4ad conservation boundary new style 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
a93aabfc4a historic map display test
note that it is test only - terms of use and copyright status needs to be checked
2022-12-08 20:42:56 +01:00
Mateusz Konieczny
8843cf33ef brown ca styling in overlays 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
f3aaeddb96 more visible conservation area layer 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
9805c0c17b switch conservation area to purple 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
c070e6a946 enable conservation area display 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
b6d4037226 show flood areas as areas 2022-12-08 20:42:55 +01:00
Mateusz Konieczny
669ec659fa add flood zone display 2022-12-08 20:42:55 +01:00
Mateusz Konieczny
7a72b6dca7 prevent overlap 2022-12-08 20:16:02 +01:00
Mateusz Konieczny
efab635407 show some INSPIRE parcels 2022-12-08 20:15:53 +01:00
Mateusz Konieczny
a6156d66a3 add switchable borough boundary overlay 2022-12-08 20:15:52 +01:00
Mateusz Konieczny
79c2a8f37f italics for disclaimer 2022-12-08 20:15:12 +01:00
Mateusz Konieczny
0b0d536664 add warning that category is not yet activated 2022-12-07 16:10:17 +01:00
Mateusz Konieczny
b1d7618ba4 add more instructions 2022-12-07 14:12:55 +01:00
Mateusz Konieczny
c5803ef24c tweak description/question about upcoming applications 2022-12-07 13:46:56 +01:00
Mateusz Konieczny
f3fb5c982c drop placeholders about not activated category 2022-12-07 13:19:11 +01:00
Mateusz Konieczny
b9d98f069b better colours
no longer clashing with selection outline
2022-12-07 13:17:16 +01:00
Mateusz Konieczny
d191326d3f box about not-yet activated crowdsourcing 2022-12-07 13:16:51 +01:00
Mike Simpson
00c926fd68
Merge pull request #1003 from matkoniecz/feature/mineral_colour
Tweak colour for mineral buildings
2022-12-07 12:15:49 +00:00
Mateusz Konieczny
246ab7a590 Tweak colour for mineral buildings
was almost exactly the same as an active outline
2022-12-07 13:12:18 +01:00
Mateusz Konieczny
270f584444 Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data 2022-12-06 19:20:54 +01:00
Mike Simpson
a4f3340c20 Merge branch 'master' into colouring-core 2022-12-06 16:57:44 +00:00
Mike Simpson
543a576b5d Another pass at removing references to Colouring London 2022-12-06 16:55:10 +00:00
Mateusz Konieczny
3e0063ba4a collapse planning applications section 2022-12-06 17:34:09 +01:00
Mateusz Konieczny
583d18b3d4 tweak situation description 2022-12-06 17:31:56 +01:00
Mike Simpson
f15b9acd46
Merge pull request #999 from matkoniecz/feature/consistent_order
extremely minor refactoring for minor annoyance
2022-12-06 13:05:50 +00:00
Mateusz Konieczny
b8339f1588 Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data 2022-12-06 13:40:44 +01:00
Mateusz Konieczny
2859dc7fb2 Consistent order
generateApiKey and deleteAccount ordered the same way as elsewhere
2022-12-06 13:37:19 +01:00
Mateusz Konieczny
ae1b30ce13 even longer titles
requested by Polly
2022-12-06 13:33:19 +01:00
Mateusz Konieczny
609848ea9d log in/registration to top
rearrange sidebar to move critically important to top
2022-12-06 11:59:02 +01:00
Mateusz Konieczny
88c332ae2c fix links exploding interface on Chrome
https://github.com/colouring-cities/colouring-london/issues/996
2022-12-06 11:46:12 +01:00
Mateusz Konieczny
19069a69d2 tweak displayed text 2022-12-05 19:26:25 +01:00
Mateusz Konieczny
c134b5e630 drop dead code 2022-12-05 12:23:57 +01:00
Mateusz Konieczny
c72749abf6 add note that category is not yet activated 2022-12-02 17:21:38 +01:00
Mateusz Konieczny
36678faaf0 better note 2022-12-02 17:11:10 +01:00
Mateusz Konieczny
94f2a93ebb fix TODO 2022-12-02 17:10:00 +01:00
Mateusz Konieczny
05f27e3a92 add placeholders explaining why questions are not yet activated 2022-12-02 17:04:35 +01:00
Mateusz Konieczny
626a425cdd Fix English grammar 2022-12-02 17:03:59 +01:00
Mateusz Konieczny
e5ca4f19f2 disable crowdsourcing 2022-12-02 17:01:36 +01:00
Mateusz Konieczny
9133ca787c drop dead code 2022-12-02 15:44:51 +01:00
Mateusz Konieczny
3fa0734951 explain potential low quality address data 2022-12-02 15:39:20 +01:00
Mateusz Konieczny
2033bad1a8 tweak description of planning id collection 2022-12-02 15:36:03 +01:00
Mateusz Konieczny
32752fe71e remove empty map layer 2022-12-02 15:30:12 +01:00
Mateusz Konieczny
5c3139ff6f drop unwanted layers 2022-12-02 15:28:50 +01:00
Mike Simpson
a1c69fdc13 Merge branch 'master' into colouring-core 2022-11-30 15:33:30 +00:00
Mike Simpson
f9999048ec More Config Changes
- Added project specific GitHub URL to config
- More changes to "Colouring Cities" where it seems appropriate
- More use of "Colouring {CityName}" across the site
2022-11-30 15:20:00 +00:00
Mateusz Konieczny
7039c0cefa Merge branch 'master' into feature/display-of-planning-data 2022-11-30 15:05:09 +01:00
Mateusz Konieczny
47014c1995 colour inline map switch mockup 2022-11-29 12:08:12 +01:00
Mateusz Konieczny
c036de76b9 rearrange colors of boxes for consistency 2022-11-29 12:02:21 +01:00
Mateusz Konieczny
d56a81bff6 crowdsourced finalizing initial interface 2022-11-29 11:45:49 +01:00
Mateusz Konieczny
69f753c0a4 rework disclaimers 2022-11-29 11:28:04 +01:00
Mateusz Konieczny
48841b0ab0 remove italics after all 2022-11-29 11:04:29 +01:00
Mateusz Konieczny
8c134968a9 rewrite organisation of planning menu 2022-11-28 11:26:57 +01:00
Mateusz Konieczny
aac5287628 rebuild Building protection, Zone menus 2022-11-28 11:02:41 +01:00
Mateusz Konieczny
9c4f7e0ee8 remove no longer needed development info box 2022-11-25 10:20:04 +01:00
Mateusz Konieczny
655fed8964 better describe planning applications 2022-11-25 10:19:09 +01:00
Mateusz Konieczny
09a5aadfe6 better describe predicted planning applications 2022-11-25 10:18:56 +01:00
Mateusz Konieczny
f610e0346b reword community_expected_planning_application 2022-11-25 10:18:39 +01:00
Mateusz Konieczny
cfc9930cc5 better describe predicted planning applications in planning section 2022-11-25 10:12:05 +01:00
Mateusz Konieczny
a4456b1bab reword historic area assesment 2022-11-25 10:11:34 +01:00
Mateusz Konieczny
6fcbbc700c Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data 2022-11-24 12:12:27 +01:00
Mateusz Konieczny
81d8aa124e note about coverage of data 2022-11-23 15:22:01 +01:00
Mateusz Konieczny
d604ba30d8 Tweak warning for designation/protection data quality 2022-11-23 13:10:39 +01:00
Mateusz Konieczny
ba6bd944fc tweak wording for older planning data 2022-11-23 11:48:48 +01:00
Mateusz Konieczny
c66038c036 Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data 2022-11-23 10:11:55 +01:00
Mateusz Konieczny
d53a893ea5 tweak wording 2022-11-23 10:04:46 +01:00
Mateusz Konieczny
6965056b8b tweak default collapse state
as requested in #984
2022-11-23 09:11:19 +01:00
Mateusz Konieczny
3a05627af1 More clear instructions for protected site menu
fixes #982
2022-11-23 09:02:15 +01:00
Mateusz Konieczny
930fb11e6a show address data in planning data green box 2022-11-23 08:59:10 +01:00
Mateusz Konieczny
bec6277706 add special empty map
I am deeply unhappy about ugly disclaimer handling though right now I have no good ideas how to provide nicer display
2022-11-21 22:10:44 +01:00
Mateusz Konieczny
5ba6e270f2 more consistent intendation 2022-11-21 10:09:11 +01:00
Mike Simpson
ba513d7935 First pass at using Config Files - Interface Text
- Create config file to specify parameters like City Name, Initial Map Position etc.
- Replace all reference on welcome and privacy page with the name of the city
- Changed some hard-coded references to "Colouring London" to generic "Colouring Cities"
- Also corrected out of date URLS
2022-11-16 16:15:32 +00:00
Mateusz Konieczny
9512d30c28 add status explanation note
this allow to handle OBS statuses, also done in this commit
2022-11-13 09:01:38 +01:00
Mateusz Konieczny
a679054a0d show last 30 days, not last 7 in very recent applications 2022-11-10 08:29:08 +01:00
Mateusz Konieczny
d4ec4653b8 Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data 2022-11-08 16:23:20 +01:00
Mateusz Konieczny
36513a31de Change section to mimic upcoming planning applications info 2022-11-08 14:49:56 +01:00
Mateusz Konieczny
bc8ec5d202 change structure of planning section 2022-11-08 14:48:16 +01:00
Mateusz Konieczny
07514e6852 More planned entries 2022-11-08 14:46:24 +01:00
Mateusz Konieczny
e6b6187c24 Merge branch 'master' into feature/display-of-planning-data 2022-11-08 13:41:15 +01:00
Mateusz Konieczny
36b1c68814 Small language tweaks after review on staging 2022-11-08 13:08:34 +01:00
Mike Simpson
c00c59914c
Merge pull request #976 from matkoniecz/feature/remake-designation-menu
Remake designation/protection menu.
2022-11-08 11:54:00 +00:00
Mike Simpson
5c2455ce8d
Merge pull request #975 from matkoniecz/feature/stop-showing-child-count
Stop showing child count in group headers.
2022-11-08 11:51:49 +00:00
Mateusz Konieczny
ea79990ab4 cvhage structure of planning menu 2022-11-08 12:34:56 +01:00
Mateusz Konieczny
f63ff98268 changing layour of planning data display 2022-11-08 12:34:51 +01:00
Mateusz Konieczny
32048bd253 Remake designation/protection menu. 2022-11-08 12:32:35 +01:00
Mateusz Konieczny
24b6905829 Stop showing child count in group headers. 2022-11-08 12:23:59 +01:00
Mateusz Konieczny
880d742bd5 Increase text in group headers 2022-11-08 12:07:09 +01:00
Mateusz Konieczny
1de5c51209 new layers 2022-11-07 10:50:50 +01:00
Mateusz Konieczny
8f8edd0a17 deduplicate 2022-11-07 10:50:24 +01:00
Mateusz Konieczny
5d3f374cf7 record and show raw status from data 2022-11-05 10:06:49 +01:00
Mateusz Konieczny
15be5cce40 record status as an available property 2022-11-05 10:06:49 +01:00
Mateusz Konieczny
adbe79727a new test layers 2022-11-05 10:06:49 +01:00
Mateusz Konieczny
50c8b3ddac remove logger 2022-11-04 16:07:27 +01:00
Mateusz Konieczny
a69444fa2c more clear section names 2022-11-04 11:37:46 +01:00
Mateusz Konieczny
66ee4f2235 split old planning data into separate section 2022-11-04 11:37:13 +01:00
Mateusz Konieczny
dc49ff5833 properly record how data is structured
less likely to keep changing
2022-11-04 11:36:05 +01:00
Mateusz Konieczny
f2078aecb0 remove not needed TODO 2022-11-02 10:38:42 +01:00
Mateusz Konieczny
32076a9012 drop linking as we have no link to share 2022-11-01 20:18:21 +01:00
Mateusz Konieczny
ce339ea339 More verbose legend as requested 2022-10-31 12:34:44 +01:00
Mateusz Konieczny
0ba4d4f734 be more clear why data is missing 2022-10-31 12:34:19 +01:00
Mateusz Konieczny
1c210fb8d6 smarter order in legend list 2022-10-31 11:53:34 +01:00
Mateusz Konieczny
28285fe4ef actually link data 2022-10-31 10:32:37 +01:00
Mateusz Konieczny
4ebce23156 handle multiple applications 2022-10-31 10:20:41 +01:00
Mateusz Konieczny
0f689217c3 change data source 2022-10-31 10:09:12 +01:00
Mateusz Konieczny
d1cc8c7a16 more consistent headers 2022-10-31 07:08:31 +01:00
Mateusz Konieczny
2d6907281f temporary removal of outdated group 2022-10-20 21:39:03 +02:00
Mateusz Konieczny
b582a40df2 show planning application map in both planning and community 2022-10-05 20:06:55 +02:00
Mateusz Konieczny
205580d7fe better display as unusual data in planning view
applications with unandled statuses are shown
not available application id is not shown as unknown anymore
2022-10-05 19:56:25 +02:00
Mateusz Konieczny
a98b7c0b17 drop checkox 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
5626de53c2 tweak wording 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
6ffe655706 remove props.building.planning_portal_link 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
c3fd10cd5a planning application link 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
0d0cdc501a move areas checkbox out of green box 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
db6dde1194 apply draft styling for disclaimer: note, it needs to be done properly 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
5eb2c54f06 tweak disclaimer and source info presentation 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
5e8766d0b8 fix misplaced verification button 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
a28d009b23 italics, TODO HACK FIXME done it properly 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
d5e3c1feac tweak phrasing for source info 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
d75b18be66 rearrange source and status info order 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
39190f7712 start showing registration date 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
e3ef25aa0c aply interface rewrite draft 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
966ba81f7f tweak link 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
317a28ce60 fix line wrapping 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
08eb0d38b4 fix syntax 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
c2fbe305f7 fix typo quote 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
a2ec8a7152 tweak disclaimeer text 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
90dae39f12 tweak wording of disclaimer 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
4110d2624b hot fix previous one 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
1b1bd5b139 move planning_portal_link to top 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
186d414d55 tweak wording again 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
305b7441ba tweak wording 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
9c0b961d7a link Community section from Planning section 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
0d853f8e6e repeat community_expected_planning_application in planning section 2022-10-05 19:56:20 +02:00
Mateusz Konieczny
3f7c7d5d6e draft of interface 2022-10-05 19:55:18 +02:00
Mateusz Konieczny
1ad5128874 tweak text again 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
fa8bbcf54e rephrase valid_date 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
b4bcf0988f rearrange entries in green box 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
f13ac7d4a9 Rejected vs Refused 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
9d08619a61 show title properly 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
68f56214c6 take title out of the infobox 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
def260e584 support unknown status 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
5a06e37ec6 change documentation link 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
4085735d38 temporary form of displaying checkbox with url in the title 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
54e0615b74 New disclaimer text, DRY 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
0bbf4dcdce improve styling 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
fa71dae61f Use more delicate colours in planning layer. 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
d2d54e6c94 Tweak layout of green box listing 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
8cbb3cd84b Display official planning data. 2022-10-05 19:52:14 +02:00
Mateusz Konieczny
852454d527 tweak note about missing email
fixes #942
2022-10-05 17:48:56 +02:00
Mateusz Konieczny
8781a263c8 use less cryptic placeholder
https://github.com/colouring-cities/colouring-london/issues/942#issuecomment-1257203358
2022-10-05 17:47:35 +02:00
Mike Simpson
2bdbbce8d2
Merge pull request #947 from colouring-cities/add-newcastle-logo
Add Newcastle University Logo
2022-10-04 13:46:25 +01:00
Mike Simpson
ae46f3559c
Merge pull request #941 from matkoniecz/feature/matching-forms
More uniform form style
2022-10-03 09:45:08 +01:00
Mike Simpson
0a28a882b0
Merge pull request #946 from matkoniecz/feature/redesign_designation_protection_menu
redesign designation/protection menu
2022-10-03 09:44:04 +01:00
Mateusz Konieczny
50cecf36bb add conservation area id 2022-10-03 08:04:26 +02:00
Mike Simpson
9ccf2c7ffb Add Newcastle University Logo 2022-09-28 12:58:59 +01:00
Mateusz Konieczny
6c29c36b3a add coverage note 2022-09-27 11:15:55 +02:00
Mateusz Konieczny
f5bcb7e6da change hint to 'Please add relevant link here' 2022-09-26 10:00:54 +02:00
Mateusz Konieczny
886f548713 fix off by one error in username legth limit 2022-09-25 15:39:54 +02:00
Mateusz Konieczny
69087a1f32 reorder protected items
fixes #939
2022-09-25 00:57:58 +02:00
Mateusz Konieczny
aa04cda117 Revert "reorder legend entries to match order in interface"
This reverts commit b80cdb23b4.
2022-09-25 00:01:18 +02:00
Mateusz Konieczny
84fc857355 Shared form style
fixes #937
2022-09-24 23:41:10 +02:00
Mateusz Konieczny
cea4bad4e4 proper input form for UNESCO WHS 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
b80cdb23b4 reorder legend entries to match order in interface 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
5b4c0be1e5 tweak special input field further 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
0e1d81f41e use proper form for the id input 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
e9579070f5 get rid of defunct and not needed import 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
cd52a4e494 mark URL entry as URL 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
4fb388ea92 add visualisation for more types of data being used 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
20f99e9103 Redesign interface listing protection
Per @polly64 checkbox fields were removed and switch was made to using links as both as input method and for providing source.

It is no longer possible to just claim that something is listed/featured, entering data will now be also faster
2022-09-24 12:57:17 +02:00
Mateusz Konieczny
cbd99f49f3 intendation to follow new nesting 2022-09-24 12:57:17 +02:00
Mateusz Konieczny
4d0ca9434f Introduce nested groups 2022-09-24 12:57:17 +02:00
Ed Chalstrey
3cdaa72bd0 fix spacing 2022-08-16 16:09:14 +01:00
Ed Chalstrey
cde0dd3ecf spaces 2022-08-16 16:08:03 +01:00
Ed Chalstrey
8f35ca73ce re-jig para 2022-08-16 16:07:20 +01:00
Ed Chalstrey
2f61a70225 abbreviate CCRP 2022-08-16 11:29:38 +01:00
Ed Chalstrey
e7c531fc68 simplify 2022-08-16 11:26:52 +01:00
Ed Chalstrey
76d28d5d2d draft para 2022-08-16 11:25:05 +01:00
Ed Chalstrey
dd69627671 Revert "remove padding"
This reverts commit 949a2a0486.
2022-08-11 10:06:13 +01:00
Ed Chalstrey
949a2a0486 remove padding 2022-08-11 10:01:31 +01:00
Ed Chalstrey
6b18a58bde move EditHistoryLatest to section-body 2022-08-09 15:48:22 +01:00
Ed Chalstrey
01178dd46c Revert "move EditHistoryLatest outside section"
This reverts commit 2e17f25285.
2022-08-09 15:45:37 +01:00
Ed Chalstrey
2e17f25285 move EditHistoryLatest outside section 2022-08-09 15:44:38 +01:00
Ed Chalstrey
404f944c8e remove edit date from age specifically 2022-08-09 15:42:30 +01:00
Ed Chalstrey
dc30bc4384 add EditHistoryLatest for all categories 2022-08-09 15:40:59 +01:00
Ed Chalstrey
149cf0bdff remove div wrapper 2022-08-09 15:35:18 +01:00
Ed Chalstrey
59da16fe02 update text 2022-08-09 15:29:46 +01:00
Ed Chalstrey
f62b82685f remove font specs 2022-08-09 15:28:39 +01:00
Ed Chalstrey
fa88bad32f try suppressing subsequent list items 2022-08-09 15:27:33 +01:00
Ed Chalstrey
85322ef16d try <ul> instead 2022-08-09 15:17:40 +01:00
Ed Chalstrey
5643b27637 remove p 2022-08-09 15:15:44 +01:00
Ed Chalstrey
9863e99cb6 single <p> for latest edit 2022-08-09 15:14:18 +01:00
Ed Chalstrey
0b9598f47b remove edit hist title 2022-08-09 15:09:07 +01:00
Ed Chalstrey
a8e2399924 fix const name 2022-08-09 15:06:57 +01:00
Ed Chalstrey
03d4dab8fb fix import 2022-08-09 15:06:12 +01:00
Ed Chalstrey
e573574d5c add EditHistoryLatest 2022-08-09 15:05:36 +01:00
Ed Chalstrey
3270804b1b add props.building to EditHistory 2022-08-09 14:54:27 +01:00