spina 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37a4e7a05e778543501bd7eb6207dec35b06b72684075afb2ce79548d9949433
-  data.tar.gz: b5eb26331d6ceebaad20f7b3abd1ad1f8055d2cc8adb605b8d03a6215463ccad
+  metadata.gz: 5ca9516ae7fac7e92db6bb74e3ce6f1b96b02e49ed0c4412289613c1f23e2751
+  data.tar.gz: 95642d1a677a7954a7a8ffeee9744429eb5018f341a45074eead164f63da9d20
 SHA512:
-  metadata.gz: a0bc9556e474f379f88ecb1ad4ad91ede16919e213e5965924ca4954952c365e2dc69fca5cbeefab4ad46ffca56c1026d81a392171fe462c375f29181d0cd237
-  data.tar.gz: cf99eea36a61f80dcce76e99fdb79be6d532ba74d21c47ea427cce10fe40b68d3d5499119aa4ae2bdf36ff29041f0ccd18e25be63d9ffbcb63cc67b9010b8f3b
+  metadata.gz: 4367545f8be6b4aee64ba2bdce891c75b31ca69b2319258d5bbd59f818f0708bf52ac697f904e5711fa3ccd6f2e67ad564a6b254f2594efc26e8aef356b791eb
+  data.tar.gz: c278b5a133c4c30ec98dce7ee7f86b35380c495ac972ce9d4b45229e3c2ff57cd7b0e0f45467fffd235e8aa7700aa0faa0e4173c4af86c5f8ba1884859d27063

data/README.md

@@ -1,271 +1,42 @@
-![Spina CMS](http://www.spinacms.com/spinacms.png)
+![Spina CMS](https://www.spinacms.com/spinacms.png)
 
-[Visit the website](http://www.spinacms.com)
+[Spina CMS](https://www.spinacms.com) is an easy to use CMS that features a clean interface without distractions. [Live demo](http://spinacms-demo.herokuapp.com/admin/pages)
 
 [![Build Status](https://travis-ci.com/SpinaCMS/Spina.svg?branch=master)](https://travis-ci.com/SpinaCMS/Spina)
 [![Code Climate](https://codeclimate.com/github/SpinaCMS/Spina/badges/gpa.svg)](https://codeclimate.com/github/SpinaCMS/Spina)
 [![Test Coverage](https://codeclimate.com/github/SpinaCMS/Spina/badges/coverage.svg)](https://codeclimate.com/github/SpinaCMS/Spina/coverage)
 [![Slack](https://slack-spinacms.herokuapp.com/badge.svg)](https://slack-spinacms.herokuapp.com)
 
-[![View performance data on Skylight](https://badges.skylight.io/status/0kzPHGlfswAw.svg)](https://oss.skylight.io/app/applications/0kzPHGlfswAw)
-[![View performance data on Skylight](https://badges.skylight.io/problem/0kzPHGlfswAw.svg)](https://oss.skylight.io/app/applications/0kzPHGlfswAw)
-[![View performance data on Skylight](https://badges.skylight.io/typical/0kzPHGlfswAw.svg)](https://oss.skylight.io/app/applications/0kzPHGlfswAw)
+## Getting Started
+[Read the guide](https://www.spinacms.com/guide) to learn more about how to use Spina. If you just want to get started, create a new Ruby on Rails app and follow these instructions:
 
-# Getting Started
-
-Spina is a CMS for Rails 6.0. This guide is designed for developers with experience using Ruby on Rails.
-
-To start using Spina CMS add the following line to your Gemfile:
+Add the following line to your Gemfile:
 
 ```ruby
 gem 'spina'
 ```
 
-First run the installer to get started:
+Run the installer to start the setup process:
 
     rails g spina:install
 
-The installer will help you setup your first user.
+The installer will help you create your first user.
 
 Then start `rails s` and access Spina at `/admin`.
 
-## Upgrading from 0.X to 1.0
-
-Because upgrading 1.0 means switching to ActiveStorage, we've created a complementary gem to make the upgrade process easier.
-
-`gem 'spina-upgrade', git: 'https://github.com/SpinaCMS/spina-upgrade'`
-
-After installing this gem, make sure you setup ActiveStorage. Then you can run the upgrade command to migrate all `Spina::Photo` records to `Spina::Image`. Images will be reuploaded using ActiveStorage, so depending on your storage this could take a while.
-
-`rails g spina:upgrade`
-
-Replace `Spina::Photo` with `Spina::Image` where necessary and make sure that you edit every `image_tag`.
-
-## Upgrading from 0.12 to 0.12.1
-
-First run the new migrations
-
-    rails spina:install:migrations
-    rails db:migrate
-
-This will create a table for the `Spina::Resource` model.
-
-Globalize is replaced by Mobility. Switching to Mobility is fairly straightfoward.
-- Run `rails g spina:install` to add the `mobility.rb` initializer.
-- Replace instances of `Globalize` with `Mobility` in your own code
-
-This is the last release before Spina switches to Rails 5.2 and ActiveStorage.
-
-## Upgrading from 0.11 to 0.12
-
-Just run the new migrations.
-
-    rails spina:install:migrations
-    rails db:migrate
-
-## Upgrading from 0.10 to 0.11
-
-The spina-template gem is merged into the spina gem. You don't have to use the original spina-template gem anymore.
-
-## Upgrading from 0.9 to 0.10
-
-When upgrading to Spina 0.10 it's essential to update spina-template to version 0.4 or higher. Otherwise layout issues will occur.
-
-## Upgrading from 0.8 to 0.9
-
-Theme configuration changed to:
-
-```ruby
-# config/initializers/themes/default.rb
-Spina::Theme.register do |theme|
-# Theme config
-end
-```
-
-And theme sections, structures, layouts, view_layouts and layout_parts
-has been normalised.
-
-Check out [config/initializers/themes/demo.rb](https://github.com/denkGroot/Spina/blob/master/lib/generators/spina/templates/config/initializers/themes/demo.rb) for an example.
-
-Add new migrations `rake spina:install:migrations` and `rake db:migrate`
-
-## Upgrading from 0.7 to 0.8
-
-Spina-specific configuration moved from `Spina::Engine.config` to just `Spina.config`.
-Change the following in your initializer:
-
-```ruby
-# config/initializers/spina.rb
-
-Spina::Engine.configure do |config| # OLD
-Spina.configure do |config| # NEW
-```
-
-# Basics
-
-The installer generates a few initializers that contain necessary configuration for Spina.
-
-In the initializers folder there's a new folder named `themes`. Inside you will find a configuration file named `default.rb`. This file contains all of your theme-specific settings. You can define multiple Page parts, View templates and Custom pages.
-
-## Page parts
-
-A page in Spina has many Page parts. By default these page parts can be one of the following:
-
-- `Spina::Line`
-- `Spina::Text`
-- `Spina::Image`
-- `Spina::ImageCollection`
-- `Spina::Structure`
-- `Spina::Option`
-
-These are the building blocks of your view templates. You can have an unlimited number of page parts in a page. We prefer to keep the number of parts to a minimum so that managing your pages won't become too complex.
-
-Spina uses an initializer to create the basic building blocks of your page. There are three steps to add a new building block or page part to your app:
-
-1. Set up a new page part in the initializer
-2. Set the new initializer into a view template
-3. Add it to the view
-
-#### Create a new page part
-When you install Spina, you will see the following in `config/initializers/themes/default.rb`
-
-```ruby
-::Spina::Theme.register do |theme|
-
-  theme.name = 'default'
-  theme.title = 'Default Theme'
-
-  theme.page_parts = [{
-    name:             'content',
-    title:            'Content',
-    partable_type:    'Spina::Text'
-  }]
-
-  theme.view_templates = [{
-    name:       'homepage',
-    title:      'Homepage',
-    page_parts: ['content']
-  }, {
-    name: 'show',
-    title:        'Default',
-    description:  'A simple page',
-    usage:        'Use for your content',
-    page_parts:   ['content']
-  }]
-
-  theme.custom_pages = [{
-    name:           'homepage',
-    title:          'Homepage',
-    deletable:      false,
-    view_template:  'homepage'
-  }]
-
-end
-```
-
-Right now, the default theme is applying a title to the page, with a simple text div below it. Go to `/admin` on your app and have a look. Edit the textbox and go to preview the page.
-
-Spina represents each building block of your page, called a 'page part,' as a hash inside the `page_parts` array. If we look at the default setup we can see there is one hash inside the array representing the one textbox we see on our page.
-
-Let's say I wanted to add another text box below this called `portfolio`. First I would add another hash to the `self.page_parts` array like so:
-
-```ruby
-theme.page_parts = [{
-  name:             'content',
-  title:            'Content',
-  partable_type:    'Spina::Text'
-}, {
-  name:             'portfolio', # added this hash
-  title:            'Portfolio',
-  partable_type:    'Spina::Text'
-}]
-```
-
-#### Add it to the view template
-
-Now, we need to update the `self.view_templates` hash next. These view templates provide customization for the different views you might want. For example, you may have a 'blog' view or an 'about' view which add different page parts. For this example we will add the portfolio part into the 'Default' view template.
-
-```ruby
-theme.view_templates = [{
-  name:       'homepage',
-  title:      'Homepage',
-  page_parts: ['content']
-}, {
-  name:         'show',
-  title:        'Default',
-  description:  'A simple page',
-  usage:        'Use for your content',
-  page_parts:   ['content', 'portfolio'] # added 'portfolio'
-}]
-```
-
-#### Add it to the view
-
-Finally, let's go to `views/default/pages/show.html.erb` and add the following:
-
-```ruby
-<h1><%= @page.title %></h1>
-
-<%= @page.content(:text).try(:html_safe) %>
-<%= @page.content(:portfolio).try(:html_safe) %> # added this line
-```
-
-We have successfully added another textbox! Restart your server and load up the admin section again. You should see another text box below the content box.
-
-## View templates
-
-Each theme typically has a few different view templates which make up your website. By default Spina generates a *homepage* and *show* template.
-
-The views for these templates are stored in `app/views/default/pages`.
-
-## Navigations
-
-Usually managing a single list of pages is enough for most use cases. Sometimes however, you need a little more flexibility. This is where navigations come in. You can create multiple navigations which are basically different collections of your pages. You can choose to include all or just a few of your pages. You can also edit the order of pages per navigation.
-
-You define navigations in your theme's config file:
-
-```ruby
-::Spina::Theme.register do |theme|
-  # ...
-
-  theme.navigations = [{
-    name: 'main',
-    label: 'Main navigation',
-    auto_add_pages: true
-  }, {
-    name: 'mobile',
-    label: 'Mobile'  
-  }]
-
-  # ...
-end
-```
-
-`auto_add_pages` ensures that each page that you create automatically gets added to this navigation.
-
-Besides navigations there's always a single overview of all pages. Your sitemap and friendly URLs are generated based on this overview.
-
-Creating navigations is optional.
-
-## Custom pages
-
-You can define custom pages for your theme that will be generated when bootstrapping your website. You can define whether or not they're deletable. By default Spina creates a custom page named Homepage which is not deletable.
-
-# Contributing
+## Contributing
 
 Check our [Contributing Guide](CONTRIBUTING.md) for instructions on how to help the project.
 
 <a href="https://github.com/SpinaCMS/Spina/graphs/contributors"><img src="https://opencollective.com/Spina/contributors.svg?width=890" /></a>
 
-
-# Backers
+## Backers
 
 Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/Spina#backer)]
 
 <a href="https://opencollective.com/Spina#backers" target="_blank"><img src="https://opencollective.com/Spina/backers.svg?width=890"></a>
 
-
-# Sponsors
+## Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Spina#sponsor)]
 
@@ -280,14 +51,22 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 <a href="https://opencollective.com/Spina/sponsor/8/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/8/avatar.svg"></a>
 <a href="https://opencollective.com/Spina/sponsor/9/website" target="_blank"><img src="https://opencollective.com/Spina/sponsor/9/avatar.svg"></a>
 
+## License
 
+Spina is released under the [MIT license](LICENSE.md).
 
-# License
+## Acknowledgements
 
-Spina is released under the [MIT license](LICENSE.md).
+All icons in Spina were made by Brent Jackson [Geomicons](http://jxnblk.com/geomicons-wired/).
 
-# Credits
+The font used in Spina's admin panel is called Metropolis and was created by Chris Simpson [Metropolis](https://github.com/chrismsimpson/Metropolis)
 
-Some parts of Spina are heavily influenced by the wonderful Refinery CMS. Credits to [the Refinery  team](https://www.refinerycms.com/).
+    Copyright (c) 2015, Chris Simpson <chris@victoryonemedia.com>.
 
-All icons in Spina were made by Brent Jackson [Geomicons](http://jxnblk.com/geomicons-wired/).
+    This Font Software is licensed under the SIL Open Font License, Version 1.1.
+    This license is copied below, and is also available with a FAQ at:
+    http://scripts.sil.org/OFL
+
+    Version 2.0 - 18 March 2012
+
+Some early parts of Spina are influenced by Refinery CMS. Credits to [the Refinery team](https://www.refinerycms.com/).

data/app/assets/stylesheets/spina.sass

@@ -1,6 +1,4 @@
 // Configuration
-@import font_awesome5_webfont
-@import font_awesome5
 @import spina/trix
 
 @import spina/configuration

data/app/assets/stylesheets/spina/_buttons.sass

@@ -10,7 +10,7 @@ button, input[type="submit"], input[type="button"]
   color: #444
   display: inline-block
   font-size: 14px
-  font-weight: bold
+  font-weight: 600
   line-height: 20px
   margin: 0 4px 4px 0
   outline: none

data/app/assets/stylesheets/spina/_configuration.sass.erb

@@ -11,7 +11,7 @@ $alert-color: orange
 $warning-color: orange
 
 $asset-pipeline: true
-$font-family: "Proxima Nova", "Helvetica Neue", "Helvetica", sans-serif
+$font-family: "Metropolis", sans-serif
 $icon-font: $font-family
 $gutter: 5em
 

data/app/assets/stylesheets/spina/_fonts.sass

@@ -1,3 +1,35 @@
+// Metropolis
+
+@font-face
+  font-family: "Metropolis"
+  font-style: normal
+  font-weight: normal
+  src: url(asset-path("spina/Metropolis-Regular.woff2")) format('woff2')
+
+@font-face
+  font-family: "Metropolis"
+  font-style: normal
+  font-weight: 500
+  src: url(asset-path("spina/Metropolis-Medium.woff2")) format('woff2')
+
+@font-face
+  font-family: "Metropolis"
+  font-style: normal
+  font-weight: 600
+  src: url(asset-path("spina/Metropolis-SemiBold.woff2")) format('woff2')
+
+@font-face
+  font-family: "Metropolis"
+  font-style: normal
+  font-weight: 700
+  src: url(asset-path("spina/Metropolis-Bold.woff2")) format('woff2')
+
+@font-face
+  font-family: "Metropolis"
+  font-style: italic
+  font-weight: normal
+  src: url(asset-path("spina/Metropolis-RegularItalic.woff2")) format('woff2')
+
 // Icons
 
 @font-face

data/app/controllers/spina/admin/media_folders_controller.rb

@@ -7,6 +7,10 @@ module Spina
         @media_folder = MediaFolder.new
       end
 
+      def edit
+        @media_folder = MediaFolder.find(params[:id])
+      end
+
       def show
         add_breadcrumb I18n.t('spina.website.media_library'), admin_media_library_path
         add_breadcrumb I18n.t('spina.website.images'), spina.admin_images_path
@@ -21,6 +25,12 @@ module Spina
         redirect_to spina.admin_images_path
       end
 
+      def update
+        @media_folder = MediaFolder.find(params[:id])
+        @media_folder.update(media_folder_params)
+        redirect_to spina.admin_media_folder_path(@media_folder)
+      end
+
       def destroy
         @media_folder = MediaFolder.find(params[:id])
         @media_folder.destroy