Commit 45c69dfe71a8e18c5d7c29ff7c2d97f052e8e18b
Exists in
master
and in
28 other branches
Merge branch 'ai3050' of https://gitlab.com/brauliobo/noosfero into brauliobo/noosfero-ai3050
Showing
5 changed files
with
30 additions
and
6 deletions
Show diff stats
app/models/layout_template.rb
| @@ -16,15 +16,15 @@ class LayoutTemplate | @@ -16,15 +16,15 @@ class LayoutTemplate | ||
| 16 | end | 16 | end |
| 17 | 17 | ||
| 18 | def name | 18 | def name |
| 19 | - @config['name'] | 19 | + _ @config['name'] |
| 20 | end | 20 | end |
| 21 | 21 | ||
| 22 | def title | 22 | def title |
| 23 | - @config['title'] | 23 | + _ @config['title'] |
| 24 | end | 24 | end |
| 25 | 25 | ||
| 26 | def description | 26 | def description |
| 27 | - @config['description'] | 27 | + _ @config['description'] |
| 28 | end | 28 | end |
| 29 | 29 | ||
| 30 | def number_of_boxes | 30 | def number_of_boxes |
app/views/themes/index.rhtml
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | "/designs/templates/#{template.id}/thumbnail.png", | 12 | "/designs/templates/#{template.id}/thumbnail.png", |
| 13 | :alt => _('The "%s" template')) + | 13 | :alt => _('The "%s" template')) + |
| 14 | '<div class="opt-info">'.html_safe + | 14 | '<div class="opt-info">'.html_safe + |
| 15 | - content_tag('strong', template.name, :class => 'name') + | 15 | + content_tag('strong', template.name, :title => template.title, :class => 'name') + |
| 16 | ' <br/> '.html_safe | 16 | ' <br/> '.html_safe |
| 17 | 17 | ||
| 18 | if @current_template == template.id # selected | 18 | if @current_template == template.id # selected |
po/pt/noosfero.po
| @@ -2875,6 +2875,30 @@ msgstr "Artigo de texto com linguagem de marcação Textile" | @@ -2875,6 +2875,30 @@ msgstr "Artigo de texto com linguagem de marcação Textile" | ||
| 2875 | msgid "Accessible alternative for visually impaired users." | 2875 | msgid "Accessible alternative for visually impaired users." |
| 2876 | msgstr "Alternativa acessível para usuários com deficiência visual." | 2876 | msgstr "Alternativa acessível para usuários com deficiência visual." |
| 2877 | 2877 | ||
| 2878 | +#: app/models/layout_template.rb | ||
| 2879 | +msgid "Left Bar" | ||
| 2880 | +msgstr "Uma barra à esquerda" | ||
| 2881 | + | ||
| 2882 | +#: app/models/layout_template.rb | ||
| 2883 | +msgid "2 Left Bars" | ||
| 2884 | +msgstr "Duas barras à esquerda" | ||
| 2885 | + | ||
| 2886 | +#: app/models/layout_template.rb | ||
| 2887 | +msgid "Left and Bottom Bar" | ||
| 2888 | +msgstr "Uma barra à esquerda e outra ao final" | ||
| 2889 | + | ||
| 2890 | +#: app/models/layout_template.rb | ||
| 2891 | +msgid "Right Bar" | ||
| 2892 | +msgstr "Uma barra à direita" | ||
| 2893 | + | ||
| 2894 | +#: app/models/layout_template.rb | ||
| 2895 | +msgid "Default" | ||
| 2896 | +msgstr "Padrão" | ||
| 2897 | + | ||
| 2898 | +#: app/models/layout_template.rb | ||
| 2899 | +msgid "No Sidebars" | ||
| 2900 | +msgstr "Nenhuma barra lateral" | ||
| 2901 | + | ||
| 2878 | #: app/models/login_block.rb:4 | 2902 | #: app/models/login_block.rb:4 |
| 2879 | msgid "Login/logout" | 2903 | msgid "Login/logout" |
| 2880 | msgstr "Login/Sair" | 2904 | msgstr "Login/Sair" |
public/designs/templates/leftbottom/config.yml
| 1 | -name: "Left and Bottom bar" | 1 | +name: "Left and Bottom Bar" |
| 2 | title: "Style 2 columns and a box at bottom of content" | 2 | title: "Style 2 columns and a box at bottom of content" |
| 3 | description: "A theme with 2 columns and a box below the content" | 3 | description: "A theme with 2 columns and a box below the content" |
| 4 | number_of_boxes: 3 | 4 | number_of_boxes: 3 |
public/designs/templates/nosidebars/config.yml