Commit 6cdfd2cefe328cf839136efedbf4bbd1740025a6
Exists in
colab
and in
4 other branches
Merge pull request #91 from mezuro/minor-fixes
Minor fixes
Showing
4 changed files
with
1 additions
and
14 deletions
Show diff stats
29.5 KB
app/views/compound_metric_configurations/_form.html.erb
| @@ -34,18 +34,6 @@ | @@ -34,18 +34,6 @@ | ||
| 34 | </div> | 34 | </div> |
| 35 | </div> | 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 | <% if @compound_metric_configuration.persisted? %> | 37 | <% if @compound_metric_configuration.persisted? %> |
| 50 | <%= hidden_field_tag(:reading_group_id, @metric_configuration.reading_group_id) %> | 38 | <%= hidden_field_tag(:reading_group_id, @metric_configuration.reading_group_id) %> |
| 51 | <% else %> | 39 | <% else %> |
app/views/layouts/application.html.erb
| @@ -103,7 +103,7 @@ | @@ -103,7 +103,7 @@ | ||
| 103 | 103 | ||
| 104 | <footer> | 104 | <footer> |
| 105 | <div class="footer-left">© <%= link_to 'The Mezuro Team', '/humans.txt' %> 2013-2014</div> | 105 | <div class="footer-left">© <%= 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 | </footer> | 107 | </footer> |
| 108 | 108 | ||
| 109 | </div> <!-- /container --> | 109 | </div> <!-- /container --> |
features/compound_metric_configuration/create.feature
| @@ -22,7 +22,6 @@ Feature: Compound Metric Configuration Creation | @@ -22,7 +22,6 @@ Feature: Compound Metric Configuration Creation | ||
| 22 | And I fill the Script field with "8*8;" | 22 | And I fill the Script field with "8*8;" |
| 23 | And I fill the Weight field with "8" | 23 | And I fill the Weight field with "8" |
| 24 | And I set the select field "Scope" as "Class" | 24 | And I set the select field "Scope" as "Class" |
| 25 | - And I set the select field "Aggregation Form" as "Average" | ||
| 26 | And I set the select field "Reading Group" as "Scholar" | 25 | And I set the select field "Reading Group" as "Scholar" |
| 27 | And I press the Save button | 26 | And I press the Save button |
| 28 | Then I should see "My Compound Metric" | 27 | Then I should see "My Compound Metric" |