@@ -18,73 +18,82 @@ <% form_for(@computer) do |f| %> <%= f.error_messages %> +<table> + <tr> + <td> + <%= t('computers.name') %> + <%= f.text_field :name, :tabindex => '1', :focus => true %> - <%= t('computers.name') %> - <%= f.text_field :name, :tabindex => '1', :focus => true %> + <% 2.times do %> + <br> + <% end %> - <% 2.times do %> - <br> - <% end %> + <%= f.label 'mac' %> + <%= f.text_field :mac, :tabindex => '2' %> - <%= f.label 'mac' %> - <%= f.text_field :mac, :tabindex => '2' %> + <% 2.times do %> + <br> + <% end %> - <% 2.times do %> - <br> - <% end %> + <%= f.label 'ip' %> + <%= f.text_field :ip, :tabindex => '3' %> - <%= f.label 'ip' %> - <%= f.text_field :ip, :tabindex => '3' %> + <% 2.times do %> + <br> + <% end %> - <% 2.times do %> - <br> - <% end %> + <%= t('computers.inventory_register') %> + <%= f.text_field :inventory_register, :tabindex => '4' %> - <%= t('computers.inventory_register') %> - <%= f.text_field :inventory_register, :tabindex => '4' %> + <% 2.times do %> + <br> + <% end %> - <% 2.times do %> - <br> - <% end %> + <%= t('computers.available') %> + <%= t('computers.y') %> <%= radio_button('computer', 'available', 't', :tabindex => '5') %> + <%= t('computers.not') %> <%= radio_button('computer', 'available', 'f', :tabindex => '6') %> - <%= t('computers.available') %> - <%= t('computers.y') %> <%= radio_button('computer', 'available', 't', :tabindex => '5') %> - <%= t('computers.not') %> <%= radio_button('computer', 'available', 'f', :tabindex => '6') %> + <% 2.times do %> + <br> + <% end %> - <% 2.times do %> - <br> - <% end %> + <% if not @computer.is_part_of_a_workstation %> + <div id="quarter" > + <%= collection_select 'computer', 'place_id', Place.find(:all, :select => 'id, title', :order => 'title ASC'), 'id', 'title', + {:prompt => true}, :tabindex => '7' %> + </div> + <% end %> - <% if not @computer.is_part_of_a_workstation %> - <div id="quarter" > - <%= collection_select 'computer', 'place_id', Place.find(:all, :select => 'id, title', :order => 'title ASC'), 'id', 'title', - {:prompt => true}, :tabindex => '7' %> - </div> - <% end %> + <div id="quarter" > + <%= t 'bill.code' %> + <%= collection_select 'computer', 'bill_id', Bill.find(:all), 'id', :company_bill, + {:prompt => true}, :tabindex => '8' %> + </div > - <div id="quarter" > - <%= t 'bill.code' %> - <%= collection_select 'computer', 'bill_id', Bill.find(:all), 'id', :company_bill, - {:prompt => true}, :tabindex => '8' %> - </div > + <% 2.times do %> + <br> + <% end %> + </td> + <td> - <% 2.times do %> - <br> - <% end %> - <%= t('computers.description') %> - <%= fckeditor_textarea("computer", "description", :toolbarSet => 'Simple', :width => '100%', :height => '200px') %> + <%= t('computers.description') %> + <%= fckeditor_textarea("computer", "description", :toolbarSet => 'Easy', :width => '100%', :height => '300px') %> + <% 2.times do %> + <br> + <% end %> - <% 2.times do %> - <br> - <% end %> + + <% if action_name == 'new' %> + <%= f.submit t('computers.create'), :tabindex => '9' %> + <% else %> + <%= f.submit t('computers.edit'), :tabindex => '10' %> + <% end %> + </td> + </tr> +</table> - <% if action_name == 'new' %> - <%= f.submit t('computers.create'), :tabindex => '9' %> - <% else %> - <%= f.submit t('computers.edit'), :tabindex => '10' %> - <% end %> <% end %> app/views/computers/_form.html.erb @@ -30,15 +30,12 @@ FCKConfig.ToolbarSets["Easy"] = [ FCKConfig.ToolbarSets["Simple"] = [ ['Source','-','-','Templates'], ['Cut','Copy','Paste','PasteWord','-','Print','SpellCheck'], - ['Undo','Redo','-','Find','Replace','-','SelectAll'], + ['Undo','Redo','-','Find','Replace','-','SelectAll','Table','Rule','Smiley'], '/', ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'], ['OrderedList','UnorderedList','-','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], ['Link','Unlink'], - '/', - ['Image','Table','Rule','Smiley'], - ['FontName','FontSize'], - ['TextColor','BGColor'], - ['-','About'] + ['FontName','FontSize'], + ['TextColor','BGColor'] ] ; public/javascripts/fckcustom.js 2ccc4517642716e3adc402bab4b233443c064c68 cesar cesar@cesar.unl.edu.ar http://github.com/cesarediaz/inventory/commit/a0c217baa17e2e6247cbb0b763f191c0a4fb33e4 a0c217baa17e2e6247cbb0b763f191c0a4fb33e4 2009-10-15T16:42:47-07:00 2009-10-15T16:42:47-07:00 - Partial * added html to improve the visual aspect of this form - Public * changed to 'Easy' toolset configuration in custom fck editor script 262a47fb888ddbdd9ac4f56a84b0411911aa41b5 cesar cesar@cesar.unl.edu.ar