diff options
Diffstat (limited to 'app/views/nodes')
| -rw-r--r-- | app/views/nodes/edit.html.erb | 39 | ||||
| -rw-r--r-- | app/views/nodes/show.html.erb | 11 |
2 files changed, 36 insertions, 14 deletions
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb index 1ac05e0..e0e51d8 100644 --- a/app/views/nodes/edit.html.erb +++ b/app/views/nodes/edit.html.erb | |||
| @@ -76,24 +76,35 @@ | |||
| 76 | 76 | ||
| 77 | <div class="node_description">Images</div> | 77 | <div class="node_description">Images</div> |
| 78 | <div class="node_content"> | 78 | <div class="node_content"> |
| 79 | <ul id="image_box" rel="<%= @page.id %>"> | 79 | <div id="related_assets" |
| 80 | <% @page.assets.images.each do |image| %> | 80 | data-search-url="<%= search_node_related_assets_path(@node) %>" |
| 81 | <li rel="images_<%= image.id %>"> | 81 | data-create-url="<%= node_related_assets_path(@node) %>"> |
| 82 | <%= image_tag(image.upload.url(:thumb)) %> | 82 | <ul id="related_asset_list" class="thumbnail_list"> |
| 83 | </li> | 83 | <% @page.related_assets.includes(:asset).each do |related| %> |
| 84 | <% end %> | 84 | <li data-url="<%= node_related_asset_path(@node, related) %>"> |
| 85 | </ul> | 85 | <span class="related_asset_handle"><%= icon("grip-vertical", library: "tabler", "aria-hidden": true) %></span> |
| 86 | <div class="clear_left right"> | 86 | <%= image_tag related.asset.upload.url(:thumb) %> |
| 87 | <a id="image_browser_toggle" class="unselected" href="#">image browser</a> | 87 | <button type="button" class="related_asset_remove" aria-label="Remove image"> |
| 88 | </div> | 88 | <%= icon("x", library: "tabler", "aria-hidden": true) %> |
| 89 | <div id="image_browser"> | 89 | </button> |
| 90 | <ul> | 90 | </li> |
| 91 | <% Asset.images.each do |image| %> | ||
| 92 | <li rel="images_<%= image.id %>"><%= image_tag(image.upload.url(:thumb)) %></li> | ||
| 93 | <% end %> | 91 | <% end %> |
| 94 | </ul> | 92 | </ul> |
| 93 | <%= text_field_tag nil, nil, id: "related_asset_search_term", placeholder: "Search images to attach…", autocomplete: "off" %> | ||
| 94 | <div id="related_asset_search_results" class="search_results"></div> | ||
| 95 | </div> | 95 | </div> |
| 96 | </div> | 96 | </div> |
| 97 | |||
| 98 | <template id="related_asset_template"> | ||
| 99 | <li> | ||
| 100 | <span class="related_asset_handle"><%= icon("grip-vertical", library: "tabler", "aria-hidden": true) %></span> | ||
| 101 | <img src=""> | ||
| 102 | <button type="button" class="related_asset_remove" aria-label="Remove image"> | ||
| 103 | <%= icon("x", library: "tabler", "aria-hidden": true) %> | ||
| 104 | </button> | ||
| 105 | </li> | ||
| 106 | </template> | ||
| 107 | |||
| 97 | </div> | 108 | </div> |
| 98 | </details> | 109 | </details> |
| 99 | 110 | ||
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb index 280e492..8ea03cd 100644 --- a/app/views/nodes/show.html.erb +++ b/app/views/nodes/show.html.erb | |||
| @@ -152,6 +152,17 @@ | |||
| 152 | <div class="node_description">Tags</div> | 152 | <div class="node_description">Tags</div> |
| 153 | <div class="node_content node_info_group"><%= @page.tag_list %></div> | 153 | <div class="node_content node_info_group"><%= @page.tag_list %></div> |
| 154 | 154 | ||
| 155 | <% if @page.assets.images.any? %> | ||
| 156 | <div class="node_description">Images</div> | ||
| 157 | <div class="node_content node_info_group"> | ||
| 158 | <ul class="thumbnail_list"> | ||
| 159 | <% @page.assets.images.each do |asset| %> | ||
| 160 | <li><%= link_to image_tag(asset.upload.url(:thumb)), asset_path(asset) %></li> | ||
| 161 | <% end %> | ||
| 162 | </ul> | ||
| 163 | </div> | ||
| 164 | <% end %> | ||
| 165 | |||
| 155 | <div class="node_description">Events</div> | 166 | <div class="node_description">Events</div> |
| 156 | <div class="node_content node_info_group"> | 167 | <div class="node_content node_info_group"> |
| 157 | <ul> | 168 | <ul> |