diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb index c578ff6..ef35141 100644 --- a/app/helpers/boxes_helper.rb +++ b/app/helpers/boxes_helper.rb @@ -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 diff --git a/app/views/shared/access_denied.rhtml b/app/views/shared/access_denied.rhtml index 9daed0c..8af1d38 100644 --- a/app/views/shared/access_denied.rhtml +++ b/app/views/shared/access_denied.rhtml @@ -1,19 +1,20 @@
-

<%= @title || _('Access denied') %>

+ <% noosfero_wrap do %> +

<%= @title || _('Access denied') %>

- <% unless @message.nil? %> -

<%= @message %>

- <% else %> -

<%= _('You are not allowed to view this page.') %>

-

<%= _("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.") %>

- <% end %> + <% unless @message.nil? %> +

<%= @message %>

+ <% else %> +

<%= _('You are not allowed to view this page.') %>

+

<%= _("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.") %>

+ <% end %> -
+ <% 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 %>
diff --git a/app/views/shared/not_found.rhtml b/app/views/shared/not_found.rhtml index 62c7ba8..a444706 100644 --- a/app/views/shared/not_found.rhtml +++ b/app/views/shared/not_found.rhtml @@ -1,11 +1,13 @@
-

<%= _('There is no such page: %s') % (content_tag('tt', @path)) %>

-

- <%= _('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.') %> -

- <% button_bar do %> - <%= button :back, _('Go back'), :back %> - <%= button :home, _('Go to %s home page') % environment.name, :controller => 'home' %> + <% noosfero_wrap do %> +

<%= _('There is no such page: %s') % (content_tag('tt', @path)) %>

+

+ <%= _('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.') %> +

+ <% button_bar do %> + <%= button :back, _('Go back'), :back %> + <%= button :home, _('Go to %s home page') % environment.name, :controller => 'home' %> + <% end %> <% end %>
diff --git a/public/designs/themes/base/footer.rhtml b/public/designs/themes/base/footer.rhtml index 54a7bb9..bf0feb7 100644 --- a/public/designs/themes/base/footer.rhtml +++ b/public/designs/themes/base/footer.rhtml @@ -1,4 +1,5 @@ +<%= language_chooser %> diff --git a/public/designs/themes/base/layout.css b/public/designs/themes/base/layout.css index 05bdb81..e3da661 100644 --- a/public/designs/themes/base/layout.css +++ b/public/designs/themes/base/layout.css @@ -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 { diff --git a/public/designs/themes/base/navigation.rhtml b/public/designs/themes/base/navigation.rhtml new file mode 100644 index 0000000..8978b1a --- /dev/null +++ b/public/designs/themes/base/navigation.rhtml @@ -0,0 +1,3 @@ +
  • <%= _('Enterprises') %>
    • +
  • <%= _('Products') %>
    • +
  • <%= _('Events') %>
    • diff --git a/public/designs/themes/noosfero/footer.rhtml b/public/designs/themes/noosfero/footer.rhtml deleted file mode 100644 index 8540d68..0000000 --- a/public/designs/themes/noosfero/footer.rhtml +++ /dev/null @@ -1,10 +0,0 @@ - - -<%= language_chooser %> diff --git a/public/designs/themes/noosfero/footer.rhtml b/public/designs/themes/noosfero/footer.rhtml new file mode 120000 index 0000000..7e3e084 --- /dev/null +++ b/public/designs/themes/noosfero/footer.rhtml @@ -0,0 +1 @@ +../base/footer.rhtml \ No newline at end of file diff --git a/public/designs/themes/noosfero/navigation.rhtml b/public/designs/themes/noosfero/navigation.rhtml deleted file mode 100644 index 8978b1a..0000000 --- a/public/designs/themes/noosfero/navigation.rhtml +++ /dev/null @@ -1,3 +0,0 @@ -
  • <%= _('Enterprises') %>
    • -
  • <%= _('Products') %>
    • -
  • <%= _('Events') %>
    • diff --git a/public/designs/themes/noosfero/navigation.rhtml b/public/designs/themes/noosfero/navigation.rhtml new file mode 120000 index 0000000..5001a9c --- /dev/null +++ b/public/designs/themes/noosfero/navigation.rhtml @@ -0,0 +1 @@ +../base/navigation.rhtml \ No newline at end of file diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index 991772d..84585ad 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -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; -- libgit2 0.21.2