diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2577a97..c2826d1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -921,7 +921,6 @@ module ApplicationHelper 'lightbox', 'colorpicker', pngfix_stylesheet_path, - 'jquery.ui/sunny/jquery-ui-1.8.2.custom', ] end @@ -962,7 +961,7 @@ module ApplicationHelper end def ui_icon(icon_type) - "" + "" end def ui_button(label, url, html_options = {}) @@ -973,4 +972,13 @@ module ApplicationHelper link_to_remote(label, options, html_options.merge(:class => 'ui_button fg-button')) end + def jquery_ui_theme_stylesheet_path + 'jquery.ui/sunny/jquery-ui-1.8.2.custom' + end + + # transform all element with class ui_button in a jQuery UI button + def render_jquery_ui_buttons + javascript_tag('render_jquery_ui_buttons()') + end + end diff --git a/app/helpers/manage_products_helper.rb b/app/helpers/manage_products_helper.rb index 6ff212e..682a1f3 100644 --- a/app/helpers/manage_products_helper.rb +++ b/app/helpers/manage_products_helper.rb @@ -34,7 +34,7 @@ module ManageProductsHelper count_chars += toplevel.name.length end ancestors.each do |category| - if count_chars > 60 + if count_chars > 55 hierarchy << hierarchy_category_item(category, options[:make_links], '( … )') break else diff --git a/app/views/layouts/application-ng.rhtml b/app/views/layouts/application-ng.rhtml index 85f3618..f5c346d 100644 --- a/app/views/layouts/application-ng.rhtml +++ b/app/views/layouts/application-ng.rhtml @@ -12,6 +12,7 @@ <%= stylesheet_link_tag template_stylesheet_path %> <%= stylesheet_link_tag icon_theme_stylesheet_path %> <%= stylesheet_link_tag theme_stylesheet_path %> + <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %> <%# Add custom tags/styles/etc via content_for %> <%= yield :head %> @@ -91,5 +92,6 @@ <%= noosfero_layout_features %> <%= theme_javascript_ng %> + <%= render_jquery_ui_buttons %> diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 462276e..f299fe0 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -23,6 +23,7 @@ %> <%= stylesheet_link_tag template_stylesheet_path %> <%= stylesheet_link_tag icon_theme_stylesheet_path %> + <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %> <%# Add custom tags/styles/etc via content_for %> <%= yield :head %> @@ -124,11 +125,6 @@ <%# if you need to add HTML stuff to the layout, include it in app/views/shared/noosfero_layout_features.rhtml! %> <%= noosfero_layout_features %> - - - + <%= render_jquery_ui_buttons %> diff --git a/app/views/manage_products/edit_category.rhtml b/app/views/manage_products/edit_category.rhtml index 686c941..98b2655 100644 --- a/app/views/manage_products/edit_category.rhtml +++ b/app/views/manage_products/edit_category.rhtml @@ -24,7 +24,7 @@ <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %> - <%= ui_icon(:alert) %> + <%= ui_icon('ui-icon-alert') %> <%= _('This category does not allow registration of products, select a more specific category') %> diff --git a/app/views/manage_products/new.rhtml b/app/views/manage_products/new.rhtml index e63f448..ed7ff99 100644 --- a/app/views/manage_products/new.rhtml +++ b/app/views/manage_products/new.rhtml @@ -17,7 +17,7 @@ <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %> - <%= ui_icon(:alert) %> + <%= ui_icon('ui-icon-alert') %> <%= _('This category does not allow registration of products, select a more specific category') %> diff --git a/app/views/shared/_dialog_error_messages.rhtml b/app/views/shared/_dialog_error_messages.rhtml index b9600ff..8774086 100644 --- a/app/views/shared/_dialog_error_messages.rhtml +++ b/app/views/shared/_dialog_error_messages.rhtml @@ -6,7 +6,7 @@ modal: true, width: 600, resizable: false, - title: "<%= ui_icon(:alert) %>Ops…", + title: "<%= ui_icon('ui-icon-alert') %>Ops…", }); <% end %> <%= error_messages_for object_name %> diff --git a/po/pt/noosfero.po b/po/pt/noosfero.po index c418acf..31c316d 100644 --- a/po/pt/noosfero.po +++ b/po/pt/noosfero.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: noosfero 0.24.2\n" "POT-Creation-Date: 2010-07-17 17:20-0300\n" -"PO-Revision-Date: 2010-07-17 17:29-0300\n" +"PO-Revision-Date: 2010-07-18 14:30-0300\n" "Last-Translator: Joenio Costa \n" "Language-Team: LANGUAGE TEAM \n" "MIME-Version: 1.0\n" @@ -4469,7 +4469,7 @@ msgid "" "This category does not allow registration of products, select a more " "specific category" msgstr "" -"Esta categoria não aceita registro de produtos, selecione uma catregoria " +"Esta categoria não aceita registro de produtos, selecione uma categoria " "mais específica" #: app/views/manage_products/index.rhtml:1 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index db86342..2d676a2 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -3142,15 +3142,13 @@ h1#agenda-title { /* ==> public/stylesheets/controller_manage_products.css <== */ -#new_product_title { - text-align: center; -} #product_category_form { border: 1px solid #AABB88; -moz-border-radius: 5px; -webkit-border-radius: 5px; background: url(/images/ccc.gif); /* image ccc.gif from http://www.wannabegirl.org/translucent */ padding: 10px 30px 20px 30px; + width: 570px; } #categories_container_wrapper { overflow-x: scroll; diff --git a/script/sample-categories b/script/sample-categories index a32874c..c5d5d60 100755 --- a/script/sample-categories +++ b/script/sample-categories @@ -122,4 +122,7 @@ desenv = new_productcategory(software_livre, 'Desenvolvimento') capacitacao = new_productcategory(software_livre, 'Capacitação') admin_de_sistemas = new_productcategory(software_livre, 'Administração de sistemas') arte_digital = new_productcategory(software_livre, 'Arte Digital') +arte_vetorial = new_productcategory(arte_digital, 'Arte Digital com Vetores') +animacao = new_productcategory(arte_digital, 'Animação Digital') +animacao_com_blender = new_productcategory(animacao, 'Animação Digital com Blender 3D') done -- libgit2 0.21.2