Skip to content
This repository has been archived by the owner on Mar 5, 2021. It is now read-only.

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history 
Conflicts:
	dist/kopf.js
	es-plugin.properties
	package.json
	src/kopf/controllers/global.js
  • Loading branch information
@lmenezes
lmenezes committed Feb 19, 2014
2 parents 67bca09 + 68db420 commit e268796
Show file tree
Hide file tree
Showing 68 changed files with 5,058 additions and 1,177 deletions.
26 changes: 17 additions & 9 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ module.exports = function(grunt) {
}
},
watch: {
scripts: {
files: ['src/kopf/**/*.*','src/kopf/*.*'],
tasks: ['build'],
options: {
spawn: false,
},
},
scripts: {
files: ['src/kopf/**/*.*','src/kopf/*.*'],
tasks: ['build'],
options: {
spawn: false,
},
},
},
copy: {
main: {
Expand Down Expand Up @@ -50,6 +50,7 @@ module.exports = function(grunt) {
'src/kopf/elastic/cluster_settings.js',
'src/kopf/elastic/cluster.js',
'src/kopf/elastic/elastic_client.js',
'src/kopf/elastic/es_connection.js',
'src/kopf/elastic/index.js',
'src/kopf/elastic/editable_index_settings.js',
'src/kopf/elastic/node.js',
Expand All @@ -75,8 +76,10 @@ module.exports = function(grunt) {
// SERVICES
'src/kopf/services/alerts.js',
'src/kopf/services/settings.js',
'src/kopf/services/aceeditor.js',
// MODELS
'src/kopf/models/ace_editor.js',
'src/kopf/models/gist.js',
// UTIL
'src/kopf/util.js',

Expand Down Expand Up @@ -152,7 +155,10 @@ module.exports = function(grunt) {
},
qunit: {
all: ['tests/all.html']
}
},
karma: {
unit: { configFile: 'tests/karma.config.js', keepalive: true },
},
});
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-concat');
Expand All @@ -161,7 +167,9 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-karma');
grunt.registerTask('dev', ['karma', 'watch'])
grunt.registerTask('test', ['karma'])
grunt.registerTask('build', ['clean', 'jshint', 'qunit', 'copy', 'concat']);
grunt.registerTask('server', ['clean', 'jshint', 'qunit', 'copy', 'concat','connect:server']);

};
200 changes: 167 additions & 33 deletions dist/kopf.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ h4 { color: #666; font-variant:small-caps; font-weight: 500; }
h5 { color: #777; font-variant:small-caps; font-weight: 500; }
h6 { color: #999; font-variant:small-caps; font-weight: 500; }

#page-wrap { min-height: 100%; height: auto !important; height: 100%; margin: 0 auto -60px; padding: 0px 0px 60px; }
#page-wrap { min-height: 100%; height: auto !important; height: 100%; margin: 0 auto -60px; padding: 0px 25px 60px; }

.settings-section-header {
top: 15px;
Expand Down Expand Up @@ -195,10 +195,14 @@ html,body {
.alert-block {
font-size: 12px;
font-weight: 300;
padding-top: 0px;
padding-top: 10px;
padding-bottom: 0px;
text-align: left;
}

.alert {
margin-bottom: 0px;
}
.alert-server-response {
padding-top: 25px;
}
Expand Down Expand Up @@ -400,9 +404,44 @@ body {
color: #666;
}
.cluster-health-content {
background: #fff;
font-size: 10px;
color: #666;
font-family: "Lucida Console", Monaco, monospace;
}

.cluster-health-form-group {
padding-left: 5px;
float: right;
}
.gist-timestamp-col {
width: 70px;
}
.gist-link-col {
width: 240px;
}
.gist-title-col {
width: auto;
}
.cluster-health-filters {
padding-top: 6px;
}
table.overview {
table-layout:fixed;
}
table.overview tr td { width: 16.67%; }

.index-menu-icon {
padding-right: 5px;
}

.dropdown-menu .divider {
margin: 5px 0px;
}

.cluster-map-header-index-icon {
padding-right: 5px;
}

.cluster-map-header-cluster-actions {
font-size: 32px;
vertical-align: middle !important;
Expand All @@ -422,16 +461,27 @@ a.cluster-map-header-cluster-action {
text-decoration: none;
}
.cluster-map-header-index-cell {
width: 230px !important;
max-width: 230px !important;
max-height: 40px !important;
vertical-align: top !important;
background: #f9f9f9;
border-bottom: 0px !important;
}

.closed-index {
color: #D0D0D0 !important;
font-weight: 300 !important;
}

.closed-index-cell {
background: #F9F9F9;
}

.cluster-map-header-index-name {
word-wrap:break-word;
overflow: hidden;
white-space: nowrap;
font-weight: 500;
text-overflow: ellipsis;
display: block;
}
.cluster-map-header-index-alias {
word-wrap:break-word;
Expand All @@ -442,6 +492,19 @@ a.cluster-map-header-cluster-action {
.cluster-map-header-index-actions {
padding: 6px;
}
.cluster-map-header-index-name {
color: #555555;
font-size: 13px;
font-weight: 500;
cursor: pointer;
}
a.cluster-map-header-index-name:hover {
color: #555555;
font-size: 13px;
font-weight: 500;
text-decoration: none;
}

.cluster-map-header-index-action {
color: #555555;
font-size: 12px;
Expand All @@ -457,18 +520,28 @@ a.cluster-map-header-index-action:hover {
.cluster-map-node-name {
word-wrap:break-word;
font-weight: 500;
font-size: 13px;
text-overflow: ellipsis;
overflow: hidden;
display: block;
}
.cluster-map-node-types {
padding-top: 5px;
padding-left: 0px;
font-size: 12px;
padding-top: 4px;
}
.cluster-map-node-type {
padding-right: 12px;
font-weight: 300;
padding-left: 5px;
font-size: 12px;
}
.cluster-overview-filter {
padding-bottom: 10px;
}
.node-type-icon {
padding-left: 2px;
padding-right: 2px;
}
.cluster-map-node-cell {
width: 220px;
max-width: 220px;
max-height: 40px !important;
vertical-align: top !important;
background: #f9f9f9;
Expand Down Expand Up @@ -497,8 +570,8 @@ a.cluster-map-header-index-action:hover {
}
.cluster-map-pagination {
padding-top: 5px;
font-weight: 400;
height: 30px;
font-weight: 300;
font-size: 12px;
}
.cluster-map-node-action {
color: #555555;
Expand All @@ -522,35 +595,30 @@ a.cluster-map-node-action {
}
.cluster-map-stats-section {
background: #f9f9f9;
text-align: justify;
padding-left: 15px;
padding-right: 15px;
border: 1px solid #dddddd;
border-radius: 3px 3px 3px 3px;
height: 50px;
margin-bottom: 40px;
margin-top: 20px;
padding-left: 10px;
border: 1px solid #ccc;
margin-top: 10px;
border-radius: 4px 4px 4px 4px;
margin-bottom: 30px;
}
.cluster-map-stat-block {
display: inline-block;
padding-top: 3px;
}
.cluster-map-stats-section:after {
content: "";
width: 100%;
display: inline-block;
}
.cluster-map-stat-number {
color: #555555;
font-size: 28px;
font-size: 20px;
text-align: center;
font-weight: 600;
font-weight: 500;
}
.cluster-map-stat-description {
color: #555555;
font-size: 18px;
font-size: 12px;
text-align: center;
font-weight: 200;
font-weight: 300;
}
.shard {
text-align: center;
Expand Down Expand Up @@ -623,8 +691,6 @@ a.header-action:hover {
}

.header-index-cell {
max-width: 230px;
min-width: 230px;
max-height: 40px !important;
vertical-align: top !important;
background: #f9f9f9;
Expand Down Expand Up @@ -671,8 +737,6 @@ a.header-index-action-mini:hover {
text-decoration: none;
}
.shards {
max-width: 230px;
min-width: 230px;
max-height: 40px !important;
vertical-align: top !important;
word-wrap:break-word;
Expand Down Expand Up @@ -752,6 +816,70 @@ a.header-index-action-mini:hover {
.json-collapsed {
display: none;
}
.dropdown-menu {
margin-top: 0px;
margin-left: 25px;
}

.navbar-nav {
margin-top: 0px;
}

.navbar-collapse {
border-top: 0px;
}

.navbar-brand {
padding: 0px 15px 0px 0px;
margin-left: 25px;
font-size: 38px;
font-variant: small-caps;
line-height: 32px;
font-weight: 100;
color: #dff0d8;
}
.navbar-toggle {
padding: 6px 9px;
margin-right: 25px;
}
.navbar-toggle .icon-bar {
width: 10px;
height: 1px;
}

.navbar-toggle-red .icon-bar {
background: #f2dede !important;
}

.navbar-toggle-yellow .icon-bar {
background: #fcf8e3 !important;
}

.navbar-toggle-green .icon-bar {
background: #dff0d8 !important;
}

.navbar-toggle {
height: 22px;
width: 30px;
}

.navbar-toggle-red {
height: 22px;
width: 30px;
border: 1px solid #c09853;
}
.navbar-toggle-yellow {
height: 22px;
width: 30px;
border: 1px solid #fcf8e3;
}
.navbar-toggle-green {
height: 22px;
width: 30px;
border: 1px solid #dff0d8;
}

.navbar-fixed-top {
margin-right: 0px !important;
}
Expand Down Expand Up @@ -860,12 +988,13 @@ a.header-index-action-mini:hover {
}
.navbar-app-settings {
color: #000000;
width: 250px;
width: auto;
padding-left: 10px;
padding-right: 10px;
}
.navbar-host-input {
width: 250px;
padding-right: 25px;
width: 280px;
padding-top: 2px;
vertical-align: middle;
}
Expand All @@ -878,6 +1007,7 @@ a.header-index-action-mini:hover {
vertical-align: middle;
padding-top: 4px;
padding-bottom: 4px;
min-width: 300px;
}
.navbar-nav > li {
height: 38px !important;
Expand Down Expand Up @@ -959,6 +1089,10 @@ select.input-sm-twoxheight {
padding-left: 15px;
}

.row-nomargin-button{
margin-right: 15px;
}

.form-label-repository {
padding-left: 15px;
}
Loading

0 comments on commit e268796

Please sign in to comment.