Skip to content
This repository has been archived by the owner on Jul 21, 2019. It is now read-only.

[refs #00611] Add ability to use custom_url in program page #645

Merged
merged 36 commits into from
Sep 3, 2018
Merged

[refs #00611] Add ability to use custom_url in program page #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
d4bbcc5
Add display of videos and slides to program page
mattstratton Oct 19, 2017
76cf879
updates CFP OPEN footer to use time comparions
tgross Aug 24, 2018
d60c744
fixes date formatting on speaking page
tgross Aug 25, 2018
b743c6f
updates to use time comparisons for start/end dates
tgross Aug 25, 2018
a2ee444
improves template rendering performance
tgross Aug 25, 2018
76f36ad
[refs #00611] Add custom_url to program
Jul 27, 2018
0109891
Merge pull request #644 from tgross/build_performance
bridgetkromhout Aug 27, 2018
3952c01
Merge pull request #642 from tgross/better_date_comparisons
bridgetkromhout Aug 27, 2018
f9501fe
Adding documentation of CFP date string change
bridgetkromhout Aug 27, 2018
3394395
Merge pull request #641 from tgross/what_are_even_timezones
bridgetkromhout Aug 27, 2018
509494e
Install non-breaking npm package updates
mattstratton Aug 31, 2018
a1ba227
Update to gulp 4 to resolve vulns
mattstratton Aug 31, 2018
46086bc
Exclude package-lock.json from release
mattstratton Aug 31, 2018
7053db6
Merge pull request #647 from devopsdays/update-packages
mattstratton Aug 31, 2018
c0de2a6
Update dev gulp tasks
mattstratton Aug 31, 2018
4ea8e80
Lock node version
mattstratton Aug 31, 2018
9575257
Remove extra node version from travis file
mattstratton Aug 31, 2018
e22614b
Fix process html gulp task
mattstratton Aug 31, 2018
c4975ae
Add gulp-cli
mattstratton Aug 31, 2018
35d8644
Merge pull request #648 from devopsdays/update-packages
mattstratton Aug 31, 2018
74f8c26
Update theme to version 1.20.0
mattstratton Aug 31, 2018
8542c34
Merge branch 'master' into feature/program-icons
bridgetkromhout Sep 3, 2018
7828ae9
replace powerpoint with text
bridgetkromhout Sep 3, 2018
de7d2ed
second powerpoint to text icon
bridgetkromhout Sep 3, 2018
f747c88
Add opt-in toggle for icon display on program page
mattstratton Sep 3, 2018
40d9ea6
Move deprecated gulp tasks out of gulp
mattstratton Sep 3, 2018
9864f73
Move deprecated gulp tasks out of gulp
mattstratton Sep 3, 2018
123a109
Merge pull request #605 from devopsdays/feature/program-icons
bridgetkromhout Sep 3, 2018
75b0646
Merge branch 'master' of github.com:devopsdays/devopsdays-theme
mattstratton Sep 3, 2018
0fae8be
Update theme to version 1.21.0
mattstratton Sep 3, 2018
f91af77
[refs #00611] Add custom_url to program
Jul 27, 2018
bd001e5
Merge branch 'tkt-00611' of github.com:chriscoffee/devopsdays-theme i…
mattstratton Sep 3, 2018
5c667c1
Revert to merge updated program page
mattstratton Sep 3, 2018
3afa403
Updated merge
mattstratton Sep 3, 2018
ef201e0
Build CSS
mattstratton Sep 3, 2018
fced731
Tweak layout with slide/video links
mattstratton Sep 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ bower_components
release/
dist
.DS_Store
.idea/
1 change: 1 addition & 0 deletions .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v9.4.0
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
sudo: false
language: node_js
node_js:
- "6"

env:
- CXX=g++-4.8
addons:
Expand All @@ -12,6 +11,7 @@ addons:
- g++-4.8
before_script:
- npm install -g gulp
- npm i -g gulp-cli
- npm install
- cd exampleSite

Expand All @@ -24,7 +24,7 @@ script:
before_deploy:
- cd $TRAVIS_BUILD_DIR
- mkdir -p release
- zip -r release/devopsdays-theme-$TRAVIS_TAG.zip . -x \*.git\* \*exampleSite\* appveyor.yml \*.travis.ci\* \*tests\* \*bin\* \*build\* \*release\* config.codekit3 \*bower_components\* bower.json gulpfile.js netlify.toml package.json STYLE.md *\node_modules\* *\scss\* *\gulp\* contributing.json static/js/devopsdays.js .travis.yml \*utils\*
- zip -r release/devopsdays-theme-$TRAVIS_TAG.zip . -x \*.git\* \*exampleSite\* appveyor.yml \*.travis.ci\* \*tests\* \*bin\* \*build\* \*release\* config.codekit3 \*bower_components\* bower.json gulpfile.js netlify.toml package.json package-lock.json STYLE.md *\node_modules\* *\scss\* *\gulp\* contributing.json static/js/devopsdays.js .travis.yml \*utils\*

deploy:
provider: releases
Expand Down
16 changes: 15 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
# Change Log

## [1.21.0](https://github.com/devopsdays/devopsdays-theme/tree/1.21.0) (2018-09-03)
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.20.0...1.21.0)

**Closed issues:**

- Program should support links to slides and video [\#600](https://github.com/devopsdays/devopsdays-theme/issues/600)

## [1.20.0](https://github.com/devopsdays/devopsdays-theme/tree/1.20.0) (2018-08-31)
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.19.1...1.20.0)

## [1.19.1](https://github.com/devopsdays/devopsdays-theme/tree/1.19.1) (2018-08-20)
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.19.0...1.19.1)

**Implemented enhancements:**

- Create search feature [\#633](https://github.com/devopsdays/devopsdays-theme/issues/633)

**Fixed bugs:**

- Long city names wrap in event navbar [\#638](https://github.com/devopsdays/devopsdays-theme/issues/638)
Expand Down Expand Up @@ -687,4 +701,4 @@



\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
45 changes: 29 additions & 16 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
[Pages and Frontmatter](#pages-and-frontmatter)
 [General Page Fields](#general-page-fields)
 [Talk Page Fields](#talk-page-fields)
 [Speaker Page Fields](#speaker-page-fields)
 [Speaker Page Fields](#speaker-page-fields)
 [Program Page Fields](#program-page-fields)
 [Blog Post Fields](#blog-post-fields)
[Shortcodes](#shortcodes)
 [google_form](#google_form)
Expand All @@ -45,14 +46,14 @@ The YYYY-CITY.yml file is the main configuration file for your event. This is wh
| `speakers_verbose` | String | No | Set this to "true" if you want verbose speaker attributes (URLs visible). | "true" |

### Date-related Fields
All dates are in unquoted YYYY-MM-DD, like this: `variable: 2016-01-05`
All dates are in unquoted YYYY-MM-DD, like this: `variable: 2016-01-05`, or like `variable: 2016-01-05T23:59:00-06:00`

| Field Name | Type | Required | Description | Example |
|-------------------------|------------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------|
| `startdate` | YYYY-MM-DD | No | The start date of your event. Leave blank if you don't have a venue reserved yet. | 2016-01-05 |
| `enddate` | YYYY-MM-DD | No | The end date of your event. Leave blank if you don't have a venue reserved yet. | 2016-01-05 |
| `cfp_date_start` | YYYY-MM-DD | No | The date you will start accepting talk proposals. Can be a blank value. | 2016-01-05 |
| `cfp_date_end` | YYYY-MM-DD | No | The date you will close your call for proposals. Can be a blank value. | 2016-01-05 |
| `cfp_date_end` | YYYY-MM-DD | No | The date you will close your call for proposals. Can be a blank value. If you set the full datetime string with correct TZ, CFP will display as open until local close time. | 2016-01-05T23:59:00-06:00 |
| `cfp_date_announce` | YYYY-MM-DD | No | The date you will inform proposers of status. Can be a blank value. | 2016-01-05 |
| `cfp_open` | String | No | Either "true" or "false". Can be blank. This controls whether or not the "propose" button shows on your event page. *Deprecated field; if you have set `cfp_date_start` and `cfp_date_end` they will serve the same purpose.* | "true" |
| `cfp_link` | String | No | If you have a custom link for submitting proposals, add it here. This will control the Propose menu item as well as the "Propose" button. | "https://myurlhere" |
Expand Down Expand Up @@ -175,22 +176,24 @@ program:
date: 2017-06-16
start_time: "08:00"
end_time: "09:00"
custom_url: "https://example.com/registration"
- title: "Opening Welcome"
type: custom
date: 2017-06-16
start_time: "09:15"
end_time: "09:00"
```

| Field Name | Required | Description | Example |
|--------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------|
| `title` | Yes | The name of the program element. If it is a talk, ignite, or workshop, use the name of the talk/ignite/workshop file, minus the `.md` extension. | "Opening Welcome" or "apple-jack" |
| `type` | Yes | The type for the program element. Valid choices are `custom`, `talk`, `ignite`, `workshop`, or `open-space`. This defines the color of the program element. `talk`, `ignite`, and `workshop` types will create a link to the program item named in `title`. | talk |
| `date` | Yes | The date of the program element, in YYYY-MM-DD format. | 2017-06-16 |
| `start_time` | Yes | The start time of the program element. | "08:00" |
| `end_time` | Yes | The end time of the program element. | "13:40" |
| `comments` | No | Additional comments/notes about the program types `talk`, `workshop` and `custom` (for example, location of an evening event). Markdown is supported. | "This will be at the [Pony Club](http://www.mattstratton.com),1005 Ponyville Drive,Ponyville, IL,60612" |
| `background_color` | No | Allows the ability to override the color of the program element. Only the background color can be changed; please test to make sure the color works with the displayed text colors. Color is expressed in RGB HEX value. Must be in quotes. | "#FFFA99" |
| Field Name | Required | Description | Example |
|--------------------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------|
| `title` | Yes | The name of the program element. If it is a talk, ignite, or workshop, use the name of the talk/ignite/workshop file, minus the `.md` extension. | "Opening Welcome" or "apple-jack" |
| `type` | Yes | The type for the program element. Valid choices are `custom`, `talk`, `ignite`, `workshop`, or `open-space`. This defines the color of the program element. `talk`, `ignite`, and `workshop` types will create a link to the program item named in `title`. | talk |
| `date` | Yes | The date of the program element, in YYYY-MM-DD format. | 2017-06-16 |
| `start_time` | Yes | The start time of the program element. | "08:00" |
| `end_time` | Yes | The end time of the program element. | "13:40" |
| `comments` | No | Additional comments/notes about the program types `talk`, `workshop` and `custom` (for example, location of an evening event). Markdown is supported. | "This will be at the [Pony Club](http://www.mattstratton.com),1005 Ponyville Drive,Ponyville, IL,60612" |
| `background_color` | No | Allows the ability to override the color of the program element. Only the background color can be changed; please test to make sure the color works with the displayed text colors. Color is expressed in RGB HEX value. Must be in quotes. | "#FFFA99" |
| `custom_url` | No | Replaces the URL for various program types to link to external URL or a URL of your choosing. Valid for `custom`, `talk`, `ignite`, `workshop`, or `open-space` | "https://example.com" |

##### Program Element Colors

Expand All @@ -213,12 +216,14 @@ ignites:
date: 2017-06-16
- title: "DevOps With Delight"
date: 2017-06-16
custom_url: "https://example.com/ignites
```

| Field Name | Required | Description | Example |
|------------|----------|-----------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------|
| `title` | Yes | The title of the ignite. If it is named after the filename (without the `.md` extension` of a talk, it will generate a link to the talk page. | "matt-stratton" or "DevOps With Delight" |
| `date` | Yes | The date of the ignite, in YYYY-MM-DD format. | 2017-06-16 |
| Field Name | Required | Description | Example |
|--------------|----------|-----------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------|
| `title` | Yes | The title of the ignite. If it is named after the filename (without the `.md` extension` of a talk, it will generate a link to the talk page. | "matt-stratton" or "DevOps With Delight" |
| `date` | Yes | The date of the ignite, in YYYY-MM-DD format. | 2017-06-16 |
| `custom_url` | No | Allows linking to URL off-site for various reasons. | "https://example.com/schedule" |

## Pages and Frontmatter

Expand Down Expand Up @@ -275,6 +280,14 @@ Pages of the type `speaker` have a few additional frontmatter elements available
| `gitlab` | No | Speakers' GitLab username. | "mattstratton" |
| `image` | No | The image for the speaker. This image is relative to the `static/events/YYYY-CITY/speakers` directory. It can be either .png or .jpg. It must be square, and 300px square, 600px square, or 900px square. | "matt-stratton.jpg" |

### Program Page Fields

The page of type `program` has one additional frontmatter element.

| Field Name | Required | Description | Example |
|------------|----------|----------------------------------------------------------|---------|
| `icons` | No | Toggles display of slide/video icons on the program page | "true" |

### Blog Post Fields

| Field Name | Required | Description | Example |
Expand Down
1 change: 1 addition & 0 deletions archetypes/program.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ City = ""
Year = ""
Title = ""
Type = "program"
Icons = "false"
+++
Loading