diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 26de1ca..e8b18ef 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -1,7 +1,5 @@ class AccountController < ApplicationController - uses_flexible_template :owner => 'owner' - # say something nice, you goof! something sweet. def index unless logged_in? diff --git a/app/controllers/edit_template_controller.rb b/app/controllers/edit_template_controller.rb index 9f10976..0e7013c 100644 --- a/app/controllers/edit_template_controller.rb +++ b/app/controllers/edit_template_controller.rb @@ -2,11 +2,7 @@ class EditTemplateController < ApplicationController uses_flexible_template :edit => true, :owner => 'owner' - def flexible_template_owner - Profile.find(1) - end - - def flexible_template_dict(str) + def flexible_template_block_dict(str) { 'MainBlock' => _("Main Block"), 'ListBlock' => _("List Block"), @@ -14,5 +10,4 @@ class EditTemplateController < ApplicationController }[str] || str end - end diff --git a/app/helpers/edit_template_helper.rb b/app/helpers/edit_template_helper.rb index 0157adb..53747a5 100644 --- a/app/helpers/edit_template_helper.rb +++ b/app/helpers/edit_template_helper.rb @@ -1,4 +1,11 @@ # Methods added to this helper will be available to all templates in the application. module EditTemplateHelper + def flexible_template_block_dict(str) + { + 'MainBlock' => _("Main Block"), + 'ListBlock' => _("List Block"), + 'LinkBlock' => _("Link Block") + }[str] || str + end end diff --git a/app/views/edit_template/index.rhtml b/app/views/edit_template/index.rhtml index ddfa21b..f697fd2 100644 --- a/app/views/edit_template/index.rhtml +++ b/app/views/edit_template/index.rhtml @@ -1,7 +1,14 @@ -<%= link_to _('Show Layout'), :controller => 'home' %> -<%= link_to _('Edit Layout'), :controller => 'edit_template' %> +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda +mxendo o contedudo para ver como fica a parada toda -<%= select_template %> -<%= select_theme %> -<%= select_icons_theme %> -<%= display_icon('back')%> diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 52e80dd..5fc02fc 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -1,9 +1,9 @@ <%= javascript_include_tag :defaults %> - <%= javascript_include_tag_template %> - <%= stylesheet_link_tag_template %> - <%= stylesheet_link_tag_theme %> + <%= javascript_include_tag_for_template %> + <%= stylesheet_link_tag_for_template %> + <%= stylesheet_link_tag_for_theme %> @@ -26,13 +26,13 @@
<%= flash[:notice] %>
- <%= display_boxes(yield) %> diff --git a/db/migrate/002_create_profiles.rb b/db/migrate/002_create_profiles.rb index 16e32e0..7abc264 100644 --- a/db/migrate/002_create_profiles.rb +++ b/db/migrate/002_create_profiles.rb @@ -7,7 +7,7 @@ class CreateProfiles < ActiveRecord::Migration t.column :user_id, :integer t.column :template, :string, :default => "default" t.column :theme, :string, :default => "default" - t.column :icons_theme, :string, :default => "default" + t.column :icon_theme, :string, :default => "default" end end diff --git a/lib/extended_tag.rb b/lib/extended_tag.rb index 8078135..c15b0ab 100644 --- a/lib/extended_tag.rb +++ b/lib/extended_tag.rb @@ -13,7 +13,7 @@ class Tag end end - acts_as_ferret :fields => [:name] +# acts_as_ferret :fields => [:name] # Return all the tags that were suggested but not yet approved diff --git a/public/templates/default/stylesheets/style.css b/public/templates/default/stylesheets/style.css index d37c4e5..9465f2e 100644 --- a/public/templates/default/stylesheets/style.css +++ b/public/templates/default/stylesheets/style.css @@ -26,7 +26,7 @@ body { } /* the container */ -#box { +#frame { background-color: #FFFFFF; margin-left: auto; margin-right: auto; diff --git a/public/themes/default/default.css b/public/themes/default/default.css index f8f72fa..bd1d1fd 100644 --- a/public/themes/default/default.css +++ b/public/themes/default/default.css @@ -1,3 +1,3 @@ -#box { +#frame { background-color: white; } diff --git a/public/themes/pink/pink.css b/public/themes/pink/pink.css index a1fceb8..e3d163e 100644 --- a/public/themes/pink/pink.css +++ b/public/themes/pink/pink.css @@ -1,4 +1,4 @@ -#box { +#frame { background-color: pink; } diff --git a/test/fixtures/profiles.yml b/test/fixtures/profiles.yml index 2a8a4f6..d199f77 100644 --- a/test/fixtures/profiles.yml +++ b/test/fixtures/profiles.yml @@ -6,7 +6,7 @@ johndoe: virtual_community_id: 1 user_id: 1 template: 'default' - icons_theme: 'default' + icon_theme: 'default' theme: 'default' joerandomhacker: id: 2 @@ -15,7 +15,7 @@ joerandomhacker: virtual_community_id: 1 user_id: 2 template: 'simple' - icons_theme: 'simple' + icon_theme: 'simple' theme: 'simple' john_and_joe: id: 3 @@ -23,7 +23,7 @@ john_and_joe: identifier: john_and_joe virtual_community_id: 1 template: 'simple' - icons_theme: 'simple' + icon_theme: 'simple' theme: 'simple' ze: id: 4 @@ -31,5 +31,5 @@ ze: identifier: ze virtual_community_id: 1 template: 'default' - icons_theme: 'default' + icon_theme: 'default' theme: 'default' -- libgit2 0.21.2