From: Tomas Sedovic <[email protected]>
---
src/app/controllers/user_sessions_controller.rb | 4 +
src/app/stylesheets/aggregator.scss | 5 +
src/app/stylesheets/components.scss | 492 -----------------------
src/app/stylesheets/dcloud.scss | 327 ---------------
src/app/stylesheets/layout.scss | 287 -------------
src/app/views/layouts/_footer.haml | 11 +
src/app/views/layouts/_footer.rhtml | 3 -
src/app/views/layouts/_header.haml | 25 +-
src/app/views/layouts/aggregator.haml | 48 ++-
src/config/environment.rb | 3 +
src/config/navigation.rb | 10 -
11 files changed, 70 insertions(+), 1145 deletions(-)
create mode 100644 src/app/stylesheets/aggregator.scss
delete mode 100644 src/app/stylesheets/components.scss
delete mode 100644 src/app/stylesheets/dcloud.scss
delete mode 100644 src/app/stylesheets/layout.scss
create mode 100644 src/app/views/layouts/_footer.haml
delete mode 100644 src/app/views/layouts/_footer.rhtml
diff --git a/src/app/controllers/user_sessions_controller.rb
b/src/app/controllers/user_sessions_controller.rb
index 5e44548..14d32ae 100644
--- a/src/app/controllers/user_sessions_controller.rb
+++ b/src/app/controllers/user_sessions_controller.rb
@@ -23,6 +23,10 @@ class UserSessionsController < ApplicationController
before_filter :require_no_user, :only => [:new, :create]
before_filter :require_user, :only => :destroy
+ def section_id
+ "loginpage"
+ end
+
def new
@user_session = UserSession.new
end
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
new file mode 100644
index 0000000..fa031f2
--- /dev/null
+++ b/src/app/stylesheets/aggregator.scss
@@ -0,0 +1,5 @@
+...@charset "UTF-8";
+...@import "base";
+
+html {
+}
diff --git a/src/app/stylesheets/components.scss
b/src/app/stylesheets/components.scss
deleted file mode 100644
index 4f3ca4c..0000000
--- a/src/app/stylesheets/components.scss
+++ /dev/null
@@ -1,492 +0,0 @@
-...@import "base";
-/* header style */
-
-.header_logo {
- position: absolute;
- top: 10px;
- left: 10px;
- color: #b5b5b5;
- span {
- text-transform: uppercase;
- margin-left: 5px;
- font-weight: bold;
- letter-spacing: -0.02em;
- }
-}
-
-ul.nav {
- padding: 0;
- padding-top: 1em;
- margin: 0;
- white-space: nowrap;
- list-style-type: none;
- li {
- display: inline;
- font-size: 120%;
- padding: 3px 15px;
- color: #b3b3b3;
- a {
- color: #313a3d;
- text-shadow: 0 1px 1px white;
- }
- &.selected {
- background: #cbd6db !important;
- @include border-radius(16px);
- -moz-box-shadow: 0 1px 1px #efefef;
- }
- &:hover {
- background: #dedede;
- @include border-radius(16px);
- }
- }
-}
-
-.header_menu_wrapper {
- padding: 0;
- margin: 35px 0 0 0;
- float: left;
- height: 35px;
- width: 230px;
- background: #cccccc;
-}
-
-.header_menu {
- padding: 5px 0 0 10px;
- margin: 1px;
- background: #cccccc url(/images/bg_navtoolbar.png) repeat-x top;
- font-size: 110%;
- line-height: 1.5;
- height: 26px;
- width: 216px;
- border: white solid 1px;
-}
-
-.header_menu_greybox {
- padding: 0;
- margin: 35px 0 0 0;
- float: left;
- height: 35px;
- width: 230px;
- background: #cccccc;
-}
-
-#hi-username {
- margin-right: 15px;
- float: left;
-}
-
-/* dashboard style */
-
-.dashboard_column {
- float: left;
- width: 50%;
-}
-
-.dashboard_section_summary {
- background: #f2f2f2;
- font-size: 0.8em;
- font-weight: bolder;
- margin: 10px 0;
- padding: 5px 0px 5px 5px;
- p {
- display: inline;
- float: left;
- margin: 3px 0 3px 0;
- }
- img {
- &:first-child {
- padding-right: 5px;
- }
- vertical-align: middle;
- float: right;
- }
-}
-
-#getting_started_dashboard_section {
- background: #f2f2f2;
- width: 850px;
- font-size: 0.9em;
- padding: 10px;
- margin: 10px 0px 10px 5px;
- border: 1px solid black;
- @include border-radius(5px);
- p {
- padding-bottom: 5px;
- }
- ul {
- width: 100%;
- height: 120px;
- padding-left: 7px;
- li {
- display: inline;
- float: left;
- width: 205px;
- padding: 0 7px 0 10px;
- border-right: 1px solid black;
- &:last-child {
- border-right: none;
- width: 150px;
- }
- }
- }
- img {
- height: 91px;
- }
-}
-
-#getting_started_links a {
- float: right;
-}
-
-#actions_dashboard_section {
- height: 100px;
- border: 1px solid #dddddd;
- padding: 15px;
- margin: 5px 15px 15px 0px;
- @include border-radius(5px);
- -moz-box-shadow: 0 1px 3px #cccccc;
- h2 {
- padding: 0;
- margin: 0 0 15px;
- letter-spacing: -0.02em;
- color: #4b5d63;
- }
- a {
- display: block;
- float: left;
- margin: 0px 15px 5px 0px;
- color: #0075c0;
- text-decoration: underline;
- }
-}
-
-#service_quality_dashboard_section {
- border: 1px solid #dddddd;
- padding: 15px;
- margin: 0 15px 15px 0px;
- @include border-radius(5px);
- -moz-box-shadow: 0 1px 3px #cccccc;
- h2 {
- padding: 0;
- margin: 0 0 15px;
- letter-spacing: -0.02em;
- color: #4b5d63;
- }
-}
-
-.provider_service_quality_graph {
- width: 100px;
- height: 50px;
- float: left;
- margin: 0px 5px 0px 5px;
-}
-
-.provider_service_quality_graph_summary {
- float: left;
- width: 60px;
- height: 15px;
- padding: 20px 0 24px 0;
-}
-
-#key_indicators_dashboard_section {
- height: 220px;
- border: 1px solid #dddddd;
- padding: 15px;
- margin: 0 15px 15px 0px;
- @include border-radius(5px);
- -moz-box-shadow: 0 1px 3px #cccccc;
- h2 {
- padding: 0;
- margin: 0 0 15px;
- letter-spacing: -0.02em;
- color: #4b5d63;
- }
- ul {
- float: left !important;
- width: 195px;
- margin: 0;
- padding: 0;
- list-style: none;
- li {
- width: 80%;
- margin: 0;
- padding-bottom: 10px;
- }
- }
- .count {
- float: right;
- }
- .instance_graph {
- float: left;
- }
-}
-
-#provider_instances_graph {
- width: 250px;
- float: left;
-}
-
-#quota_usage_dashboard_section {
- border: 1px solid #dddddd;
- padding: 15px;
- margin: 5px 15px 15px 0px;
- @include border-radius(5px);
- -moz-box-shadow: 0 1px 3px #cccccc;
- h2 {
- padding: 0;
- margin: 0 0 15px;
- letter-spacing: -0.02em;
- color: #4b5d63;
- }
-}
-
-.account_quota_usage_graph_summary {
- padding: 15px 15px;
- display: inline;
- float: left;
- width: 45%;
-}
-
-.account_quota_usage_graph_key {
- float: right;
- vertical-align: top;
- font-size: 0.8em;
- text-align: right;
- width: 100%;
- height: 20px;
- padding: 0 15px 0 0;
-}
-
-.account_quota_usage_history_graph {
- display: inline;
- float: left;
- margin-left: 10px;
- border: 1px solid black;
- width: 120px;
- height: 20px;
-}
-
-.account_quota_usage_current_graph {
- display: inline;
- float: left;
- margin: 0 0 10px 10px;
- width: 140px;
- height: 50px;
-}
-
-.pool_quota_usage_summary {
- display: inline;
- float: left;
- padding-left: 15px;
- width: 15%;
-}
-
-.pool_quota_usage_limit {
- display: inline;
- float: left;
- width: 33%;
- height: 25px;
- border: 1px solid black;
- margin-left: 17px;
-}
-
-.pool_quota_usage_instances {
- display: inline;
- float: left;
- width: 33%;
- height: 25px;
- border: 1px solid black;
- margin-left: 17px;
- margin-bottom: 15px;
-}
-
-#image_descriptor_nav {
- margin: 2px 0px 0 0px;
- width: 98%;
- h2 {
- height: 29px;
- font-weight: normal;
- padding: 10px 10px 0px 10px;
- margin: 0px;
- }
- ul {
- margin: 20px;
- width: 100%;
- li {
- display: inline;
- float: left;
- width: 200px;
- border: 1px solid #cccccc;
- border-top: none;
- border-right: none;
- padding-left: 10px;
- clear: none;
- font-size: 1em;
- h4 {
- margin-top: 0px;
- margin-bottom: 0.5em;
- }
- p {
- margin-top: 0;
- margin-bottom: 2em;
- color: gray;
- }
- &.selected p {
- color: black;
- }
- }
- }
-}
-
-#image_descriptor_form {
- border: none;
- padding: 1em 0;
- background: none;
- width: 800px;
- margin: 20px;
- display: inline-block;
- input {
- width: auto;
- }
- ul li {
- textarea, select, input[type=text] {
- width: 302px;
- float: left;
- border-top: 1px solid #7f7f7f;
- background: white;
- border-bottom: 1px solid #7f7f7f;
- border-left: 1px solid black;
- border-right: 1px solid black;
- @include border-radius(4px);
- }
- }
- .description {
- float: left;
- width: 300px;
- font-size: 95%;
- padding-left: 1em;
- padding-bottom: 20px;
- }
- label {
- color: black;
- font-size: 90%;
- font-weight: bold;
- &.plain {
- font-weight: normal;
- }
- }
- .pkglist {
- float: left;
- width: 380px;
- height: 300px;
- overflow: auto;
- background-color: white;
- border: 2px solid #cccccc;
- @include border-radius(6px);
- }
- .submit {
- padding-top: 20px;
- }
- .pkglist .action_link {
- float: right;
- width: 60px !important;
- color: blue;
- }
- .closed_folder {
- background-image: url(/images/dir_closed.png);
- background-repeat: no-repeat;
- }
- .opened_folder {
- background-image: url(/images/dir_open.png);
- background-repeat: no-repeat;
- }
- .groupname {
- cursor: pointer;
- }
- .hidden {
- display: none;
- }
- .selection_list > li {
- padding-bottom: 10px;
- }
- .group, .groupkgs {
- padding-left: 20px;
- }
- .pkglist .ui-tabs {
- padding: 0;
- .ui-tabs-panel {
- padding: 1em 0.5em;
- }
- }
- .left-pkglist .ui-widget-header {
- height: 26px;
- padding: 10px;
- }
- .pkglist {
- ul.ui-tabs-nav {
- background-color: white;
- width: 379px;
- height: 44px;
- }
- .select_repository {
- float: right;
- padding: 5px 0px 5px 0px;
- select {
- width: 150px;
- }
- }
- }
- .selection_list {
- padding: 10px;
- }
- .side_panel {
- width: 150px;
- float: left;
- border: 1px solid #cccccc;
- margin: 5px;
- padding: 10px;
- min-height: 300px;
- label {
- float: none;
- font-size: 1em;
- padding: 5px;
- }
- li {
- padding-bottom: 20px;
- }
- }
- .main_panel {
- width: 580px;
- float: left;
- border: 1px solid #cccccc;
- margin: 5px;
- min-height: 300px;
- padding: 10px;
- .image_build_panel {
- border-bottom: 1px solid #cccccc;
- padding: 10px;
- input {
- font-size: 1em;
- }
- }
- }
- .expand_target_list_button {
- float: right;
- display: none;
- }
- .target_list {
- li {
- border: 1px solid #cccccc;
- margin: 20px;
- padding: 5px;
- .status, .actions {
- float: right;
- width: 100px;
- }
- }
- .empty {
- text-align: center;
- padding: 30px;
- }
- }
-}
diff --git a/src/app/stylesheets/dcloud.scss b/src/app/stylesheets/dcloud.scss
deleted file mode 100644
index b9cdfae..0000000
--- a/src/app/stylesheets/dcloud.scss
+++ /dev/null
@@ -1,327 +0,0 @@
-...@import "base";
-
-form {
- border: none;
- margin: 0;
- padding: 0;
- display: inline-block;
-}
-
-fieldset {
- border: 3px solid #efeff0;
- border-right: none;
- border-left: none;
- border-bottom: none;
- padding: 18px 0 10px 10px;
-}
-
-ul li input {
- border: 2px solid #becfe4;
- color: #333333;
- display: block;
- float: left;
- outline-color: -moz-use-text-color;
- outline-style: none;
- outline-width: medium;
- padding: 3px;
- width: 302px;
-}
-
-legend {
- text-transform: uppercase;
- color: #9a9a9a;
- font-weight: bold;
-}
-
-input, select {
- font-family: "Lucida Grande", "Luxi Sans", "Bitstream Vera Sans", "Trebuchet
MS", helvetica, verdana, arial, sans-serif;
- font-size: 1.4em;
-}
-
-.fieldWithErrors {
- display: inline-block;
- padding: 3px;
- background: #fff7b2;
- border: 3px solid #fff7b2;
-}
-
-.errorExplanation {
- margin: 0 0 24px 0;
- padding: 9px;
- background: #fff7b2;
- color: #867a5e;
- @include border-radius(3px);
-}
-
-#errorExplanation h2 {
- font-size: 14px;
- font-weight: bold;
- color: #867a5e;
-}
-
-.dcloud_form {
- background: #e8e8e8;
- border: solid 8px #f5f5f5;
- @include border-radius(10px);
- margin-top: 54px;
- width: 550px;
- margin-left: auto;
- margin-right: auto;
- padding: 36px;
- h2 {
- font-size: 1.9em;
- font-weight: normal;
- color: #43728e;
- margin: 0 0 24px 0;
- padding: 0;
- }
- ul {
- list-style-image: none;
- list-style-position: outside;
- list-style-type: none;
- margin: 0;
- padding: 0;
- label {
- display: block;
- float: left;
- padding: 3px 0 24px 0;
- width: 175px;
- font-size: 1.4em;
- color: #616161;
- span {
- display: block;
- float: left;
- width: 160px;
- font-size: 0.8em;
- color: #9a9a9a;
- }
- }
- li {
- clear: both;
- }
- }
- .txtfield {
- border: 2px solid #becfe4;
- color: #333333;
- display: block;
- float: left;
- outline-color: -moz-use-text-color;
- outline-style: none;
- outline-width: medium;
- padding: 3px;
- width: 318px;
- }
- .submit {
- float: right;
- display: inline;
- clear: both;
- }
-}
-
-/* Styles for table */
-
-#main table {
- width: 100%;
- border-collapse: collapse;
- th, td {
- border: 1px solid #e1e2e3;
- border-right: 0;
- border-left: 0;
- padding: 0;
- text-align: left;
- font-size: 14px;
- line-height: 24px;
- padding-left: 18px;
- }
- th {
- background: none;
- border-top: none;
- a {
- display: block;
- text-decoration: none;
- &:hover {
- text-decoration: underline;
- }
- }
- }
-}
-
-.actionlink {
- color: #0075c0 !important;
- line-height: 36px;
- font-size: 14px;
- padding-left: 18px;
-}
-
-ul#providers + a.actionlink {
- display: block;
-}
-
-.submit_link {
- background: none;
- border: 0;
- text-decoration: underline;
- color: #0075c0;
- line-height: 36px;
- font-size: 14px;
- padding-left: 10px;
- &:hover {
- cursor: pointer;
- }
-}
-
-/* Styles for the left navigator */
-
-#side {
- padding: 0;
- width: 229px;
- a.actionlink {
- color: #0075c0;
- line-height: 36px;
- font-size: 14px;
- padding-left: 10px;
- }
-}
-
-$provider_icon: "/images/icon_provider.png";
-$pool_icon: "/images/icon_vmpool.png";
-
-...@mixin list-menu($icon) {
- line-height: 36px;
- list-style-type: none;
- margin: 0;
- padding: 0 0 0 10px;
- li {
- font-size: 14px;
- a {
- display: block;
- padding-left: 32px;
- width: 224px;
- background: url($icon) no-repeat 2px 50%;
- &:hover {
- background-color: #efefef;
- }
- &.selected {
- background-color: #5599b8;
- color: white;
- }
- }
- }
-}
-
-ul {
- &#providers {
- @include list-menu($provider_icon);
- }
- &#pools {
- @include list-menu($pool_icon);
- }
-}
-
-.instance_action_list {
- padding: 0;
- li {
- padding: 0 0.3em;
- border-left: 1px solid black;
- display: inline;
- &.first {
- border-left: none;
- }
- }
-}
-
-#instances_table_wrapper {
- min-height: 0;
- margin-bottom: 1em;
-}
-
-/* Style for button links */
-
-a.button_link {
- border: 1px solid black;
- text-decoration: none;
- padding: 4px;
- margin-bottom: 3px;
- display: block;
- background: #666666;
- color: white;
- @include border-radius(5px);
-}
-
-#dashboard-tabs, #provider-tabs, #pool-tabs {
- border: none;
-}
-
-#dashboard-tabs ul, #provider-tabs ul, #pool-tabs ul {
- float: none;
-}
-
-/* paginated data table */
-.dtable {
- position: relative;
- width: 96%;
- margin: 20px 2% 20px 2%;
- .wrapped_table {
- border: 1px solid #bbbbbb;
- }
- table {
- width: 100%;
- }
- .dtable_form {
- width: 100%;
- }
- tbody tr:hover {
- background-color: #eeeeee;
- }
- table th {
- text-align: left;
- }
- .ordercol {
- background-position: left center;
- background-repeat: no-repeat;
- padding-left: 20px;
- }
- .asc {
- background-image: url(/images/Sort_down_11.png);
- }
- .desc {
- background-image: url(/images/Sort_up_11.png);
- }
- .header {
- height: 25px;
- background-color: #eeeeee;
- border-bottom: 1px solid #bbbbbb;
- }
- .footer {
- height: 24px;
- background-color: #eeeeee;
- border-top: 1px solid #bbbbbb;
- line-height: 1.8;
- padding-left: 10px;
- }
- .search_field {
- font-size: 14px;
- position: absolute;
- top: 0px;
- right: 1px;
- }
- .search_field input {
- font-size: 14px;
- }
- .pagination {
- float: right;
- padding-right: 10px;
- a {
- color: blue;
- }
- }
- .title {
- font-size: 15px;
- font-weight: bold;
- padding-left: 10px;
- }
- .action_buttons {
- padding-top: 10px;
- padding-bottom: 10px;
- }
-}
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
deleted file mode 100644
index b871a26..0000000
--- a/src/app/stylesheets/layout.scss
+++ /dev/null
@@ -1,287 +0,0 @@
-...@charset "UTF-8";
-...@import "base";
-
-html {
- font-size: small;
- min-width: 900px;
- min-height: 400px;
-}
-
-body {
- font-family: "Lucida Grande", "Luxi Sans", "Bitstream Vera Sans", "Trebuchet
MS", helvetica, verdana, arial, sans-serif;
- padding: 0;
- margin: 0;
- width: 100%;
- height: 100%;
- background-color: #333333;
- font-size: 90%;
-}
-
-img {
- border-style: none;
-}
-
-a {
- color: black;
- text-decoration: none;
-}
-
-h2, h3 {
- font-weight: normal;
-}
-
-#header {
- padding: 0;
- margin: 0;
- position: absolute;
- top: 0px;
- left: 0px;
- width: 100%;
- height: 90px;
- overflow: hidden;
- background: #535353 url(/images/bg_header.png) repeat-x top;
-}
-
-#content {
- position: absolute;
- top: 70px;
- left: 0px;
- right: 0px;
- bottom: 0px;
- overflow: auto;
- background-color: white;
-}
-
-#side {
- padding: 5px 0 0 5px;
- float: left;
- margin: 0;
- top: 70px;
- left: 0px;
- height: 100%;
- overflow: auto;
- width: 224px;
- background-color: white;
- border-right: 1px #cccccc solid;
- h3 {
- color: #999999;
- font-size: 1em;
- margin: 1em 1em 0.5em 1em;
- text-transform: uppercase;
- }
-}
-
-#main {
- padding: 0;
- margin-left: 0;
- top: 70px;
- bottom: 0px;
- overflow: auto;
- background-color: white;
- border-left: #cccccc solid 0px;
-}
-
-/* ----- Right side of Header -------- */
-
-.header_info {
- padding: 10px 31px 0px 10px;
- margin: 0;
- float: right;
- text-align: right;
- font-size: 100%;
- color: #b5b5b5;
- a {
- font-weight: bold;
- &:link, &:active, &:visited, &:hover {
- color: black;
- text-decoration: none;
- }
- }
-}
-
-#textfield_effect {
- border-width: 1px;
- border-style: solid;
- border-color: #7a7a7a;
- padding-left: 5px;
- background: #4a4a4a;
- font-size: 100%;
- color: white;
- width: 100px;
- height: 16px;
-}
-
-/* ----- Blue Tabbed Navigation -------- */
-
-.ui-tabs-nav {
- margin: 0;
- padding: 0;
- background: none;
- list-style-type: none;
- float: left;
- font-size: 110%;
- li {
- margin: 0 1px 0 1px;
- padding: 0;
- float: left;
- }
- a {
- float: left;
- padding: 0 15px 0 15px;
- color: #cccccc;
- text-decoration: none;
- line-height: 2.3;
- height: 24px;
- text-align: center;
- background: none;
- &:hover {
- color: white;
- border-bottom: 5px solid #537585;
- }
- &:focus, &:active {
- outline-style: none;
- }
- }
-}
-
-.ui-tabs-selected a {
- color: white;
- outline-style: none;
- height: 24px;
- line-height: 1.6;
- border-bottom: 5px solid #5599b8;
-}
-
-.ui-tabs-hide {
- /*display:none; */
-}
-
-/* ----- PopUp Dialog -------- */
-
-.dialog_title {
- background: #dee7eb;
- padding: 15px;
- width: 600px;
-}
-
-.dialog_title_small {
- background: #dee7eb;
- padding: 15px;
- min-width: 500px;
-}
-
-.header {
- font-size: 180%;
- line-height: 1.6;
-}
-
-.dialog_body {
- overflow: auto;
- height: 350px;
-}
-
-.confirm_dialog_title {
- width: 400px;
- padding: 15px;
- font-size: 110%;
- background: url(/images/bg_warningMessage.png) top repeat-x;
-}
-
-.confirm_dialog_header {
- background: url(/images/icon_warning.png) top left no-repeat;
- padding: 0 0 0 45px;
- min-height: 36px;
-}
-
-.confirm_dialog_footer {
- height: 37px;
- text-align: right;
- padding: 5px 9px 0 0;
-}
-
-.button {
- padding: 0 0 0 2px;
- float: right;
-}
-
-.button_left_blue {
- background: url(/images/button_left.png) no-repeat;
- width: 6px;
- height: 29px;
- float: left;
-}
-
-.button_middle_blue {
- background: url(/images/button_middle.png) repeat-x;
- height: 29px;
- float: left;
- color: white;
- line-height: 2.3;
- font-size: 105%;
- display: block;
-}
-
-.button_right_blue {
- background: url(/images/button_right.png) no-repeat;
- width: 6px;
- height: 29px;
- float: left;
-}
-
-.button_middle_blue a {
- color: white;
- text-decoration: none;
- display: block;
- padding: 0 10px 0 10px;
- &:hover {
- color: #e7eff6;
- text-decoration: none;
- padding: 0 10px 0 10px;
- }
-}
-
-.button_left_grey {
- background: url(/images/button_left_grey.png) no-repeat;
- width: 6px;
- height: 29px;
- float: left;
-}
-
-.button_middle_grey {
- background: url(/images/button_middle_grey.png) repeat-x;
- height: 29px;
- float: left;
- color: white;
- line-height: 2.3;
- font-size: 105%;
- display: block;
-}
-
-.button_right_grey {
- background: url(/images/button_right_grey.png) no-repeat;
- width: 6px;
- height: 29px;
- float: left;
-}
-
-.button_middle_grey a {
- color: white;
- text-decoration: none;
- display: block;
- padding: 0 10px 0 10px;
- &:hover {
- color: #e7eff6;
- text-decoration: none;
- padding: 0 10px 0 10px;
- }
-}
-
-.fieldWithErrors {
- background-color: #ffb2b2;
- border: 3px solid #ffb2b2;
-}
-
-.errorExplanation {
- color: #333333;
- padding: 2px;
-}
diff --git a/src/app/views/layouts/_footer.haml
b/src/app/views/layouts/_footer.haml
new file mode 100644
index 0000000..a266d24
--- /dev/null
+++ b/src/app/views/layouts/_footer.haml
@@ -0,0 +1,11 @@
+%ul.container_16
+ - unless @current_user.nil?
+ %li
+ = link_to t(:logout), logout_url
+ %li
+ %a{ :href => ""}
+ = t(:configure)
+ %li
+ %a{ :href => ""}
+ = t(:about)
+ %li Copyright © 2010 Red Hat, Inc.
diff --git a/src/app/views/layouts/_footer.rhtml
b/src/app/views/layouts/_footer.rhtml
deleted file mode 100644
index 421d9aa..0000000
--- a/src/app/views/layouts/_footer.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="footer">
-ET Group. Copyright Red Hat, Inc. 2007
-</div>
diff --git a/src/app/views/layouts/_header.haml
b/src/app/views/layouts/_header.haml
index 26f1c2d..6155b48 100644
--- a/src/app/views/layouts/_header.haml
+++ b/src/app/views/layouts/_header.haml
@@ -1,9 +1,16 @@
-.header_logo
- %span Deltacloud Aggregator
- = render_navigation(:level => 2, :expand_all => true)
-
-.header_info
- #hi-username
- = link_to @current_user.first_name + " " + @current_user.last_name, {
:controller => "users", :action => "show"} unless @current_user.nil?
- = link_to t(:logout), logout_url unless @current_user.nil?
- = link_to t(:login), login_url if @current_user.nil?
+%h1 Red Hat Deltacloud
+- unless @current_user.nil?
+ %ul
+ %li.about
+ %a{:href => ""}
+ = t(:about)
+ %li.configure
+ %a{:href => ""}
+ = t(:configure)
+ %li.hello
+ %a{:href => ""}
+ = t(:hello)
+ %b
+ = @current_user.first_name + " " + @current_user.last_name
+ %li.logout
+ = link_to t(:logout), logout_url
diff --git a/src/app/views/layouts/aggregator.haml
b/src/app/views/layouts/aggregator.haml
index 645b77c..c852c35 100644
--- a/src/app/views/layouts/aggregator.haml
+++ b/src/app/views/layouts/aggregator.haml
@@ -1,18 +1,18 @@
!!!
%html{html_attrs}
%head
- %meta(http-equiv="content-type" content="text/html;charset=UTF-8")
+ %meta(http-equiv="Content-Type" content="text/html; charset=UTF-8")
%title
- Deltacloud
+ Red Hat Deltacloud
= yield :title
- = stylesheet_link_tag 'compiled/layout'
- = stylesheet_link_tag 'compiled/components'
- = stylesheet_link_tag 'compiled/dcloud'
+ = stylesheet_link_tag 'compiled/aggregator'
= stylesheet_link_tag 'facebox'
= stylesheet_link_tag 'jquery.ui-1.8.1/jquery-ui-1.8.1.custom.css'
= stylesheet_link_tag 'jquery.loadmask'
+ / [if lt IE 9]
+ = javascript_include_tag
"http://html5shiv.googlecode.com/svn/trunk/html5.js";
= javascript_include_tag "jquery-1.4.2.min.js"
= javascript_include_tag "application.js"
= javascript_include_tag "facebox.js"
@@ -20,15 +20,29 @@
= javascript_include_tag "jquery.loadmask.min"
= yield :scripts
- %body
- #header
- = render :partial => '/layouts/header'
- #content
- / NOTE: uncoment the following line to enable the new navigation
- /= render_navigation(:expand_all => true)
- - if ['instance', 'pool'].include? controller.controller_name
- #side
- = render :partial => '/layouts/main_nav' unless @current_user.nil?
- #main
- = render :partial => '/layouts/notification'
- = (yield(:content) or yield) # content is set if we're using a sub
template
+ - if controller.respond_to?(:section_id)
+ - section_id = controller.section_id
+ - else
+ - section_id = ""
+ %body{:id => section_id}
+ .container_16
+ %header
+ = render :partial => '/layouts/header'
+ - if current_user.nil?
+ #formwindow
+ = yield
+ - else
+ #search.prefix_10
+ %form
+ %input{ :name => "s", :type => "search", :placeholder => "Search
Cloud Aggregator", :value => "Search Deltacloud Aggregator"}
+ %p
+ %a{ :href => "" }
+ = t(:advanced_search)
+ = render_navigation(:expand_all => true)
+ #subnav
+ /todo
+ #content.container_16
+ = render :partial => '/layouts/notification'
+ = (yield(:content) or yield) # content is set if we're using a sub
template
+ %footer
+ = render :partial => "layouts/footer"
diff --git a/src/config/environment.rb b/src/config/environment.rb
index ba14e06..b002c80 100644
--- a/src/config/environment.rb
+++ b/src/config/environment.rb
@@ -25,6 +25,8 @@ RAILS_GEM_VERSION = '>= 2.3.2' unless defined?
RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
require 'util/condormatic'
+require 'haml'
+
Rails::Initializer.run do |config|
# Settings in config/environments/* take precedence over those specified here
@@ -83,6 +85,7 @@ Rails::Initializer.run do |config|
# config.i18n.default_locale = :de
config.after_initialize do
+ Haml::Template.options[:format] = :html5
begin
# This pulls all the possible classad matches from the database and puts
# them on condor on startup. Note that this can fail because this is
run on startup
diff --git a/src/config/navigation.rb b/src/config/navigation.rb
index 08a8898..cfb1189 100644
--- a/src/config/navigation.rb
+++ b/src/config/navigation.rb
@@ -1,15 +1,5 @@
SimpleNavigation::Configuration.run do |navigation|
navigation.items do |first_level|
- first_level.item :old_nav, "Old Navigation", "#" do |old_nav|
- old_nav.dom_class = 'nav'
- old_nav.item :dashboard, t(:dashboard), :controller => "dashboard"
- old_nav.item :instances, t(:instances), :controller => "instance"
- old_nav.item :templates, t(:templates), :controller => "image", :action
=> "show"
- old_nav.item :users, t(:users), {:controller => "users"}, :if => lambda {
- @current_user &&
has_view_perms?(BasePermissionObject.general_permission_scope) }
- old_nav.item :settings, t(:settings), :controller => "settings"
- end
-
first_level.item :operate, t(:operate), '#' do |second_level|
second_level.item :monitor, t(:monitor), '/dashboard'
end
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
