Make deleting and unlinking tags require confirmation.
Added text inside the delete buttons and made them confirm.
This commit is contained in:
		
							parent
							
								
									fd6943fce1
								
							
						
					
					
						commit
						8447fb3343
					
				
					 3 changed files with 67 additions and 27 deletions
				
			
		|  | @ -1224,7 +1224,7 @@ class PDBUtilMixin: | ||||||
|             tag = self.get_tag(name=tagname) |             tag = self.get_tag(name=tagname) | ||||||
|             old_name = tag.name |             old_name = tag.name | ||||||
|             tag.rename(rename_to) |             tag.rename(rename_to) | ||||||
|             note = ('rename', f'{old_name}={tag.name}') |             note = ('rename_tag', f'{old_name}={tag.name}') | ||||||
|             output_notes.append(note) |             output_notes.append(note) | ||||||
|         else: |         else: | ||||||
|             tag_parts = tagname.split('.') |             tag_parts = tagname.split('.') | ||||||
|  |  | ||||||
|  | @ -97,10 +97,11 @@ button:active | ||||||
|     /*position: absolute;*/ |     /*position: absolute;*/ | ||||||
|     top: 3px; |     top: 3px; | ||||||
|     vertical-align: middle; |     vertical-align: middle; | ||||||
|  |     font-size: 7pt; | ||||||
| 
 | 
 | ||||||
|     width:  18px; |     min-width:  18px; | ||||||
|     height: 14px; |     min-height: 14px; | ||||||
|     padding: 0; |     /*padding: 0;*/ | ||||||
| 
 | 
 | ||||||
| } | } | ||||||
| /* | /* | ||||||
|  | @ -111,6 +112,7 @@ is hovered over. | ||||||
| { | { | ||||||
|     display: none; |     display: none; | ||||||
| } | } | ||||||
|  | .tag_object:hover + * .remove_tag_button, | ||||||
| .tag_object:hover + .remove_tag_button, | .tag_object:hover + .remove_tag_button, | ||||||
| .remove_tag_button:hover, | .remove_tag_button:hover, | ||||||
| .remove_tag_button_perm:hover | .remove_tag_button_perm:hover | ||||||
|  |  | ||||||
|  | @ -130,17 +130,53 @@ body | ||||||
|     {% endif %} |     {% endif %} | ||||||
|     <ul> |     <ul> | ||||||
|         {% for (qualified_name, tag) in tags %} |         {% for (qualified_name, tag) in tags %} | ||||||
|  |             {% if "." in qualified_name %} | ||||||
|             <li> |             <li> | ||||||
|                 {{tag_object.tag_object(tag, innertext='(?)', link='info')}} |                 {{tag_object.tag_object(tag, innertext='(?)', link='info')}} | ||||||
|             {{tag_object.tag_object(tag, link='search', innertext=qualified_name, with_alt_description=True)}}<!-- |                 {{tag_object.tag_object(tag, link='search', innertext=qualified_name, with_alt_description=True)-}} | ||||||
|             --><button class="remove_tag_button red_button" onclick="delete_tag('{{qualified_name}}', receive_callback);"></button> |                 <button | ||||||
|  |                 class="remove_tag_button red_button button_with_confirm" | ||||||
|  |                 data-onclick="delete_tag('{{qualified_name}}', receive_callback);" | ||||||
|  |                 data-prompt="Unlink Tags?" | ||||||
|  |                 data-confirm="Unlink" | ||||||
|  |                 data-confirm-class="remove_tag_button_perm red_button" | ||||||
|  |                 data-cancel-class="remove_tag_button_perm gray_button" | ||||||
|  |                 > | ||||||
|  |                 unlink | ||||||
|  |                 </button> | ||||||
|             </li> |             </li> | ||||||
|  |             {% else %} | ||||||
|  |             <li> | ||||||
|  |                 {{tag_object.tag_object(tag, innertext='(?)', link='info')}} | ||||||
|  |                 {{tag_object.tag_object(tag, link='search', innertext=qualified_name, with_alt_description=True)-}} | ||||||
|  |                 <button | ||||||
|  |                 class="remove_tag_button red_button button_with_confirm" | ||||||
|  |                 data-onclick="delete_tag('{{qualified_name}}', receive_callback);" | ||||||
|  |                 data-prompt="Delete Tag?" | ||||||
|  |                 data-confirm="Delete" | ||||||
|  |                 data-confirm-class="remove_tag_button_perm red_button" | ||||||
|  |                 data-cancel-class="remove_tag_button_perm gray_button" | ||||||
|  |                 > | ||||||
|  |                 delete | ||||||
|  |                 </button> | ||||||
|  |             </li> | ||||||
|  |             {% endif %} | ||||||
|  | 
 | ||||||
|             {% if include_synonyms %} |             {% if include_synonyms %} | ||||||
|             {% for synonym in tag.get_synonyms() %} |             {% for synonym in tag.get_synonyms() %} | ||||||
|             <li> |             <li> | ||||||
|                 {{tag_object.tag_object(tag, innertext='(+)', link=none)}} |                 {{tag_object.tag_object(tag, innertext='(+)', link=none)}} | ||||||
|             {{tag_object.tag_object(tag, link='search', innertext=qualified_name + '+' + synonym)}}<!-- |                 {{tag_object.tag_object(tag, link='search', innertext=qualified_name + '+' + synonym)-}} | ||||||
|             --><button class="remove_tag_button red_button" onclick="delete_tag_synonym('{{synonym}}', receive_callback);"></button> |                 <button | ||||||
|  |                 class="remove_tag_button red_button button_with_confirm" | ||||||
|  |                 data-onclick="delete_tag_synonym('{{synonym}}', receive_callback);" | ||||||
|  |                 data-prompt="Remove Synonym?" | ||||||
|  |                 data-confirm="Remove" | ||||||
|  |                 data-confirm-class="remove_tag_button_perm red_button" | ||||||
|  |                 data-cancel-class="remove_tag_button_perm gray_button" | ||||||
|  |                 > | ||||||
|  |                 remove | ||||||
|  |                 </button> | ||||||
|             </li> |             </li> | ||||||
|             {% endfor %} |             {% endfor %} | ||||||
|             {% endif %} |             {% endif %} | ||||||
|  | @ -202,6 +238,8 @@ function receive_callback(response) | ||||||
|     { |     { | ||||||
|         var response = responses[index]; |         var response = responses[index]; | ||||||
|         var tagname = response["tagname"]; |         var tagname = response["tagname"]; | ||||||
|  |         var message_positivity; | ||||||
|  |         var message_text; | ||||||
|         if ("error_type" in response) |         if ("error_type" in response) | ||||||
|         { |         { | ||||||
|             message_positivity = "message_negative"; |             message_positivity = "message_negative"; | ||||||
|  | @ -212,28 +250,28 @@ function receive_callback(response) | ||||||
|             var action = response["action"]; |             var action = response["action"]; | ||||||
|             message_positivity = "message_positive"; |             message_positivity = "message_positive"; | ||||||
|             if (action == "new_tag") |             if (action == "new_tag") | ||||||
|             {message_text = "Created tag " + tagname;} |             {message_text = `Created tag ${tagname}`;} | ||||||
| 
 | 
 | ||||||
|             else if (action == "new_synonym") |             else if (action == "new_synonym") | ||||||
|             {message_text = "New synonym " + tagname;} |             {message_text = `New synonym ${tagname}`;} | ||||||
| 
 | 
 | ||||||
|             else if (action == "existing_tag") |             else if (action == "existing_tag") | ||||||
|             {message_text = "Existing tag " + tagname;} |             {message_text = `Existing tag ${tagname}`;} | ||||||
| 
 | 
 | ||||||
|             else if (action == "join_group") |             else if (action == "join_group") | ||||||
|             {message_text = "Grouped " + tagname;} |             {message_text = `Grouped ${tagname}`;} | ||||||
| 
 | 
 | ||||||
|             else if (action == "rename") |             else if (action == "rename_tag") | ||||||
|             {message_text = "Renamed " + tagname;} |             {message_text = `Renamed ${tagname}`;} | ||||||
| 
 | 
 | ||||||
|             else if (action == "delete_tag") |             else if (action == "delete_tag") | ||||||
|             {message_text = "Deleted tag " + tagname;} |             {message_text = `Deleted tag ${tagname}`;} | ||||||
| 
 | 
 | ||||||
|             else if (action == "delete_synonym") |             else if (action == "delete_synonym") | ||||||
|             {message_text = "Deleted synonym " + response["synonym"];} |             {message_text = `Deleted synonym ${response["synonym"]}`;} | ||||||
| 
 | 
 | ||||||
|             else if (action == "unlink_tag") |             else if (action == "unlink_tag") | ||||||
|             {message_text = "Unlinked tags " + tagname;} |             {message_text = `Unlinked tags ${tagname}`;} | ||||||
| 
 | 
 | ||||||
|         } |         } | ||||||
|         common.create_message_bubble(message_area, message_positivity, message_text, 8000); |         common.create_message_bubble(message_area, message_positivity, message_text, 8000); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue