Merge branch 'development' into dev_new

README.md

@@ -1,34 +1,32 @@
-# OurPhone™
+# OurWorld Freezone
 
-## 
+![](../static/images/logo_placeholder2.png)
-
-![](./public/images/logo_placeholder1.png)
 
 ## About
 
-The official website of OurZone™
+The official website of **OurWorld Freezone**
 
-Production(master branch) [www.ourphone.ourworld.tf](https://www.ourzone.ourworld.tf/)
+Production(master branch) [www.ourworld.freezone.tf](https://www.ourzone.ourworld.tf/)
 
-Staging(developmentr branch) [www2.ourphone.ourworld.tf](https://www2.ourzone.ourworld.tf/)
+Staging(developmentr branch) [www2.ourworld.freezone.tf](https://www2.ourzone.ourworld.tf/)
 
 
 Last updated: March 2023
 
 ## Contribution
 
-Feel free to [create a new issue](https://github.com/ourworld-tsc/www_ourphone/issues) to report an error on the website, or if you have any suggestions on website improvements. 
+Feel free to [create a new issue](https://github.com/ourworldfreezone/www_ourworld_freezone/issues/) to report an error on the website, or if you have any suggestions on website improvements. 
 
-# Welcome to OurWorld Website Repository
+# Welcome to Ourworld Free Zone Website Repository
 
-- Website Name: OurWorld
+- Website Name: Ourworld Free Zone
-- Brief Description: This is the official website of OurWorld.
+- Brief Description: This is the official website of Ourworld Free Zone.
 Last Updated: March 2023
 
-- Website URL: https://ourworld.tf/
+- Website URL: https://ourworld.freezone.tf/
 
 - For any suggestions or improvement ideas please 
-Create an issue on: https://github.com/threefoldfoundation/www_ourworld_tf/issues
+Create an issue on: https://github.com/ourworldfreezone/www_ourworld_freezone/issues/
 
 ## Administrators
 [ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin)

config.toml

@@ -78,6 +78,24 @@ feed = true
 paginate_by = 2
 paginate_path = "blog-posts"
 
+[[taxonomies]]
+name = "partners-category"
+feed = true
+paginate_by = 6
+paginate_path = "partner-card"
+
+[[taxonomies]]
+name = "news-category"
+feed = true
+paginate_by = 6
+paginate_path = "news-card"
+
+[[taxonomies]]
+name = "memberships"
+feed = true
+paginate_by = 8
+paginate_path = "people/memberships"
+
 [extra]
 header_class = "customize"
 footer_class = "customize"

content/home/index.md

@@ -1,5 +1,5 @@
 ---
-title: "OurWorld"
+title: "Ourworld Free Zone"
 description: ""
 date: 2018-09-14
 updated: 2021-02-20
@@ -157,7 +157,7 @@ Seamlessly manage both fiat and digital currencies with our comprehensive bankin
 
 ![Image](./img/flexible.png#sm#mx-auto)
 #### Affordable & Flexible Company Licenses
-OurWorld offers cost-effective and flexible company licenses, making it easier to kickstart your entrepreneurial journey.
+Ourworld Free Zone offers cost-effective and flexible company licenses, making it easier to kickstart your entrepreneurial journey.
 
 </div>
 
@@ -167,7 +167,7 @@ OurWorld offers cost-effective and flexible company licenses, making it easier t
 
 ![Image](./img/sovereign.png#sm#mx-auto)
 #### Sovereign Economic Jurisdiction 
-OurWorld empowers businesses to operate within an independent economic environment, fostering growth and prosperity.
+Ourworld Free Zone empowers businesses to operate within an independent economic environment, fostering growth and prosperity.
 
 </div>
 

templates/partials/blogPosts.html

@@ -7,7 +7,7 @@
   {% set path_array = current_path | split(pat="/") %}
   {% set taxonomy = path_array[1] %}
   {% set category = path_array[2] %}
-    The Latest from OurWorld   
+    The Latest from Ourworld Free Zone  
     {% if taxonomy == "categories" %} - 
         {{category | replace(from='-', to=' ' ) | title}}
     {% endif %}