Download as
Browse Code »

Commit 45c69dfe71a8e18c5d7c29ff7c2d97f052e8e18b

Authored by Rodrigo Souto
2 parents b5f420ca edc5d4c5
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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
  Diff comments   View file @45c69df
... ... @@ -16,15 +16,15 @@ class LayoutTemplate
16 16 end
17 17  
18 18 def name
19   - @config['name']
  19 + _ @config['name']
20 20 end
21 21  
22 22 def title
23   - @config['title']
  23 + _ @config['title']
24 24 end
25 25  
26 26 def description
27   - @config['description']
  27 + _ @config['description']
28 28 end
29 29  
30 30 def number_of_boxes
... ...
app/views/themes/index.rhtml
  Diff comments   View file @45c69df
... ... @@ -12,7 +12,7 @@
12 12 "/designs/templates/#{template.id}/thumbnail.png",
13 13 :alt => _('The "%s" template')) +
14 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 16 ' <br/> '.html_safe
17 17  
18 18 if @current_template == template.id # selected
... ...
po/pt/noosfero.po
  Diff comments   View file @45c69df
... ... @@ -2875,6 +2875,30 @@ msgstr &quot;Artigo de texto com linguagem de marcação Textile&quot;
2875 2875 msgid "Accessible alternative for visually impaired users."
2876 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 2902 #: app/models/login_block.rb:4
2879 2903 msgid "Login/logout"
2880 2904 msgstr "Login/Sair"
... ...
public/designs/templates/leftbottom/config.yml
  Diff comments   View file @45c69df
1   -name: "Left and Bottom bar"
  1 +name: "Left and Bottom Bar"
2 2 title: "Style 2 columns and a box at bottom of content"
3 3 description: "A theme with 2 columns and a box below the content"
4 4 number_of_boxes: 3
... ...
public/designs/templates/nosidebars/config.yml
  Diff comments   View file @45c69df
1   -name: "No Side Bars"
  1 +name: "No Sidebars"
2 2 title: "No sidebars, only content"
3 3 description: "A template without sidebars, only content"
4 4 number_of_boxes: 1
... ...