Remove duplicated markup between list/grid album cards.
This commit is contained in:
		
							parent
							
								
									be976d584c
								
							
						
					
					
						commit
						746d094d81
					
				
					 1 changed files with 14 additions and 26 deletions
				
			
		|  | @ -1,4 +1,5 @@ | ||||||
| {% macro create_root_album_card(view="grid") %} | {% macro create_root_album_card(view="grid") %} | ||||||
|  | {% set view = (view if view in ("list", "grid") else "grid") %} | ||||||
| {% set viewparam = "?view=list" if view == "list" else "" %} | {% set viewparam = "?view=list" if view == "list" else "" %} | ||||||
|     {% if view == "list" %} |     {% if view == "list" %} | ||||||
|     <div class="album_card album_card_list"> |     <div class="album_card album_card_list"> | ||||||
|  | @ -18,33 +19,11 @@ | ||||||
| {% endmacro %} | {% endmacro %} | ||||||
| 
 | 
 | ||||||
| {% macro create_album_card(album, view="grid", unlink_parent=none) %} | {% macro create_album_card(album, view="grid", unlink_parent=none) %} | ||||||
|  | {% set view = (view if view in ("list", "grid") else "grid") %} | ||||||
| {% set viewparam = "?view=list" if view == "list" else "" %} | {% set viewparam = "?view=list" if view == "list" else "" %} | ||||||
|     {% if view == "list" %} |     <div class="album_card album_card_{{view}}" data-id="{{album.id}}"> | ||||||
|     <div class="album_card album_card_list" data-id="{{album.id}}"> |     {% if view == "grid" %} | ||||||
|         <div class="album_card_title"> |  | ||||||
|             <a href="/album/{{album.id}}{{viewparam}}">{{album.display_name}}</a> |  | ||||||
|         </div> |  | ||||||
| 
 |  | ||||||
|         <div class="album_card_metadata"> |  | ||||||
|             <span class="album_card_child_count">{{album.get_children()|length}}</span> children |  | ||||||
|             {{-' | '-}} |  | ||||||
|             <span class="album_card_photo_count">{{album.sum_photos(recurse=False)}}</span> photos |  | ||||||
|         </div> |  | ||||||
|     </div> |  | ||||||
|     {% else %} |  | ||||||
|     <div class="album_card album_card_grid" data-id="{{album.id}}"> |  | ||||||
|         <a class="album_card_thumbnail" href="/album/{{album.id}}{{viewparam}}"></a> |         <a class="album_card_thumbnail" href="/album/{{album.id}}{{viewparam}}"></a> | ||||||
| 
 |  | ||||||
|         <div class="album_card_title"> |  | ||||||
|             <a href="/album/{{album.id}}{{viewparam}}">{{album.display_name}}</a> |  | ||||||
|         </div> |  | ||||||
| 
 |  | ||||||
|         <div class="album_card_metadata"> |  | ||||||
|             <span class="album_card_child_count">{{album.get_children()|length}}</span> children |  | ||||||
|             {{-' | '-}} |  | ||||||
|             <span class="album_card_photo_count">{{album.sum_photos(recurse=False)}}</span> photos |  | ||||||
|         </div> |  | ||||||
| 
 |  | ||||||
|         <div class="album_card_tools"> |         <div class="album_card_tools"> | ||||||
|             {% if unlink_parent is not none %} |             {% if unlink_parent is not none %} | ||||||
|             <button |             <button | ||||||
|  | @ -58,6 +37,15 @@ | ||||||
|             </button> |             </button> | ||||||
|             {% endif %} |             {% endif %} | ||||||
|         </div> |         </div> | ||||||
|     </div> |  | ||||||
|     {% endif %} |     {% endif %} | ||||||
|  |         <div class="album_card_title"> | ||||||
|  |             <a href="/album/{{album.id}}{{viewparam}}">{{album.display_name}}</a> | ||||||
|  |         </div> | ||||||
|  | 
 | ||||||
|  |         <div class="album_card_metadata"> | ||||||
|  |             <span class="album_card_child_count">{{album.get_children()|length}}</span> children | ||||||
|  |             {{-' | '-}} | ||||||
|  |             <span class="album_card_photo_count">{{album.sum_photos(recurse=False)}}</span> photos | ||||||
|  |         </div> | ||||||
|  |     </div> | ||||||
| {% endmacro %} | {% endmacro %} | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue