From b3806ad264168246ec1ccfaf80723371e6669f79 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Thu, 11 Jul 2013 16:56:58 -0300 Subject: [PATCH] Adding name config for templates --- app/models/layout_template.rb | 4 ++++ app/views/themes/index.rhtml | 2 +- public/designs/templates/2leftbars/config.yml | 1 + public/designs/templates/default/config.yml | 1 + public/designs/templates/leftbar/config.yml | 1 + public/designs/templates/rightbar/config.yml | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/layout_template.rb b/app/models/layout_template.rb index 991faf6..a6a7ea5 100644 --- a/app/models/layout_template.rb +++ b/app/models/layout_template.rb @@ -15,6 +15,10 @@ class LayoutTemplate @id = id end + def name + @config['name'] + end + def title @config['title'] end diff --git a/app/views/themes/index.rhtml b/app/views/themes/index.rhtml index eb9ce49..4d8dfbc 100644 --- a/app/views/themes/index.rhtml +++ b/app/views/themes/index.rhtml @@ -12,7 +12,7 @@ "/designs/templates/#{template.id}/thumbnail.png", :alt => _('The "%s" template')) + '
'.html_safe + - content_tag('strong', template.id, :class => 'name') + + content_tag('strong', template.name, :class => 'name') + '
'.html_safe if @current_template == template.id # selected diff --git a/public/designs/templates/2leftbars/config.yml b/public/designs/templates/2leftbars/config.yml index 5cc015e..1cd0d4f 100644 --- a/public/designs/templates/2leftbars/config.yml +++ b/public/designs/templates/2leftbars/config.yml @@ -1,3 +1,4 @@ +name: "2 Left Bars" title: "2 sidebars at left of content" description: "A template with 2 sidebars at left of content" number_of_boxes: 3 diff --git a/public/designs/templates/default/config.yml b/public/designs/templates/default/config.yml index 3ad2eaf..2f21386 100644 --- a/public/designs/templates/default/config.yml +++ b/public/designs/templates/default/config.yml @@ -1,3 +1,4 @@ +name: "Default" title: "Default Style 3 columns" description: "A theme default with 3 columns" number_of_boxes: 3 diff --git a/public/designs/templates/leftbar/config.yml b/public/designs/templates/leftbar/config.yml index 5349b13..41bb403 100644 --- a/public/designs/templates/leftbar/config.yml +++ b/public/designs/templates/leftbar/config.yml @@ -1,3 +1,4 @@ +name: "Left Bar" title: "Left bar" description: "A template with the menu bar at the left" number_of_boxes: 2 diff --git a/public/designs/templates/rightbar/config.yml b/public/designs/templates/rightbar/config.yml index 2dbe092..a362063 100644 --- a/public/designs/templates/rightbar/config.yml +++ b/public/designs/templates/rightbar/config.yml @@ -1,3 +1,4 @@ +name: "Right Bar" title: "Right bar" description: "A template with the menu bar at the right" number_of_boxes: 2 -- libgit2 0.21.2