diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 0de4cfff7d0..2b173596b73 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+label.view.secondary.ips=View secondary IPs
message.acquire.ip.nic=Please confirm that you would like to acquire a new secondary IP for this NIC.
NOTE: You need to manually configure the newly-acquired secondary IP inside the virtual machine.
message.select.affinity.groups=Please select any affinity groups you want this VM to belong to:
message.no.affinity.groups=You do not have any affinity groups. Please continue to the next step.
@@ -54,6 +55,7 @@ label.account.specific=Account-Specific
label.account=Account
label.accounts=Accounts
label.acquire.new.ip=Acquire New IP
+label.acquire.new.secondary.ip=Acquire new secondary IP
label.action.attach.disk.processing=Attaching Disk....
label.action.attach.disk=Attach Disk
label.action.attach.iso.processing=Attaching ISO....
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index c2d0526910c..a86b2a25ca5 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1762,22 +1762,51 @@ div.list-view td.state.off span {
.detail-group .main-groups table td.value .view-all {
cursor: pointer;
/*[empty]height:;*/
- border-left: 1px solid #9FA2A5;
/*+border-radius:4px 0 0 4px;*/
-moz-border-radius: 4px 0 0 4px;
-webkit-border-radius: 4px 0 0 4px;
-khtml-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px;
- background: url(../images/sprites.png) no-repeat 100% -398px;
float: right;
- margin: 1px 0 0;
- padding: 8px 33px 6px 15px;
+ margin: 7px 0 0;
+ padding: 0px;
+}
+
+.detail-group .main-groups table td.value .view-all span {
+ display: block;
+ float: left;
+ padding: 5px 2px 8px 4px;
+ background: url(../images/gradients.png) repeat-x 0px -529px;
+ border-left: 1px solid #9FA2A6;
+ /*+border-radius:4px 0 0 4px;*/
+ -moz-border-radius: 4px 0 0 4px;
+ -webkit-border-radius: 4px 0 0 4px;
+ -khtml-border-radius: 4px 0 0 4px;
+ border-radius: 4px 0 0 4px;
+ margin-top: -5px;
+}
+
+.detail-group .main-groups table td.value .view-all .end {
+ background: url(../images/sprites.png) no-repeat 100% -397px;
+ float: right;
+ width: 22px;
+ height: 25px;
+ padding: 0px;
+ margin: -6px 0px 0px;
}
.detail-group .main-groups table td.value .view-all:hover {
background-position: 100% -431px;
}
+.detail-group .main-groups table td.value .view-all:hover span {
+ background-position: 0px -566px;
+}
+
+.detail-group .main-groups table td.value .view-all:hover div.end {
+ background-position: -618px -430px;
+}
+
.detail-view .detail-group .button.add {
clear: both;
margin: 0px 21px 13px 0 !important;
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index e1f9a30d5d4..a5f0662e0bf 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,8 @@ under the License.
<% long now = System.currentTimeMillis(); %>