feature #1664: Add login info

2025-01-11 05:17:41 +03:00 · 2013-03-07 16:58:54 +01:00 · 2013-03-07 16:58:54 +01:00 · a5d6fc6574
commit a5d6fc6574
parent ea44bec65f
6 changed files with 174 additions and 114 deletions
--- a/src/sunstone/public/css/app.css
+++ b/src/sunstone/public/css/app.css
@ -6105,7 +6105,7 @@ table.dataTable td {
 }

 /* -----------------------------------------
-   Tabs remove icon 
+   Tabs remove icon
 ----------------------------------------- */
 /* line 118, ../sass/app.scss */
 .remove-tab:hover {
@ -6147,78 +6147,94 @@ div.button-bar {
 /* line 158, ../sass/app.scss */
 #logo {
  font-weight: bold;
-  color: white;
  margin: 10%;
  margin-top: 15%;
-  margin-bottom: 15%;
+  margin-bottom: 10%;
 }

-/* line 166, ../sass/app.scss */
+/* line 165, ../sass/app.scss */
 #login-info {
-  padding-top: 4px;
-  float: right;
-  padding-right: 5px;
+  text-align: center;
+  overflow: visible;
+  position: absolute;
+  margin: 0px;
+  top: auto;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  width: auto;
+  z-index: 0;
+  height: 70px;
+  display: block;
+  visibility: visible;
 }

-/* line 172, ../sass/app.scss */
+/* line 186, ../sass/app.scss */
 #links {
  padding-top: 4px;
  margin-right: 40px;
  float: right;
 }

-/* line 178, ../sass/app.scss */
+/* line 192, ../sass/app.scss */
 #login-info, #login-info a, #links, #links a {
-  color: white;
+  color: #555;
 }

-/* line 182, ../sass/app.scss */
+/* line 196, ../sass/app.scss */
 #login-info, #login-info a {
  font-weight: bold;
 }

-/* line 185, ../sass/app.scss */
+/* line 199, ../sass/app.scss */
 .sunstone-color {
  color: #2ba6cb;
 }

-/* line 189, ../sass/app.scss */
+/* line 203, ../sass/app.scss */
 #logo-wrapper {
  float: right;
  margin-top: 0px;
  margin-right: 20px;
 }

-/* line 195, ../sass/app.scss */
+/* line 209, ../sass/app.scss */
+.menu-nav {
+  height: 70%;
+  overflow: overlay;
+}
+
+/* line 214, ../sass/app.scss */
 #menu {
  padding-right: 0;
  padding-left: 0;
  border: 0;
+  overflow: hidden;
 }

-/* line 201, ../sass/app.scss */
+/* line 221, ../sass/app.scss */
 #tabs_content {
  box-shadow: -8px -8px 11px -11px black;
  z-index: 2 !important;
 }

-/* line 206, ../sass/app.scss */
+/* line 226, ../sass/app.scss */
 #navigation {
  margin: 8%;
  box-shadow: 0 0 1px 0px black;
 }

-/* line 211, ../sass/app.scss */
+/* line 231, ../sass/app.scss */
 .tabs.vertical li {
  border-left: none;
 }

-/* line 215, ../sass/app.scss */
+/* line 235, ../sass/app.scss */
 .tabs.vertical li.active {
  border-top: none;
 }

-/* line 220, ../sass/app.scss */
+/* line 240, ../sass/app.scss */
 #navigation > li:not(.subTab).navigation-active-li > a,
 #navigation > li:not(.subTab).active > a {
  background: #f2f2f2;
@ -6226,46 +6242,46 @@ div.button-bar {
  color: #555;
 }

-/* line 230, ../sass/app.scss */
+/* line 250, ../sass/app.scss */
 #navigation i {
  margin-right: 3px;
 }

-/* line 235, ../sass/app.scss */
+/* line 255, ../sass/app.scss */
 #navigation li.subTab > a {
  background: #fdfdfd;
  color: #555;
  border: none;
-  padding: 10px 11px 10px 25px;
+  padding: 7px 11px 7px 25px;
 }

-/* line 242, ../sass/app.scss */
+/* line 262, ../sass/app.scss */
 #navigation li.subsubTab {
  padding-left: 15px;
 }

-/* line 246, ../sass/app.scss */
+/* line 266, ../sass/app.scss */
 #navigation li:not(subTab) {
  border-left: 5px solid #f2f2f2 !important;
 }

-/* line 250, ../sass/app.scss */
+/* line 270, ../sass/app.scss */
 #navigation li.subTab:not(.navigation-active-li) {
  border-left: 5px solid #fdfdfd !important;
 }

-/* line 254, ../sass/app.scss */
+/* line 274, ../sass/app.scss */
 #navigation li:hover {
  font-weight: bold;
 }

-/* line 258, ../sass/app.scss */
+/* line 278, ../sass/app.scss */
 #navigation .navigation-active-li {
  border-left: 5px solid #555555 !important;
 }

 /* top menu css */
-/* line 319, ../sass/app.scss */
+/* line 339, ../sass/app.scss */
 #menutop_container {
  margin: 0px 171px;
  color: #FFFFFF;
@ -6273,14 +6289,14 @@ div.button-bar {
  font-weight: bold;
 }

-/* line 325, ../sass/app.scss */
+/* line 345, ../sass/app.scss */
 #menutop_navbar {
  float: left;
  height: 25px;
  font-size: 13px;
 }

-/* line 330, ../sass/app.scss */
+/* line 350, ../sass/app.scss */
 #menutop_navbar ul {
  float: left;
  height: 25px;
@ -6289,12 +6305,12 @@ div.button-bar {
  padding-left: 1px;
 }

-/* line 337, ../sass/app.scss */
+/* line 357, ../sass/app.scss */
 #menutop_navbar ul {
  background-color: #4d4d4d;
 }

-/* line 340, ../sass/app.scss */
+/* line 360, ../sass/app.scss */
 #menutop_navbar ul li {
  float: left;
  min-width: 72px;
@ -6311,245 +6327,245 @@ div.button-bar {
  color: white;
 }

-/* line 356, ../sass/app.scss */
+/* line 376, ../sass/app.scss */
 #menutop_navbar ul li:hover {
  background-color: #ffffff;
 }

 /* end top menu css */
-/* line 367, ../sass/app.scss */
+/* line 387, ../sass/app.scss */
 .ui-layout-pane {
  border: none;
 }

-/* line 372, ../sass/app.scss */
+/* line 392, ../sass/app.scss */
 .button.small {
  font-size: 12px;
  box-shadow: none;
  height: 28px;
 }

-/* line 378, ../sass/app.scss */
+/* line 398, ../sass/app.scss */
 .button {
  box-shadow: none;
 }

-/* line 382, ../sass/app.scss */
+/* line 402, ../sass/app.scss */
 .button.tiny {
  box-shadow: none;
 }

-/* line 386, ../sass/app.scss */
+/* line 406, ../sass/app.scss */
 .panel {
  padding: 0px;
  background: #f2f2f2;
 }

-/* line 391, ../sass/app.scss */
+/* line 411, ../sass/app.scss */
 .tabs.vertical li a {
  padding: 15px 11px;
 }

-/* line 395, ../sass/app.scss */
+/* line 415, ../sass/app.scss */
 input[type="text"] {
  height: 28px !important;
 }

-/* line 399, ../sass/app.scss */
+/* line 419, ../sass/app.scss */
 .right {
  float: right !important;
 }

-/* line 403, ../sass/app.scss */
+/* line 423, ../sass/app.scss */
 .ui-layout-pane {
  background: #fdfdfd;
 }

-/* line 410, ../sass/app.scss */
+/* line 430, ../sass/app.scss */
 tr.odd:hover td {
  background-color: #2ba6cb !important;
  cursor: pointer;
  color: white !important;
 }

-/* line 416, ../sass/app.scss */
+/* line 436, ../sass/app.scss */
 tr.even:hover td {
  background-color: #2ba6cb !important;
  cursor: pointer;
  color: white !important;
 }

-/* line 422, ../sass/app.scss */
+/* line 442, ../sass/app.scss */
 tr {
  border-bottom: 1px solid #e6e6e6;
 }

-/* line 428, ../sass/app.scss */
+/* line 448, ../sass/app.scss */
 table thead tr th, table tfoot tr td {
  padding: 5px 10px 5px;
  line-height: 16px;
 }

-/* line 433, ../sass/app.scss */
+/* line 453, ../sass/app.scss */
 table {
  border-collapse: collapse;
  border-spacing: 0;
 }

 /* Growl */
-/* line 439, ../sass/app.scss */
+/* line 459, ../sass/app.scss */
 .jGrowl-notification h1 {
  font-size: 1.2em;
 }

-/* line 443, ../sass/app.scss */
+/* line 463, ../sass/app.scss */
 .jGrowl-notification, .jGrowl-notify-submit {
  border: 2px #444444 solid;
  background-color: #F3F3F3!important;
  color: #666666;
 }

-/* line 449, ../sass/app.scss */
+/* line 469, ../sass/app.scss */
 .jGrowl-notify-error {
  border: 2px #660000 solid;
  background-color: #F39999!important;
  color: #660000;
 }

-/* line 455, ../sass/app.scss */
+/* line 475, ../sass/app.scss */
 .jGrowl-notify-error table td.key_error {
  text-transform: capitalize;
  width: 100%;
  font-weight: bold;
 }

-/* line 461, ../sass/app.scss */
+/* line 481, ../sass/app.scss */
 .jGrowl-notify-error table td.key_error:after {
  content: ":";
 }

-/* line 468, ../sass/app.scss */
+/* line 488, ../sass/app.scss */
 .markrow {
  background-color: #cdebf5 !important;
 }

-/* line 469, ../sass/app.scss */
+/* line 489, ../sass/app.scss */
 .markrowselected {
  background-color: #2ba6cb !important;
  color: #FFF;
 }

-/* line 470, ../sass/app.scss */
+/* line 490, ../sass/app.scss */
 .markrowchecked {
  background-color: #cdebf5;
 }

-/* line 473, ../sass/app.scss */
+/* line 493, ../sass/app.scss */
 .hidden {
  display: none;
 }

-/* line 482, ../sass/app.scss */
+/* line 502, ../sass/app.scss */
 #navigation li.topTab span.plusIcon,
 #navigation li.subTab span.plusIcon {
  display: none;
  float: right;
 }

-/* line 487, ../sass/app.scss */
+/* line 507, ../sass/app.scss */
 span.plusIcon {
  color: #d0d0d0;
 }

-/* line 491, ../sass/app.scss */
+/* line 511, ../sass/app.scss */
 span.plusIcon:hover {
  color: #555;
 }

-/* line 498, ../sass/app.scss */
+/* line 518, ../sass/app.scss */
 table.extended_table tbody tr td {
  padding: 3px 10px;
 }

-/* line 505, ../sass/app.scss */
+/* line 525, ../sass/app.scss */
 .reveal-modal {
  top: 50px;
 }

-/* line 510, ../sass/app.scss */
+/* line 530, ../sass/app.scss */
 .ui-layout-resizer-open-hover,
 .ui-layout-resizer-dragging {
  background: #EEE;
 }

-/* line 515, ../sass/app.scss */
+/* line 535, ../sass/app.scss */
 .reveal-modal .panel {
  margin-left: -30px;
  margin-right: -30px;
  margin-bottom: 30px;
 }

-/* line 521, ../sass/app.scss */
+/* line 541, ../sass/app.scss */
 .reveal-modal.xlarge {
  padding-top: 0px;
  width: 80%;
  margin-left: -40%;
 }

-/* line 527, ../sass/app.scss */
+/* line 547, ../sass/app.scss */
 .reveal-modal {
  padding-top: 0px;
 }

-/* line 531, ../sass/app.scss */
+/* line 551, ../sass/app.scss */
 .reveal-modal h3 {
  margin-left: 30px;
  margin-bottom: 7px !important;
 }

-/* line 536, ../sass/app.scss */
+/* line 556, ../sass/app.scss */
 .reveal-modal .close-reveal-modal:not(.button) {
  top: 13px;
 }

-/* line 540, ../sass/app.scss */
+/* line 560, ../sass/app.scss */
 .reveal-modal .close-reveal-modal:not(.button):hover {
  color: #222;
 }

-/* line 544, ../sass/app.scss */
+/* line 564, ../sass/app.scss */
 fieldset {
  margin: 0px 10px;
 }

-/* line 550, ../sass/app.scss */
+/* line 570, ../sass/app.scss */
 .graph_table table {
  border: 0px;
  margin: 0px;
 }

-/* line 555, ../sass/app.scss */
+/* line 575, ../sass/app.scss */
 .graph_table table tr {
  border: 0px;
 }

-/* line 560, ../sass/app.scss */
+/* line 580, ../sass/app.scss */
 .ui-layout-pane {
  padding: 0px;
  overflow: overlay;
 }

-/* line 565, ../sass/app.scss */
+/* line 585, ../sass/app.scss */
 .reveal-modal .columns {
  padding: 0 8px;
 }

-/* line 569, ../sass/app.scss */
+/* line 589, ../sass/app.scss */
 select {
  width: auto;
 }

-/* line 574, ../sass/app.scss */
+/* line 594, ../sass/app.scss */
 form.creation {
  max-height: 450px;
  overflow-y: auto;
@ -6557,12 +6573,12 @@ form.creation {
  padding: 5px;
 }

-/* line 581, ../sass/app.scss */
+/* line 601, ../sass/app.scss */
 #dialog input {
  margin: 0px;
 }

-/* line 586, ../sass/app.scss */
+/* line 606, ../sass/app.scss */
 .progress-container {
  position: relative;
  width: 100%;
@ -6570,7 +6586,7 @@ form.creation {
  background: #FFF;
 }

-/* line 593, ../sass/app.scss */
+/* line 613, ../sass/app.scss */
 .progress {
  position: absolute;
  width: 100%;
@ -6578,7 +6594,7 @@ form.creation {
  background: #FFF;
 }

-/* line 600, ../sass/app.scss */
+/* line 620, ../sass/app.scss */
 .progress-text {
  position: absolute;
  width: 100%;
@ -6586,53 +6602,53 @@ form.creation {
  color: black !important;
 }

-/* line 607, ../sass/app.scss */
+/* line 627, ../sass/app.scss */
 .meter {
  background: #cdebf5 !important;
 }

-/* line 611, ../sass/app.scss */
+/* line 631, ../sass/app.scss */
 .dashboard .subheader {
  text-align: center;
 }

-/* line 615, ../sass/app.scss */
+/* line 635, ../sass/app.scss */
 .dashboard h2.subheader {
  margin-bottom: 0;
  margin-top: 0;
 }

-/* line 620, ../sass/app.scss */
+/* line 640, ../sass/app.scss */
 .dashboard h6.subheader {
  margin-top: 0;
 }

-/* line 624, ../sass/app.scss */
+/* line 644, ../sass/app.scss */
 .dashboard h3.subheader {
  margin-top: 0;
 }

-/* line 628, ../sass/app.scss */
+/* line 648, ../sass/app.scss */
 ul.button-group {
  margin-bottom: 0;
 }

-/* line 632, ../sass/app.scss */
+/* line 652, ../sass/app.scss */
 .value_td {
  text-overflow: ellipsis;
 }

-/* line 636, ../sass/app.scss */
+/* line 656, ../sass/app.scss */
 small {
  color: #b6b6b6 !important;
 }

-/* line 640, ../sass/app.scss */
+/* line 660, ../sass/app.scss */
 .header-dashboard {
  margin-top: -5px;
 }

-/* line 644, ../sass/app.scss */
+/* line 664, ../sass/app.scss */
 .span-dashboard {
  background: #fcfcfc;
  color: #6f6f6f;
@ -6640,12 +6656,23 @@ small {
  box-shadow: 0 0 2px 0px #6f6f6f;
 }

-/* line 651, ../sass/app.scss */
+/* line 671, ../sass/app.scss */
 .button.secondary {
  color: #2f2f2f;
 }

-/* line 655, ../sass/app.scss */
+/* line 675, ../sass/app.scss */
 .button.dropdown.small::after {
  border-color: #2f2f2f transparent transparent transparent;
 }
+
+/* line 679, ../sass/app.scss */
+.footer-opennebula {
+  font-size: 10px;
+  color: #b6b6b6 !important;
+}
+
+/* line 684, ../sass/app.scss */
+a.footer.button {
+  margin: 5px;
+}
--- a/src/sunstone/public/js/locale.js
+++ b/src/sunstone/public/js/locale.js
@ -89,6 +89,6 @@ $(document).ready(function(){
    $('#doc_link').html(tr("Documentation"));
    $('#support_link').html(tr("Support"));
    $('#community_link').html(tr("Community"));
-    $('#welcome').html(tr("Welcome"));
-    $('#logout').html(tr("Sign out"));
-});
+    //$('#welcome').html(tr("Welcome"));
+    //$('#logout').html(tr("Sign out"));
+});
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@ -107,7 +107,7 @@ var users_tab_content = '\
 var create_user_tmpl =
 '<div class="panel">\
  <h3>\
-    <small id="create_vnet_header">'+tr("Create Group")+'</small>\
+    <small id="create_vnet_header">'+tr("Create User")+'</small>\
  </h3>\
 </div>\
 <form id="create_user_form" action="">\
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@ -423,9 +423,9 @@ function setLogin(){
    };


-    $("div#header span#user").html(username);
+    $("div#menu span#user").html(username);

-    $("div#header a#logout").click(function(){
+    $("div#menu a#logout").click(function(){
        redirect = function(){window.location.href = "login";};
        switch(whichUI()){
        case "sunstone":
--- a/src/sunstone/public/sass/app.scss
+++ b/src/sunstone/public/sass/app.scss
@ -112,7 +112,7 @@ padding: 3px 10px;
 }

 /* -----------------------------------------
-   Tabs remove icon 
+   Tabs remove icon
 ----------------------------------------- */

 .remove-tab:hover {
@ -157,18 +157,32 @@ div.button-bar {

 #logo {
    font-weight: bold;
-    color: white;
    margin:10%;
    margin-top: 15%;
-    margin-bottom: 15%;
+    margin-bottom: 10%;
 }

 #login-info {
-    padding-top: 4px;
-    float: right;
-    padding-right: 5px;
+//    padding-top: 4px;
+//    float: center;
+//    padding-right: 5px;
+//    width:100%;
+    text-align:center;
+    overflow: visible;
+    position: absolute;
+    margin: 0px;
+    top: auto;
+    bottom: 0px;
+    left: 0px;
+    right: 0px;
+    width: auto;
+    z-index: 0;
+    height: 70px;
+    display: block;
+    visibility: visible;
 }

+
 #links {
    padding-top: 4px;
    margin-right: 40px;
@ -176,7 +190,7 @@ div.button-bar {
 }

 #login-info, #login-info a, #links, #links a {
-    color: white;
+    color: #555;
 }

 #login-info, #login-info a {
@ -192,10 +206,16 @@ div.button-bar {
    margin-right: 20px;
 }

+.menu-nav {
+    height: 70%;
+    overflow: overlay;
+}
+
 #menu {
    padding-right:  0;
    padding-left:   0;
    border:0;
+    overflow:hidden;
 }

 #tabs_content {
@ -236,7 +256,7 @@ div.button-bar {
    background: #fdfdfd;
    color: #555;
    border:none;
-    padding: 10px 11px 10px 25px;
+    padding: 7px 11px 7px 25px;
 }

 #navigation li.subsubTab {
@ -251,7 +271,7 @@ div.button-bar {
    border-left: 5px solid #fdfdfd !important;
 }

-#navigation li:hover { 
+#navigation li:hover {
    font-weight: bold;
 }

@ -654,4 +674,13 @@ small {

 .button.dropdown.small::after {
    border-color: #2f2f2f transparent transparent transparent;
-}
+}
+
+.footer-opennebula {
+    font-size: 10px;
+    color: #b6b6b6 !important;
+}
+
+a.footer.button {
+    margin: 5px;
+}
--- a/src/sunstone/views/index.erb
+++ b/src/sunstone/views/index.erb
@ -21,7 +21,7 @@
    <script type="text/javascript" src="vendor/4.0/foundation/modernizr.foundation.js"></script>

    <script type="text/javascript" src="vendor/4.0/datatables/jquery.dataTables.min.js"></script>
-    
+
    <script type="text/javascript" src="vendor/4.0/foundation_datatables/responsive-tables.js"></script>
    <script type="text/javascript" src="vendor/4.0/foundation_datatables/datatables.foundation.js"></script>

@ -46,7 +46,7 @@
    <!--Languages-->
    <script type="text/javascript" src="js/locale.js"></script>
 <%if session[:lang]%>
-    <script type="text/javascript" src="locale/<%=session[:lang]%>/<%=session[:lang]%>.js"></script> 
+    <script type="text/javascript" src="locale/<%=session[:lang]%>/<%=session[:lang]%>.js"></script>
 <%end%>
    <!--endLanguages-->

@ -86,15 +86,19 @@
    <div id="logo">
        <img src="images/opennebula-sunstone-v4.0.png"/>
    </div>
+    <div class="menu-navZ">
    <ul id="navigation" class="tabs vertical">
+
    </ul>
 </div>
+    <div id="login-info" class="centered">
+        <i class="icon-user"></i> <span id="user"></span><br>
+        <a href="#" class="button tiny secondary footer" id="logout">Sign out</a><br>
+        <span class="footer-opennebula"><a href="http://opennebula.org" target="_blank">OpenNebula 3.9.0</a> by <a href="http://c12g.com" target="_blank">C12G Labs</a>.</span>
+    </div>
+</div>


-<!--<div id="footer" style="overflow:visible;" class="ui-layout-south">
-    <a href="http://opennebula.org" target="_blank">OpenNebula 3.9.0</a> by <a href="http://c12g.com" target="_blank">C12G Labs</a>.
-</div>-->
-

 <div id="dialogs">

@ -116,4 +120,4 @@
    <script type="text/javascript"  src="vendor/4.0/foundation/jquery.foundation.tabs.js"></script>
    <script type="text/javascript"  src="vendor/4.0/foundation/app.js"></script>
 </body>
-</html>
+</html>