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 d35eb7e
Date Thu, 03 Oct 2013 21:50:14 GMT
Updated Branches:
  refs/heads/ui-restyle fbb0499be -> d35eb7e64


Add home breadcrumb


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

Branch: refs/heads/ui-restyle
Commit: d35eb7e64497babf12822f008f35ab9ac1e61b76
Parents: fbb0499
Author: Brian Federle <brian.federle@citrix.com>
Authored: Thu Oct 3 14:50:05 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Thu Oct 3 14:50:05 2013 -0700

----------------------------------------------------------------------
 .../classes/resources/messages.properties       |  1 +
 ui/dictionary.jsp                               |  1 +
 ui/scripts/ui/core.js                           |  2 +-
 ui/stylesheets/_browser.scss                    |  6 +++
 ui/stylesheets/csui/_breadcrumbs.scss           | 45 +++++++++++---------
 5 files changed, 35 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d35eb7e6/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 774a15b..4b54acb 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.home=Home
 label.use.default.language=Use default language
 label.delete.events=Delete events
 label.delete.alerts=Delete alerts

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d35eb7e6/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index dd45057..2b07a2f 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,7 @@ under the License.
 <% long now = System.currentTimeMillis(); %>
 <script language="javascript">
 dictionary = {
+'label.home': '<fmt:message key="label.home" />',
 'label.use.default.language': '<fmt:message key="label.use.default.language" />',
 'label.delete.events': '<fmt:message key="label.delete.events" />',
 'label.delete.alerts': '<fmt:message key="label.delete.alerts" />',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d35eb7e6/ui/scripts/ui/core.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/core.js b/ui/scripts/ui/core.js
index c0d5c57..07fb6cb 100644
--- a/ui/scripts/ui/core.js
+++ b/ui/scripts/ui/core.js
@@ -247,7 +247,7 @@
                     $('<div>').attr({
                         id: 'breadcrumbs'
                     })
-                    .append($('<div>').addClass('home'))
+                    .append($('<div>').addClass('home').html(_l('label.home')))
                     .append($('<div>').addClass('end'))
             )
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d35eb7e6/ui/stylesheets/_browser.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/_browser.scss b/ui/stylesheets/_browser.scss
index ff7439c..7727842 100644
--- a/ui/stylesheets/_browser.scss
+++ b/ui/stylesheets/_browser.scss
@@ -39,4 +39,10 @@
 
 #breadcrumbs {
     @include csui-breadcrumbs;
+
+    .home {
+        @include csui-breadcrumb;
+        
+        margin-left: 20px;
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d35eb7e6/ui/stylesheets/csui/_breadcrumbs.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_breadcrumbs.scss b/ui/stylesheets/csui/_breadcrumbs.scss
index cc227a6..191eedc 100644
--- a/ui/stylesheets/csui/_breadcrumbs.scss
+++ b/ui/stylesheets/csui/_breadcrumbs.scss
@@ -14,6 +14,31 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+
+// Individual breadcrumb
+@mixin csui-breadcrumb {
+    color: #237AD7;
+    font-size: 12px;
+    list-style: none;
+    float: left;
+
+    &:after {
+        content: ">";
+        color: #ccc;
+        margin-right: 10px;
+        margin-left: 10px;
+    }
+
+    &.active {
+        color: darken(#ccc, 30%);
+
+        &:after {
+            content: "";
+        }
+    }
+}
+
+// Breadcrumb row
 @mixin csui-breadcrumbs {
     box-shadow: 0px 3px 5px #ccc;
     
@@ -24,25 +49,7 @@
         padding-bottom: 10px;
         
         li {
-            color: #237AD7;
-            font-size: 12px;
-            list-style: none;
-            float: left;
-
-            &:after {
-                content: ">";
-                color: #ccc;
-                margin-right: 10px;
-                margin-left: 10px;
-            }
-
-            &.active {
-                color: darken(#ccc, 30%);
-
-                &:after {
-                    content: "";
-                }
-            }
+            @include csui-breadcrumb;            
         }
     }
 }
\ No newline at end of file


Mime
View raw message