-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove show comments/scores buttons under machine details
- Loading branch information
Showing
14 changed files
with
110 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 12 additions & 9 deletions
21
app/views/location_machine_xrefs/_render_machine_tools.html.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,12 @@ | ||
| = render :partial => 'location_machine_xrefs/backglass', :locals => {:lmx => lmx} | ||
| = render :partial => 'location_machine_xrefs/ic_button', :locals => {:lmx => lmx} | ||
| = render :partial => 'machine_conditions/show_machine_conditions', :locals => {:lmx => lmx}, cached: true | ||
| = render :partial => 'location_machine_xrefs/update_machine_condition', :locals => {:lmx => lmx} | ||
| = render :partial => 'machine_score_xrefs/add_high_score', :locals => {:lmx => lmx} | ||
| = render :partial => 'machine_score_xrefs/show_high_scores', :locals => {:lmx => lmx} | ||
| %div.external_link_container | ||
| = render :partial => 'location_machine_xrefs/pintips', :locals => {:lmx => lmx} | ||
| = render :partial => 'location_machine_xrefs/kineticist', :locals => {:lmx => lmx} | ||
| - cache [logged_in, lmx] do | ||
| = render :partial => 'location_machine_xrefs/backglass', :locals => {:lmx => lmx} | ||
| %div.external_link_container | ||
| = render :partial => 'location_machine_xrefs/pintips', :locals => {:lmx => lmx} | ||
| = render :partial => 'location_machine_xrefs/kineticist', :locals => {:lmx => lmx} | ||
| = render :partial => 'location_machine_xrefs/ic_button', :locals => {:lmx => lmx} | ||
| %div.machine_comments_container | ||
| = render :partial => 'machine_conditions/show_machine_conditions', :locals => {:lmx => lmx}, cached: true | ||
| = render :partial => 'location_machine_xrefs/update_machine_condition', :locals => {:lmx => lmx} | ||
| %div.machine_scores_container | ||
| = render :partial => 'machine_score_xrefs/show_high_scores', :locals => {:lmx => lmx} | ||
| = render :partial => 'machine_score_xrefs/add_high_score', :locals => {:lmx => lmx} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| - location_machine_xrefs.each do |lmx| | ||
| - cache [logged_in, lmx] do | ||
| %div[lmx, :machine] | ||
| = render :partial => 'location_machine_xrefs/list_machine', :locals => {:lmx => lmx} | ||
| .clear | ||
| = render :partial => 'location_machine_xrefs/machine_tools', :locals => {:lmx => lmx} | ||
| %div[lmx, :machine] | ||
| = render :partial => 'location_machine_xrefs/list_machine', :locals => {:lmx => lmx} | ||
| .clear | ||
| = render :partial => 'location_machine_xrefs/machine_tools', :locals => {:lmx => lmx} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| - lmx.machine_score_xrefs.each do |msx| | ||
| %span.high_score_new_line="#{number_with_delimiter(msx.score, :delimiter => ",")}" | ||
| %span.high_score_date=msx.created_at ? msx.created_at.strftime("%b %d, %Y") : '' | ||
| - if msx.user | ||
| by | ||
| = link_to msx.user.username, "#{request.scheme}://#{request.host_with_port}/users/#{msx.user.username}/profile" | ||
| %div.high_score_new_line="#{number_with_delimiter(msx.score, :delimiter => ",")}" | ||
| %div.high_score_meta | ||
| - if msx.user | ||
| %span.high_score_user | ||
| = link_to msx.user.username, "#{request.scheme}://#{request.host_with_port}/users/#{msx.user.username}/profile" | ||
| %span.high_score_date=msx.created_at ? msx.created_at.strftime("%b %d, %Y") : '' |
13 changes: 8 additions & 5 deletions
13
app/views/machine_conditions/_show_machine_conditions.html.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,8 @@ | ||
| %div[lmx, :machineconditions_container]{:style => "display:#{lmx.sorted_machine_conditions.empty? ? 'none' : 'block'}"} | ||
| - icon_path = image_tag('icons/comment-quote.svg', :alt => 'Show Comments', :class => 'small_banner_icon') | ||
| = banner('show_conditions_lmx','Show machine comments',icon_path,lmx) | ||
| %div[lmx, :show_conditions]{:style => 'display:none'} | ||
| = render :partial => 'locations/render_machine_conditions', :locals => {:conditions => lmx.sorted_machine_conditions, :lmx => lmx} | ||
| %div.bold.font20.center.p_10.brightpurple | ||
| Machine Comments | ||
| %div[lmx, :machineconditions_container] | ||
| %div[lmx, :show_conditions] | ||
| - if lmx.sorted_machine_conditions.empty? | ||
| %div.grey.center No machine comments yet | ||
| - else | ||
| = render :partial => 'locations/render_machine_conditions', :locals => {:conditions => lmx.sorted_machine_conditions, :lmx => lmx} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,8 @@ | ||
| %div[lmx, :score_container]{:style => "display:#{lmx.machine_score_xrefs.empty? ? 'none' : 'block'}"} | ||
| - icon_path = image_tag('icons/star.svg', :alt => 'Show Scores', :class => 'small_banner_icon') | ||
| = banner('show_scores_lmx', 'Show high scores', icon_path, lmx) | ||
| %div[lmx, :show_scores]{:style => 'display:none'} | ||
| = render :partial => 'locations/render_scores', :locals => {:lmx => lmx} | ||
| %div.bold.font20.center.p_10.brightpurple | ||
| High Scores | ||
| %div[lmx, :score_container] | ||
| %div[lmx, :show_scores] | ||
| - if lmx.machine_score_xrefs.empty? | ||
| %div.grey.center No scores yet | ||
| - else | ||
| = render :partial => 'locations/render_scores', :locals => {:lmx => lmx} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.