Skip to content

Commit

Permalink
Fix broken views (#18)
Browse files Browse the repository at this point in the history 
* Overwrite views

* Bump version

* Update Gemfile.lock

* Change version

Thanks to review
  • Loading branch information
@agustibr
Aitor Lopez Beltran authored and agustibr committed Feb 6, 2019
1 parent a0d2649 commit 4361b86
Show file tree
Hide file tree
Showing 5 changed files with 157 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
decidim-sabarca (0.12.0)
decidim-sabarca (0.16.0.pre.0.2)
acts_as_list (= 0.9.9)
decidim-accountability (= 0.16.0)
decidim-admin (= 0.16.0)
Expand Down Expand Up @@ -289,7 +289,7 @@ GEM
htmlentities (4.3.4)
http-cookie (1.0.3)
domain_name (~> 0.5)
httparty (0.16.3)
httparty (0.16.4)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
i18n (1.2.0)
Expand Down
28 changes: 28 additions & 0 deletions app/views/decidim/pages/_standalone.html.erb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<section class="subhero sabarca-header-section">
<div class="row">
<div class="main-block block-center">
<div class="titles">
<h1 class="heading1 page-title"><%= title %></h1>
</div>
</div>
</div>
</section>

<div class="wrapper">
<main>
<%= cell "decidim/tos_page", :announcement %>

<div class="columns small-12">
<div class="card">
<div class="card__content"><%= decidim_sanitize translated_attribute page.content %></div>
</div>
</div>

<%= cell "decidim/tos_page", :sticky_form %>
</main>
</div>

<script>
$(".announcement").parent().removeClass('row column');
$(".flex-center").removeClass('row column')
</script>
45 changes: 45 additions & 0 deletions app/views/decidim/pages/_tabbed.html.erb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<section class="subhero sabarca-header-section">
<div class="row">
<div class="main-block block-center">
<div class="titles">
<h1 class="heading1 page-title"><%= title %></h1>
<h2 class="heading4"><%= description %></h2>
</div>
</div>
</div>
</section>

<div class="wrapper">
<main class="main-container tabbed-container">
<%= cell "decidim/tos_page", :announcement %>

<div class="row collapse main-container--side-panel">
<div class="columns medium-4 large-3">
<div class="side-panel">
<ul class="tabs vertical side-panel__tabs">
<% pages.each do |sibling| %>
<li class="tabs-title <%= page == sibling ? "is-active" : nil %>">
<%= link_to translated_attribute(sibling.title), page_path(sibling.slug), 'aria-selected': page == sibling %>
</li>
<% end %>
</ul>
</div>
</div>

<div class="columns medium-8 large-9">
<div class="main-container__content">
<div class="tabs-content vertical">
<div class="static__content">
<h2 class="section-heading">
<%= translated_attribute page.title %>
</h2>
<%= decidim_sanitize translated_attribute page.content %>
</div>
</div>
</div>
</div>
</div>

<%= cell "decidim/tos_page", :sticky_form %>
</main>
</div>
81 changes: 81 additions & 0 deletions app/views/decidim/pages/index.html.erb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<%
edit_link(
decidim_admin.static_pages_path,
:read,
:static_page
)
%>

<section class="subhero sabarca-header-section">
<div class="row">
<div class="main-block block-center">
<div class="titles">
<h1 class="heading1 page-title"><%= t "decidim.pages.index.title" %></h1>
<h2 class="heading4"><%= t(".subheading", name: current_organization.name) %></h2>
</div>
</div>
</div>
</section>

<div class="wrapper">
<% if @topics.any? %>
<div class="row">
<h3 class="section-heading"><%= t ".topics" %></h3>
<div class="row collapse">
<div class="row small-up-1 smallmedium-up-2 mediumlarge-up-2 large-up-3 card-grid">
<% @topics.each do |topic| %>
<% if topic.pages.any? %>
<div class="column">
<article class="card card--process card--mini">
<div class="card__content">
<h4 class="card__title">
<%= link_to translated_attribute(topic.title), page_path(topic.pages.first), class: "card__link" %>
</h4>
<p><%= translated_attribute topic.description %></p>
<ul>
<% topic.pages.each do |page| %>
<li><%= link_to translated_attribute(page.title), page_path(page) %></li>
<% end %>
</ul>
</div>
<div class="card__footer">
<div class="card__support">
<%= link_to t(".read_more"), page_path(topic.pages.first), class: "card__button button secondary button--sc small light" %>
</div>
</div>
</article>
</div>
<% end %>
<% end %>
</div>
</div>
</div>
<% end %>
<% if @orphan_pages.any? %>
<div class="row">
<h3 class="section-heading"><%= t ".standalone_pages" %></h3>
<div class="row collapse">
<div class="row small-up-1 smallmedium-up-2 mediumlarge-up-2 large-up-3 card-grid">
<% @orphan_pages.each do |page| %>
<div class="column">
<article class="card card--process card--mini">
<div class="card__content">
<h4 class="card__title">
<%= link_to translated_attribute(page.title), page_path(page), class: "card__link" %>
</h4>
<%== strip_tags html_truncate(translated_attribute(page.content), length: 140, separator: "...") %>
</div>
<div class="card__footer">
<div class="card__support">
<%= link_to t(".read_more"), page_path(page), class: "card__button button secondary button--sc small light" %>
</div>
</div>
</div>
</article>
<% end %>
</div>
</div>
</div>
<% end %>
</div>
2 changes: 1 addition & 1 deletion lib/decidim/sabarca/version.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module Decidim
module Sabarca
VERSION = "0.12.0"
VERSION = "0.16.0-0.1"
end
end

0 comments on commit 4361b86

Please sign in to comment.