mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	CloudStack UI - router page - add Redundant grid row that indicates whether this router is redundant or not. And if it's, redundant state will be shown on UI.
This commit is contained in:
		
							parent
							
								
									d71ed00148
								
							
						
					
					
						commit
						d98f7ebfbd
					
				| @ -3,6 +3,8 @@ | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| #Labels | #Labels | ||||||
|  | label.is.redundant.router=Redundant | ||||||
|  | 
 | ||||||
| force.delete=Force Delete | force.delete=Force Delete | ||||||
| force.delete.domain.warning=Warning: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources. | force.delete.domain.warning=Warning: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources. | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,5 +1,6 @@ | |||||||
| #New - Add all new parameters here.   | #New - Add all new parameters here.   | ||||||
| 
 | label.is.redundant.router=redundante | ||||||
|  | label.redundant.state=Redundant State | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| #Labels | #Labels | ||||||
|  | |||||||
| @ -3,6 +3,8 @@ | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| #Labels | #Labels | ||||||
|  | label.is.redundant.router=冗長 | ||||||
|  | 
 | ||||||
| force.delete=強制削除 | force.delete=強制削除 | ||||||
| force.delete.domain.warning=警告:このオプションを選択するとすべての子ドメインおよび関連するすべてのアカウントとそのリソースの削除が発生します。 | force.delete.domain.warning=警告:このオプションを選択するとすべての子ドメインおよび関連するすべてのアカウントとそのリソースの削除が発生します。 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -3,6 +3,8 @@ | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| #Labels | #Labels | ||||||
|  | label.is.redundant.router=冗余 | ||||||
|  | 
 | ||||||
| force.delete=力删除 | force.delete=力删除 | ||||||
| force.delete.domain.warning=警告:选择此选项将导致所有子域和所有相关的帐户和资源删除。 | force.delete.domain.warning=警告:选择此选项将导致所有子域和所有相关的帐户和资源删除。 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -208,6 +208,18 @@ dictionary = { | |||||||
|                         </div> |                         </div> | ||||||
|                     </div> |                     </div> | ||||||
|                 </div> |                 </div> | ||||||
|  |                                                  | ||||||
|  |                 <div class="grid_rows even"> | ||||||
|  |                     <div class="grid_row_cell" style="width: 20%;"> | ||||||
|  |                         <div class="row_celltitles"> | ||||||
|  |                             <fmt:message key="label.is.redundant.router"/>:</div> | ||||||
|  |                     </div> | ||||||
|  |                     <div class="grid_row_cell" style="width: 79%;"> | ||||||
|  |                         <div class="row_celltitles" id="isredundantrouter"> | ||||||
|  |                         </div> | ||||||
|  |                     </div> | ||||||
|  |                 </div> | ||||||
|  |                                                                  | ||||||
|             </div>            |             </div>            | ||||||
|         </div> |         </div> | ||||||
|     </div>    |     </div>    | ||||||
|  | |||||||
| @ -184,6 +184,12 @@ function routerJsonToDetailsTab() { | |||||||
|     $thisTab.find("#account").text(fromdb(jsonObj.account));   |     $thisTab.find("#account").text(fromdb(jsonObj.account));   | ||||||
|     setDateField(jsonObj.created, $thisTab.find("#created"));	 |     setDateField(jsonObj.created, $thisTab.find("#created"));	 | ||||||
|          |          | ||||||
|  |     setBooleanReadField(jsonObj.isredundantrouter, $thisTab.find("#isredundantrouter")); | ||||||
|  |     if(jsonObj.isredundantrouter == true) { | ||||||
|  |     	var t = $thisTab.find("#isredundantrouter").text()+ " (" + fromdb(jsonObj.redundantstate) + ")"; | ||||||
|  |     	$thisTab.find("#isredundantrouter").text(t); | ||||||
|  |     }    | ||||||
|  |      | ||||||
|     resetViewConsoleAction(jsonObj, $thisTab);    |     resetViewConsoleAction(jsonObj, $thisTab);    | ||||||
|      |      | ||||||
|     // actions
 |     // actions
 | ||||||
| @ -232,6 +238,8 @@ function routerClearDetailsTab() { | |||||||
|     $thisTab.find("#domain").text("");   |     $thisTab.find("#domain").text("");   | ||||||
|     $thisTab.find("#account").text("");   |     $thisTab.find("#account").text("");   | ||||||
|     $thisTab.find("#created").text("");    |     $thisTab.find("#created").text("");    | ||||||
|  |     $thisTab.find("#isredundantrouter").text(""); | ||||||
|  |          | ||||||
|     resetViewConsoleAction(null, $thisTab);        |     resetViewConsoleAction(null, $thisTab);        | ||||||
|      |      | ||||||
|     var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu"); |     var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu"); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user