middleman-presentation-core 0.16.0.alpha → 0.16.0.beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. checksums.yaml +4 -4
  2. data/features/build_presentation.feature +1 -1
  3. data/features/code_highlighting.feature +1 -1
  4. data/features/create_slide-cli.feature +1 -1
  5. data/features/create_slides-templates-cli.feature +1 -1
  6. data/features/edit_slide-cli.feature +1 -1
  7. data/features/export_presentation-cli.feature +1 -1
  8. data/features/grouping_slides.feature +1 -1
  9. data/features/ignore_slides.feature +1 -1
  10. data/features/init_application-cli.feature +1 -1
  11. data/features/list_assets-cli.feature +2 -2
  12. data/features/list_components-cli.feature +1 -1
  13. data/features/list_helpers-cli.feature +1 -1
  14. data/features/list_plugins-cli.feature +1 -1
  15. data/features/metadata-footer.feature +28 -0
  16. data/features/metadata-headline.feature +28 -0
  17. data/features/plugins.feature +1 -1
  18. data/features/presentation.feature +2 -3
  19. data/features/quoting_markdown.feature +44 -0
  20. data/features/rename_slide-cli.feature +1 -1
  21. data/features/render_slides.feature +1 -1
  22. data/features/show_config-cli.feature +16 -0
  23. data/features/show_footer.feature +1 -1
  24. data/features/version_number.feature +1 -2
  25. data/lib/middleman-presentation-core/application_config.rb +9 -1
  26. data/lib/middleman-presentation-core/assets_manager.rb +1 -1
  27. data/lib/middleman-presentation-core/cli/serve_presentation.rb +4 -1
  28. data/lib/middleman-presentation-core/main.rb +1 -1
  29. data/lib/middleman-presentation-core/middleman_extension.rb +3 -0
  30. data/lib/middleman-presentation-core/start.rb +2 -1
  31. data/lib/middleman-presentation-core/version.rb +1 -1
  32. data/locales/de.yml +6 -0
  33. data/locales/en.yml +6 -0
  34. data/spec/assets_manager_spec.rb +3 -8
  35. data/templates/Gemfile.tt +0 -2
  36. data/templates/predefined_slides.d/00_00.html.erb.tt +5 -16
  37. data/templates/predefined_slides.d/999980.html.erb.tt +1 -1
  38. data/templates/predefined_slides.d/999981.html.erb.tt +5 -5
  39. data/templates/predefined_slides.d/999982.html.erb.tt +1 -1
  40. data/templates/script/start +9 -9
  41. data/templates/source/layout.erb +6 -13
  42. metadata +8 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 77157b46fbf6859e28e3a36b4118f81113e73926
4
- data.tar.gz: 1beb090ded3538ceb23ce35f5db91211fd05a1af
3
+ metadata.gz: 4e474a0c63cb81ac21f9207b2372a962b063685a
4
+ data.tar.gz: d111a0f6c4f8f9d2346b4dc9246b7680d547f7cd
5
5
  SHA512:
6
- metadata.gz: ae3fce59b4e1db18baa8e3142505a7b317d8ab9ae5a3f3e5786a9a58a66e1397232750b894de570be8b3ce1213b756466453154d6b2bdbe0ab44c670ab185e84
7
- data.tar.gz: 445ee94f785d4f6b8c290faa26c26bac3897ef86ccde86dbfa34970dec1b8fa09cab330afc1c647d1747a485ad0d471214c2d1fc922092df178f69081cf321c7
6
+ metadata.gz: 3e973d30e5ce00e6ed584011c45cd4f165c8b0e8db18c165d607dd77fecf3344d93b7d724b5a45e22d3645994da97dbb40115208c9cfd78e2a6505928d6e8d8f
7
+ data.tar.gz: 9020f78fea662e51a53ed42e13fb2575ed87b974d0ebe8c4b5e0cbc5c4b92efb1e008255448a8ef585189823b8648bf84eb08e86fefce26704b5fba5c7df86e3
@@ -5,7 +5,7 @@ Feature: Build presentation
5
5
  In order to use it
6
6
 
7
7
  Background:
8
- Given I use presentation fixture "presentation1" with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
 
10
10
  Scenario: Build it
11
11
  When I successfully run `middleman-presentation build presentation`
@@ -5,7 +5,7 @@ Feature: Code highlighting in Markdown slides
5
5
  In order to make it more understandable for the audience
6
6
 
7
7
  Background:
8
- Given I use presentation fixture "presentation1" with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
 
10
10
  Scenario: Code block
11
11
  Given a slide named "01.html.md" with:
@@ -5,7 +5,7 @@ Feature: Add new slide
5
5
  In order do build it
6
6
 
7
7
  Background:
8
- Given I use presentation fixture "presentation1" with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
 
10
10
  Scenario: Custom Slide
11
11
  When I successfully run `middleman-presentation create slide 01`
@@ -5,7 +5,7 @@ Feature: Use templates for new slides
5
5
  In order do build it
6
6
 
7
7
  Background:
8
- Given I use presentation fixture "presentation1" with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
 
10
10
  Scenario: Project Erb Slide template
11
11
  And a project template named "erb.tt" with:
@@ -5,7 +5,7 @@ Feature: Edit slide
5
5
  In order to make changes
6
6
 
7
7
  Background:
8
- Given I use presentation fixture "presentation1" with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
 
10
10
  Scenario: Existing slide
11
11
  Given a slide named "01.html.erb" with:
@@ -5,7 +5,7 @@ Feature: Export presentation
5
5
  In order to give to the audience
6
6
 
7
7
  Background:
8
- Given I use presentation fixture "presentation1" with title "My Presentation" and date "20140901"
8
+ Given I use presentation fixture "export_presentation1" with title "My Presentation" and date "20140901"
9
9
 
10
10
  Scenario: Default file name
11
11
  When I successfully run `middleman-presentation export presentation`
@@ -5,7 +5,7 @@ Feature: Grouping slides
5
5
  In order to use vertical slides feature
6
6
 
7
7
  Background:
8
- Given I use presentation fixture "presentation1" with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
 
10
10
  Scenario: Read slides from filesystem
11
11
  Given a slide named "01namespace/01.html.erb" with:
@@ -5,7 +5,7 @@ Feature: Ignore slides
5
5
  In order to make them invisible
6
6
 
7
7
  Background:
8
- Given I use presentation fixture "presentation1" with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
 
10
10
  Scenario: Ignore a slide by basename
11
11
  Given a slide named "01.html.md" with:
@@ -43,7 +43,7 @@ Feature: Initialize middleman-presentation
43
43
  Given I set the environment variables to:
44
44
  | variable | value |
45
45
  | USER | my_user|
46
- And I create a new presentation with title "My Presentation"
46
+ And I use presentation fixture "local_config1" with title "My Presentation"
47
47
  When I successfully run `middleman-presentation init application --local`
48
48
  Then the presentation config file for middleman-presentation should contain:
49
49
  """
@@ -5,9 +5,9 @@ Feature: Show known assets
5
5
  In order to have an overview
6
6
 
7
7
  Scenario: List available assets
8
- Given I create a new presentation with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
  When I successfully run `middleman-presentation list assets`
10
10
  Then the output should contain:
11
11
  """
12
- | Source path
12
+ Source path
13
13
  """
@@ -5,7 +5,7 @@ Feature: Show available components
5
5
  In order to have an overview
6
6
 
7
7
  Scenario: List available components
8
- Given I create a new presentation with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
  When I successfully run `middleman-presentation list components`
10
10
  Then the output should contain:
11
11
  """
@@ -5,7 +5,7 @@ Feature: Show available helpers
5
5
  In order to have an overview
6
6
 
7
7
  Scenario: List available helpers
8
- Given I create a new presentation with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
  When I successfully run `middleman-presentation list helpers`
10
10
  Then the output should contain:
11
11
  """
@@ -5,7 +5,7 @@ Feature: Show available plugins
5
5
  In order to have an overview
6
6
 
7
7
  Scenario: List available plugins
8
- Given I create a new presentation with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
  When I successfully run `middleman-presentation list plugins`
10
10
  Then the output should contain:
11
11
  """
@@ -0,0 +1,28 @@
1
+ Feature: Display metadata in footer
2
+
3
+ As a presentator
4
+ I want to display metadata on the first slide and in the footer
5
+ In order to show them to the audience
6
+
7
+ Background:
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
+
10
+ Scenario: Display only requested fields
11
+ Given a presentation config file for middleman-presentation with:
12
+ """
13
+ speaker: Max Mustermann
14
+ date: 2014-05-01
15
+ metadata_footer:
16
+ - speaker
17
+ metadata_headline: []
18
+ """
19
+ Given the Server is running
20
+ And I go to "/"
21
+ Then I should see:
22
+ """
23
+ Max Mustermann
24
+ """
25
+ Then I should not see:
26
+ """
27
+ 2014-05-01
28
+ """
@@ -0,0 +1,28 @@
1
+ Feature: Display metadata in headline
2
+
3
+ As a presentator
4
+ I want to display metadata in the headline of the first slide
5
+ In order to show them to the audience
6
+
7
+ Background:
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
+
10
+ Scenario: Display only requested fields
11
+ Given a presentation config file for middleman-presentation with:
12
+ """
13
+ speaker: Max Mustermann
14
+ date: 2014-05-01
15
+ metadata_footer: []
16
+ metadata_headline:
17
+ - speaker
18
+ """
19
+ Given the Server is running
20
+ And I go to "/"
21
+ Then I should see:
22
+ """
23
+ Max Mustermann
24
+ """
25
+ Then I should not see:
26
+ """
27
+ 2014-05-01
28
+ """
@@ -10,7 +10,7 @@ Feature: Support plugins for middleman-presentation
10
10
  plugins:
11
11
  - middleman-presentation-simple_plugin
12
12
  """
13
- And I use presentation fixture "presentation1" with title "My Presentation"
13
+ And I use presentation fixture "plugins1" with title "My Presentation"
14
14
 
15
15
  Scenario: Use method in plugin
16
16
  Given a slide named "01.html.erb" with:
@@ -5,14 +5,12 @@ Feature: Run presentation
5
5
  In order to use it
6
6
 
7
7
  Background:
8
- Given I use presentation fixture "presentation1" with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
 
10
10
  Scenario: Simple Slide
11
11
  Given a slide named "01.html.erb" with:
12
12
  """
13
13
  <section>
14
- </section>
15
- <section>
16
14
  <h1>Hello World</h1>
17
15
  </section>
18
16
  """
@@ -55,3 +53,4 @@ Feature: Run presentation
55
53
  """
56
54
  #When I go to "images/lightbox2/img/close.png"
57
55
  #Then the status code should be "200"
56
+
@@ -0,0 +1,44 @@
1
+ Feature: Change quotes
2
+
3
+ As a presentator
4
+ I want to use the quotes which are suitable for my mother tung
5
+ In order to make it look good
6
+
7
+ Background:
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
+
10
+ Scenario: Default quotes
11
+ Given a slide named "01.html.md" with:
12
+ """
13
+ <section>
14
+ # "Hello World"
15
+ </section>
16
+ """
17
+ And the Server is running
18
+ And I go to "/"
19
+ Then I should see:
20
+ """
21
+ “Hello World”
22
+ """
23
+
24
+ Scenario: German quotes
25
+ Given a presentation config file for middleman-presentation with:
26
+ """
27
+ smart_quotes:
28
+ - lsquo # opening '
29
+ - rsquo # closing '
30
+ - bdquo # opening "
31
+ - rdquo # opening "
32
+ """
33
+ And a slide named "01.html.md" with:
34
+ """
35
+ <section>
36
+ # "Hello World"
37
+ </section>
38
+ """
39
+ And the Server is running
40
+ And I go to "/"
41
+ Then I should see:
42
+ """
43
+ „Hello World”
44
+ """
@@ -5,7 +5,7 @@ Feature: Rename slide
5
5
  In order to make its name fit the need
6
6
 
7
7
  Background:
8
- Given I use presentation fixture "presentation1" with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
 
10
10
  Scenario: Full-name
11
11
  Given a slide named "01.html.erb" with:
@@ -5,7 +5,7 @@ Feature: Render different kind of templates
5
5
  In order to reduce the amount of time to create a new presentation
6
6
 
7
7
  Background:
8
- Given I use presentation fixture "presentation1" with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
 
10
10
  Scenario: Markdown Slide
11
11
  Given a slide named "01.html.md" with:
@@ -23,3 +23,19 @@ Feature: Configuration
23
23
  """
24
24
  .slidesignore
25
25
  """
26
+
27
+ Scenario: Merge configuration
28
+ Given I use presentation fixture "simple1" with title "My Presentation"
29
+ And a presentation config file for middleman-presentation with:
30
+ """
31
+ bower_directory: blub/asdf
32
+ """
33
+ When I successfully run `middleman-presentation show config`
34
+ Then the output should contain:
35
+ """
36
+ .ignore
37
+ """
38
+ And the output should contain:
39
+ """
40
+ blub/asdf
41
+ """
@@ -5,7 +5,7 @@ Feature: Show footer
5
5
  In order to make to add some meta information
6
6
 
7
7
  Scenario: Print link
8
- Given I create a new presentation with title "My Presentation"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
9
9
  And the Server is running
10
10
  When I go to "/"
11
11
  Then I should see:
@@ -5,8 +5,7 @@ Feature: Show version number
5
5
  In order to display it
6
6
 
7
7
  Scenario: Default version number
8
- Given I successfully run `middleman-presentation create presentation presentation1 --title "Test"`
9
- And I cd to "presentation1"
8
+ Given I use presentation fixture "simple1" with title "My Presentation"
10
9
  And the Server is running
11
10
  When I go to "/"
12
11
  Then I should see:
@@ -3,12 +3,17 @@ module Middleman
3
3
  module Presentation
4
4
  # Configuration for presentation extension
5
5
  class ApplicationConfig < FeduxOrgStdlib::AppConfig
6
+ option :network_port, 4567
7
+ option :network_interface, '127.0.0.1'
8
+
6
9
  option :title, nil
7
10
  option :subtitle, nil
8
11
  option :project_id, nil
9
- option :version, nil
12
+ option :version, 'v0.0.1'
13
+ option :smart_quotes, %w(rdquo rsquo ldquo rdquo)
10
14
 
11
15
  option :date, Time.now.strftime('%Y-%m-%d %H:%M:%S')
16
+ option :copyright, '&copy;' + Time.now.strftime('%Y')
12
17
  option :speaker, process_environment.fetch('USER')
13
18
  option :license, 'CC BY 4.0'
14
19
  option :bower_directory, 'vendor/assets/components'
@@ -168,6 +173,9 @@ module Middleman
168
173
 
169
174
  option :debugging_libraries, %w(pry byebug)
170
175
 
176
+ option :metadata_headline, [:date, :speaker, :company, :version, :license]
177
+ option :metadata_footer, [:copyright, :author, :license]
178
+
171
179
  def preferred_configuration_file
172
180
  ::File.expand_path(::File.join('~', '.config', _application_name, _config_file))
173
181
  end
@@ -40,7 +40,7 @@ module Middleman
40
40
  }
41
41
  end
42
42
 
43
- List.new(data).to_s(fields: [:source_path, :destination_path, :loadable, :importable])
43
+ List.new(data).to_s(fields: [:source_path, :destination_path, :loadable, :importable], vertical: true)
44
44
  end
45
45
 
46
46
  # Iterate over each loadable asset
@@ -6,7 +6,8 @@ module Middleman
6
6
  class ServePresentation < BaseGroup
7
7
  include Thor::Actions
8
8
 
9
- desc Middleman::Presentation.t('views.presentation.serve.title')
9
+ class_option :network_port, type: :numeric, default: Middleman::Presentation.config.network_port, desc: Middleman::Presentation.t('views.presentation.serve.options.network_port')
10
+ class_option :network_interface, default: Middleman::Presentation.config.network_interface, desc: Middleman::Presentation.t('views.presentation.serve.options.network_interface')
10
11
 
11
12
  def initialize_generator
12
13
  enable_debug_mode
@@ -20,6 +21,8 @@ module Middleman
20
21
 
21
22
  cmd = []
22
23
  cmd << 'middleman server'
24
+ cmd << "-p #{options[:network_port]}"
25
+ cmd << "-h #{options[:network_interface]}"
23
26
  cmd << '--verbose' if options[:debug_mode]
24
27
 
25
28
  run(cmd.join(' '))
@@ -4,7 +4,7 @@ module Middleman
4
4
  # Presentation extension
5
5
  module Presentation
6
6
  @logger = Logger.new
7
- @config = ApplicationConfig.new(merge_files: true)
7
+ @config = ApplicationConfig.new(merge_files: true, safe: true)
8
8
  @helpers_manager = HelpersManager.new
9
9
  @assets_manager = AssetsManager.new
10
10
  @components_manager = ComponentsManager.new
@@ -3,6 +3,9 @@ module Middleman
3
3
  module Presentation
4
4
  # Presentation extension
5
5
  class MiddlemanExtension < Extension
6
+ def after_configuration
7
+ Middleman::Presentation.config.reload
8
+ end
6
9
  end
7
10
  end
8
11
  end
@@ -32,7 +32,8 @@ module Middleman
32
32
  code_block_class: 'mp-code-block',
33
33
  inline_code_class: 'mp-code-inline'
34
34
  },
35
- smart_quotes: true
35
+ smartypants: true,
36
+ smart_quotes: Middleman::Presentation.config.smart_quotes
36
37
 
37
38
  # ignore slides so that a user doesn't need to prepend slide names
38
39
  # with an underscore
@@ -3,6 +3,6 @@
3
3
  module Middleman
4
4
  # Presentation
5
5
  module Presentation
6
- VERSION = '0.16.0.alpha'
6
+ VERSION = '0.16.0.beta'
7
7
  end
8
8
  end
data/locales/de.yml CHANGED
@@ -1,6 +1,9 @@
1
1
  ---
2
2
  de:
3
3
  errors:
4
+ unknown_metadata_fields:
5
+ one: Es soll ein unbekanntes Metadatum angezeigt werden %{fields}.
6
+ one: Es sollen unbekannte Metadaten angezeigt werden %{fields}.
4
7
  standard_error: "Es ist ein Fehler aufgetreten. Die Fehlermeldung lautet wie folgt:\n%{message}"
5
8
  argument_error: Der Wert "%{value}" für "%{argument}" ist unzulässig.
6
9
  middleman_build_error: 'Es ist ein Fehler beim Generieren der statischen Variante der Präsentation aufgetreten:'
@@ -209,6 +212,9 @@ de:
209
212
  serve:
210
213
  title: Zeige Präsentation
211
214
  headline: Zeige Präsentation "%{title}"
215
+ options:
216
+ network_port: Netzwerk-Port, an dem der Server lauschen soll
217
+ network_interface: Netwerk-Schnittstelle, an der der Server lauschen soll
212
218
  build:
213
219
  title: Präsentation generieren
214
220
  headline: Generiere die Präsentation "%{title}"
data/locales/en.yml CHANGED
@@ -1,6 +1,9 @@
1
1
  ---
2
2
  en:
3
3
  errors:
4
+ unknown_metadata_fields:
5
+ one: You entered an unknown metadata field %{fields}.
6
+ other: You entered an unknown metadata fields %{fields}.
4
7
  standard_error: "An error occured. Please see the attached message\n%{message}."
5
8
  invalid_component: Sorry, but argument "%{argument}" needs to respond to "#root_directory=".
6
9
  argument_error: The value "%{value}" for "%{argument}" is invalid.
@@ -209,6 +212,9 @@ en:
209
212
  serve:
210
213
  title: Serve presentation
211
214
  headline: Serve presentation "%{title}"
215
+ options:
216
+ network_port: Networkport the server listens on
217
+ network_interface: Networkinterface the server listens on
212
218
  build:
213
219
  title: Build presentation
214
220
  headline: Build presentation "%{title}"
@@ -97,15 +97,10 @@ RSpec.describe AssetsManager do
97
97
  allow(list).to receive(:each) { |&block| [asset].each(&block) }
98
98
 
99
99
  manager.load_from_list list
100
+ result = manager.to_s
100
101
 
101
- expect(manager.to_s).to eq <<-EOS.strip_heredoc.chomp
102
- +-------------+------------------+----------+------------+
103
- | Source path | Destination path | Loadable | Importable |
104
- +-------------+------------------+----------+------------+
105
- | image1.png | output.d | true | true |
106
- +-------------+------------------+----------+------------+
107
- 1 row in set
108
- EOS
102
+ expect(result).to include 'Source path'
103
+ expect(result).to include 'image1.png'
109
104
  end
110
105
  end
111
106
  end
data/templates/Gemfile.tt CHANGED
@@ -1,7 +1,5 @@
1
1
  source 'https://rubygems.org'
2
2
 
3
- gem 'middleman'
4
-
5
3
  # For faster file watcher updates on Windows:
6
4
  # gem 'wdm', :platforms => [:mswin, :mingw]
7
5
 
@@ -1,23 +1,12 @@
1
1
  <section class="mp-start-slide" data-state="mp-start-slide">
2
2
  <ul class="mp-layout-grid-centered">
3
3
  <li class="mp-layout-grid-column-66">
4
- <h1><%= Middleman::Presentation.config.title %></h1>
5
- <h2><%= Middleman::Presentation.config.subtitle %></h2>
4
+ <h1><%%= Middleman::Presentation.config.title %></h1>
5
+ <h2><%%= Middleman::Presentation.config.subtitle %></h2>
6
6
 
7
- <p class="mp-speaker">
8
- <small><%= Middleman::Presentation.config.date %>&nbsp;&ndash;&nbsp;
9
- <%= Middleman::Presentation.config.speaker -%>
10
- <%- if Middleman::Presentation.config.company -%>
11
- (<%= Middleman::Presentation.config.company %>)
12
- <%- end -%>
13
- </small>
14
- </p>
15
- <%- if Middleman::Presentation.config.version -%>
16
- <p class="mp-version"><%= Middleman::Presentation.config.version %></p>
17
- <%- end -%>
18
- <%- if Middleman::Presentation.config.license -%>
19
- <p class="mp-license"><%= Middleman::Presentation.config.license %></p>
20
- <%- end -%>
7
+ <span class="mp-meta">
8
+ <%%= metadata_markup(Middleman::Presentation.config.metadata_headline, Middleman::Presentation.config.known_options) %>
9
+ </span>
21
10
  </li>
22
11
  <li class="mp-layout-grid-column-33">
23
12
  <div class="mp-logo"></div>
@@ -1,4 +1,4 @@
1
- <section class="mp-last-slide">
1
+ <section class="mp-question-slide">
2
2
  <h1><%= Middleman::Presentation.t('slides.questions.title', locale: @language) %></h1>
3
3
  <div class="mp-logo-question"></div>
4
4
  </section>
@@ -1,22 +1,22 @@
1
- <section class="mp-last-slide">
1
+ <section class="mp-contact-slide">
2
2
  <h1><%= Middleman::Presentation.t('slides.contact.title', locale: @language) %></h1>
3
3
  <ul class="mp-layout-grid-centered">
4
4
  <li class"mp-layout-grid-column-33">
5
5
  <div class="mp-logo-contact"></div>
6
6
  </li>
7
7
  <li class"mp-layout-grid-column-33">
8
- <ul class="mp-list-with-icons">
9
- <%% if Middleman::Presentation.config.email_address -%>
8
+ <ul class="mp-contact-list mp-list-with-icons">
9
+ <%% unless Middleman::Presentation.config.email_address.blank? -%>
10
10
  <li>
11
11
  <i class="mp-icon mp-icon-contact-mail"></i><a href="mailto:<%%= Middleman::Presentation.config.email_address %>" class="mp-external-url"><%%= Middleman::Presentation.config.email_address %></a>
12
12
  </li>
13
13
  <%% end -%>
14
- <%% if Middleman::Presentation.config.phone_number -%>
14
+ <%% unless Middleman::Presentation.config.phone_number.blank? -%>
15
15
  <li>
16
16
  <i class="mp-icon mp-icon-contact-phone"></i><%%= Middleman::Presentation.config.phone_number %>
17
17
  </li>
18
18
  <%% end -%>
19
- <%% if Middleman::Presentation.config.github_url -%>
19
+ <%% unless Middleman::Presentation.config.github_url.blank? -%>
20
20
  <li>
21
21
  <i class="mp-icon mp-icon-contact-github"></i><a href="<%%= Middleman::Presentation.config.github_url %>" class="mp-external-url" target="_blank"><%%= File.basename(URI.parse(Middleman::Presentation.config.github_url).path) %></a>
22
22
  </li>
@@ -1,4 +1,4 @@
1
- <section>
1
+ <section class="mp-last-slide">
2
2
  <h2><%= Middleman::Presentation.t('slides.end.title', locale: @language) %></h2>
3
3
  <i class="mp-icon mp-icon-absolute-large mp-icon-the-end"></i>
4
4
  </section>
@@ -13,16 +13,16 @@ options.verbose = false
13
13
  OptionParser.new do |opts|
14
14
  opts.banner = 'Usage: script/start [options]'
15
15
 
16
- opts.on('-p PORT', '--port PORT', 'Port to listen on') do |p|
16
+ opts.on('-p PORT', '--network-port PORT', 'Port to listen on') do |p|
17
17
  options.listen.port = p
18
18
  end
19
19
 
20
- opts.on('-h HOST', '--host HOST', 'Host to listen on') do |h|
21
- options.listen.host = h
20
+ opts.on('-i INTERFACE', '--network-interface INTERFACE', 'Interface to listen on') do |h|
21
+ options.listen.interface = h
22
22
  end
23
23
 
24
- opts.on('-v', '--verbose', 'Verbose mode') do |_h|
25
- options.verbose = true
24
+ opts.on('-d', '--debug-mode', 'Debug mode') do |_h|
25
+ options.debug_mode = true
26
26
  end
27
27
 
28
28
  end.parse!
@@ -35,9 +35,9 @@ Process.waitpid(launchy_pid)
35
35
 
36
36
  command = []
37
37
  command << 'bundle exec'
38
- command << 'middleman server'
39
- command << "-p #{options.listen.port}"
40
- command << "-h #{options.listen.host}"
41
- command << '--verbose' if options.verbose
38
+ command << 'middleman-presentation serve'
39
+ command << "--network-port #{options.listen.port}"
40
+ command << "--network-interface #{options.listen.interface}"
41
+ command << '--debug-mode' if options.debug_mode
42
42
 
43
43
  system(command.join(' '))
@@ -42,16 +42,9 @@
42
42
  <div class="slides">
43
43
  <%%= yield %>
44
44
  </div>
45
- <footer class="mp-site-footer">
46
- <div class="mp-copyright-notice">
47
- &copy; <%%= Time.now.strftime('%Y') %>&nbsp;&nbsp;<%%= Middleman::Presentation.config.author -%>,&nbsp;
48
- <span class="mp-license">
49
- <%%- if Middleman::Presentation.config.license -%>
50
- <%%= Middleman::Presentation.config.license %>
51
- <%%- end -%>
52
- </span>
45
+ <footer class="mp-presentation-footer">
46
+ <%%= metadata_markup(Middleman::Presentation.config.metadata_footer, Middleman::Presentation.config.known_options) %>
53
47
  <a href="?print-pdf" class="mp-print-link"><i class="mp-print"></i></a>
54
- </div>
55
48
  </footer>
56
49
  </div>
57
50
 
@@ -64,13 +57,13 @@
64
57
  // The "normal" size of the presentation, aspect ratio will be preserved
65
58
  // when the presentation is scaled to fit different resolutions. Can be
66
59
  // specified using percentage units.
67
- width: <%%= Middleman::Presentation.config.width %>,
68
- height: <%%= Middleman::Presentation.config.height %>,
60
+ width: '<%%= Middleman::Presentation.config.width %>',
61
+ height: '<%%= Middleman::Presentation.config.height %>',
69
62
  // Factor of the display size that should remain empty around the content
70
63
  margin: <%%= Middleman::Presentation.config.margin %>,
71
64
  // Bounds for smallest/largest possible scale to apply to content
72
- minScale: <%%= Middleman::Presentation.config.min_scale %>,
73
- maxScale: <%%= Middleman::Presentation.config.max_scale %>,
65
+ minScale: '<%%= Middleman::Presentation.config.min_scale %>',
66
+ maxScale: '<%%= Middleman::Presentation.config.max_scale %>',
74
67
  // Display controls in the bottom right corner
75
68
  controls: <%%= Middleman::Presentation.config.activate_controls %>,
76
69
  // Display a presentation progress bar
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-presentation-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.0.alpha
4
+ version: 0.16.0.beta
5
5
  platform: ruby
6
6
  authors:
7
7
  - Max Meyer
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-11-10 00:00:00.000000000 Z
12
+ date: 2014-11-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: middleman
@@ -294,8 +294,11 @@ files:
294
294
  - features/list_helpers-cli.feature
295
295
  - features/list_plugins-cli.feature
296
296
  - features/list_styles-cli.feature
297
+ - features/metadata-footer.feature
298
+ - features/metadata-headline.feature
297
299
  - features/plugins.feature
298
300
  - features/presentation.feature
301
+ - features/quoting_markdown.feature
299
302
  - features/rename_slide-cli.feature
300
303
  - features/render_slides.feature
301
304
  - features/show_config-cli.feature
@@ -524,8 +527,11 @@ test_files:
524
527
  - features/list_helpers-cli.feature
525
528
  - features/list_plugins-cli.feature
526
529
  - features/list_styles-cli.feature
530
+ - features/metadata-footer.feature
531
+ - features/metadata-headline.feature
527
532
  - features/plugins.feature
528
533
  - features/presentation.feature
534
+ - features/quoting_markdown.feature
529
535
  - features/rename_slide-cli.feature
530
536
  - features/render_slides.feature
531
537
  - features/show_config-cli.feature