Commit
b3806ad264168246ec1ccfaf80723371e6669f79
Exists in
master
and in
29 other branches
add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options
Adding name config for templates
|
| @@ -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 |
|
| @@ -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 |
|
| |
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 |
|
| |
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 |
|
| |
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 |
|
| |
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 |
