From 570fcf2fe04c3a2c08970fba8e84d10a134b06db Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 8 Feb 2016 17:13:52 -0800 Subject: use newer 'amber' that supports page excerpts --- amber/layouts/_blog_summary.html.haml | 9 ++++++--- amber/menu.txt | 1 + config/deploy.rb | 2 +- pages/about-us/news/2015/rails-girls-summer-of-code-2015.md | 3 +-- pages/about-us/news/2016/en.haml | 3 +++ pages/about-us/news/2016/rails-girls-summer-of-code-2016.md | 4 +--- 6 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 pages/about-us/news/2016/en.haml diff --git a/amber/layouts/_blog_summary.html.haml b/amber/layouts/_blog_summary.html.haml index 58ab0d5..b4a7308 100644 --- a/amber/layouts/_blog_summary.html.haml +++ b/amber/layouts/_blog_summary.html.haml @@ -10,10 +10,13 @@ %i = time_tag(page.props.posted_at.to_date, :format => :long, :pubdate => true) %div.content - - if page.props.preview + - if page.props.preview_image - if page.props.preview_image .preview-img %img{:src => page.props.preview_image} + - if page.props.preview = page.props.preview - - if page.props.more - = link(I18n.t(:read_more) => amber_path(page)) \ No newline at end of file + - else + = render :text => page.props.excerpt, :type => page.props.content_type + - if page.props.more + = link(I18n.t(:read_more) => amber_path(page)) \ No newline at end of file diff --git a/amber/menu.txt b/amber/menu.txt index 37addfd..89d8550 100644 --- a/amber/menu.txt +++ b/amber/menu.txt @@ -6,6 +6,7 @@ about-us # people contact news + 2016 2015 2014 2013 diff --git a/config/deploy.rb b/config/deploy.rb index eb7c618..4b96542 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -28,7 +28,7 @@ namespace :amber do task :rebuild do on roles(:all) do |host| within release_path do - execute :amber, 'rebuild' + execute "~/amber/bin/amber", 'rebuild' end end end diff --git a/pages/about-us/news/2015/rails-girls-summer-of-code-2015.md b/pages/about-us/news/2015/rails-girls-summer-of-code-2015.md index a9687e6..ab30949 100644 --- a/pages/about-us/news/2015/rails-girls-summer-of-code-2015.md +++ b/pages/about-us/news/2015/rails-girls-summer-of-code-2015.md @@ -3,9 +3,8 @@ @posted_at = '2015-11-30' @more = true @preview_image = '/img/pages/rgsoc.png' -@preview = "Rails Girls Summer of Code 2015 is over. It was a success and we're very happy about the new LEAP webapp features that just got merged !" -We had two teams this year working on two major feature for the [LEAP webapp](https://leap.se/en/docs/platform/services/webapp). The webapp is using ruby on rails, so we applied with it to this years RGSOC as an organisation. +Rails Girls Summer of Code 2015 is over. It was a success and we're very happy about the new LEAP webapp features that just got merged! We had two teams this year working on two major feature for the [LEAP webapp](https://leap.se/en/docs/platform/services/webapp). The webapp is using ruby on rails, so we applied with it to this years RGSOC as an organisation. # Bitcoin Payments diff --git a/pages/about-us/news/2016/en.haml b/pages/about-us/news/2016/en.haml new file mode 100644 index 0000000..dd6f43e --- /dev/null +++ b/pages/about-us/news/2016/en.haml @@ -0,0 +1,3 @@ +- @path_prefix = '2015' + += child_summaries \ No newline at end of file diff --git a/pages/about-us/news/2016/rails-girls-summer-of-code-2016.md b/pages/about-us/news/2016/rails-girls-summer-of-code-2016.md index cd3ebf5..03251a7 100644 --- a/pages/about-us/news/2016/rails-girls-summer-of-code-2016.md +++ b/pages/about-us/news/2016/rails-girls-summer-of-code-2016.md @@ -3,10 +3,8 @@ @posted_at = '2016-02-03' @more = true @preview_image = '/img/pages/rgsoc.png' -@preview = "LEAP Webapp got accepted to this years Rails Girls Summer of Code" -The [LEAP webapp](https://leap.se/en/docs/platform/services/webapp) got accepted again this year for the [Rails Girls Summer of Code](http://railsgirlssummerofcode.org/). -Rails Girls Summer of Code is a global fellowship program aimed at bringing more diversity into Open Source. Successful applicants are paid a monthly stipend, from July-September, to work on Open Source projects of their choice. +The [LEAP webapp](https://leap.se/en/docs/platform/services/webapp) got accepted again this year for the [Rails Girls Summer of Code](http://railsgirlssummerofcode.org/). Rails Girls Summer of Code is a global fellowship program aimed at bringing more diversity into Open Source. Successful applicants are paid a monthly stipend, from July-September, to work on Open Source projects of their choice. Application as a team start at February 15th. Here's [LEAP's project application](https://teams.railsgirlssummerofcode.org/projects/82), including a list of features that could be realized. -- cgit v1.2.3