Changeset 465

Show
Ignore:
Timestamp:
01/23/07 12:29:00 (2 years ago)
Author:
timo
Message:

More renaming, mainly in the views.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/workorder_report_rename/app/views/asset_permission/edit.rhtml

    r464 r465  
    1212    </tr> 
    1313    <tr> 
    14       <th><%= _('Create reports') %></th> 
    15       <td><%= check_box(:assets_user_group, :create_report) %></td> 
     14      <th><%= _('Create forms') %></th> 
     15      <td><%= check_box(:assets_user_group, :create_form) %></td> 
    1616    </tr> 
    1717    <tr> 
    …… 
    4141<%= end_form_tag %> 
    4242 
    43 <% if @assets_user_group.create_report or @assets_user_group.create_work_order or @assets_user_group.attach_file -%> 
    44   <% if @assets_user_group.create_report -%> 
    45     <h3><%= _('Default permissions for reports created by user group "%s"', h(@user_group.name)) %></h3> 
    46     <%= render(:partial => 'profiles', :object => @report_permission_profiles, 
     43<% if @assets_user_group.create_form or @assets_user_group.create_work_order or @assets_user_group.attach_file -%> 
     44  <% if @assets_user_group.create_form -%> 
     45    <h3><%= _('Default permissions for forms created by user group "%s"', h(@user_group.name)) %></h3> 
     46    <%= render(:partial => 'profiles', :object => @form_permission_profiles, 
    4747               :locals => {:type => 'FormPermissionProfile', 
    48                            :available_groups => @report_available_groups, 
    49                            :view_text => _('View report'), 
    50                            :edit_text => _('Edit report'), 
    51                            :object_name => 'report'}) %> 
     48                           :available_groups => @form_available_groups, 
     49                           :view_text => _('View form'), 
     50                           :edit_text => _('Edit form'), 
     51                           :object_name => 'form'}) %> 
    5252  <% end -%> 
    5353  <% if @assets_user_group.create_work_order -%> 

  • branches/workorder_report_rename/app/views/data_permission/edit.rhtml

    r464 r465  
    22case @object.class.to_s 
    33  when 'Form' 
    4     view_text = _('View report') 
    5     edit_text = _('Edit report') 
    6     object_link = link_to_report(@object) 
     4    view_text = _('View form') 
     5    edit_text = _('Edit form') 
     6    object_link = link_to_form(@object) 
    77  when 'WorkOrder' 
    88    view_text = _('View work order') 

  • branches/workorder_report_rename/app/views/data_permission/preview.rhtml

    r464 r465  
    22case @datatype 
    33  when 'Form' 
    4     view_text = _('View report') 
    5     edit_text = _('Edit report') 
    6     title = _('Permissions for the new report') 
     4    view_text = _('View form') 
     5    edit_text = _('Edit form') 
     6    title = _('Permissions for the new form') 
    77  when 'WorkOrder' 
    88    view_text = _('View work order') 

  • branches/workorder_report_rename/app/views/layouts/mainlevel.rhtml

    r464 r465  
    2121    <title><%= @title %> - NorfelloCMMS</title> 
    2222 
    23     <!-- report/view --> 
    24     <%= @content_for_report_style %> 
     23    <!-- form/view --> 
     24    <%= @content_for_form_style %> 
    2525 
    2626    <%= stylesheet_link_tag 'base' %> 

  • branches/workorder_report_rename/app/views/overview/executive_view.rhtml

    r464 r465  
    66  <tr> 
    77    <td><img src="<%= url_for(:action => 'get_chart', :type => 'resource_usage') %>"/></td> 
    8     <td><img src="<%= url_for(:action => 'get_chart', :type => 'reports_by_type') %>"/></td> 
     8    <td><img src="<%= url_for(:action => 'get_chart', :type => 'forms_by_type') %>"/></td> 
    99  </tr> 
    1010  <tr> 

  • branches/workorder_report_rename/app/views/shared/_list_items.rhtml

    r464 r465  
    162162                  link_to_work_order(value, true, false) 
    163163                when 'Form' 
    164                   link_to_report(value, true) 
     164                  link_to_form(value, true) 
    165165                when 'Attachment' 
    166166                  link_to_attachment(value, true) 
    167167                when 'FormTemplate' 
    168168                  image_tag('16x16/download') + 
    169                     link_to(_('Download'), :controller => 'report_type', :action => 'download_template', :id => value.id) 
     169                    link_to(_('Download'), :controller => 'form_type', :action => 'download_template', :id => value.id) 
    170170                when 'UserGroup' 
    171171                  h(value.name) 

  • branches/workorder_report_rename/app/views/timeline/_display_event.rhtml

    r455 r465  
    2828 
    2929  <% when 'FormEvent' -%> 
    30     <%= link_to_asset(event.report.asset) if show_asset_link %> 
    31     <%= link_to_report(event.report) %> 
     30    <%= link_to_asset(event.form.asset) if show_asset_link %> 
     31    <%= link_to_form(event.form) %> 
    3232 
    3333    <span class="created"> 

  • branches/workorder_report_rename/app/views/work_order/create.rhtml

    r464 r465  
    55<%= form_tag(:action => 'create') %> 
    66 
    7 <% if @cause_report_id -%> 
    8   <%= hidden_field_tag(:cause_report_id, @cause_report_id) %> 
     7<% if @cause_form_id -%> 
     8  <%= hidden_field_tag(:cause_form_id, @cause_form_id) %> 
    99<% end -%> 
    1010<table class="form"> 

  • branches/workorder_report_rename/app/views/work_order/view.rhtml

    r464 r465  
    11<%= error_messages_for :work_order %> 
    22 
    3 <% if @work_order.cause_report -%> 
    4   <%= _('Cause report') + ': ' + link_to_report(@work_order.cause_report, true) %> 
     3<% if @work_order.cause_form -%> 
     4  <%= _('Cause form') + ': ' + link_to_form(@work_order.cause_form, true) %> 
    55<% end -%> 
    66 
    …… 
    6565                    {:action => 'download', :id => @work_order.id}) %></td> 
    6666    <% if @work_order.is_closed? -%> 
    67       <% if @work_order.effect_report.is_a?(Form) -%> 
    68         <td><%= _('Effect report') + ': ' + link_to_report(@work_order.effect_report, true) %></td> 
     67      <% if @work_order.effect_form.is_a?(Form) -%> 
     68        <td><%= _('Effect form') + ': ' + link_to_form(@work_order.effect_form, true) %></td> 
    6969      <% elsif work_order_tag = @work_order.work_order_tag and 
    70                effect_report_tag = work_order_tag.effect_report_tag -%> 
    71         <td><%= link_to(image_tag('16x16/report') + _('Create report'), 
    72                         {:controller => 'report', :action => 'select_report_type', 
     70               effect_form_tag = work_order_tag.effect_form_tag -%> 
     71        <td><%= link_to(image_tag('16x16/form') + _('Create form'), 
     72                        {:controller => 'form', :action => 'select_form_type', 
    7373                         :cause_work_order_id => @work_order.id, 
    74                          :tag_id => effect_report_tag.id }) %></td> 
     74                         :tag_id => effect_form_tag.id }) %></td> 
    7575      <% end -%> 
    7676    <% end -%> 

  • branches/workorder_report_rename/app/views/work_order_type/view_template.rhtml

    r2 r465  
    11<% if @work_order_template -%> 
    2   <% content_for('report_style') do -%> 
     2  <% content_for('form_style') do -%> 
    33    <%= @template_style %> 
    44  <% end -%> 

  • branches/workorder_report_rename/public/stylesheets/base.css

    r464 r465  
    1717@import "asset.css"; 
    1818@import "timeline.css"; 
    19 @import "reports.css"; 
     19@import "forms.css"; 
    2020@import "workorders.css"; 
    2121@import "odt2html.css"; 

  • branches/workorder_report_rename/public/stylesheets/forms.css

    r452 r465  
    1 /* REPORTS */ 
     1/* FORMS */ 
    22 
    3 h3.report { 
    4   background: url(../images/22x22/report.png) 0 0 no-repeat; 
     3h3.form { 
     4  background: url(../images/22x22/form.png) 0 0 no-repeat; 
    55  padding: 4px 0 6px 30px; 
    66} 

  • branches/workorder_report_rename/public/stylesheets/odt2html.css

    r395 r465  
    1313   Tested on firefox 1.5   
    1414*/  
    15 div.report_html_view table>tbody>tr>td {  
     15div.form_html_view table>tbody>tr>td {  
    1616  padding: 0; 
    1717}  
    18 div.report_html_view table>tbody>tr>td>table {  
     18div.form_html_view table>tbody>tr>td>table {  
    1919  padding: 0;  
    2020  margin: 0;  
    2121} 
    22 div.report_html_view td>div { 
     22div.form_html_view td>div { 
    2323  margin-left: 5px; 
    2424} 

  • branches/workorder_report_rename/public/stylesheets/reset.css

    r393 r465  
    77body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td{margin:0;padding:0;} 
    88 
    9 /* table{border-collapse:collapse;border-spacing:0;} This breaks tables in report html views... */ 
     9/* table{border-collapse:collapse;border-spacing:0;} This breaks tables in form html views... */ 
    1010 
    1111fieldset,img{border:0;} 

  • branches/workorder_report_rename/public/stylesheets/timeline.css

    r391 r465  
    6565} 
    6666 
    67 a.report { 
     67a.form { 
    6868        padding-left: 20px; 
    69         background: transparent url(../images/16x16/timeline_report.gif) 0px 0px no-repeat; 
     69        background: transparent url(../images/16x16/timeline_form.gif) 0px 0px no-repeat; 
    7070} 
    7171 

  • branches/workorder_report_rename/test/unit/asset_test.rb

    r464 r465  
    3939    @authorized_to_read = create_raw_asset('User authorized to read', 'READ', @root) 
    4040    @authorized_to_edit = create_raw_asset('User authorized to edit', 'EDIT', @root) 
    41     @authorized_to_create_form = create_raw_asset('User authorized to create form', 'REPORT', @root) 
     41    @authorized_to_create_form = create_raw_asset('User authorized to create form', 'FORM', @root) 
    4242    @authorized_to_create_work_order = create_raw_asset('User authorized to create work order', 'WORKORDER', @root) 
    4343    @authorized_to_attach_file = create_raw_asset('User authorized to attach file', 'ATTACHMENT', @root) 

© 2004-2007 Norfello Oy All Rights Reserved