Skip to content

Commit

Permalink
Merge pull request #69 from mezuro/helpcontainer
Browse files Browse the repository at this point in the history 
Helpcontainer

Form tooltips
  • Loading branch information
@rafamanzo
rafamanzo committed May 1, 2014
2 parents 34e71c8 + e1a97c9 commit 6853200
Show file tree
Hide file tree
Showing 16 changed files with 475 additions and 175 deletions.
16 changes: 12 additions & 4 deletions app/assets/stylesheets/form_with_tooltip.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
width: 100%;
border-bottom: 1px solid #f2f2f2;
border-top: 1px solid #e3e3e3;
overflow: hidden;
display: inline-flex;
}

Expand All @@ -24,8 +23,7 @@
.help-container {
float: left;
width: 400px;
margin: 0 0 -20000px 0;
padding: 20px 20px 20000px 20px;
padding: 20px;
background: #f5f5f5;
border-left: 1px solid #e3e3e3;
border-right: 1px solid #e3e3e3;
Expand All @@ -35,4 +33,14 @@
width: 95% !important;
margin: 0;
background: #f9f9f9;
}
}

.text-area {
width: 95% !important;
margin: 0;
}

.field-container select {
width: 99% !important;
margin: 0;
}
81 changes: 58 additions & 23 deletions app/views/compound_metric_configurations/_form.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,68 @@
<%= render :partial => 'shared/form_errors', :locals => {:object => @compound_metric_configuration} %>
<div class="row margin-left-none">
<div class="form-table span9">

<%= f.fields_for :metric do |metric| %>
<%= render partial: "metric_options", :locals => {:f => metric, :metric => @compound_metric_configuration.metric} %>
<% end %>
<%= f.fields_for :metric do |metric| %>
<%= render partial: "metric_options", :locals => {:f => metric, :metric => @compound_metric_configuration.metric} %>
<% end %>

<div class="form-group">
<%= f.label :code, class: 'control-label' %>
<%= f.text_field :code, class: 'form-control' %>
</div>
<div class="form-row">
<div class="field-container">
<%= f.label :code, class: 'control-label' %>
<%= f.text_field :code, class: 'text-field' %>
</div>
<div class="help-container">
<p>
Code it is a variable that holds the value of a metric analysis. It's used inside a compound metric
</p>
<p>
Example :
Code foo := 10
</p>
</div>
</div>

<div class="form-group">
<%= f.label :weight, class: 'control-label' %>
<%= f.text_field :weight, class: 'form-control' %>
</div>
<div class="form-row">
<div class="field-container">
<%= f.label :weight, class: 'control-label' %>
<%= f.text_field :weight, class: 'text-field' %>
</div>
<div class="help-container">
<p>
It's the weight of the metric
</p>
</div>
</div>

<div class="form-group">
<%= f.label :aggregation_form, 'Aggregation Form', class: 'control-label' %>
<%= f.select( :aggregation_form, aggregation_options, {class: 'form-control'} ) %>
</div>
<div class="form-row">
<div class="field-container">
<%= f.label :aggregation_form, 'Aggregation Form', class: 'control-label' %>
<%= f.select( :aggregation_form, aggregation_options, {class: 'form-control'} ) %>
</div>
<div class="help-container">
<p>
It's the aggregation form of the metric
</p>
</div>
</div>

<% if @compound_metric_configuration.persisted? %>
<%= hidden_field_tag(:reading_group_id, @compound_metric_configuration.reading_group_id) %>
<% else %>
<div class="form-group">
<%= f.label :reading_group_id, 'Reading Group', class: 'control-label' %>
<%= f.select( :reading_group_id, reading_group_options, {class: 'form-control'} ) %>
<% if @compound_metric_configuration.persisted? %>
<%= hidden_field_tag(:reading_group_id, @metric_configuration.reading_group_id) %>
<% else %>
<div class="form-row">
<div class="field-container">
<%= f.label :reading_group_id, 'Reading Group', class: 'control-label' %>
<%= f.select( :reading_group_id, reading_group_options, {class: 'form-control'} ) %>
</div>
<div class="help-container">
<p>
The reading group that is associated with this metric
</p>
</div>
</div>
<% end %>
</div>
<% end %>

</div>
<br>
<%= f.submit 'Save', class: 'btn btn-primary' %>
<%= link_to 'Back', mezuro_configuration_path(@compound_metric_configuration.configuration_id), class: 'btn btn-default' %>
63 changes: 45 additions & 18 deletions app/views/compound_metric_configurations/_metric_options.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,48 @@
<div class="form-group">
<%= f.label :name, class: 'control-label' %>
<%= f.text_field :name, class: 'form-control', value: (metric.name unless metric.nil?) %>
</div>
<div class="form-row">
<div class="field-container">
<%= f.label :name, class: 'control-label' %>
<%= f.text_field :name, class: 'text-field', value: (metric.name unless metric.nil?) %>
</div>
<div class="help-container">
<p>
A custom name for your compound metric.
</p>
</div>
</div>

<div class="form-group">
<%= f.label :description, class: 'control-label' %>
<%= f.text_field :description, class: 'form-control', value: (metric.description unless metric.nil?) %>
</div>
<div class="form-row">
<div class="field-container">
<%= f.label :description, class: 'control-label' %>
<%= f.text_field :description, class: 'text-field', value: (metric.description unless metric.nil?) %>
</div>
<div class="help-container">
<p>
A short description about your compound metric.
</p>
</div>
</div>

<div class="form-group">
<%= f.label :script, class: 'control-label' %>
<%= f.text_area :script, class: 'form-control', value: (metric.script unless metric.nil?) %>
</div>
<div class="form-row">
<div class="field-container">
<%= f.label :script, class: 'control-label' %>
<%= f.text_area :script, class: 'text-area', value: (metric.script unless metric.nil?) %>
</div>
<div class="help-container">
<p>
A mathematic expression to calculate your compound metric.
</p>
</div>
</div>

<div class="form-group">
<%= f.label :scope, 'Scope', class: 'control-label' %>
<%= f.select( :scope, scope_options, {class: 'form-control', selected: (metric.scope unless metric.nil?)} ) %>
</div>

<%= f.hidden_field(:compound, { value: "true"}) %>
<div class="form-row">
<div class="field-container">
<%= f.label :scope, 'Scope', class: 'control-label' %>
<%= f.select( :scope, scope_options, {class: 'form-control', selected: (metric.scope unless metric.nil?)} ) %>
</div>
<div class="help-container">
<p>
With which code type your metric is designed to work?
</p>
</div>
</div>
<%= f.hidden_field(:compound, { value: "true"}) %>
79 changes: 57 additions & 22 deletions app/views/metric_configurations/_form.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,66 @@
<%= render :partial => 'shared/form_errors', :locals => {:object => @metric_configuration} %>

<div class="form-group">
<%= f.label :code, class: 'control-label' %>
<%= f.text_field :code, class: 'form-control' %>
</div>
<div class="row margin-left-none">
<div class="form-table span9">

<div class="form-group">
<%= f.label :weight, class: 'control-label' %>
<%= f.text_field :weight, class: 'form-control' %>
</div>
<div class="form-row">
<div class="field-container">
<%= f.label :code, class: 'control-label' %>
<%= f.text_field :code, class: 'text-field' %>
</div>
<div class="help-container">
<p>
Code it is a variable that holds the value of a metric analysis. It's used inside a compound metric
</p>
<p>
Example :
Code foo := 10
</p>
</div>
</div>

<div class="form-group">
<%= f.label :aggregation_form, 'Aggregation Form', class: 'control-label' %>
<%= f.select( :aggregation_form, aggregation_options, {class: 'form-control'} ) %>
</div>
<div class="form-row">
<div class="field-container">
<%= f.label :weight, class: 'control-label' %>
<%= f.text_field :weight, class: 'text-field' %>
</div>
<div class="help-container">
<p>
It's the weight of the metric
</p>
</div>
</div>

<div class="form-row">
<div class="field-container">
<%= f.label :aggregation_form, 'Aggregation Form', class: 'control-label' %>
<%= f.select( :aggregation_form, aggregation_options, {class: 'form-control'} ) %>
</div>
<div class="help-container">
<p>
It's the aggregation form of the metric
</p>
</div>
</div>

<% if @metric_configuration.persisted? %>
<%= hidden_field_tag(:reading_group_id, @metric_configuration.reading_group_id) %>
<% else %>
<div class="form-row">
<div class="field-container">
<%= f.label :reading_group_id, 'Reading Group', class: 'control-label' %>
<%= f.select( :reading_group_id, reading_group_options, {class: 'form-control'} ) %>
</div>
<div class="help-container">
<p>
The reading group that is associated with this metric
</p>
</div>
</div>
<% end %>

<% if @metric_configuration.persisted? %>
<%= hidden_field_tag(:reading_group_id, @metric_configuration.reading_group_id) %>
<% else %>
<div class="form-group">
<%= f.label :reading_group_id, 'Reading Group', class: 'control-label' %>
<%= f.select( :reading_group_id, reading_group_options, {class: 'form-control'} ) %>
</div>
<% end %>
</div>

<%= hidden_field_tag(:metric_name, @metric_configuration.metric.name) %>
<%= hidden_field_tag(:base_tool_name, @metric_configuration.base_tool_name) %>

<br>
<%= f.submit 'Save', class: 'btn btn-primary' %>
5 changes: 4 additions & 1 deletion app/views/metric_configurations/edit.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@

<%= form_for(@metric_configuration, :url => mezuro_configuration_metric_configuration_update_url(@mezuro_configuration_id, @metric_configuration.id), method: :put) do |f| %>
<%= render partial: 'form', locals: {f: f} %>
<%= link_to 'Back', mezuro_configuration_path(@metric_configuration.configuration_id), class: 'btn btn-default' %>
<div class="row margin-left-none" style="margin-top: 20px">
<%= f.submit 'Save', class: 'btn btn-primary' %>
<%= link_to 'Back', mezuro_configuration_path(@metric_configuration.configuration_id), class: 'btn btn-default' %>
</div>
<% end %>
6 changes: 5 additions & 1 deletion app/views/metric_configurations/new.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,9 @@

<%= form_for(@metric_configuration, :url => mezuro_configuration_metric_configurations_path(@metric_configuration.configuration_id)) do |f| %>
<%= render partial: 'form', locals: {f: f} %>
<%= link_to 'Back', mezuro_configuration_choose_metric_path(@metric_configuration.configuration_id), class: 'btn btn-default' %>
<div class="row margin-left-none" style="margin-top: 20px">
<%= f.submit 'Save', class: 'btn btn-primary' %>
<%= link_to 'Back', mezuro_configuration_choose_metric_path(@metric_configuration.configuration_id), class: 'btn btn-default' %>
</div>

<% end %>
37 changes: 29 additions & 8 deletions app/views/mezuro_configurations/_form.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,39 @@
<%= form_for(@mezuro_configuration, :html => { role: 'form' }) do |f| %>
<%= render :partial => 'shared/form_errors', :locals => {:object => @mezuro_configuration} %>

<div class="form-group">
<%= f.label :name, class: 'control-label' %><br>
<%= f.text_field :name, class: 'form-control' %>
</div>
<div class="row margin-left-none">
<div class="form-table span9">

<div class="form-row">
<div class="field-container">
<%= f.label :name, class: 'control-label' %><br>
<%= f.text_field :name, class: 'text-field' %>
</div>
<div class="help-container">
<p>
Your configuration name!
</p>
</div>
</div>

<div class="form-row">
<div class="field-container">
<%= f.label :description, class: 'control-label' %><br>
<%= f.text_area :description, class: 'text-area' %>
</div>
<div class="help-container">
<p>
Your configuration description!
</p>
</div>
</div>

<div class="form-group">
<%= f.label :description, class: 'control-label' %><br>
<%= f.text_area :description, class: 'form-control' %>
</div>
</div>

<div class="row margin-left-none" style="margin-top: 20px">
<%= f.submit 'Save', class: 'btn btn-primary' %>

<%= link_to 'Back', mezuro_configurations_path, class: 'btn btn-default' %>
</div>

<% end %>
Loading

0 comments on commit 6853200

Please sign in to comment.