Commit
b3806ad264168246ec1ccfaf80723371e6669f79
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
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 |
