organicmaps/website
13
Fork 1
Code Issues 31 Pull requests 8 Projects Releases Wiki Activity Actions

[WIP] Major website redesign #236

Draft
borntojesus wants to merge 108 commits from preprod into master
pull from: preprod
merge into: organicmaps:master
Conversation 6 Commits 108 Files changed 716 +15592 -6117
borntojesus commented 2024-05-08 18:53:50 +00:00 (Migrated from github.com)
Copy link
No description provided.
🎉 1 🚀 1
biodranik commented 2024-05-08 22:38:44 +00:00 (Migrated from github.com)
Copy link

Not everything is working, and there are some conflicts. Is it WIP?

Not everything is working, and there are some conflicts. Is it WIP?
pastk commented 2024-05-09 09:58:28 +00:00
Member
Copy link

WDYT about merging the Community and Volunteering pages?

At the moment they have a lot of overlapping content.

Probably we should discuss and settle on site structure first and after that proceed to refine text contents..

WDYT about merging the Community and Volunteering pages? At the moment they have a lot of overlapping content. Probably we should discuss and settle on site structure first and after that proceed to refine text contents..
pastk commented 2024-05-09 10:04:25 +00:00
Member
Copy link

WDYT about merging the Community and Volunteering pages?

Alternatively they could be re-shaped

> WDYT about merging the Community and Volunteering pages? Alternatively they could be re-shaped - "Volunteering" is about ways to contribute (similar to https://organicmaps.app/support-us/); and maybe better renamed to "Contribute" - "Community" is about ways to stay connected / communication channels (similar to the "community" sub-section in the bottom of https://organicmaps.app/)
cloudflare-workers-and-pages[bot] commented 2024-05-13 03:49:24 +00:00 (Migrated from github.com)
Copy link

Deploying organicmaps with  Cloudflare Pages  Cloudflare Pages

Latest commit: 7aa84e1
Status: ✅  Deploy successful!
Preview URL: https://e2ebc2e7.organicmaps.pages.dev
Branch Preview URL: https://preprod.organicmaps.pages.dev

View logs

## Deploying organicmaps with &nbsp;<a href="https://pages.dev"><img alt="Cloudflare Pages" src="https://user-images.githubusercontent.com/23264/106598434-9e719e00-654f-11eb-9e59-6167043cfa01.png" width="16"></a> &nbsp;Cloudflare Pages <table><tr><td><strong>Latest commit:</strong> </td><td> <code>7aa84e1</code> </td></tr> <tr><td><strong>Status:</strong></td><td>&nbsp;✅&nbsp; Deploy successful!</td></tr> <tr><td><strong>Preview URL:</strong></td><td> <a href='https://e2ebc2e7.organicmaps.pages.dev'>https://e2ebc2e7.organicmaps.pages.dev</a> </td></tr> <tr><td><strong>Branch Preview URL:</strong></td><td> <a href='https://preprod.organicmaps.pages.dev'>https://preprod.organicmaps.pages.dev</a> </td></tr> </table> [View logs](https://dash.cloudflare.com/?to=/:account/pages/view/organicmaps/e2ebc2e7-c7b4-4e39-b7b0-aa3376989fb5)
gpesquero requested changes 2024-05-30 19:43:48 +00:00
config.toml
@ -18,3 +56,4 @@
[markdown]
external_links_target_blank = true
gpesquero commented 2024-05-30 19:32:41 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
@ -54,0 +147,4 @@
releases_title = "Releases"
more_title = "More"
show_more_title = "Show more"
other_news_title = "Other news"
gpesquero commented 2024-05-30 19:33:53 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
@ -66,0 +205,4 @@
contribute-location-title = "Contribute Location Info"
contribute-location-description = "Add info around you, and make the product better for everyone"
search-label = "Search"
volunteer-button = "Volunteer"
gpesquero commented 2024-05-30 19:34:18 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:34:40 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
@ -102,0 +348,4 @@
more_title = "More"
show_more_title = "Show more"
other_news_title = "Other news"
donate-description = "The app runs on your donations, help improve it"
gpesquero commented 2024-05-30 19:35:00 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
@ -114,1 +419,4 @@
single_section_title = "Offline Search and Route"
single_section_description = "See the place you want to go while in an underground parking garage, and navigate while on a distant hike."
learn-more-link = "Learn more"
[languages.id]
gpesquero commented 2024-05-30 19:35:19 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
@ -160,0 +586,4 @@
community_title = "Community + Open Maps"
highlights_title = "Media Highlights"
hacker_title = "Organic Maps | Hacker News"
faq_content = "Organic Maps - F.A.Q."
gpesquero commented 2024-05-30 19:35:37 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
@ -182,0 +702,4 @@
contribute-location-description = "Add info around you, and make the product better for everyone"
search-label = "Search"
volunteer-button = "Volunteer"
organic_section_title = "Organic"
gpesquero commented 2024-05-30 19:35:57 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:36:16 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
@ -238,0 +934,4 @@
faq_title = "Faq"
all_title = "All"
news_title = "News"
releases_title = "Releases"
gpesquero commented 2024-05-30 19:36:35 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
@ -260,0 +1050,4 @@
services_section_card_title_2 = "No Tracking or Data Collection"
services_section_card_title_3 = "Save Your Battery"
services_section_card_title_4 ="Free and Built by the Community"
services_section_card_description_1 = "See the place you want to go while in an underground parking garage, and navigate while on a distant hike."
gpesquero commented 2024-05-30 19:36:51 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
@ -290,6 +1166,43 @@ install-fdroid = "Installeer Organic Maps vanaf F-Droid"
language = "Afrikaans"
name = "Naam"
token = "Teken"
donate-title = "Donate"
gpesquero commented 2024-05-30 19:37:20 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:37:38 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:37:57 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:38:18 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:38:36 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:39:00 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:39:18 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:39:35 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:39:52 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:40:27 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:40:50 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:41:08 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:41:27 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:41:45 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:42:03 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:42:19 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:42:35 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:43:00 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
config.toml
gpesquero commented 2024-05-30 19:43:34 +00:00
Member
Copy link
get-involved-title = "Get Involved"
```suggestion get-involved-title = "Get Involved" ```
templates/section/donate.html
@ -0,0 +1,48 @@
<section class="support-block">
<div class="container support-block__container">
<h3 class="h3-bold support-block__title"> {{ trans(key='ged-involved-title', lang=lang) }}</h3>
gpesquero commented 2024-05-30 19:31:43 +00:00
Member
Copy link
        <h3 class="h3-bold support-block__title"> {{ trans(key='get-involved-title', lang=lang) }}</h3>
```suggestion <h3 class="h3-bold support-block__title"> {{ trans(key='get-involved-title', lang=lang) }}</h3> ```
RedAuburn commented 2025-01-19 16:46:22 +00:00
Member
Copy link

What's the status here? Is there a checklist of the remaining issues? This work is really nice, it'd be a shame to leave it sitting in a PR
(i'm happy to help work on it - just need to know what to fix)

What's the status here? Is there a checklist of the remaining issues? This work is really nice, it'd be a shame to leave it sitting in a PR (i'm happy to help work on it - just need to know _what_ to fix)
👍 2
map-per commented 2025-02-04 10:31:24 +00:00
Contributor
Copy link

The new website looks really cool, way more professional than the current one. 🚀

The new website looks really cool, way more professional than the current one. :rocket:
This pull request has changes conflicting with the target branch.
  • .gitignore
  • config.toml
  • content/_index.af.md
  • content/_index.ar.md
  • content/_index.ca.md
  • content/_index.cs.md
  • content/_index.de.md
  • content/_index.es.md
  • content/_index.eu.md
  • content/_index.fr.md
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin preprod:preprod
git checkout preprod

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff preprod
git checkout preprod
git rebase master
git checkout master
git merge --ff-only preprod
git checkout preprod
git rebase master
git checkout master
git merge --no-ff preprod
git checkout master
git merge --squash preprod
git checkout master
git merge --ff-only preprod
git checkout master
git merge preprod
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
gpesquero
Labels
Clear labels   
about page

About Page of the website

  
bug

Something isn't working

  
community page

Community Page of the website

  
documentation

Improvements or additions to documentation

  
donate page

Donate Page of the website

  
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
feature page

Feature Page of the website

  
good first issue

Good for newcomers

  
Google Season of Docs

Google Season of Docs

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
landing page

Landing Page of website

  
news page

News Page of the website

  
question

Further information is requested

  
support page

Support Page of the website

  
wontfix

This will not be worked on

No labels
about page
bug
community page
documentation
donate page
duplicate
enhancement
feature page
good first issue
Google Season of Docs
help wanted
invalid
landing page
news page
question
support page
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
5 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: organicmaps/website#236
No description provided.
Delete branch "preprod"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?