Cosmetic changes:

- Align left the title of creation product screen - Fixing width of categories selection for new and edit screens - Dont cache jquery.ui stylesheet - Ensure consistency between ui_icon and ui_button methods - Creating more categories in sample-categories script - Fix pt_BR translation of 'categories' (ActionItem1391,ActionItem1392)

Cosmetic changes:
- Align left the title of creation product screen - Fixing width of categories selection for new and edit screens - Dont cache jquery.ui stylesheet - Ensure consistency between ui_icon and ui_button methods - Creating more categories in sample-categories script - Fix pt_BR translation of 'categories' (ActionItem1391,ActionItem1392)
Joenio Costa
1 parent c3e66f14
Showing 10 changed files with 24 additions and 17 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/manage_products_helper.rb
app/views/layouts/application-ng.rhtml
app/views/layouts/application.rhtml
app/views/manage_products/edit_category.rhtml
app/views/manage_products/new.rhtml
app/views/shared/_dialog_error_messages.rhtml
po/pt/noosfero.po
public/stylesheets/application.css
script/sample-categories
@@ -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)
-    "<span class='ui-icon ui-icon-#{icon_type}' style='float:left; margin-right:7px;'></span>"
+    "<span class='ui-icon #{icon_type}' style='float:left; margin-right:7px;'></span>"
   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
@@ -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
@@ -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 @@
     </div><!-- end id="theme-footer" -->
     <%= noosfero_layout_features %>
     <%= theme_javascript_ng %>
+    <%= render_jquery_ui_buttons %>
   </body>
 </html>
@@ -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 %>
-
-    <script type='text/javascript'>
-       // transform all element with class ui_button in a jQuery UI button
-       render_jquery_ui_buttons()
-    </script>
-
+    <%= render_jquery_ui_buttons %>
   </body>
 </html>
@@ -24,7 +24,7 @@
       <span id='save_and_continue_wrapper'>
         <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
         <span class='tooltip' id='save_and_continue_disabled_tooltip'>
-           <%= ui_icon(:alert) %>
+           <%= ui_icon('ui-icon-alert') %>
            <%= _('This category does not allow registration of products, select a more specific category') %>
         </span>
       </span>
@@ -17,7 +17,7 @@
     <span id='save_and_continue_wrapper'>
       <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
       <span class='tooltip' id='save_and_continue_disabled_tooltip'>
-         <%= ui_icon(:alert) %>
+         <%= ui_icon('ui-icon-alert') %>
          <%= _('This category does not allow registration of products, select a more specific category') %>
       </span>
     </span>
@@ -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 %>
@@ -13,7 +13,7 @@ msgid &quot;&quot;
 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 <joenio@colivre.coop.br>\n"
 "Language-Team: LANGUAGE TEAM <E-MAIL@ADDRESS or HOME PAGE>\n"
 "MIME-Version: 1.0\n"
@@ -4469,7 +4469,7 @@ msgid &quot;&quot;
 "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
@@ -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;
@@ -122,4 +122,7 @@ desenv = new_productcategory(software_livre, &#39;Desenvolvimento&#39;)
 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
	@@ -34,7 +34,7 @@ module ManageProductsHelper		@@ -34,7 +34,7 @@ module ManageProductsHelper
34	count_chars += toplevel.name.length	34	count_chars += toplevel.name.length
35	end	35	end
36	ancestors.each do \|category\|	36	ancestors.each do \|category\|
37	- if count_chars > 60	37	+ if count_chars > 55
38	hierarchy << hierarchy_category_item(category, options[:make_links], '( … )')	38	hierarchy << hierarchy_category_item(category, options[:make_links], '( … )')
39	break	39	break
40	else	40	else
	@@ -24,7 +24,7 @@		@@ -24,7 +24,7 @@
24	<span id='save_and_continue_wrapper'>	24	<span id='save_and_continue_wrapper'>
25	<%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>	25	<%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
26	<span class='tooltip' id='save_and_continue_disabled_tooltip'>	26	<span class='tooltip' id='save_and_continue_disabled_tooltip'>
27	- <%= ui_icon(:alert) %>	27	+ <%= ui_icon('ui-icon-alert') %>
28	<%= _('This category does not allow registration of products, select a more specific category') %>	28	<%= _('This category does not allow registration of products, select a more specific category') %>
29	</span>	29	</span>
30	</span>	30	</span>
	@@ -17,7 +17,7 @@		@@ -17,7 +17,7 @@
17	<span id='save_and_continue_wrapper'>	17	<span id='save_and_continue_wrapper'>
18	<%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>	18	<%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
19	<span class='tooltip' id='save_and_continue_disabled_tooltip'>	19	<span class='tooltip' id='save_and_continue_disabled_tooltip'>
20	- <%= ui_icon(:alert) %>	20	+ <%= ui_icon('ui-icon-alert') %>
21	<%= _('This category does not allow registration of products, select a more specific category') %>	21	<%= _('This category does not allow registration of products, select a more specific category') %>
22	</span>	22	</span>
23	</span>	23	</span>
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6	modal: true,	6	modal: true,
7	width: 600,	7	width: 600,
8	resizable: false,	8	resizable: false,
9	- title: "<%= ui_icon(:alert) %>Ops…",	9	+ title: "<%= ui_icon('ui-icon-alert') %>Ops…",
10	});	10	});
11	<% end %>	11	<% end %>
12	<%= error_messages_for object_name %>	12	<%= error_messages_for object_name %>
	@@ -13,7 +13,7 @@ msgid ""		@@ -13,7 +13,7 @@ msgid ""
13	msgstr ""	13	msgstr ""
14	"Project-Id-Version: noosfero 0.24.2\n"	14	"Project-Id-Version: noosfero 0.24.2\n"
15	"POT-Creation-Date: 2010-07-17 17:20-0300\n"	15	"POT-Creation-Date: 2010-07-17 17:20-0300\n"
16	-"PO-Revision-Date: 2010-07-17 17:29-0300\n"	16	+"PO-Revision-Date: 2010-07-18 14:30-0300\n"
17	"Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"	17	"Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18	"Language-Team: LANGUAGE TEAM <E-MAIL@ADDRESS or HOME PAGE>\n"	18	"Language-Team: LANGUAGE TEAM <E-MAIL@ADDRESS or HOME PAGE>\n"
19	"MIME-Version: 1.0\n"	19	"MIME-Version: 1.0\n"
	@@ -4469,7 +4469,7 @@ msgid ""		@@ -4469,7 +4469,7 @@ msgid ""
4469	"This category does not allow registration of products, select a more "	4469	"This category does not allow registration of products, select a more "
4470	"specific category"	4470	"specific category"
4471	msgstr ""	4471	msgstr ""
4472	-"Esta categoria não aceita registro de produtos, selecione uma catregoria "	4472	+"Esta categoria não aceita registro de produtos, selecione uma categoria "
4473	"mais específica"	4473	"mais específica"
4474		4474
4475	#: app/views/manage_products/index.rhtml:1	4475	#: app/views/manage_products/index.rhtml:1