Download as
Browse Code »

Commit b3806ad264168246ec1ccfaf80723371e6669f79

Authored by Rodrigo Souto
1 parent 2f737f2c
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

Adding name config for templates

Showing 6 changed files with 9 additions and 1 deletions   Show diff stats
app/models/layout_template.rb
  Diff comments   View file @b3806ad
@@ -15,6 +15,10 @@ class LayoutTemplate @@ -15,6 +15,10 @@ class LayoutTemplate
15 @id = id 15 @id = id
16 end 16 end
17 17
  18 + def name
  19 + @config['name']
  20 + end
  21 +
18 def title 22 def title
19 @config['title'] 23 @config['title']
20 end 24 end
app/views/themes/index.rhtml
  Diff comments   View file @b3806ad
@@ -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.id, :class => 'name') + 15 + content_tag('strong', template.name, :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
public/designs/templates/2leftbars/config.yml
  Diff comments   View file @b3806ad
  1 +name: "2 Left Bars"
1 title: "2 sidebars at left of content" 2 title: "2 sidebars at left of content"
2 description: "A template with 2 sidebars at left of content" 3 description: "A template with 2 sidebars at left of content"
3 number_of_boxes: 3 4 number_of_boxes: 3
public/designs/templates/default/config.yml
  Diff comments   View file @b3806ad
  1 +name: "Default"
1 title: "Default Style 3 columns" 2 title: "Default Style 3 columns"
2 description: "A theme default with 3 columns" 3 description: "A theme default with 3 columns"
3 number_of_boxes: 3 4 number_of_boxes: 3
public/designs/templates/leftbar/config.yml
  Diff comments   View file @b3806ad
  1 +name: "Left Bar"
1 title: "Left bar" 2 title: "Left bar"
2 description: "A template with the menu bar at the left" 3 description: "A template with the menu bar at the left"
3 number_of_boxes: 2 4 number_of_boxes: 2
public/designs/templates/rightbar/config.yml
  Diff comments   View file @b3806ad
  1 +name: "Right Bar"
1 title: "Right bar" 2 title: "Right bar"
2 description: "A template with the menu bar at the right" 3 description: "A template with the menu bar at the right"
3 number_of_boxes: 2 4 number_of_boxes: 2