diff --git a/CHANGELOG.md b/CHANGELOG.md index e4b08419d..9cae12ac3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Spina CMS Changelog -## 2.1 (Unreleased) +## 2.1 (July 3rd, 2021) * Refactored all javascript with Hotwire * Refactored all CSS with TailwindCSS @@ -13,7 +13,7 @@ ## 2.0 -⚠️ _Beware: lots of changes regarding page content. The old page parts are gone in favor of new JSON-based parts. Read the [Upgrading Guide](https://www.spinacms.com/guide/getting-started/upgrading-from-v1) to learn how to upgrade._ +⚠️ _Beware: lots of changes regarding page content. The old page parts are gone in favor of new JSON-based parts. Read the [Upgrading Guide](https://www.spinacms.com/docs/getting-started/upgrading) to learn how to upgrade._ ### 2.0.2 (March 19th, 2021) * Fixed issue with webp images diff --git a/docs/v2/0_introduction.md b/docs/v2/0_introduction.md deleted file mode 100644 index eaa4afcd3..000000000 --- a/docs/v2/0_introduction.md +++ /dev/null @@ -1,13 +0,0 @@ -# Introduction - -Spina is a content management system (CMS) that focuses on ease of use. We believe that managing content should not involve HTML, CSS or configuration. - -*Looking for docs for v1? [You can find here them on Github](https://github.com/Bramjetten/Spina/tree/attrjson/docs/v1)* - -You as a designer, developer or all-round maker decide how your new website looks and feels. Clients who use Spina can then simply add their content without messing up your work. This means better looking websites and fewer requests from clients! - -Explaining why it works so well is hard, so it's probably best to show you: - -[youtube 81GQ_g6Ihug] - -It's really easy to get started with Spina CMS. Proceed to the next chapter to learn more. diff --git a/docs/v2/1_getting_started.md b/docs/v2/1_getting_started.md index 5a96e0cb9..d60c08418 100644 --- a/docs/v2/1_getting_started.md +++ b/docs/v2/1_getting_started.md @@ -1,3 +1,18 @@ # Getting started -Spina is a CMS for Rails 6.0. +Spina is a CMS for Rails 6.1. If you want to get started quickly, create a new Ruby on Rails app with a PostgreSQL database and ActiveStorage enabled and follow these instructions: + +Add the following line to your Gemfile: + +```ruby +gem 'spina' +``` + +Run the installer to start the setup process: + + rails g spina:install + +The installer will help you create your first user. + +Then start `rails s` and access Spina at `/admin`. + diff --git a/docs/v2/advanced/1_create_custom_parts.md b/docs/v2/advanced/1_create_custom_parts.md index f3cc44f8b..72735d0bf 100644 --- a/docs/v2/advanced/1_create_custom_parts.md +++ b/docs/v2/advanced/1_create_custom_parts.md @@ -25,11 +25,14 @@ end ## Step 2. Create a view for page editing -```haml --# app/views/spina/admin/parts/movies/_form.html.haml -.page-form-label= f.object.title -.page-form-control - .select-dropdown= f.select :movie_id, Movie.all.pluck(:name, :id) +```erb + +
+ +
+ <%= f.select :movie_id, Movie.all.pluck(:name, :id) %> +
+
``` ## Step 3. Register your new part diff --git a/docs/v2/getting_started/1_installing_ruby.md b/docs/v2/getting_started/1_installing_ruby.md index ebaba092d..00a9f9556 100644 --- a/docs/v2/getting_started/1_installing_ruby.md +++ b/docs/v2/getting_started/1_installing_ruby.md @@ -2,11 +2,10 @@ Before you can install Spina, you need to have Ruby and Rails installed first. Here are a couple of excellent resources to do that: +- [Install Ruby on Rails (gorails.com)](https://gorails.com/setup) - [Installing Ruby (ruby-lang.org)](https://www.ruby-lang.org/en/documentation/installation/) - [Getting Started with Rails (guides.rubyonrails.org)](https://guides.rubyonrails.org/getting_started.html) -If you're on a Mac you should something like `rbenv` to manage different versions of Ruby. - ## Database You need a database to store all of your content. Spina CMS requires a PostgreSQL database. You can install it using several ways. If you're on a Mac we recommend using `homebrew` so you can simply run `brew install postgresql`. \ No newline at end of file diff --git a/docs/v2/getting_started/2_installing_spina.md b/docs/v2/getting_started/2_installing_spina.md index d9453f586..de589dfff 100644 --- a/docs/v2/getting_started/2_installing_spina.md +++ b/docs/v2/getting_started/2_installing_spina.md @@ -6,7 +6,13 @@ Start by creating a new Rails app using a PostgreSQL database. rails new yourwebsite --database=postgresql ``` -After generating a new app, add the following line to your Gemfile: +Run the ActiveStorage installer to install ActiveStorage. + +``` +rails active_storage:install +``` + +After that, add the following line to your Gemfile: ``` gem 'spina' diff --git a/docs/v2/themes/6_resources.md b/docs/v2/themes/6_resources.md index 49465d473..8b372e274 100644 --- a/docs/v2/themes/6_resources.md +++ b/docs/v2/themes/6_resources.md @@ -30,9 +30,7 @@ Every resource can have the following attributes: - label - view_template - order_by -- parent_page_id - -When defining a parent page, all pages within that resource will be scoped to that parent page. This means that all generated URL's will be prefixed with the parent page's URL. An example: you can create a regular page called `blog` and have a resource called `blogposts`. Your blog view template could then list all pages that are inside the blog resource. In Spina you would have a nice separate menu called "Blogposts" where you can easily manage a list of blogposts. +- slug **Updating resources and page slugs/paths** diff --git a/spina.gemspec b/spina.gemspec index 792141e10..a919e3b34 100644 --- a/spina.gemspec +++ b/spina.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |gem| gem.metadata = { "homepage_uri" => "https://www.spinacms.com", "bug_tracker_uri" => "https://github.com/SpinaCMS/Spina/issues", - "documentation_uri" => "https://www.spinacms.com/guide", + "documentation_uri" => "https://www.spinacms.com/docs", "changelog_uri" => "https://github.com/SpinaCMS/Spina/blob/master/CHANGELOG.md", "source_code_uri" => "https://github.com/SpinaCMS/Spina", }