Fixed menu
diff --git a/xos/core/static/xos.css b/xos/core/static/xos.css
index 82c0967..5058664 100644
--- a/xos/core/static/xos.css
+++ b/xos/core/static/xos.css
@@ -277,60 +277,12 @@
margin-bottom: 5px;
}
-
-/*For changing the background color of the left side navigation list items*/
-/*For changing the color of the left side navigation list items*/
-/*For changing the font of the left side navigation list items*/
-.left-nav>ul>li>a {
-/*background-color: #CDE7FF;*/
-/* Light color nav choices */
-/*background-color: #DFECF8;*/
-/*background-color: #91BFE4;*/
-/*background-color: #DAECFC;*/
-background-color: #448CCA;
-/*ONlab.us reg color blue*/
-/*background-color: #ccffff;*/
-font-weight: normal;
-/*color: #105E9E;*/
-color: #ffffff;
-text-shadow: rgb(46, 43, 43) 0.1em 0.1em 0.2em;
-letter-spacing: 1px;
-font-size: 12px;
-border-bottom: none;
-}
-
-/*For giving the padding for the left side navigation*/
-.left-nav>ul {
-padding-left: 5px;
-}
-
-/*For increasing the height of left side navigation list items*/
-.left-nav>ul>li {
-padding-top:4px;
-line-height: 35px;
-width: 200px;
-}
-
/*For changing background color of suit center*/
#suit-center {
background-color: #ffffff;
}
-.left-nav>ul>li.active>a {
-/*background-color: #448CCA;*/
-/* Last Active
-background-color: #0061B7; */
-background-color: #515151;
-/*background-color: #448CCA;*/
-font-weight:normal;
-color:#ffffff;
-text-shadow: rgb(46, 43, 43) 0.1em 0.1em 0.2em;
-letter-spacing: 1px;
-/*left: 10px;*/
-background-image: url("right_arrow.png");
- background-position: 97% center;
-}
.nav-tabs-suit li{
@@ -391,37 +343,6 @@
line-height: 0;
}
-
-/* create an arrow that points down */
-
-
-.left-nav>ul>li.active>a:hover{
-/*background-color: #448CCA;*/
-/*background-color: #91BFE4;*/
-/*background-color: #D6E7F8;*/
-font-weight:normal;
-font-size: 1.2em;
-/*font-weight: bold;*/
-color:#ffffff;
-/*padding-top:10px;*/
-text-decoration:none;
-}
-
-/* Adjust font weight to normal on hover, else white blurs */
-.left-nav>ul>li>a:hover{
-/*background-color: #448CCA;*/
-/*background-color: #004775;*/
-background-color: #515151;
-color:#ffffff;
-font-weight:normal;
-font-size: 1.2em;
-/*padding-top:10px;*/
-text-decoration:none;
-/*border-left: 15px solid #105E9E ;*/
-border-left: 10px solid #ffffff;
-text-shadow: rgb(46, 43, 43) 0.1em 0.1em 0.2em;
-letter-spacing: 1px;
-}
.nav-tabs-suit li.active a:hover,.nav-tabs-suit li a:hover{
/*background-color: #448CCA;*/
background-color: #515151;
@@ -678,7 +599,7 @@
.login #wrap {
background: none repeat scroll 0 0 rgba(0, 0, 0, 0);
overflow: hidden;
- padding: 0;
+ padding: 0f;
}
#wrap {
background: none repeat scroll 0 0 rgba(0, 0, 0, 0);
@@ -777,9 +698,13 @@
}
.icon-home ,.icon-deployment ,.icon-site ,.icon-slice ,.icon-user, .icon-reservation, .icon-app{
-background-position: left center;
-width:22px;
-height:22px;
+ background-position: left center;
+ width:22px;
+ height:22px;
+ display: inline-block;
+ margin-right: 10px;
+ position: relative;
+ top: 5px;
}
.icon-app {
@@ -787,42 +712,128 @@
}
.icon-home {
/* Going with darker standard color nav -- so using over png's background-image: url("Home.png"); */
-background-image: url("Home_over.png");
+background-image: url("Home.png");
}
.icon-deployment{
-background-image: url("Deployments_over.png");
+background-image: url("Deployments.png");
}
.icon-site{
-background-image: url("Sites_over.png");
+background-image: url("Sites.png");
}
.icon-slice{
-background-image: url("Slices_over.png");
+background-image: url("Slices.png");
}
.icon-user{
-background-image: url("Users_over.png");
+background-image: url("Users.png");
}
.icon-reservation{
-background-image: url("Reservations_over.png");
+background-image: url("Reservations.png");
}
-.left-nav>ul>li.active>a>.icon-home , .left-nav>ul>li:hover>a>.icon-home , .left-nav>ul>li.focus>a>.icon-home{
-background-image: url("Home_over.png");
+
+/*For giving the padding for the left side navigation*/
+.left-nav>ul {
+ padding-left: 5px;
}
-.left-nav>ul>li.active>a>.icon-deployment,.left-nav>ul>li:hover>a>.icon-deployment,.left-nav>ul>li.focus>a>.icon-deployment{
-background-image: url("Deployments_over.png");
+/*For increasing the height of left side navigation list items*/
+.left-nav>ul>li {
+ padding-top:4px;
+ line-height: 35px;
}
-.left-nav>ul>li.active>a>.icon-site , .left-nav>ul>li:hover>a>.icon-site , .left-nav>ul>li.focus>a>.icon-site{
-background-image: url("Sites_over.png");
+
+/*For changing the background color of the left side navigation list items*/
+/*For changing the color of the left side navigation list items*/
+/*For changing the font of the left side navigation list items*/
+.left-nav>ul>li>a {
+ /*background-color: #448CCA;*/
+ /*ONlab.us reg color blue*/
+ /*background-color: #ccffff;*/
+ /*font-weight: normal;*/
+ /*color: #105E9E;*/
+ /*color: #ffffff;*/
+ /*text-shadow: rgb(46, 43, 43) 0.1em 0.1em 0.2em;*/
+ /*letter-spacing: 1px;*/
+ /*font-size: 12px;*/
+ /*border-bottom: none;*/
}
-.left-nav>ul>li.active>a>.icon-slice , .left-nav>ul>li:hover>a>.icon-slice , .left-nav>ul>li.focus>a>.icon-slice {
-background-image: url("Slices_over.png");
+
+.left-nav>ul>li.active>a {
+ /*background-color: #448CCA;*/
+ /* Last Active
+ background-color: #0061B7; */
+ /*background-color: #515151;*/
+ /*background-color: #448CCA;*/
+ /*font-weight:normal;*/
+ /*color:#ffffff;*/
+ /*text-shadow: rgb(46, 43, 43) 0.1em 0.1em 0.2em;*/
+ /*letter-spacing: 1px;*/
+
+ /*left: 10px;*/
+ /*background-image: url("right_arrow.png");*/
+ /*background-position: 97% center;*/
}
-.left-nav>ul>li.active>a>.icon-user , .left-nav>ul>li:hover>a>.icon-user , .left-nav>ul>li.focus>a>.icon-user{
-background-image: url("Users_over.png");
+
+/* create an arrow that points down */
+
+
+.left-nav>ul>li.active>a:hover{
+ /*background-color: #448CCA;*/
+ /*background-color: #91BFE4;*/
+ /*background-color: #D6E7F8;*/
+ /*font-weight:normal;*/
+ /*font-size: 1.2em;*/
+ /*font-weight: bold;*/
+ /*color:#ffffff;*/
+ /*padding-top:10px;*/
+ /*text-decoration:none;*/
}
-.left-nav>ul>li.active>a>.icon-reservation , .left-nav>ul>li:hover>a>.icon-reservation , .left-nav>ul>li.focus>a>.icon-reservation{
-background-image: url("Reservations_over.png");
+
+/* Adjust font weight to normal on hover, else white blurs */
+.left-nav>ul>li>a:hover{
+ /*background-color: #448CCA;*/
+ /*background-color: #004775;*/
+ /*background-color: #515151;*/
+ /*color:#ffffff;*/
+ /*font-weight:normal;*/
+ /*font-size: 1.2em;*/
+ /*padding-top:10px;*/
+ /*text-decoration:none;*/
+ /*border-left: 10px solid #ffffff;*/
+ /*text-shadow: rgb(46, 43, 43) 0.1em 0.1em 0.2em;*/
+ /*letter-spacing: 1px;*/
+}
+
+.left-nav>ul>li.active>a>.icon-home ,
+/*.left-nav>ul>li:hover>a>.icon-home ,*/
+.left-nav>ul>li.focus>a>.icon-home{
+ background-image: url("Home_over.png");
+}
+
+.left-nav>ul>li.active>a>.icon-deployment,
+/*.left-nav>ul>li:hover>a>.icon-deployment,*/
+.left-nav>ul>li.focus>a>.icon-deployment{
+ background-image: url("Deployments_over.png");
+}
+.left-nav>ul>li.active>a>.icon-site,
+/*.left-nav>ul>li:hover>a>.icon-site,*/
+.left-nav>ul>li.focus>a>.icon-site{
+ background-image: url("Sites_over.png");
+}
+.left-nav>ul>li.active>a>.icon-slice,
+/*.left-nav>ul>li:hover>a>.icon-slice,*/
+.left-nav>ul>li.focus>a>.icon-slice{
+ background-image: url("Slices_over.png");
+}
+.left-nav>ul>li.active>a>.icon-user,
+/*.left-nav>ul>li:hover>a>.icon-user,*/
+.left-nav>ul>li.focus>a>.icon-user{
+ background-image: url("Users_over.png");
+}
+.left-nav>ul>li.active>a>.icon-reservation,
+/*.left-nav>ul>li:hover>a>.icon-reservation,*/
+.left-nav>ul>li.focus>a>.icon-reservation{
+ background-image: url("Reservations_over.png");
}
#dashboardHPC {
diff --git a/xos/templates/admin/base.html b/xos/templates/admin/base.html
index 8936b69..3fb9309 100644
--- a/xos/templates/admin/base.html
+++ b/xos/templates/admin/base.html
@@ -124,7 +124,7 @@
{% endblock %}
<div class="container-fluid">
- <div class="col-xs-4">
+ <div class="col-xs-4 left-nav">
{% include 'suit/menu.html' %}
</div>
diff --git a/xos/xos/apps.py b/xos/xos/apps.py
index fdeab29..3462990 100644
--- a/xos/xos/apps.py
+++ b/xos/xos/apps.py
@@ -3,4 +3,11 @@
class MyDjangoSuitConfig(DjangoSuitConfig):
admin_name = 'XOS'
menu_position = 'vertical'
- menu_open_first_child = False
\ No newline at end of file
+ menu_open_first_child = False
+ menu = (
+ {'label': 'Deployments', 'icon':'icon-deployment', 'url': '/admin/core/deployment/'},
+ {'label': 'Sites', 'icon':'icon-site', 'url': '/admin/core/site/'},
+ {'label': 'Slices', 'icon':'icon-slice', 'url': '/admin/core/slice/'},
+ {'label': 'Users', 'icon':'icon-user', 'url': '/admin/core/user/'},
+ {'label': 'Services', 'icon':'icon-cog', 'url': '/serviceGrid/'},
+ )
\ No newline at end of file
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index fd43f1d..51de172 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -178,68 +178,6 @@
'core.context_processors.xos',
)
-# Django Suit configuration example
-SUIT_CONFIG = {
- # header
- 'ADMIN_NAME': getattr(config, "gui_branding_name", "OpenCloud"),
- # 'HEADER_DATE_FORMAT': 'l, j. F Y',
- # 'HEADER_TIME_FORMAT': 'H:i',
-
- # forms
- #'SHOW_REQUIRED_ASTERISK': True, # Default True
- 'CONFIRM_UNSAVED_CHANGES': True, # Default True
-
- # menu
- # 'SEARCH_URL': '/admin/auth/user/',
- # 'MENU_ICONS': {
- # 'sites': 'icon-leaf',
- # 'auth': 'icon-lock',
- # },
- # 'MENU_OPEN_FIRST_CHILD': True, # Default True
- 'MENU_EXCLUDE': (
- 'auth.group',
- 'auth',
- 'core.network',
- 'core.instance',
- 'core.node',
- 'core.image',
- 'core.deploymentrole',
- 'core.siterole',
- 'core.slicerole',
- 'core.networktemplate',
- 'core.networkparametertype',
- 'core.router',
- 'core.tag',
- 'core.account',
- 'core.invoice',
- 'core.serviceclass',
- ),
- 'MENU': (
- #{'app': 'core', 'icon':'icon-lock'},
- #{'app': 'core', 'icon': 'icon-lock', 'models': ('core.site', 'core.deployment', 'core.service', 'core.slice', 'core.user', 'core.reservation', 'core.account', 'core.invoice', 'core.payment', 'core.usableobject')},
- {'label': 'Deployments', 'icon':'icon-deployment', 'url': '/admin/core/deployment/'},
- {'label': 'Sites', 'icon':'icon-site', 'url': '/admin/core/site/'},
- {'label': 'Slices', 'icon':'icon-slice', 'url': '/admin/core/slice/'},
- {'label': 'Users', 'icon':'icon-user', 'url': '/admin/core/user/'},
- {'label': 'Services', 'icon':'icon-cog', 'url': '/serviceGrid/'},
-# {'label': 'RequestRouter', 'icon':'icon-cog', 'app': 'requestrouter'},
-# {'label': 'HyperCache', 'icon':'icon-cog', 'app': 'hpc'},
-# {'label': 'Syndicate', 'icon':'icon-cog', 'app': 'syndicate_storage'},
-# {'label': 'URL Filter', 'icon': 'icon-cog', 'app': 'urlfilter'},
-# {'label': 'Service Comp', 'icon': 'icon-cog', 'app': 'servcomp'},
-
- #{'label': 'Configured Services', 'icon':'icon-cog', 'models': [{'label': 'Content Delivery Network', 'app':'hpc'}]},
- # 'sites',
- # {'app': 'auth', 'icon':'icon-lock', 'models': ('user', 'group')},
- # {'label': 'Support', 'icon':'icon-question-sign', 'url': '/support/'},
- # {'label': 'Settings', 'icon':'icon-cog', 'models': ('core.user', 'core.site')},
- # ),
- ),
-
- # misc
- # 'LIST_PER_PAGE': 15
-}
-
# A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to
# the site admins on every HTTP 500 error when DEBUG=False.