Always wrap content to have nice boxes around it

Antonio Terceiro
1 parent 0e65d20c
Showing 5 changed files with 4 additions and 14 deletions Show diff stats
app/helpers/boxes_helper.rb
app/views/shared/access_denied.rhtml
app/views/shared/not_found.rhtml
public/designs/themes/base/style.css
public/stylesheets/application.css
@@ -10,7 +10,7 @@ module BoxesHelper
       else
         content_tag('div',
           content_tag('div',
-            content_tag('div', content, :class => 'no-boxes-inner-2'),
+            content_tag('div', wrap_main_content(content), :class => 'no-boxes-inner-2'),
             :class => 'no-boxes-inner-1'
           ),
           :class => 'no-boxes'
 <div id='access-denied'>
-  <% noosfero_wrap do %>
     <h1> <%= @title || _('Access denied') %> </h1>
     <% unless @message.nil? %>
@@ -15,6 +14,5 @@
       <%= button :home, _('Go to the site home page'), :controller => 'home' %>
     <% end %>
-  <% end %>
 </div>
 <div id='not-found'>
-  <% noosfero_wrap do %>
     <h1><%= _('There is no such page: %s') % (content_tag('tt', @path)) %></h1>
     <p>
     <%= _('You may have clicked an expired link or mistyped the address.') %>
@@ -9,5 +8,4 @@
       <%= button :back, _('Go back'), :back %>
       <%= button :home, _('Go to %s home page') % environment.name, :controller => 'home' %>
     <% end %>
-  <% end %>
 </div>
@@ -773,7 +773,7 @@ X.sep {
   width: 48%;
 }
-.controller-search #content .no-boxes h1 {
+#content .no-boxes h1 {
   font-variant: small-caps;
   color: #555753;
   font-size: 18px;
@@ -454,8 +454,6 @@ div.pending-tasks {
 #content #not-found,
 #content #access-denied {
   -moz-border-radius: 6px;
-  margin-left: 20%;
-  margin-right: 20%;
 }
 #content #not-found p,
@@ -3006,12 +3004,8 @@ h1#agenda-title {
   display: inline;
 }
-.controller-profile .no-boxes {
-  margin: 0px 260px 0px 260px;
-}
-
-.controller-profile #content .no-boxes h1 {
-  margin: 1px 0px 1px 160px;
+.no-boxes {
+  margin: 0px 200px 0px 200px;
 }
 .controller-profile #content .no-boxes h1,
	@@ -10,7 +10,7 @@ module BoxesHelper		@@ -10,7 +10,7 @@ module BoxesHelper
10	else	10	else
11	content_tag('div',	11	content_tag('div',
12	content_tag('div',	12	content_tag('div',
13	- content_tag('div', content, :class => 'no-boxes-inner-2'),	13	+ content_tag('div', wrap_main_content(content), :class => 'no-boxes-inner-2'),
14	:class => 'no-boxes-inner-1'	14	:class => 'no-boxes-inner-1'
15	),	15	),
16	:class => 'no-boxes'	16	:class => 'no-boxes'
	@@ -773,7 +773,7 @@ X.sep {		@@ -773,7 +773,7 @@ X.sep {
773	width: 48%;	773	width: 48%;
774	}	774	}
775		775
776	-.controller-search #content .no-boxes h1 {	776	+#content .no-boxes h1 {
777	font-variant: small-caps;	777	font-variant: small-caps;
778	color: #555753;	778	color: #555753;
779	font-size: 18px;	779	font-size: 18px;