cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [50/50] git commit: refs/heads/Health-Check-UI - Merge branch 'master' into Health-Check-UI
Date Fri, 15 Mar 2013 18:46:44 GMT
Updated Branches:
  refs/heads/Health-Check-UI 1d47458ed -> 9ca7b82ba


Merge branch 'master' into Health-Check-UI

Conflicts:
	ui/css/cloudstack3.css


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9ca7b82b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9ca7b82b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9ca7b82b

Branch: refs/heads/Health-Check-UI
Commit: 9ca7b82baa4c60a83d85d397ce19d3166e80273b
Parents: 1d47458 42d33fc
Author: Brian Federle <brian.federle@citrix.com>
Authored: Fri Mar 15 11:46:32 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Fri Mar 15 11:46:32 2013 -0700

----------------------------------------------------------------------
 .../com/cloud/agent/api/BackupSnapshotCommand.java |    7 +
 api/src/com/cloud/network/NetworkModel.java        |    2 +
 api/src/com/cloud/vm/UserVmService.java            |    3 +-
 .../apache/cloudstack/api/ApiConstants.java.orig   |  468 -----------
 .../command/user/template/ListTemplatesCmd.java    |   13 +-
 .../api/command/user/vm/UpgradeVMCmd.java          |    4 +-
 .../api/agent/test/BackupSnapshotAnswerTest.java   |    2 +-
 .../api/agent/test/BackupSnapshotCommandTest.java  |    4 +-
 .../WEB-INF/classes/resources/messages.properties  |    1 +
 debian/cloudstack-management.install               |    6 +-
 debian/rules                                       |   12 +-
 docs/en-US/cloudmonkey.xml                         |   84 ++-
 .../storage/motion/AncientDataMotionStrategy.java  |    4 +-
 .../kvm/resource/LibvirtComputingResource.java     |   57 ++-
 .../xen/resource/CitrixResourceBase.java           |    7 +-
 scripts/vm/hypervisor/xenserver/vmopsSnapshot      |   29 +-
 .../vm/hypervisor/xenserver/xcposs/vmopsSnapshot   |   27 +-
 scripts/vm/network/security_group.py               |  166 ++++-
 server/conf/cloudstack-limits.conf.in              |   21 +
 server/conf/cloudstack-sudoers.in                  |   22 +
 server/src/com/cloud/configuration/Config.java     |    2 +-
 .../deploy/AbstractDeployPlannerSelector.java      |   14 +-
 .../cloud/deploy/HypervisorVmPlannerSelector.java  |   15 +-
 server/src/com/cloud/network/NetworkModelImpl.java |   17 +
 .../router/VirtualNetworkApplianceManagerImpl.java |   35 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   32 +-
 .../com/cloud/network/MockNetworkModelImpl.java    |    6 +
 .../test/com/cloud/vpc/MockNetworkModelImpl.java   |    6 +
 ui/css/cloudstack3.css                             |  190 +++++-
 ui/dictionary.jsp                                  |    1 +
 ui/scripts/dashboard.js                            |   75 +--
 ui/scripts/events.js                               |   12 +-
 ui/scripts/instanceWizard.js                       |   14 +-
 ui/scripts/instances.js                            |    9 +
 ui/scripts/network.js                              |  637 ++++++---------
 ui/scripts/ui-custom/dashboard.js                  |    8 +-
 ui/scripts/ui-custom/enableStaticNAT.js            |    3 +-
 ui/scripts/ui-custom/instanceWizard.js             |   27 +-
 ui/scripts/ui/widgets/detailView.js                |   29 +-
 ui/scripts/ui/widgets/listView.js                  |   58 ++-
 ui/scripts/ui/widgets/multiEdit.js                 |   12 +-
 usage/conf/db.properties.in                        |   32 +-
 usage/pom.xml                                      |   20 +-
 .../vmware/util/VmwareGuestOsMapper.java           |   36 +-
 44 files changed, 1120 insertions(+), 1109 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ca7b82b/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --cc ui/css/cloudstack3.css
index 5797428,7381715..7410568
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@@ -1760,39 -1760,12 +1760,43 @@@ div.list-view td.state.off span 
    float: right;
    margin: 1px 0 0;
    padding: 8px 33px 6px 15px;
-  }
+ }
  
  .detail-group .main-groups table td.value .view-all:hover {
 +   background-position: 100% -431px;
 + }
 +
 +/*List-view: subselect dropdown*/
 +.list-view .subselect {
 +  width: 116px;
 +  display: block;
 +  float: left;
 +  background: url(../images/bg-gradients.png) 0px -42px;
 +  padding: 0;
 +  margin: 8px 0 1px 7px;
 +  clear: both;
 +  border: 1px solid #A8A7A7;
 +  /*+border-radius:4px;*/
 +  -moz-border-radius: 4px;
 +  -webkit-border-radius: 4px;
 +  -khtml-border-radius: 4px;
 +  border-radius: 4px;
 +}
 +
 +.list-view .subselect span {
 +  margin: 4px 0 0 12px;
 +}
 +
 +.list-view .subselect select {
 +  width: 85%;
 + margin: 5px 0 4px;
 +  font-size: 10px;
 +}
 +
++.detail-group .main-groups table td.value .view-all:hover {
+   background-position: 100% -431px;
+ }
+ 
  .panel.always-maximized .detail-group .main-groups table td.value span {
    width: 565px;
  }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ca7b82b/ui/scripts/network.js
----------------------------------------------------------------------


Mime
View raw message