数据管理页面导航文字居中、批次样式修改、表格样式修改、增加位置显示栏

defs.d.ts

@@ -24,7 +24,6 @@
 /// <reference path="d.ts/developer/ts/projects.d.ts"/>
 /// <reference path="d.ts/developer/ts/workspace.d.ts"/>
 /// <reference path="d.ts/developer/ts/workspaces.d.ts"/>
-/// <reference path="d.ts/navigation/ts/navigationPlugin.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/apps.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/breadcrumbs.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/build.d.ts"/>
@@ -69,3 +68,4 @@
 /// <reference path="d.ts/kubernetes/ts/sharedControllers.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/tabs.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/templates.d.ts"/>
+/// <reference path="d.ts/navigation/ts/navigationPlugin.d.ts"/>

gulpfile.js

@@ -249,7 +249,7 @@ gulp.task('connect', ['watch'], function() {
     }, {
         proto: "http",
         port: "8080",
-        hostname: "192.168.0.102",
+        hostname: "192.168.0.101",
         path: '/java/console/api',
         targetPath: "/"
     }];

new/sj_style.css

@@ -15,9 +15,11 @@ a:hover,a:active{color:#333;}
 .fr{ float:right;}
 .cl{ clear:both; overflow:hidden;}
 /* public*/
+.mt2{margin-top: 3px;}
 .ml5{ margin-top: 5px;}.ml10{ margin-top: 10px;}
 .ml5{ margin-left:5px;}.ml10{ margin-left:10px;}
 .mr5{ margin-right:5px;}.mr10{ margin-right:10px;}
+.mb10{ margin-bottom: 10px;}
 a.sj_btn_grey{ display:inline-block; padding:0px 15px; height:30px; line-height:30px; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px;  background-image:-webkit-linear-gradient(top, #fdfdfd,#e8e8e8);background-image:linear-gradient(top,#fdfdfd,#e8e8e8); border:1px solid #cecece; color:#505050;}
 a:hover.sj_btn_grey{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3d3);background-image:linear-gradient(top,#eeeeee,#d3d3d3);}
 .sj_btn_grey{ display:inline-block; padding:0px 15px; height:30px; line-height:30px; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px;  background-image:-webkit-linear-gradient(top, #fdfdfd,#e8e8e8);background-image:linear-gradient(top,#fdfdfd,#e8e8e8); border:1px solid #cecece; color:#505050;}
@@ -25,11 +27,11 @@ a:hover.sj_btn_grey{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3
 /* sj_header */
 .sj_header{ height:70px; width:100%; background:#1d1d1d;}
 .sj_header a.sj_logo{ display:block; height:41px; width:146px; padding:14px 20px 0 12px;}
-.sj_topnav{ height:70px; width:100%; padding-left: 180px; }
+.sj_topnav{ height:70px; width:100%; padding-left: 170px; }
-.sj_topnav li  a{  height:70px; line-height:70px; font-size:14px; color:#fff; padding:0 20px;}
+.navbar-pf .sj_topnav > li > a{  height:70px; line-height:70px; font-size:14px; color:#fff; padding:0px 20px;}
 .sj_topnav  li a:hover,.sj_topnav  li a.sj_topnav_active{  background-image:-webkit-linear-gradient(top, #424242,#323232);background-image:linear-gradient(top,#424242,#323232); }
 /* sj_content */
-.sj_content{ width:100%; position:relative;  color:#505050;}
+.sj_content{ margin-top: 56px;}
 .sj_leftnav{ width:170px; min-height:800px; max-height:985px; background:#1d1d1d; position:absolute; left:0; top:0px;}
 .sj_leftnav_i{  background:#717171; padding:0 5px;;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; margin-left:80px;	}
 .sj_menu {margin-top:12px;background:#1d1d1d; 	}
@@ -41,32 +43,25 @@ a:hover.sj_btn_grey{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3
 .sj_menu_ul{  }
 .sj_menu_ul li a{ display: block;  background: #1d1d1d; color: #fff;padding-left: 30px; height: 40px; line-height: 40px; }
 .sj_menu_ul li a:hover{background: #fff; color:#1d1d1d;}
-
-
-#menu li a:hover {  background-image:-webkit-linear-gradient(top, #535353,#353535);background-image:linear-gradient(top,#535353,#353535);}
-#menu li ul li a { background: #1d1d1d; color: #fff;padding-left: 20px; border:none;}
-#menu li ul li a:hover,.sj_leftnav ul#menu li ul li .leftnavact { background: #fff; color:#1d1d1d;}
 .sj_menu_01{  background:url(../new/images/sj_icons.png) 0 0px no-repeat; padding-left:20px;}
 .sj_menu_02{  background:url(../new/images/sj_icons.png) 0 -29px no-repeat; padding-left:20px;}
 .sj_menu_03{  background:url(../new/images/sj_icons.png) 0 -112px no-repeat; padding-left:20px;}
 .sj_menu_04{  background:url(../new/images/sj_icons.png) 0 -133px no-repeat; padding-left:20px;}
 .sj_contentbox{ width:100%;  background:#fff; min-height:800px;  }
 .sj_icons_home{ background:url(../new/images/sj_icons.png) 0 -60px no-repeat; width:15px; height:15px; margin-top:10px; margin-right:3px;}
-.sj_content_position{ background:#eee; height:35px; line-height:35px; color:#7a7a7a; margin:2px 0 0 170px; padding-left:20px;}
+.sj_content_position{ background:#e1e1e1; height:35px; line-height:35px; color:#7a7a7a; padding-left:20px; margin-left:-20px; margin-bottom: 20px; width: 110%;}
 .sj_content_position ul li{ float:left;}
 .sj_filter  li{ float:left;}
-.sj_filter  li a{ display: inline-block; border:1px solid #cecece;background-image:-webkit-linear-gradient(top, #fcfcfc,#e9e9e9);background-image:linear-gradient(top, #fcfcfc,#e9e9e9); padding:5px 15px; color:#505050; margin-right:5px;}
+.sj_filter  li a{ display: inline-block; border:1px solid #cecece;background-image:-webkit-linear-gradient(top, #fcfcfc,#e9e9e9);background-image:linear-gradient(top, #fcfcfc,#e9e9e9); padding:5px 15px; color:#363636; margin-right:5px;}
 .sj_filter  li a:hover,.sj_filter  li a.active{ background:#cdcdcd; border:1px solid #9e9e9e;}
 .sj_content_top{ margin:20px 20px 0 190px;}
 .sj_searchbox{position:relative;}
-.sj_search_input{-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3; background:#fff; padding-left:5px; color:#888; height:28px; width:210px;box-shadow: inset 0px 0px 5px #dcdcdc; 	}
+.sj_search_input{-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3; background:#f5f5f5; padding-left:5px; color:#888; height:32px; width:310px;box-shadow: inset 0px 0px 5px #dcdcdc; 	}
 .sj_searchbox a.sj_search_btn{ position:absolute; top:5px; right:5px; background:url(../new/images/sj_icons.png) 0 -82px no-repeat; display:block; width:20px; height:20px; }
 /* table */
 .sj_content_table{  }
-.sj_content_table > tbody > tr > td{ height:36px; line-height:36px;}
+.sj_content_table > tbody > tr > td{ height:38px; line-height:38px; padding: 0 10px; }
-.sj_content_table tr td.tl{ text-align:left;}
+.sj_content_table > thead > tr > th{ height:38px; line-height:38px; padding: 0 10px;  }
-.sj_content_table .table-header{background-image:-webkit-linear-gradient(top, #f7f7f7,#dfdfdf);background-image:linear-gradient(top, #f7f7f7,#dfdfdf);  border-bottom:1px solid #a6a6a6;}
-.sj_content_table > thead > tr > th{ height:36px; line-height:36px;}
 .sj_content_table .sj_tr_grey{ background:#f3f3f3;}
 .sj_table_td01{ width:2%;}
 .sj_table_td02{ width:9%;}
@@ -83,3 +78,11 @@ a:hover.sj_btn_grey{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3
 .sj_table_bottom{ height:30px; line-height:30px; }
 .sj_table_bottom li{ float:left;}
 .sj_table_select{ background:#fff; border:1px solid #b1b1b1; height:25px; margin:0 5px;}
+.badge{ font-weight: normal; text-shadow:none; background-color: #a1a1a1;}
+.simple-table-checkbox{ text-align: center;}
+.table{ margin-bottom: 10px;}
+.sj_nav_taps{ border-bottom: none;}
+.sj_nav_taps li a{ display: inline-block; font-size: 12px;  border:1px solid #cecece;background-image:-webkit-linear-gradient(top, #fcfcfc,#e9e9e9);background-image:linear-gradient(top, #fcfcfc,#e9e9e9); padding:5px 15px; color:#505050; margin-right:5px;}
+.sj_nav_taps  li a:hover,.sj_nav_taps  li a.active{ background:#cdcdcd; border:1px solid #9e9e9e;}
+.sj_nav_taps > li.active > a, .sj_nav_taps > li.active > a:hover, .sj_nav_taps > li.active > a:focus {  background:#cdcdcd; border:1px solid #9e9e9e; color:#505050;}
+.sj_fluid{ padding:0;}

plugins/developer/html/workspaces.html

@@ -1,12 +1,25 @@
-<div ng-controller="Developer.WorkspacesController" hawtio-card-bg style="margin-top:100px;">
+<div ng-controller="Developer.WorkspacesController" hawtio-card-bg >
     <div hawtio-breadcrumbs></div>
     <div hawtio-tabs></div>
-    <div class="container-content">
+    <div class="container-content sj_content">
-        <div class="container-fluid">
+        <div class="sj_content_position clear" >
-            <div class="row nav-content">
+             <ul >
-                <ul class="nav nav-tabs" ng-show="navbarItems.length">
+                <li class="sj_icons_home"></li>
+                <li>当前位置：</li>
+                <li><a href="#">数据汇总</a> <span>&gt;</span></li>
+                <li><a href="#">社保系统</a><span>&gt;</span></li>
+                <li><a href="#">批次A</a></li>
+              </ul>
+        </div>
+        <div class="container-fluid sj_fluid">
+            <div class="row nav-content mb10 clear " >
+                <ul class="nav nav-tabs sj_nav_taps fl" ng-show="navbarItems.length">
                     <li role="presentation" ng-repeat="item in navbarItems" class="{{item.class}}"><a href="#" ng-click="selectBatchItem(item)">{{item.label}}</a></li>
                 </ul>
+                <div class="fr sj_searchbox">
+                    <input type="text"  class="sj_search_input"/>
+                    <a href="#" class="sj_search_btn"></a>
+                </div>
             </div>
             <div ng-hide="model.data.length" class="align-center">
                 <p class="alert alert-info">当前没有可以查看的数据.</p>