Skip to content

Commit 3e86175

Browse files
committed
Comply to markdownlint rules
1 parent 591a5bf commit 3e86175

2 files changed

Lines changed: 107 additions & 49 deletions

File tree

CHANGELOG.md

Lines changed: 59 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
# Changelog
2+
23
All notable changes to this project will be documented in this file.
34

45
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
56
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
67

78
## [Unreleased]
89

10+
This version is compatible with [SimpleSAMLphp v1.18](https://simplesamlphp.org/docs/1.18/simplesamlphp-changelog)
11+
912
### Added
1013

1114
- Add `login_with` key in discopower definitions
@@ -20,42 +23,66 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2023

2124
- Move `ribbon_text` definition to config file
2225
- Comply to [PSR-1: Basic Coding Standard](https://www.php-fig.org/psr/psr-1/) guidelines
23-
- Comply to [PSR-12: Extended Coding Style](https://www.php-fig.org/psr/psr-12/) guidelines
26+
- Comply to [PSR-12: Extended Coding Style](https://www.php-fig.org/psr/psr-12/)
27+
guidelines
2428
- Apply modern array syntax to comply with [SimpleSAMLphp v1.17](https://simplesamlphp.org/docs/stable/simplesamlphp-upgrade-notes-1.17)
29+
- Comply to [markdownlint rules](https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md)
30+
31+
<!-- markdownlint-disable line-length -->
2532

2633
## [v3.0.0](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.3.1...v3.0.0) - 2019-09-20
2734

35+
<!-- markdownlint-enable line-length -->
36+
2837
### Added
38+
2939
- Add languages (Xhosa, Zulu, Afrikaans).
3040

3141
### Changed
42+
3243
- Rename disco-tpl.php->disco.tpl.php as needed by simplesamlphp>1.14.
3344
- Update translation functionality as needed by simplesamlphp>1.14.
3445

46+
<!-- markdownlint-disable line-length -->
47+
3548
## [v2.3.1](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.3.0...v2.3.1) - 2019-09-12
3649

50+
<!-- markdownlint-enable line-length -->
51+
3752
### Fixed
3853

3954
- Fix bug in IdPs buttons style caused by unclosed html element.
4055

56+
<!-- markdownlint-disable line-length -->
57+
4158
## [v2.3.0](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.2.1...v2.3.0) - 2019-08-01
4259

60+
<!-- markdownlint-enable line-length -->
61+
4362
### Added
4463

4564
- Module discopower: Add style rules and logos for the buttons of the IdPs:
4665
- Bitbucket
4766
- Github
4867

68+
<!-- markdownlint-disable line-length -->
4969

5070
## [v2.2.1](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.2.0...v2.2.1) - 2019-07-03
5171

72+
<!-- markdownlint-enable line-length -->
73+
5274
### Fixed
5375

5476
- Fix syntax error in disco-tpl.php
5577

78+
<!-- markdownlint-disable line-length -->
79+
5680
## [v2.2.0](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.1.0...v2.2.0) - 2019-06-27
5781

82+
<!-- markdownlint-enable line-length -->
83+
5884
### Added
85+
5986
- Module discopower: Add style rules and logos for the buttons of the IdPs:
6087
- OpenAIRE
6188
- OpenMinTeD
@@ -66,12 +93,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
6693
- Enable/disable cookie banner functionality via setting in config file.
6794

6895
### Changed
96+
6997
- Update instructions on module config file usage.
7098
- Update style of Google login button.
7199

100+
<!-- markdownlint-disable line-length -->
101+
72102
## [v2.1.0](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.0.0...v2.1.0) - 2018-10-18
73103

104+
<!-- markdownlint-enable line-length -->
105+
74106
### Added
107+
75108
- Add banner and an extra view for cookies options.
76109
- Add corner ribbon that displays customisable text.
77110
- Add this changelog file.
@@ -81,46 +114,59 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
81114
- Aria
82115

83116
### Changed
84-
- Change vanilla logo and favicon.
85-
- Move wording and links from the templates of several modules to the related
86-
definition file.
87-
- Render header logo link url customisable.
117+
118+
- Change vanilla logo and favicon.
119+
- Move wording and links from the templates of several modules to the related
120+
definition file.
121+
- Render header logo link url customisable.
122+
123+
<!-- markdownlint-disable line-length -->
88124

89125
## [v2.0.0](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v1.0.0...v2.0.0) - 2018-04-17
90126

127+
<!-- markdownlint-enable line-length -->
128+
91129
### Added
130+
92131
- Module discopower:
93132
- Add style rules and logos for the IdPs:
94133
- B2ACCESS
95134
- DARIAH
96135
- Elixir
97136
- IGTF
98137
- Support customisable order of IdPs' groups based on the existing mechanism of
99-
discopower.
138+
discopower.
100139

101140
### Changed
141+
102142
- Module discopower: Support only 2 tags for the grouping of IdPs.
103143
- Module userid: Add content in the error template.
104144

105145
### Fixed
146+
106147
- Use the translated name to display an IdP.
107148

149+
<!-- markdownlint-disable line-length -->
108150

109151
## [v1.0.0](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v0.1.0...v1.0.0) - 2018-01-19
110152

153+
<!-- markdownlint-enable line-length -->
154+
111155
### Added
156+
112157
- Use SASS for the added style rules.
113158
- Use Bootstrap v3.3.7.
114159
- Add support for error pages that are produced from several modules.
115160
- Add detailed instructions for the installation procedures.
116161
- Document configuration options.
117-
- Module discopower: Add enhanced style for the following IdPs' buttons:
162+
- Module discopower: Add enhanced style for the following IdPs' buttons:
118163
- Facebook
119164
- Google
120165
- LinkedIn
121166
- ORCID
122167

123168
### Changed
169+
124170
- Change the look n feel of several SimpleSAMLphp modules:
125171
- authX509
126172
- authorize
@@ -129,14 +175,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
129175
- default
130176
- discopower
131177
- userid
132-
- Module discopower: Replace the section that includes the edugain IdPs with a section that lists all IdPs.
178+
- Module discopower: Replace the section that includes the edugain IdPs with a
179+
section that lists all IdPs.
133180
- Improve responsiveness of the layout.
134181
- Enhance the customization of the theme.
135182

136-
183+
<!-- markdownlint-disable line-length -->
137184

138185
## [v0.1.0](https://github.com/rciam/simplesamlphp-module-themevanilla/commits/v0.1.0) - 2018-01-12
139186

187+
<!-- markdownlint-enable line-length -->
188+
140189
### Added
190+
141191
Create a new theme for SimpleSAMLphp. The goal is to improve the experience for
142192
people that login to services through multiple identity providers.

README.md

Lines changed: 48 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
<h1 align="center">Vanilla theme for SimpleSAMLphp</h1>
1+
# Vanilla theme for SimpleSAMLphp
22

3-
![discopower](/screenshots/disco_buttons_bottom.png)
3+
![discopower](screenshots/disco_buttons_bottom.png)
44

55
A customisable theme for SimpleSAMLphp based on Bootstrap.
66
See more screens in the directory [screenshots](screenshots/).
77

8-
98
## Installation
109

1110
You can install the theme using any of the methods below.
@@ -18,7 +17,7 @@ installation. Check the following example, that includes all the necessary
1817
additions for the installation of the **simplesamlphp-module-themevanilla
1918
v1.0.0**.
2019

21-
```
20+
```json
2221
"require": {
2322

2423
...
@@ -71,13 +70,14 @@ v1.0.0**.
7170
```
7271

7372
With the above configuration composer will do several operations:
74-
* It will put the module `themevanilla` in the `modules` directory.
75-
* It will download and extract the compressed `css` and `js` directories that
73+
74+
- It will put the module `themevanilla` in the `modules` directory.
75+
- It will download and extract the compressed `css` and `js` directories that
7676
include the minified css and javascript files.
77-
* It will copy the `css` and `js` directories from the `vendor/rciam` directory
77+
- It will copy the `css` and `js` directories from the `vendor/rciam` directory
7878
in the `themevanilla/www/resources` directory, where the static files of the
7979
theme should be placed.
80-
* It will place the configuration file `module_themevanilla.php` inside the
80+
- It will place the configuration file `module_themevanilla.php` inside the
8181
`config` directory of the installation.
8282

8383
### Direct download
@@ -92,20 +92,21 @@ of your SimpleSAMLphp installation.
9292

9393
Clone this repository into the `modules` directory of your SimpleSAMLphp
9494
installation as follows:
95-
```
95+
96+
```sh
9697
cd /path/to/simplesamlphp/modules
9798
git clone https://github.com/rciam/simplesamlphp-module-themevanilla.git themevanilla
9899
```
100+
99101
Note that the cloned repository will not include the css files or minified
100102
javascript files.
101103
You'll need to download or produce them. You can download the compressed
102-
directories (`js.zip` and `css.zip`) from the [release page](https://github.com/rciam/simplesamlphp-module-themevanilla/releases) and
103-
extract them under `modules/themevanilla/www/resources`. If you want to produce
104-
them, you may read the customisation instructions below.
104+
directories (`js.zip` and `css.zip`) from the [release page](https://github.com/rciam/simplesamlphp-module-themevanilla/releases)
105+
and extract them under `modules/themevanilla/www/resources`. If you want to
106+
produce them, you may read the customisation instructions below.
105107
As a last step, move `example-config/module_themevanilla.php` file to the `config`
106108
directory of your SimpleSAMLphp installation.
107109

108-
109110
## Configuration
110111

111112
### Basic usage
@@ -117,16 +118,18 @@ In order to use this module as theme you need to set in the
117118

118119
The theme splits the discopower IdP discovery page into 2 sections, depending on
119120
the tags of the included IdPs:
120-
* The section that its IdPs have the tag `idps_in_searchable_list` contains all
121+
122+
- The section that its IdPs have the tag `idps_in_searchable_list` contains all
121123
the IdPs in a list of links with a search box.
122-
* The section that its IdPs have the tag `idps_with_logos` contains login
124+
- The section that its IdPs have the tag `idps_with_logos` contains login
123125
buttons with specified style rules for each IdP. Each button may have a logo
124126
icon, too.
125127

126128
Also, you need to define the order of the 2 sections. You can set this in the
127129
file `config/module_discopower.php` from the variable `taborder`.
128130
For example:
129-
```
131+
132+
```php
130133
'taborder' => [
131134
'idps_in_searchable_list',
132135
'idps_with_logos'
@@ -136,7 +139,8 @@ For example:
136139
Especially for the of the `idps_with_logos`, you need to specify the css class
137140
name, icon and label of the IdP login button using the `login_button`
138141
configuration as follows:
139-
```
142+
143+
```php
140144
'tags' => [
141145
'idps_with_logos',
142146
],
@@ -146,33 +150,34 @@ configuration as follows:
146150
'label' => 'ORCID',
147151
]
148152
```
153+
149154
To set style rules for the each button, the configured css_classname value must
150155
be defined in the `idps_buttons.scss` file. See more information bellow.
151156

152157
At the moment there are style rules for the IdPs:
153-
* ARIA
154-
* B2ACCESS
155-
* Check-in
156-
* DARIAH
157-
* eduTEAMS
158-
* Elixir
159-
* Facebook
160-
* Google
161-
* IGTF
162-
* LinkedIn
163-
* ORCID
164-
* OpenAIRE
165-
* OpenMinTeD
158+
159+
- ARIA
160+
- B2ACCESS
161+
- Check-in
162+
- DARIAH
163+
- eduTEAMS
164+
- Elixir
165+
- Facebook
166+
- Google
167+
- IGTF
168+
- LinkedIn
169+
- ORCID
170+
- OpenAIRE
171+
- OpenMinTeD
166172

167173
### Cookie Policy
168174

169-
Cookie policy includes a banner at the bottom of each page that prompts the user to
170-
accept the cookies, along with a Cookies Policy page.
175+
Cookie policy includes a banner at the bottom of each page that prompts the
176+
user to accept the cookies, along with a Cookies Policy page.
171177
The feature is disabled by default.
172178
To enable it, set `enable_cookies_banner` to `true` in the configuration file:
173179
`<path-to-simplesamlphp>/config/module_themevanilla.php`.
174180

175-
176181
## Customization
177182

178183
### Wording
@@ -183,7 +188,7 @@ You can find definitions and dictionaries in the `dictionaries` directory.
183188

184189
Place your logo and favicon in the directory:
185190
`themevanilla/www/resources/images` If you name them `logo.jpg` and
186-
`favicon.ico` they will be loaded without any other modification. If you name
191+
`favicon.ico` they will be loaded without any other modification. If you name
187192
them differently you need to modify the template `header.php` that is placed in:
188193
`themevanilla/themes/ssp/default/includes/`.
189194

@@ -208,16 +213,19 @@ If you want to hide the ribbon, set `ribbon_text` to `""`.
208213
### CSS
209214

210215
To produce the css files for this theme follow these steps:
211-
* Install sass ([installation guide](http://sass-lang.com/install))
212-
* Go to the directory `themevanilla/www/resources`
213-
* Run the cli sass: `sass --update sass:css`
216+
217+
- Install sass ([installation guide](http://sass-lang.com/install))
218+
- Go to the directory `themevanilla/www/resources`
219+
- Run the cli sass: `sass --update sass:css`
214220

215221
After these steps the css files will be in the directory
216222
`themevanilla/www/resources/css`
217223

218224
You can change the settings of this theme from the files:
219-
* `themevanilla/www/resources/sass/_settings.scss`: Here you will see the
225+
226+
- `themevanilla/www/resources/sass/_settings.scss`: Here you will see the
220227
following variables:
228+
221229
- $btn-action: background color of primary button
222230
- $btn-warning: background color of warning button
223231
- $footer-bg: footer background color
@@ -226,10 +234,10 @@ You can change the settings of this theme from the files:
226234
- $btn-footer-text: text color of button that is in the footer
227235
- $btn-footer-border: border color of button that is in the footer
228236

229-
* `themevanilla/www/resources/sass/_colors.scss`: Here you can add or change
237+
- `themevanilla/www/resources/sass/_colors.scss`: Here you can add or change
230238
color settings.
231239

232-
* `themevanilla/www/resources/sass/_idps_buttons.scss`: Here you can add or
240+
- `themevanilla/www/resources/sass/_idps_buttons.scss`: Here you can add or
233241
modify settings that are related with the buttons of the selected subset of
234242
IdPs.
235243

0 commit comments

Comments
 (0)