You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2014/01/15 22:37:33 UTC
[10/50] [abbrv] git commit: add a table with search. Some css tweaks
needed.
add a table with search. Some css tweaks needed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/60756882
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/60756882
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/60756882
Branch: refs/heads/mansu/AURORA-4187_scheduler_home_page-no-seed
Commit: 60756882ba0c55e419f957825af068c3dd9f11e4
Parents: c0e16eb
Author: Suman Karumuri <sk...@twitter.com>
Authored: Thu Dec 26 19:47:16 2013 -0800
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Mon Jan 13 15:24:38 2014 -0800
----------------------------------------------------------------------
angular-seed-master/app/index.html | 5 +-
angular-seed-master/app/js/controllers.js | 7 +
angular-seed-master/app/lib/smart-table/app.css | 283 -------------------
.../app/lib/smart-table/table.css | 283 +++++++++++++++++++
4 files changed, 293 insertions(+), 285 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/60756882/angular-seed-master/app/index.html
----------------------------------------------------------------------
diff --git a/angular-seed-master/app/index.html b/angular-seed-master/app/index.html
index 5874c8d..60a22ac 100644
--- a/angular-seed-master/app/index.html
+++ b/angular-seed-master/app/index.html
@@ -35,7 +35,8 @@
<div class='page-header' ng-controller='AuroraUI.JobSummaryController'>
<h2>{{title}}</h2>
- <smart-table columns="columnCollection" rows="rowCollection"></smart-table>
+ <smart-table config="globalConfig" columns="columnCollection" rows="rowCollection">
+ </smart-table>
</div>
<!-- Scripts -->
@@ -50,6 +51,6 @@
<!--smart table-->
<script src="lib/smart-table/Smart-Table.min.js"></script>
- <link href="lib/smart-table/app.css" rel="stylesheet">
+ <link href="lib/smart-table/table.css" rel="stylesheet">
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/60756882/angular-seed-master/app/js/controllers.js
----------------------------------------------------------------------
diff --git a/angular-seed-master/app/js/controllers.js b/angular-seed-master/app/js/controllers.js
index 7530962..ff50f4b 100644
--- a/angular-seed-master/app/js/controllers.js
+++ b/angular-seed-master/app/js/controllers.js
@@ -6,6 +6,7 @@ angular.module('auroraUI.controllers', []).
controller('AuroraUI.JobSummaryController',
function ($scope) {
$scope.title = 'Scheduled Jobs Summary';
+
$scope.jobSummary = { 'jobSummaries': [
{
'role': 'mesos',
@@ -18,10 +19,16 @@ angular.module('auroraUI.controllers', []).
'cronJobs': 20
}
]};
+
$scope.columnCollection = [
{label : 'role', map: 'role'},
{label : 'jobs', map: 'jobs'},
{label : 'cronJobs', map: 'cronJobs'}
];
+
$scope.rowCollection = $scope.jobSummary.jobSummaries;
+
+ $scope.globalConfig = {
+ isGlobalSearchActivated: true
+ };
});
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/60756882/angular-seed-master/app/lib/smart-table/app.css
----------------------------------------------------------------------
diff --git a/angular-seed-master/app/lib/smart-table/app.css b/angular-seed-master/app/lib/smart-table/app.css
deleted file mode 100644
index 947a38f..0000000
--- a/angular-seed-master/app/lib/smart-table/app.css
+++ /dev/null
@@ -1,283 +0,0 @@
-.pagination {
- text-align: center;
- margin: 0;
-}
-
-th:not(.selection-header) {
- min-width: 100px;
-}
-
-table {
- max-width: 100%;
- background-color: transparent;
- border-collapse: collapse;
- border-spacing: 0;
- margin: auto;
-}
-
-.table {
- width: 100%;
- margin-bottom: 20px;
-}
-
-.table .smart-table-header-title{
- padding: 0;
-}
-
-.table th,
-.table td {
- padding: 8px;
- line-height: 20px;
- text-align: left;
- vertical-align: top;
- border: 1px solid rgba(34, 102, 153, 0.52);
-}
-
-.table th {
- background: #269;
- color: white;
- font-weight: bold;
- text-align: center;
-
-}
-
-.table th:not(:last-child){
- border-right:1px solid white;
-}
-
-.table thead th {
- vertical-align: bottom;
-}
-
-.table tbody + tbody {
- border-top: 2px solid #dddddd;
-}
-
-.pagination ul {
- display: inline-block;
- *display: inline;
- margin-top: 0;
- margin-bottom: 0;
- margin-left: 0;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- *zoom: 1;
- -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.pagination ul > li {
- display: inline;
-}
-
-.pagination ul > li > a,
-.pagination ul > li > span {
- float: left;
- padding: 4px 12px;
- line-height: 20px;
- text-decoration: none;
- background-color: #ffffff;
- border: 1px solid #dddddd;
- border-left-width: 0;
-}
-
-.pagination ul > li > a:hover,
-.pagination ul > li > a:focus,
-.pagination ul > .active > a,
-.pagination ul > .active > span {
- background-color: #f5f5f5;
-}
-
-.pagination ul > .active > a,
-.pagination ul > .active > span {
- color: #999999;
- cursor: default;
-}
-
-.pagination ul > .disabled > span,
-.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover,
-.pagination ul > .disabled > a:focus {
- color: #999999;
- cursor: default;
- background-color: transparent;
-}
-
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > span {
- border-left-width: 1px;
- -webkit-border-bottom-left-radius: 4px;
- border-bottom-left-radius: 4px;
- -webkit-border-top-left-radius: 4px;
- border-top-left-radius: 4px;
- -moz-border-radius-bottomleft: 4px;
- -moz-border-radius-topleft: 4px;
-}
-
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > span {
- -webkit-border-top-right-radius: 4px;
- border-top-right-radius: 4px;
- -webkit-border-bottom-right-radius: 4px;
- border-bottom-right-radius: 4px;
- -moz-border-radius-topright: 4px;
- -moz-border-radius-bottomright: 4px;
-}
-
-
-.icon{
- background-image: url("../img/glyphicons-halflings.png");
-}
-
-.icon-white {
- background-image: url("../img/glyphicons-halflings-white.png");
-}
-
-[class^="icon-"],
-[class*=" icon-"] {
- display: inline-block;
- width: 14px;
- height: 14px;
- margin-top: 1px;
- *margin-right: .3em;
- line-height: 14px;
- vertical-align: text-top;
- background-position: 14px 14px;
- background-repeat: no-repeat;
-}
-
-
-.icon-download-alt {
- background-position: -96px -24px;
-}
-
-button,
-input,
-select,
-textarea {
- margin: 0;
- font-size: 100%;
- vertical-align: middle;
-}
-
-button,
-input {
- *overflow: visible;
- line-height: normal;
-}
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
- padding: 0;
- border: 0;
-}
-
-button,
-html input[type="button"],
-input[type="reset"],
-input[type="submit"] {
- cursor: pointer;
- -webkit-appearance: button;
-}
-
-label,
-select,
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
-input[type="radio"],
-input[type="checkbox"] {
- cursor: pointer;
-}
-
-input[type="search"] {
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
- -webkit-appearance: textfield;
-}
-
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
- -webkit-appearance: none;
-}
-
-textarea {
- overflow: auto;
- vertical-align: top;
-}
-
-textarea:focus,
-input[type="text"]:focus,
-input[type="password"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="date"]:focus,
-input[type="month"]:focus,
-input[type="time"]:focus,
-input[type="week"]:focus,
-input[type="number"]:focus,
-input[type="email"]:focus,
-input[type="url"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="color"]:focus,
-.uneditable-input:focus {
- border-color: rgba(82, 168, 236, 0.8);
- outline: 0;
- outline: thin dotted \9;
- /* IE6-9 */
-
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-}
-
-.icon-edit {
- background-position: -96px -72px;
-}
-
-.bubble{
- padding: 5px;
- background: #269;
- border-radius: 3px;
- color: #ffffff;
- margin-left: 10px;
-}
-
-.bubble:before{
- content: "";
- position: relative;
- display: inline-block;
- width: 0;
- height: 0;
- border: 9px solid transparent;
- border-right-color:#269;
- left: -22px;
- top:2px;
-}
-
-.doc{
- padding: 5px;
- border-radius: 3px;
-}
-
-.doc:hover{
- background: #269;
-}
-
-.btn:hover{
- background-color: rgba(34, 102, 153, 0.64);
-}
-
-#section-intro a{
- color: #269;
-}
-
-#section-intro a:hover{
- text-decoration: underline;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/60756882/angular-seed-master/app/lib/smart-table/table.css
----------------------------------------------------------------------
diff --git a/angular-seed-master/app/lib/smart-table/table.css b/angular-seed-master/app/lib/smart-table/table.css
new file mode 100644
index 0000000..004c239
--- /dev/null
+++ b/angular-seed-master/app/lib/smart-table/table.css
@@ -0,0 +1,283 @@
+.pagination {
+ text-align: center;
+ margin: 0;
+}
+
+th:not(.selection-header) {
+ min-width: 100px;
+}
+
+table {
+ max-width: 100%;
+ background-color: transparent;
+ border-collapse: collapse;
+ border-spacing: 0;
+ margin: auto;
+ border: 1px solid #000;
+}
+
+.table {
+ width: 100%;
+ margin-bottom: 20px;
+}
+
+.table .smart-table-header-title{
+ padding: 0;
+}
+
+.table th,
+.table td {
+ padding: 8px;
+ line-height: 20px;
+ text-align: left;
+ vertical-align: top;
+ border: 1px solid rgba(34, 102, 153, 0.52);
+}
+
+.table th {
+ background: #269;
+ color: white;
+ font-weight: bold;
+ text-align: center;
+}
+
+.table th:not(:last-child){
+ border-right:1px solid white;
+}
+
+.table thead th {
+ vertical-align: bottom;
+}
+
+.table tbody + tbody {
+ border-top: 2px solid #dddddd;
+}
+
+.pagination ul {
+ display: inline-block;
+ *display: inline;
+ margin-top: 0;
+ margin-bottom: 0;
+ margin-left: 0;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ *zoom: 1;
+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.pagination ul > li {
+ display: inline;
+}
+
+.pagination ul > li > a,
+.pagination ul > li > span {
+ float: left;
+ padding: 4px 12px;
+ line-height: 20px;
+ text-decoration: none;
+ background-color: #ffffff;
+ border: 1px solid #dddddd;
+ border-left-width: 0;
+}
+
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+ background-color: #f5f5f5;
+}
+
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+ color: #999999;
+ cursor: default;
+}
+
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+ color: #999999;
+ cursor: default;
+ background-color: transparent;
+}
+
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+ border-left-width: 1px;
+ -webkit-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ -webkit-border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
+ -moz-border-radius-bottomleft: 4px;
+ -moz-border-radius-topleft: 4px;
+}
+
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+ -webkit-border-top-right-radius: 4px;
+ border-top-right-radius: 4px;
+ -webkit-border-bottom-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ -moz-border-radius-topright: 4px;
+ -moz-border-radius-bottomright: 4px;
+}
+
+
+.icon{
+ background-image: url("../img/glyphicons-halflings.png");
+}
+
+.icon-white {
+ background-image: url("../img/glyphicons-halflings-white.png");
+}
+
+[class^="icon-"],
+[class*=" icon-"] {
+ display: inline-block;
+ width: 14px;
+ height: 14px;
+ margin-top: 1px;
+ *margin-right: .3em;
+ line-height: 14px;
+ vertical-align: text-top;
+ background-position: 14px 14px;
+ background-repeat: no-repeat;
+}
+
+
+.icon-download-alt {
+ background-position: -96px -24px;
+}
+
+button,
+input,
+select,
+textarea {
+ margin: 0;
+ font-size: 100%;
+ vertical-align: middle;
+}
+
+button,
+input {
+ *overflow: visible;
+ line-height: normal;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+ padding: 0;
+ border: 0;
+}
+
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+ cursor: pointer;
+ -webkit-appearance: button;
+}
+
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+ cursor: pointer;
+}
+
+input[type="search"] {
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+ -webkit-appearance: textfield;
+}
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+ -webkit-appearance: none;
+}
+
+textarea {
+ overflow: auto;
+ vertical-align: top;
+}
+
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+ border-color: rgba(82, 168, 236, 0.8);
+ outline: 0;
+ outline: thin dotted \9;
+ /* IE6-9 */
+
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+
+.icon-edit {
+ background-position: -96px -72px;
+}
+
+.bubble{
+ padding: 5px;
+ background: #269;
+ border-radius: 3px;
+ color: #ffffff;
+ margin-left: 10px;
+}
+
+.bubble:before{
+ content: "";
+ position: relative;
+ display: inline-block;
+ width: 0;
+ height: 0;
+ border: 9px solid transparent;
+ border-right-color:#269;
+ left: -22px;
+ top:2px;
+}
+
+.doc{
+ padding: 5px;
+ border-radius: 3px;
+}
+
+.doc:hover{
+ background: #269;
+}
+
+.btn:hover{
+ background-color: rgba(34, 102, 153, 0.64);
+}
+
+#section-intro a{
+ color: #269;
+}
+
+#section-intro a:hover{
+ text-decoration: underline;
+}
+