Adding link to documentation in the default theme

Also enhanced the visual of the "not found" and "access denied" screens

Adding link to documentation in the default theme
Also enhanced the visual of the "not found" and "access denied" screens
Antonio Terceiro
1 parent e17d9128
Showing 11 changed files with 41 additions and 47 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/footer.rhtml
public/designs/themes/base/layout.css
public/designs/themes/base/navigation.rhtml
public/designs/themes/noosfero/footer.rhtml
public/designs/themes/noosfero/footer.rhtml
public/designs/themes/noosfero/navigation.rhtml
public/designs/themes/noosfero/navigation.rhtml
public/stylesheets/common.css
@@ -104,6 +104,11 @@ module BoxesHelper
     (1..8).to_a.reverse.inject(content) { |acc,n| content_tag('div', acc, :id => 'main-content-wrapper-' + n.to_s) }
   end
+  def noosfero_wrap(&block)
+    text = capture(&block)
+    concat(wrap_main_content(text), block.binding)
+  end
+
   def extract_block_content(content)
     case content
     when Hash
 <div id='access-denied'>
-  <h1> <%= @title || _('Access denied') %> </h1>
+  <% noosfero_wrap do %>
+    <h1> <%= @title || _('Access denied') %> </h1>
-  <% unless @message.nil? %>
-    <p><%= @message %></p>
-  <% else %>
-    <p><%= _('You are not allowed to view this page.') %></p>
-    <p><%= _("If you are supposed to have access to this area, you'll probably want to talk to the people responsible and ask them to give you access.") %></p>
-  <% end %>
+    <% unless @message.nil? %>
+      <p><%= @message %></p>
+    <% else %>
+      <p><%= _('You are not allowed to view this page.') %></p>
+      <p><%= _("If you are supposed to have access to this area, you'll probably want to talk to the people responsible and ask them to give you access.") %></p>
+    <% end %>
-  <hr/>
+    <% button_bar do %>
+      <%= button :back, _('Go back'), :back %>
+      <%= button :home, _('Go to the site home page'), :controller => 'home' %>
+    <% end %>
-  <% button_bar do %>
-    <%= button :back, _('Go back'), :back %>
-    <%= button :home, _('Go to the site home page'), :controller => 'home' %>
   <% end %>
 </div>
 <div id='not-found'>
-  <h1><%= _('There is no such page: %s') % (content_tag('tt', @path)) %></h1>
-  <p>
-  <%= _('You may have clicked an expired link or mistyped the address.') %>
-  <%= _('If you clicked a link that was in another site, or was given to you by someone else, it would be nice if you tell them that their link is not valid anymore.') %>
-  </p>
-  <% button_bar do %>
-    <%= button :back, _('Go back'), :back %>
-    <%= button :home, _('Go to %s home page') % environment.name, :controller => 'home' %>
+  <% 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.') %>
+    <%= _('If you clicked a link that was in another site, or was given to you by someone else, it would be nice if you tell them that their link is not valid anymore.') %>
+    </p>
+    <% button_bar do %>
+      <%= button :back, _('Go back'), :back %>
+      <%= button :home, _('Go to %s home page') % environment.name, :controller => 'home' %>
+    <% end %>
   <% end %>
 </div>
 <div id="footer-links">
+  <a id="link-to-doc" class='icon-help'><%= link_to _('Documentation'), '/doc' %></a>
 </div><!-- end id="footer-links" -->
 <div id="copyright">
   <p id='noosfero-license'>
@@ -6,7 +7,5 @@
     href="http://www.noosfero.org/" id='link-noosfero'>Noosfero</a>, licensed under
     <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public
       License</a>, version 3 or above.  </p>
-  <!-- Desenvolvido com
-  <a href="http://noosfero.com.br"
-     title="FLOSS for Social!">Noosfero</a-->
 </div><!-- end id="copyright" -->
+<%= language_chooser %>
@@ -236,7 +236,7 @@ body, th, td, input {
   padding: 10px 20px;
 }
-#content .main-block h1 {
+#content .main-block h1, #not-found h1, #access-denied h1 {
   font-variant: small-caps;
   color: #555753;
   font-size: 16px;
@@ -281,8 +281,12 @@ body, th, td, input {
   text-align: left;
   float: left;
 }
-#footer-links a {
-  margin-right: 8px;
+
+#link-to-doc {
+ background-repeat: no-repeat;
+ padding-left: 20px;
+ padding-top: 2px;
+ padding-bottom: 2px;
 }
 #copyright {
@@ -0,0 +1,3 @@
+<li><a href="/assets/enterprises"><span class='icon-menu-enterprise'><%= _('Enterprises') %></span></a></li>
+<li><a href="/assets/products"><span class='icon-menu-product'><%= _('Products') %></span></a></li>
+<li><a href="/assets/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
@@ -1,10 +0,0 @@
-<div id="footer-links">
-</div><!-- end id="footer-links" -->
-<div id="copyright">
-  <p id='noosfero-license'>
-  Powered by <a
-    href="http://www.noosfero.org/" id='link-noosfero'>Noosfero</a>, licensed under
-    <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public
-      License</a>, version 3 or above.  </p>
-</div><!-- end id="copyright" -->
-<%= language_chooser %>
@@ -0,0 +1 @@
+../base/footer.rhtml
 \ No newline at end of file
@@ -1,3 +0,0 @@
-<li><a href="/assets/enterprises"><span class='icon-menu-enterprise'><%= _('Enterprises') %></span></a></li>
-<li><a href="/assets/products"><span class='icon-menu-product'><%= _('Products') %></span></a></li>
-<li><a href="/assets/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
@@ -0,0 +1 @@
+../base/navigation.rhtml
 \ No newline at end of file
@@ -476,20 +476,11 @@ div.pending-tasks {
 #content #not-found,
 #content #access-denied {
-  padding: 20px;
-  margin: 20px;
-  border: 1px solid #DDD;
   -moz-border-radius: 6px;
   margin-left: 20%;
   margin-right: 20%;
 }
-#content #not-found h1,
-#content #access-denied h1 {
-  text-align: left;
-  margin-top: 0px;
-}
-
 #content #not-found p,
 #content #access-denied p {
   text-align: justify;
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+<li><a href="/assets/enterprises"><span class='icon-menu-enterprise'><%= _('Enterprises') %></span></a></li>
	2	+<li><a href="/assets/products"><span class='icon-menu-product'><%= _('Products') %></span></a></li>
	3	+<li><a href="/assets/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
	@@ -1,10 +0,0 @@	@@ -1,10 +0,0 @@
1	-<div id="footer-links">
2	-</div><!-- end id="footer-links" -->
3	-<div id="copyright">
4	- <p id='noosfero-license'>
5	- Powered by <a
6	- href="http://www.noosfero.org/" id='link-noosfero'>Noosfero</a>, licensed under
7	- <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public
8	- License</a>, version 3 or above. </p>
9	-</div><!-- end id="copyright" -->
10	-<%= language_chooser %>
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../base/footer.rhtml
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -1,3 +0,0 @@	@@ -1,3 +0,0 @@
1	-<li><a href="/assets/enterprises"><span class='icon-menu-enterprise'><%= _('Enterprises') %></span></a></li>
2	-<li><a href="/assets/products"><span class='icon-menu-product'><%= _('Products') %></span></a></li>
3	-<li><a href="/assets/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../base/navigation.rhtml
0	\ No newline at end of file	2	\ No newline at end of file