Download as
Browse Code »

Commit 6cdfd2cefe328cf839136efedbf4bbd1740025a6

Authored by Diego Camarinha
2 parents c45ede43 f9135de4
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Merge pull request #91 from mezuro/minor-fixes 

Minor fixes
Showing 4 changed files with 1 additions and 14 deletions   Show diff stats
app/assets/images/banner-ccsl.png 0 → 100644
View file @6cdfd2c

29.5 KB
app/views/compound_metric_configurations/_form.html.erb
  Diff comments   View file @6cdfd2c
... ... @@ -34,18 +34,6 @@
34 34 </div>
35 35 </div>
36 36  
37   - <div class="form-row">
38   - <div class="field-container">
39   - <%= f.label :aggregation_form, 'Aggregation Form', class: 'control-label' %>
40   - <%= f.select( :aggregation_form, aggregation_options, {class: 'form-control'} ) %>
41   - </div>
42   - <div class="help-container">
43   - <p>
44   - It's the aggregation form of the metric
45   - </p>
46   - </div>
47   - </div>
48   -
49 37 <% if @compound_metric_configuration.persisted? %>
50 38 <%= hidden_field_tag(:reading_group_id, @metric_configuration.reading_group_id) %>
51 39 <% else %>
... ...
app/views/layouts/application.html.erb
  Diff comments   View file @6cdfd2c
... ... @@ -103,7 +103,7 @@
103 103  
104 104 <footer>
105 105 <div class="footer-left">&copy; <%= link_to 'The Mezuro Team', '/humans.txt' %> 2013-2014</div>
106   - <div class="footer-right"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %> <%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/mezuro' %> <%= image_tag 'usp-cloud-nuvem-logo.png' %></div>
  106 + <div class="footer-right"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %> <%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %> <%= image_tag 'usp-cloud-nuvem-logo.png' %> <%= link_to image_tag('banner-ccsl.png', height: '55', width: '190'), 'http://ccsl.ime.usp.br/' %></div>
107 107 </footer>
108 108  
109 109 </div> <!-- /container -->
... ...
features/compound_metric_configuration/create.feature
  Diff comments   View file @6cdfd2c
... ... @@ -22,7 +22,6 @@ Feature: Compound Metric Configuration Creation
22 22 And I fill the Script field with "8*8;"
23 23 And I fill the Weight field with "8"
24 24 And I set the select field "Scope" as "Class"
25   - And I set the select field "Aggregation Form" as "Average"
26 25 And I set the select field "Reading Group" as "Scholar"
27 26 And I press the Save button
28 27 Then I should see "My Compound Metric"
... ...