cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/ui-restyle to 6fff7c7
Date Thu, 10 Oct 2013 22:43:33 GMT
Updated Branches:
  refs/heads/ui-restyle bf121011b -> 6fff7c720


WIP: Style instance wizard, network step


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

Branch: refs/heads/ui-restyle
Commit: 6fff7c7206a16ffbd157eb799f87309082d52a7b
Parents: bf12101
Author: Brian Federle <brian.federle@citrix.com>
Authored: Thu Oct 10 15:43:28 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Thu Oct 10 15:43:28 2013 -0700

----------------------------------------------------------------------
 ui/scripts/ui-custom/instanceWizard.js |  1 -
 ui/stylesheets/_instance-wizard.scss   | 85 ++++++++++++++++++++++++++++-
 2 files changed, 84 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fff7c72/ui/scripts/ui-custom/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index a88d4c3..a7d8449 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -1032,7 +1032,6 @@
                 return $wizard.dialog({
                     title: _l('label.vm.add'),
                     width: 800,
-                    height: 570,
                     modal: true,
                     closeOnEscape: false,
                     zIndex: 5000

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fff7c72/ui/stylesheets/_instance-wizard.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/_instance-wizard.scss b/ui/stylesheets/_instance-wizard.scss
index 0797d38..04ffd21 100644
--- a/ui/stylesheets/_instance-wizard.scss
+++ b/ui/stylesheets/_instance-wizard.scss
@@ -59,8 +59,16 @@
                 margin: 5px 0;
             }
 
+            .secondary-input {
+                @include span-columns(3);
+
+                input {
+                    margin-right: 15px;
+                }
+            }
+
             .select-desc {
-                @include span-columns(11);
+                @include span-columns(7);
 
                 .name {
                     font-weight: bold;
@@ -109,4 +117,79 @@
             margin-top: 20px;
         }
     }
+
+    .step.network {
+        table {
+            width: 100%;
+        }
+
+        .select.my-networks {
+            .select-container {
+                height: 250px;
+                overflow: auto;
+            }
+        }
+
+        .new-network {
+            .select-container {
+                height: 220px;
+            }
+
+            &.unselected {
+                .select-container {
+                    height: 100px;
+                }
+            }
+
+            .name {
+                @include span-columns(2);
+            }
+
+            .value {
+                @include span-columns(4);
+            }
+
+            .select {
+                @include row;
+
+                input[type=checkbox] {
+                    @include span-columns(1);
+                }
+                .field.name {
+                    @include span-columns(10);
+
+                    .name {
+                        @include span-columns(3);
+                    }
+
+                    .value {
+                        @include span-columns(9);
+
+                        input {
+                            width: 100%;
+
+                            padding: 5px;
+                        }
+                    }
+                }
+
+                .field.service-offering {
+                    @include span-columns(12);
+                }
+
+                .secondary-input {
+                    @include span-columns(2);
+                }
+            }
+        }
+    }
+
+    .hide-if-selected { display: none !important; }
+    .unselected .hide-if-selected {
+        display: block !important;
+    }
+
+     .unselected .hide-if-unselected {
+        display: none !important;
+    }
 }
\ No newline at end of file


Mime
View raw message