Use clear_both class and some slim converts

This commit is contained in:
Alexander Meindl 2017-12-14 17:28:14 +01:00
parent 5fb69fd540
commit 1dcdf1692d
14 changed files with 38 additions and 55 deletions

View File

@ -12,4 +12,4 @@ Deface::Override.new virtual_path: 'welcome/index',
name: 'remove-welcome-news',
replace: 'div.news',
original: '163f5df8f0cb2d5009d7f57ad38174ed29201a1a',
partial: 'welcome/remove_news'
partial: 'welcome/overview_news'

View File

@ -1,11 +1,11 @@
table class="list"
table.list
tr class="#{cycle('odd', 'even')}"
td class="name"
td.name
= "#{l(:label_system_info)}:"
td class="name"
td.name
= system_info
tr class="#{cycle('odd', 'even')}"
td class="name"
td.name
= "#{l(:label_uptime)}:"
td class="name"
td.name
= system_uptime

View File

@ -1,14 +0,0 @@
<%
if @users_by_role.any?
view_roles = memberbox_view_roles
if view_roles.count>0
%>
<div class="members box">
<h3><%=l(:label_member_plural)%></h3>
<p><% view_roles.each do |role| %>
<%=h role %>: <%= @users_by_role[role].sort.collect{|u| link_to_user u}.join(", ").html_safe %><br />
<% end %></p>
</div>
<% end %>
<% end %>

View File

@ -0,0 +1,11 @@
- if @users_by_role.any?
- view_roles = memberbox_view_roles
- if view_roles.count>0
.members.box
h3 = l(:label_member_plural)
p
- view_roles.each do |role|
= h role
' :
= @users_by_role[role].sort.collect{|u| link_to_user u}.join(', ').html_safe
br

View File

@ -1,4 +1,4 @@
- project_overview_content = Additionals.settings[:project_overview_content]
- if project_overview_content.present?
.project-content class="wiki box"
.project-content.wiki.box
= textilizable(project_overview_content)

View File

@ -1,9 +0,0 @@
<%
overview_bottom = Additionals.settings[:overview_bottom]
unless overview_bottom.blank?
%>
<div style="clear: both;"></div>
<div class="overview-bottom wiki box">
<%= textilizable(overview_bottom) %>
</div>
<% end %>

View File

@ -0,0 +1,5 @@
- overview_bottom = Additionals.settings[:overview_bottom]
- unless overview_bottom.blank?
.clear_both
.overview-bottom.wiki.box
= textilizable(overview_bottom)

View File

@ -0,0 +1,5 @@
- unless Additionals.setting?(:remove_news)
.news.box
h3 = l(:label_news_latest)
= render partial: 'news/news', collection: @news
= link_to l(:label_news_view_all), news_index_path

View File

@ -1,8 +0,0 @@
<%
overview_right = Additionals.settings[:overview_right]
unless overview_right.blank?
%>
<div class="overview-right wiki box">
<%= textilizable(overview_right) %>
</div>
<% end %>

View File

@ -0,0 +1,4 @@
- overview_right = Additionals.settings[:overview_right]
- unless overview_right.blank?
.overview-right.wiki.box
= textilizable(overview_right)

View File

@ -1,8 +0,0 @@
<%
overview_top = Additionals.settings[:overview_top]
unless overview_top.blank?
%>
<div class="overview-top wiki box">
<%= textilizable(overview_top) %>
</div>
<% end %>

View File

@ -0,0 +1,4 @@
- overview_top = Additionals.settings[:overview_top]
- unless overview_top.blank?
.overview-top.wiki.box
= textilizable(overview_top)

View File

@ -1,9 +0,0 @@
<% unless Additionals.setting?(:remove_news) %>
<div class="news box">
<h3><%=l(:label_news_latest)%></h3>
<%= render :partial => 'news/news', :collection => @news %>
<%= link_to l(:label_news_view_all), :controller => 'news' %>
</div>
<% end %>

View File

@ -149,6 +149,8 @@
background-image: url(../images/smileys/failure-frame.png);
}
div.clear_both { clear: both; }
/* TAGs */
ul.tags {