From b0df4604860f1b6b620ff40c27ae5d4bbc51e000 Mon Sep 17 00:00:00 2001 From: andreasfrey Date: Wed, 15 Nov 2017 10:16:45 +0100 Subject: [PATCH 1/3] Support Section --- Gemfile | 2 + Gemfile.lock | 111 +++++++------ data/support_elements.yml | 44 ++++++ source/layouts/layout.erb | 1 + source/localizable/index.html.erb | 251 +++++++++++++++++------------- source/stylesheets/_layout.css | 60 +++++-- 6 files changed, 302 insertions(+), 167 deletions(-) create mode 100644 data/support_elements.yml diff --git a/Gemfile b/Gemfile index fbad1ec..5b30e82 100644 --- a/Gemfile +++ b/Gemfile @@ -15,3 +15,5 @@ gem "tzinfo-data", platforms: [:mswin, :mingw] gem "middleman-minify-html" gem 'therubyracer' + +gem "therubyracer" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 8c46bfe..532f98d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: http://rubygems.org/ specs: - activesupport (4.1.9) + activesupport (4.1.16) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -9,19 +9,19 @@ GEM tzinfo (~> 1.1) celluloid (0.16.0) timers (~> 4.0.0) - chunky_png (1.3.3) - coffee-script (2.3.0) + chunky_png (1.3.8) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.8.0) - compass (1.0.1) + coffee-script-source (1.12.2) + compass (1.0.3) chunky_png (~> 1.2) - compass-core (~> 1.0.1) + compass-core (~> 1.0.2) compass-import-once (~> 1.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) sass (>= 3.3.13, < 3.5) - compass-core (1.0.1) + compass-core (1.0.3) multi_json (~> 1.0) sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) @@ -30,42 +30,46 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.4) - execjs (2.2.2) - ffi (1.9.6) - ffi (1.9.6-x86-mingw32) - haml (4.0.6) + eventmachine (1.2.5) + eventmachine (1.2.5-x86-mingw32) + execjs (2.7.0) + ffi (1.9.18) + ffi (1.9.18-x86-mingw32) + haml (5.0.4) + temple (>= 0.8.0) tilt hike (1.2.3) - hitimes (1.2.2) - hooks (0.4.0) - uber (~> 0.0.4) - htmlcompressor (0.1.2) + hitimes (1.2.6) + hitimes (1.2.6-x86-mingw32) + hooks (0.4.1) + uber (~> 0.0.14) + htmlcompressor (0.2.0) http_parser.rb (0.6.0) - i18n (0.6.11) - json (1.8.1) - kramdown (1.5.0) - listen (2.8.5) - celluloid (>= 0.15.2) + i18n (0.7.0) + json (1.8.6) + kramdown (1.15.0) + libv8 (3.16.14.19) + listen (2.10.1) + celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - middleman (3.3.7) + middleman (3.3.12) coffee-script (~> 2.2) compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.3.7) + middleman-core (= 3.3.12) middleman-sprockets (>= 3.1.2) sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) - middleman-core (3.3.7) + middleman-core (3.3.12) activesupport (~> 4.1.0) bundler (~> 1.1) erubis hooks (~> 0.3) - i18n (~> 0.6.9) + i18n (~> 0.7.0) listen (>= 2.7.9, < 3.0) padrino-helpers (~> 0.12.3) rack (>= 1.4.5, < 2.0) @@ -77,32 +81,33 @@ GEM middleman-core (>= 3.0.2) multi_json (~> 1.0) rack-livereload - middleman-minify-html (3.4.0) - htmlcompressor (~> 0.1.0) + middleman-minify-html (3.4.1) + htmlcompressor (~> 0.2.0) middleman-core (>= 3.2) - middleman-sprockets (3.4.1) + middleman-sprockets (3.5.0) middleman-core (>= 3.3) sprockets (~> 2.12.1) sprockets-helpers (~> 1.1.0) sprockets-sass (~> 1.3.0) - minitest (5.5.0) - multi_json (1.10.1) - padrino-helpers (0.12.4) + minitest (5.10.3) + multi_json (1.12.2) + padrino-helpers (0.12.8.1) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.4) + padrino-support (= 0.12.8.1) tilt (~> 1.4.1) - padrino-support (0.12.4) + padrino-support (0.12.8.1) activesupport (>= 3.1) - rack (1.6.0) - rack-livereload (0.3.15) + rack (1.6.8) + rack-livereload (0.3.16) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rb-fsevent (0.9.4) - rb-inotify (0.9.5) - ffi (>= 0.5.0) - sass (3.4.9) - sprockets (2.12.3) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ref (2.0.0) + sass (3.4.25) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -112,20 +117,24 @@ GEM sprockets-sass (1.3.1) sprockets (~> 2.0) tilt (~> 1.1) - thor (0.19.1) - thread_safe (0.3.4) + temple (0.8.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) + ref + thor (0.20.0) + thread_safe (0.3.6) tilt (1.4.1) - timers (4.0.1) + timers (4.0.4) hitimes - tzinfo (1.2.2) + tzinfo (1.2.4) thread_safe (~> 0.1) - tzinfo-data (1.2014.10) + tzinfo-data (1.2017.3) tzinfo (>= 1.0.0) - uber (0.0.12) - uglifier (2.6.1) + uber (0.0.15) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - wdm (0.1.0) + wdm (0.1.1) PLATFORMS ruby @@ -135,5 +144,9 @@ DEPENDENCIES middleman (~> 3.3.3) middleman-livereload (~> 3.1.0) middleman-minify-html + therubyracer tzinfo-data wdm (~> 0.1.0) + +BUNDLED WITH + 1.16.0 diff --git a/data/support_elements.yml b/data/support_elements.yml new file mode 100644 index 0000000..1939653 --- /dev/null +++ b/data/support_elements.yml @@ -0,0 +1,44 @@ +- support: + header: Do you have any questions + header_label: Community Support + header_icon: fa-question + support_description: The stagemonitor team provides community support, you can choose between different ways to contact us. + feature_list: + - features: + - icon: fa-github-square + headline: GitHub + description: If you have a bug or an idea. + detail_link: https://github.com/stagemonitor/stagemonitor/issues + - icon: fa-envelope-o + headline: Mailing List + description: MailingGroup + detail_link: https://github.com/stagemonitor/stagemonitor-mailinglist + - icon: fa-weixin + headline: Gitter + description: Chat with us for fast support! + detail_link: https://gitter.im/stagemonitor/stagemonitor +- support: + header_label: Commercial Support + support_description: We also provide professional support for the use of stagemonitor, please Contact us for more information. + feature_list: + - features: + - icon: fa-user + headline: Individual development +# description: Kurze Beschreibung + - icon: fa-info + headline: Expert analysis +# description: Kurze Beschreibung + - icon: fa-mobile + headline: Telephone and email support +# description: Kurze Beschreibung + - features: + - icon: fa-graduation-cap + headline: Trainings and workshops +# description: Kurze Beschreibung + - icon: fa-cog + headline: Customizing +# description: Kurze Beschreibung + - icon: fa-code + headline: Help with the installation +# description: Kurze Beschreibung + diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb index 86fd252..2648bb2 100644 --- a/source/layouts/layout.erb +++ b/source/layouts/layout.erb @@ -49,6 +49,7 @@
-
- <% data.overview_elements.each do |overview_element| %> -
- <% overview_element.items.each do |item| %> -
-
- <% if item.detail_link? %> - - <% else %> - - <% end %> -
-
- <% if item.detail_link? %> -

<%= I18n.t(:"#{item.icon}-headline") %>

 - <% else %> -

<%= I18n.t(:"#{item.icon}-headline") %>

- <% end %> -

<%= I18n.t(:"#{item.icon}-description") %>

-
-
- <% end %> -
- <% end %> -
+
+ <% data.overview_elements.each do |overview_element| %> +
+ <% overview_element.items.each do |item| %> +
+
+ <% if item.detail_link? %> + + <% else %> + + <% end %> +
+
+ <% if item.detail_link? %> +

<%= I18n.t(:"#{item.icon}-headline") %>

 + <% else %> +

<%= I18n.t(:"#{item.icon}-headline") %>

+ <% end %> +

<%= I18n.t(:"#{item.icon}-description") %>

+
+
+ <% end %> +
+ <% end %> +
@@ -88,7 +88,7 @@ title: stagemonitor Live Demo <% end %> - + <% unless category.info_url.nil? %> <%= I18n.t(:"button-more-info") %> <% end %> @@ -99,91 +99,132 @@ title: stagemonitor
- <% category.features.each_with_index do |feature, index| %> -
-
-

<%= I18n.t(:"#{feature.id}-name") %>

- -

<%= I18n.t(:"#{feature.id}-description") %>

-
- -
-
-
- - <%= I18n.t(:"> - -
-
- -
-
-
-
- <% unless index == category.features.size - 1 %> -
- <% end %> - <% end %> + <% category.features.each_with_index do |feature, index| %> +
+
+

<%= I18n.t(:"#{feature.id}-name") %>

-
-
- <% end %> +

<%= I18n.t(:"#{feature.id}-description") %>

+ + +
+
+
+ + <%= I18n.t(:"> + +
+
+ +
+
+
+ + <% unless index == category.features.size - 1 %> +
+ <% end %> + <% end %> + + +
+ <% end %> +
+
+ <% data.support_elements.each do |support_element| %> +
+
+

<%= support_element.header %>

+

<%= support_element.header_label %>

+

<%= support_element.support_description %>

+
+
+ <% support_element.feature_list.each do |feature_list| %> + <% if feature_list.features.length %> +
+ <% feature_list.features.each do |item| %> +
+
+ <% if item.detail_link? %> + + <% else %> + + <% end %> +
+
+ <% if item.detail_link? %> +

<%= item.headline %>

 + <% else %> +

<%= item.headline %>

+ <% end %> +

<%= item.description %>

+
+
+ <% end %> +
+ <% end %> + <% end %> + <% end %> +
+
+ diff --git a/source/stylesheets/_layout.css b/source/stylesheets/_layout.css index 31ed0d4..5f62674 100644 --- a/source/stylesheets/_layout.css +++ b/source/stylesheets/_layout.css @@ -33,7 +33,7 @@ ul { } iframe { - border: none; + border: none; } .section-head { @@ -45,7 +45,7 @@ iframe { font: 20px/36px 'Raleway', sans-serif; color: #333; text-transform: uppercase; - letter-spacing: 1.5px; + letter-pacing: 1.5px; margin-bottom: 12px; } @@ -58,7 +58,6 @@ h2, h3 { margin-top: 0px; } - h2 { font: 28px/36px 'Raleway', sans-serif; margin-bottom: 12px; @@ -147,8 +146,10 @@ header .header-social li a:hover { color: #b4b4b4; margin-top: 35px; } -.scrolldown a:hover { color: #fff; } +.scrolldown a:hover { + color: #fff; +} .nav > li > a:hover, .nav > li > a:focus { background-color: transparent; @@ -190,9 +191,8 @@ header .header-social li a:hover { line-height: 4em; } - #hero-content .img-responsive { - width:100%; + width: 100%; max-width: 598px; } @@ -221,7 +221,7 @@ header .header-social li a:hover { color: #c9c9c9; font-size: 1.1em; padding-right: 5px; - text-align: left; + /*text-align: left;*/ } #overview .col-md-4 { @@ -285,6 +285,7 @@ header .header-social li a:hover { .feature-overview a { color: #A9B5C0; } + .feature-overview a:hover { color: #fff; } @@ -299,8 +300,8 @@ header .header-social li a:hover { } .feature-short-desc { - color: rgba(235, 238, 238, 0.75) !important; - font-style: italic; + color: rgba(235, 238, 238, 0.75) !important; + font-style: italic; } .item .item-wrap { @@ -398,7 +399,6 @@ header .header-social li a:hover { transform: scale(1.2); } - /* ------------------------------------------------------------------ */ /* j. Footer /* ------------------------------------------------------------------ */ @@ -421,8 +421,9 @@ footer a:hover, footer a:focus { color: #fff; } - -footer .right-cols .columns p { margin-bottom: 6px; } +footer .right-cols .columns p { + margin-bottom: 6px; +} footer h3 { font: 13px/24px 'Raleway', sans-serif; @@ -472,7 +473,6 @@ footer .socialize .fa { background: #0F9095; } - /* Featurettes ------------------------- */ .featurette-divider { @@ -535,3 +535,37 @@ ul.social-buttons li a { transition: all .3s; } +/*Support*/ +#support { + padding-top: 4em; + padding-bottom: 2em; +} +#support h1 { + color: white; +} +#support h2 { + font-family: 'Raleway', sans-serif; + font-style: italic; + color: #fff; +} +#support h3 { + color: white; + font-size: 20px; +} + +#support p { + color: #c9c9c9; +} +#support .row { + margin-top: 1.5em; +} + +.support-fa { + float: right; + color: #EBEEEE; +} + +.fix-width-fa { + width: 1.28571429em; + text-align: center; +} \ No newline at end of file From fd10a25179ce0abd74164243887afdc93be41283 Mon Sep 17 00:00:00 2001 From: andreasfrey Date: Mon, 20 Nov 2017 12:00:01 +0100 Subject: [PATCH 2/3] added support section --- data/support_elements.yml | 40 +++++++++++++------------------ locales/de.yml | 29 ++++++++++++++++++++++ locales/en.yml | 27 +++++++++++++++++++++ source/localizable/index.html.erb | 20 ++++++++++------ 4 files changed, 86 insertions(+), 30 deletions(-) diff --git a/data/support_elements.yml b/data/support_elements.yml index 1939653..ee3321f 100644 --- a/data/support_elements.yml +++ b/data/support_elements.yml @@ -1,44 +1,38 @@ - support: - header: Do you have any questions - header_label: Community Support + headline: :comunity-support-headline + header_label: :comunity-support-label header_icon: fa-question - support_description: The stagemonitor team provides community support, you can choose between different ways to contact us. + support_description: :comunity-support-description feature_list: - features: - icon: fa-github-square - headline: GitHub - description: If you have a bug or an idea. + headline: :github-headline + description: :github-description detail_link: https://github.com/stagemonitor/stagemonitor/issues - icon: fa-envelope-o - headline: Mailing List - description: MailingGroup + headline: :mailing-list-headline + description: mailing-list-description detail_link: https://github.com/stagemonitor/stagemonitor-mailinglist - icon: fa-weixin - headline: Gitter - description: Chat with us for fast support! + headline: gitter-headline + description: gitter-description detail_link: https://gitter.im/stagemonitor/stagemonitor - support: - header_label: Commercial Support - support_description: We also provide professional support for the use of stagemonitor, please Contact us for more information. + header_label: :commercial-support-label + support_description: :commercial-support-description feature_list: - features: - icon: fa-user - headline: Individual development -# description: Kurze Beschreibung + headline: :individual-headline - icon: fa-info - headline: Expert analysis -# description: Kurze Beschreibung + headline: :expert-headline - icon: fa-mobile - headline: Telephone and email support -# description: Kurze Beschreibung + headline: :phone-headline - features: - icon: fa-graduation-cap - headline: Trainings and workshops -# description: Kurze Beschreibung + headline: :training-headline - icon: fa-cog - headline: Customizing -# description: Kurze Beschreibung + headline: :customize-headline - icon: fa-code - headline: Help with the installation -# description: Kurze Beschreibung + headline: :installation-headline diff --git a/locales/de.yml b/locales/de.yml index 7eebdf9..6f49954 100644 --- a/locales/de.yml +++ b/locales/de.yml @@ -119,3 +119,32 @@ de: server_metrics-description: Dieses Dashboard enthält Informationen über die Nutzung des Server Thread Pools, die Anzahl der aktuellen Sessions, die Auslastung Ihrer Hosts und die Anzahl der laufenden Server. server_metrics-image_title: Server Dashboard + + comunity-support-headline: Benötigen Sie Hilfe + comunity-support-label: Community Support + comunity-support-description: Das stagemonitor Team bietet kostenlosen Support über verschieden Wege an + + github-headline: GitHub + github-description: Für Ideen oder Bugs. + + mailing-list-headline: Mailinglist + mailing-list-description: MailingGroup + + gitter-headline: Gitter + gitter-description: Chat mit uns für schnellen Support! + + commercial-support-label: Professioneller Support + commercial-support-description: Zusätzlich bieten wir professionellen Support für stagemonitor an, bitte Kontaktiere uns für weiter Informationen. + + individual-headline: Individual Software + + expert-headline: Expertenanalyse + + phone-headline: Telefon- und Emailsupport + + training-headline: Schulungen und Workshops + + customize-headline: Customizing + + installation-headline: Hilfe bei der Installation + diff --git a/locales/en.yml b/locales/en.yml index 5d8e6fd..44c339e 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -122,3 +122,30 @@ en: concurrent sessions, the load of your hosts and the number of running servers. server_metrics-image_title: Server Dashboard + comunity-support-headline: Do you have any Questions + comunity-support-label: Community Support + comunity-support-description: The stagemonitor team provides community support, you can choose between different ways to contact us. + + github-headline: GitHub + github-description: If you have a bug or an idea. + + mailing-list-headline: Mailinglist + mailing-list-description: MailingGroup + + gitter-headline: Gitter + gitter-description: Chat with us for fast support! + + commercial-support-label: Commercial Support + commercial-support-description: We also provide professional support for the use of stagemonitor, please Contact us for more information. + + individual-headline: Individual development + + expert-headline: Expert analysis + + phone-headline: Telephone and email support + + training-headline: Trainings and workshops + + customize-headline: Customizing + + installation-headline: Help with the installation diff --git a/source/localizable/index.html.erb b/source/localizable/index.html.erb index 0cf3951..0e6e54a 100644 --- a/source/localizable/index.html.erb +++ b/source/localizable/index.html.erb @@ -131,17 +131,21 @@ title: stagemonitor <% end %> +
<% data.support_elements.each do |support_element| %>
-

<%= support_element.header %>

-

<%= support_element.header_label %>

-

<%= support_element.support_description %>

+ <% unless support_element.headline.nil? %> +

<%= I18n.t(support_element.headline) %>

+ <% end %> +

<%= I18n.t(support_element.header_label) %>

+

<%= I18n.t(support_element.support_description) %>

- <% support_element.feature_list.each do |feature_list| %> + + <% support_element.feature_list.each do |feature_list| %> <% if feature_list.features.length %>
<% feature_list.features.each do |item| %> @@ -155,11 +159,13 @@ title: stagemonitor
<% if item.detail_link? %> -

<%= item.headline %>

 +

<%= I18n.t(item.headline) %>

 <% else %> -

<%= item.headline %>

+

<%= I18n.t(item.headline) %>

+ <% end %> + <% unless support_element.headline.nil? %> +

<%= I18n.t(item.description) %>

<% end %> -

<%= item.description %>

<% end %> From a9df538e01464116725a83cf2fb93289c81e48e8 Mon Sep 17 00:00:00 2001 From: andreasfrey Date: Mon, 20 Nov 2017 13:26:29 +0100 Subject: [PATCH 3/3] added Support Section --- locales/de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/de.yml b/locales/de.yml index 6f49954..76b2ed5 100644 --- a/locales/de.yml +++ b/locales/de.yml @@ -125,7 +125,7 @@ de: comunity-support-description: Das stagemonitor Team bietet kostenlosen Support über verschieden Wege an github-headline: GitHub - github-description: Für Ideen oder Bugs. + github-description: Für Ideen oder Bugs mailing-list-headline: Mailinglist mailing-list-description: MailingGroup