Skip to content

Commit f5521fb

Browse files
committed
demo polish
1 parent d29e5ed commit f5521fb

File tree

3 files changed

+24
-14
lines changed

3 files changed

+24
-14
lines changed
91.2 KB
Loading
131 KB
Loading

app/views/basil/jam.html.erb

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<!-- Eye color checkboxes -->
109109
<div style="margin-bottom: 1em">
110110
<strong style="margin-right: 1em">Eye color</strong>
111-
<% options = ['Amber', 'Blue', 'Indigo', 'Brown', 'Topaz', 'Grey', 'Green', 'Hazel', 'Amethyst', 'Violet', 'Red', 'Black', 'White'] %>
111+
<% options = ['Amber', 'Blue', 'Brown', 'Topaz', 'Grey', 'Green', 'Hazel', 'Amethyst', 'Indigo', 'Violet', 'Red', 'Black', 'White'] %>
112112
<% options.each do |option| %>
113113
<label>
114114
<input type="checkbox" name="commission[features][]" value="<%= option %> eye color" />
@@ -119,10 +119,24 @@
119119
<% end %>
120120
</div>
121121

122+
<!-- Skin tone checkboxes -->
123+
<div style="margin-bottom: 1em">
124+
<strong style="margin-right: 1em">Skin tone</strong>
125+
<% options = ['Light', 'Medium', 'Dark', 'Pale', 'Fair', 'Tan', 'White', 'Brown', 'Black', 'Olive', 'Albino', 'Chocolate', 'Grey', 'Green', 'Blue', 'Red', 'Orange', 'Silver', 'Gold', 'Yellow', 'Purple'] %>
126+
<% options.each do |option| %>
127+
<label>
128+
<input type="checkbox" name="commission[features][]" value="<%= option %> skin tone" />
129+
<span class="chip">
130+
<%= option %>
131+
</span>
132+
</label>
133+
<% end %>
134+
</div>
135+
122136
<!-- Race checkboxes -->
123137
<div style="margin-bottom: 1em">
124-
<strong style="margin-right: 1em">Race</strong>
125-
<% options = AutocompleteService.for_field_label(content_model: Character, label: 'Race') %>
138+
<strong style="margin-right: 1em">Alternate Race</strong>
139+
<% options = AutocompleteService.for_field_label(content_model: Character, label: 'Race') - ['Human'] %>
126140
<% options.each do |option| %>
127141
<label>
128142
<input type="checkbox" name="commission[features][]" value="<%= option %> race" />
@@ -200,19 +214,18 @@
200214

201215
<div class="row">
202216
<div class="col s12 cards-container">
203-
<% @recent_commissions.each do |commission| %>
217+
<% @recent_commissions.each do |commission| %>
218+
204219
<div class="hoverable card" id='card-<%= commission.job_id %>' data-complete="<%= commission.complete? %>">
205220
<div class="card-image">
206221
<%= link_to "#details-#{commission.job_id}", class: 'modal-trigger waves-effect waves-light' do %>
207222
<% if commission.complete? %>
208223
<%= image_tag commission.image, class: 'commission-image' %>
209224
<% else %>
210-
<%= image_tag image_path("placeholders/commission.png"), class: 'commission-image' %>
225+
<%= image_tag image_path("placeholders/loading2.png"), class: 'commission-image' %>
211226
<% end %>
212-
<% end %>
213-
<% if commission.final_settings %>
214227
<span class="card-title">
215-
<%= commission.final_settings&.fetch('name', '') %>
228+
<%= commission.final_settings&.fetch('name', 'Nameless') %>
216229
</span>
217230
<% end %>
218231
</div>
@@ -263,14 +276,14 @@
263276
</script>
264277
<% end %>
265278

266-
<div id="details-<%= commission.job_id %>" class="modal">
279+
<div id="details-<%= commission.job_id %>" class="modal modal-fixed-footer">
267280
<div class="modal-content">
268281
<h4>
269282
<i class="material-icons <%= Character.text_color %>"><%= Character.icon %></i>
270283
<%= commission.final_settings&.fetch('name', 'Nameless character') %>
271284
</h4>
272285
<div class="row">
273-
<div class="col s12 m4 l3">
286+
<div class="col s12 m6">
274287
<% if commission.complete? %>
275288
<%= link_to commission.image, target: '_blank' do %>
276289
<%= image_tag commission.image, class: 'commission-image', style: 'width: 100%' %>
@@ -285,17 +298,14 @@
285298
</div>
286299
<% end %>
287300
</div>
288-
<div class="col s12 m8 l9">
301+
<div class="col s12 m6">
289302
<ul style="margin: 0 8px">
290303
<li>
291304
<strong class="grey-text">Prompt:</strong>
292305
<blockquote>
293306
<%= commission.prompt %>
294307
</blockquote>
295308
</li>
296-
<li>
297-
<small><%= commission.job_id %></small>
298-
</li>
299309
</ul>
300310
</div>
301311
</div>

0 commit comments

Comments
 (0)