diff --git a/public/assets/css/main.css b/public/assets/css/main.css index eac36887..889b46e6 100644 --- a/public/assets/css/main.css +++ b/public/assets/css/main.css @@ -11,7 +11,7 @@ .sidebar-menu > li.header { color: #4b646f; - background: #1a2226; + background: black; } .sidebar-menu > li > a { @@ -21,7 +21,7 @@ .sidebar-menu > li:hover > a, .sidebar-menu > li.active > a { color: #fff; - background: #1e282c; + background: #1a2226; border-left-color: #fff; } @@ -412,7 +412,7 @@ } .skin-black .main-header .navbar .sidebar-toggle:hover { - background-color: #1e282c; + background-color: #1a2226; } @media (max-width: 767px) { @@ -425,7 +425,7 @@ } .skin-black .main-header .navbar .dropdown-menu li a:hover { - background: #1e282c; + background: #1a2226; } } @@ -440,7 +440,7 @@ } .skin-black .main-header li.user-header { - background-color: #1e282c; + background-color: #1a2226; } .skin-black .content-header { @@ -518,6 +518,45 @@ width: 290px; } +.nav-tabs-custom > .nav-tabs > li.active { + border-top-color: #8aa4af; +} + +.box { + border-top: 3px solid #8aa4af; +} + +pre { + display: block; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 1.42857143; + color: #333; + word-break: break-all; + word-wrap: break-word; + background-color: #fff; + border: none; + border-radius: 0; +} + +body, +h1, +h2, +h3, +h4, +h5, +h6, +.h1, +.h2, +.h3, +.h4, +.h5, +.h6, +.main-header .logo { + font-family: sans-serif; +} + #phpunit-data th div { margin: 0 0.5em; } #phpunit-data .success td { background: none; color: #00a65a; } #phpunit-data .fail td { background: none; color: #f56954; } diff --git a/public/assets/js/build-plugins/phpunit.js b/public/assets/js/build-plugins/phpunit.js index f5080077..3159d00c 100644 --- a/public/assets/js/build-plugins/phpunit.js +++ b/public/assets/js/build-plugins/phpunit.js @@ -1,6 +1,6 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({ id: 'build-phpunit-errors', - css: 'col-lg-6 col-md-12 col-sm-12 col-xs-12', + css: 'col-xs-12', title: Lang.get('phpunit'), lastData: null, displayOnUpdate: false, @@ -28,16 +28,6 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({ query(); } }); - - $(document).on('click', '#phpunit-data .test-toggle', function(ev) { - var input = $(ev.target); - $('#phpunit-data tbody ' + input.data('target')).toggle(input.prop('checked')); - }); - - $(document).on('click', '#phpunit-data button.trace', function() { - var $btn = $(this); - $($btn).replaceWith(self.buildTrace($btn.data('trace'))); - }); }, render: function() { @@ -45,7 +35,9 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({ return $('
' + '' + '' + - ' ' + + '' + + '' + + '' + '' + '
'+Lang.get('test_message')+''+Lang.get('status')+''+Lang.get('test_message')+''+Lang.get('trace')+'
'); }, @@ -62,7 +54,7 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({ var tests = this.lastData[0].meta_value; var thead = $('#phpunit-data thead tr'); var tbody = $('#phpunit-data tbody'); - thead.empty().append(''+Lang.get('test_message')+''); + thead.empty().append(''+Lang.get('status')+''+Lang.get('test_message')+''+Lang.get('trace')+''); tbody.empty(); if (tests.length == 0) { @@ -73,9 +65,16 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({ var counts = { success: 0, fail: 0, error: 0, skipped: 0, todo: 0 }, total = 0; for (var i in tests) { - var content = $(''), - message = $('
').appendTo(content), - severity = tests[i].severity || (tests[i].pass ? 'success' : 'failed'); + var severity = tests[i].severity || (tests[i].pass ? 'success' : 'fail'), + label = ('success' == severity) ? 'success' : ( + ('error' == severity) ? 'danger' : 'warning' + ); + + var status = $('' + severity + ''), + content = $(''), + trace = $(''), + message = $('
').appendTo(content), + trace_message = $('
').appendTo(trace); if (tests[i].message) { message.text(tests[i].message); @@ -90,34 +89,15 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({ } if (tests[i].trace && tests[i].trace.length) { - var $traceBtn = $(''); - $traceBtn.data('trace', tests[i].trace); - content.append('Trace: '); - content.append($traceBtn); + trace_message.append(tests[i].trace); } - $('').append(content).appendTo(tbody); + $('').append(status).append(content).append(trace).appendTo(tbody); counts[severity]++; total++; } - var checkboxes = $(''); - thead.append(checkboxes).append('' + Lang.get('test_total', total) + ''); - - for (var key in counts) { - var count = counts[key]; - if(count > 0) { - checkboxes.append( - '
 ' + - Lang.get('test_'+key, count)+ '
' - ); - } - } - - tbody.find('.success').hide(); - $('#build-phpunit-errors').show(); }, diff --git a/public/assets/js/build-plugins/summary.js b/public/assets/js/build-plugins/summary.js index d14951a0..af2e0186 100644 --- a/public/assets/js/build-plugins/summary.js +++ b/public/assets/js/build-plugins/summary.js @@ -3,9 +3,8 @@ var SummaryPlugin = ActiveBuild.UiPlugin.extend({ css: 'col-xs-12', title: Lang.get('build-summary'), box: true, - statusIcons: [ 'fa-clock-o', 'fa-cogs', 'fa-check', 'fa-remove' ], - statusLabels: [ Lang.get('pending'), Lang.get('running'), Lang.get('successful'), Lang.get('failed') ], - statusClasses: ['text-blue', 'text-yellow', 'text-green', 'text-red'], + statusLabels: [ Lang.get('pending'), Lang.get('running'), Lang.get('success'), Lang.get('failed') ], + statusClasses: ['info', 'warning', 'success', 'danger'], register: function() { var self = this; @@ -50,8 +49,7 @@ var SummaryPlugin = ActiveBuild.UiPlugin.extend({ '' + '' + Lang.get('stage_' + stage) + '' + '' + Lang.get(plugin) + '' + - '' + - ' ' + + '' + this.statusLabels[data.status] + '' + '' + duration + '' + diff --git a/public/assets/js/build.js b/public/assets/js/build.js index d4fd8433..fad4fd4a 100644 --- a/public/assets/js/build.js +++ b/public/assets/js/build.js @@ -166,7 +166,7 @@ var Build = Class.extend({ var container = $('
').addClass('ui-plugin ' + plugin.css).attr('id', plugin.id); var content = $('
').append(output); - content.addClass('box box-default'); + content.addClass('box'); if (plugin.title) { content.prepend('

'+plugin.title+'

'); diff --git a/src/PHPCensor/Languages/lang.en.php b/src/PHPCensor/Languages/lang.en.php index 5b866c68..22ade6c8 100644 --- a/src/PHPCensor/Languages/lang.en.php +++ b/src/PHPCensor/Languages/lang.en.php @@ -181,21 +181,21 @@ PHP Censor', 'build' => 'Build', 'lines' => 'Lines', - 'comment_lines' => 'Comment Lines', - 'noncomment_lines' => 'Non-Comment Lines', + 'comment_lines' => 'Comment lines', + 'noncomment_lines' => 'Non-Comment lines', 'logical_lines' => 'Logical Lines', - 'lines_of_code' => 'Lines of Code', - 'build_log' => 'Build Log', - 'quality_trend' => 'Quality Trend', - 'codeception_errors' => 'Codeception Errors', - 'phpmd_warnings' => 'PHPMD Warnings', - 'phpcs_warnings' => 'PHPCS Warnings', - 'phpcs_errors' => 'PHPCS Errors', - 'phplint_errors' => 'Lint Errors', - 'phpunit_errors' => 'PHPUnit Errors', + 'lines_of_code' => 'Lines of code', + 'build_log' => 'Build log', + 'quality_trend' => 'Quality trend', + 'codeception_errors' => 'Codeception errors', + 'phpmd_warnings' => 'PHPMD warnings', + 'phpcs_warnings' => 'PHPCS warnings', + 'phpcs_errors' => 'PHPCS errors', + 'phplint_errors' => 'Lint errors', + 'phpunit_errors' => 'PHPUnit errors', 'phpunit_fail_init' => 'Neither a configuration file nor a test directory found.', - 'phpcpd_warnings' => 'PHP Copy/Paste Detector Warnings', - 'phpdoccheck_warnings' => 'Missing Docblocks', + 'phpcpd_warnings' => 'PHP Copy/Paste Detector warnings', + 'phpdoccheck_warnings' => 'Missing docblocks', 'issues' => 'Issues', 'phpcpd' => 'PHP Copy/Paste Detector', @@ -462,7 +462,7 @@ PHP Censor', 'php_cpd' => 'PHP Copy/Paste Detector', 'php_docblock_checker' => 'PHP Docblock Checker', 'composer' => 'Composer', - 'php_loc' => 'PHPLOC', + 'php_loc' => 'PHP LOC', 'php_parallel_lint' => 'PHP Parallel Lint', 'email' => 'Email', 'atoum' => 'Atoum', diff --git a/src/PHPCensor/Languages/lang.pt-br.php b/src/PHPCensor/Languages/lang.pt-br.php index a3bb0116..e2f3bde0 100644 --- a/src/PHPCensor/Languages/lang.pt-br.php +++ b/src/PHPCensor/Languages/lang.pt-br.php @@ -166,19 +166,19 @@ PHPCI', 'build' => 'Build', 'lines' => 'Lines', - 'comment_lines' => 'Comment Lines', - 'noncomment_lines' => 'Non-Comment Lines', - 'logical_lines' => 'Logical Lines', - 'lines_of_code' => 'Lines of Code', + 'comment_lines' => 'Comment lines', + 'noncomment_lines' => 'Non-Comment lines', + 'logical_lines' => 'Logical lines', + 'lines_of_code' => 'Lines of code', 'build_log' => 'Log de compilação', - 'quality_trend' => 'Quality Trend', - 'codeception_errors' => 'Codeception Errors', - 'phpmd_warnings' => 'PHPMD Warnings', - 'phpcs_warnings' => 'PHPCS Warnings', - 'phpcs_errors' => 'PHPCS Errors', - 'phplint_errors' => 'Lint Errors', - 'phpunit_errors' => 'PHPUnit Errors', - 'phpdoccheck_warnings' => 'Missing Docblocks', + 'quality_trend' => 'Quality trend', + 'codeception_errors' => 'Codeception errors', + 'phpmd_warnings' => 'PHPMD warnings', + 'phpcs_warnings' => 'PHPCS warnings', + 'phpcs_errors' => 'PHPCS errors', + 'phplint_errors' => 'Lint errors', + 'phpunit_errors' => 'PHPUnit errors', + 'phpdoccheck_warnings' => 'Missing docblocks', 'issues' => 'Issues', 'codeception' => 'Codeception', diff --git a/src/PHPCensor/Languages/lang.ru.php b/src/PHPCensor/Languages/lang.ru.php index a96f87ca..7b64e137 100644 --- a/src/PHPCensor/Languages/lang.ru.php +++ b/src/PHPCensor/Languages/lang.ru.php @@ -446,7 +446,7 @@ PHP Censor', 'php_cpd' => 'PHP Copy/Paste Detector', 'php_docblock_checker' => 'PHP Docblock Checker', 'composer' => 'Composer', - 'php_loc' => 'PHPLOC', + 'php_loc' => 'PHP LOC', 'php_parallel_lint' => 'PHP Parallel Lint', 'email' => 'Email', 'atoum' => 'Atoum', diff --git a/src/PHPCensor/Languages/lang.zh.php b/src/PHPCensor/Languages/lang.zh.php index b179c6b6..daa45859 100644 --- a/src/PHPCensor/Languages/lang.zh.php +++ b/src/PHPCensor/Languages/lang.zh.php @@ -164,19 +164,19 @@ PHPCI', 'build' => 'Build', 'lines' => 'Lines', - 'comment_lines' => 'Comment Lines', - 'noncomment_lines' => 'Non-Comment Lines', - 'logical_lines' => 'Logical Lines', - 'lines_of_code' => 'Lines of Code', - 'build_log' => 'Build Log', - 'quality_trend' => 'Quality Trend', - 'codeception_errors' => 'Codeception Errors', - 'phpmd_warnings' => 'PHPMD Warnings', - 'phpcs_warnings' => 'PHPCS Warnings', - 'phpcs_errors' => 'PHPCS Errors', - 'phplint_errors' => 'Lint Errors', - 'phpunit_errors' => 'PHPUnit Errors', - 'phpdoccheck_warnings' => 'Missing Docblocks', + 'comment_lines' => 'Comment lines', + 'noncomment_lines' => 'Non-Comment lines', + 'logical_lines' => 'Logical lines', + 'lines_of_code' => 'Lines of code', + 'build_log' => 'Build log', + 'quality_trend' => 'Quality trend', + 'codeception_errors' => 'Codeception errors', + 'phpmd_warnings' => 'PHPMD warnings', + 'phpcs_warnings' => 'PHPCS warnings', + 'phpcs_errors' => 'PHPCS errors', + 'phplint_errors' => 'Lint errors', + 'phpunit_errors' => 'PHPUnit errors', + 'phpdoccheck_warnings' => 'Missing docblocks', 'issues' => 'Issues', 'codeception' => 'Codeception', diff --git a/src/PHPCensor/Model/BuildError.php b/src/PHPCensor/Model/BuildError.php index 40492eb0..4819f854 100644 --- a/src/PHPCensor/Model/BuildError.php +++ b/src/PHPCensor/Model/BuildError.php @@ -10,7 +10,6 @@ use PHPCensor\Model\Base\BuildErrorBase; /** * BuildError Model - * @uses PHPCensor\Model\Base\BuildErrorBase */ class BuildError extends BuildErrorBase { diff --git a/src/PHPCensor/View/Build/errors.phtml b/src/PHPCensor/View/Build/errors.phtml index 8a383c92..d6021d21 100644 --- a/src/PHPCensor/View/Build/errors.phtml +++ b/src/PHPCensor/View/Build/errors.phtml @@ -3,7 +3,7 @@ use PHPCensor\Helper\Lang; $linkTemplate = $build->getFileLinkTemplate(); -/** @var \PHPCI\Model\BuildError[] $errors */ +/** @var \PHPCensor\Model\BuildError[] $errors */ foreach ($errors as $error): $link = str_replace('{FILE}', $error->getFile(), $linkTemplate); @@ -11,7 +11,7 @@ foreach ($errors as $error): $link = str_replace('{LINE_END}', $error->getLineEnd(), $link); ?> - + getSeverityString()); ?> @@ -30,7 +30,7 @@ foreach ($errors as $error): ?> - getMessage(); ?> + getMessage()); ?> diff --git a/src/PHPCensor/View/Build/view.phtml b/src/PHPCensor/View/Build/view.phtml index 05fe8ee1..3543afd1 100644 --- a/src/PHPCensor/View/Build/view.phtml +++ b/src/PHPCensor/View/Build/view.phtml @@ -134,11 +134,11 @@
-
+
- +
@@ -149,7 +149,7 @@ - +
diff --git a/src/PHPCensor/View/BuildStatus/view.phtml b/src/PHPCensor/View/BuildStatus/view.phtml index 2aae24e8..381083af 100644 --- a/src/PHPCensor/View/BuildStatus/view.phtml +++ b/src/PHPCensor/View/BuildStatus/view.phtml @@ -96,7 +96,7 @@ -
+

Builds

diff --git a/src/PHPCensor/View/BuildsTable.phtml b/src/PHPCensor/View/BuildsTable.phtml index c5284297..3f094e60 100644 --- a/src/PHPCensor/View/BuildsTable.phtml +++ b/src/PHPCensor/View/BuildsTable.phtml @@ -1,9 +1,9 @@ - - - + + + @@ -11,36 +11,36 @@ getStatus()) { - case 0: - $cls = 'active'; - $subcls = 'info'; - $status = Lang::get('pending'); - - break; - - case 1: - $cls = 'warning'; - $subcls = 'warning'; - $status = Lang::get('running'); - break; - - case 2: - $cls = 'success'; - $subcls = 'success'; - $status = Lang::get('success'); - break; - - case 3: - $cls = 'danger'; - $subcls = 'danger'; - $status = Lang::get('failed'); - break; + case 0: + $cls = 'active'; + $subcls = 'info'; + $status = Lang::get('pending'); + + break; + + case 1: + $cls = 'warning'; + $subcls = 'warning'; + $status = Lang::get('running'); + break; + + case 2: + $cls = 'success'; + $subcls = 'success'; + $status = Lang::get('success'); + break; + + case 3: + $cls = 'danger'; + $subcls = 'danger'; + $status = Lang::get('failed'); + break; } ?> - - + + - - - - + + + diff --git a/src/PHPCensor/View/Group/edit.phtml b/src/PHPCensor/View/Group/edit.phtml index 0aba8f57..809fc59f 100644 --- a/src/PHPCensor/View/Group/edit.phtml +++ b/src/PHPCensor/View/Group/edit.phtml @@ -1,5 +1,5 @@ -
+

diff --git a/src/PHPCensor/View/Group/index.phtml b/src/PHPCensor/View/Group/index.phtml index f1018f3e..9b6c6b16 100644 --- a/src/PHPCensor/View/Group/index.phtml +++ b/src/PHPCensor/View/Group/index.phtml @@ -5,7 +5,7 @@
-
+

diff --git a/src/PHPCensor/View/Home/index.phtml b/src/PHPCensor/View/Home/index.phtml index debbf7ce..28ca5fcf 100644 --- a/src/PHPCensor/View/Home/index.phtml +++ b/src/PHPCensor/View/Home/index.phtml @@ -3,7 +3,7 @@
-
+

@@ -16,7 +16,7 @@
-
+

diff --git a/src/PHPCensor/View/Plugin/index.phtml b/src/PHPCensor/View/Plugin/index.phtml index f6526eba..4f017be3 100644 --- a/src/PHPCensor/View/Plugin/index.phtml +++ b/src/PHPCensor/View/Plugin/index.phtml @@ -8,7 +8,7 @@
-
+

@@ -35,7 +35,7 @@
-
+

diff --git a/src/PHPCensor/View/Project/view.phtml b/src/PHPCensor/View/Project/view.phtml index 3483eb6d..a2149600 100644 --- a/src/PHPCensor/View/Project/view.phtml +++ b/src/PHPCensor/View/Project/view.phtml @@ -42,34 +42,34 @@
-
-
+
+

()

-
#getId(), 6, '0', STR_PAD_LEFT); ?>
#getId(), 6, '0', STR_PAD_LEFT); ?> getCreated()->format('Y-m-d H:i:s'); ?> + getStatus()) ?> getBranch(); ?> - - -
- - User()->getIsAdmin()): ?> - -
    -
    • -
- -
- 		getBranch(); ?> + + +
+ + User()->getIsAdmin()): ?> + +
    +
    • +
+ +
+
- - - +
+ + + - - - - - - - - - - -
+ + + + + + + + + + +
-
+
getType(), ['github', 'gitlab', 'bitbucket'])): ?> -
+

@@ -100,7 +100,7 @@ getSshPublicKey()): ?> -
+

getSshPublicKey(); ?>
diff --git a/src/PHPCensor/View/ProjectForm.phtml b/src/PHPCensor/View/ProjectForm.phtml index 9f2e2701..1bdaef49 100644 --- a/src/PHPCensor/View/ProjectForm.phtml +++ b/src/PHPCensor/View/ProjectForm.phtml @@ -1,8 +1,8 @@
-
-
+
+

@@ -11,11 +11,11 @@
-
+
-
+

diff --git a/src/PHPCensor/View/Settings/index.phtml b/src/PHPCensor/View/Settings/index.phtml index e76b77f1..ba9bb404 100644 --- a/src/PHPCensor/View/Settings/index.phtml +++ b/src/PHPCensor/View/Settings/index.phtml @@ -30,20 +30,20 @@

-
+
-
+

-
+

@@ -81,7 +81,7 @@
-
+

@@ -99,7 +99,7 @@
-
+

@@ -116,7 +116,7 @@
-
+

Authentication Settings

diff --git a/src/PHPCensor/View/User/index.phtml b/src/PHPCensor/View/User/index.phtml index 84eac454..c1e2af79 100644 --- a/src/PHPCensor/View/User/index.phtml +++ b/src/PHPCensor/View/User/index.phtml @@ -6,8 +6,8 @@
-
-
+
+
@@ -56,6 +56,5 @@
- -
+
diff --git a/src/PHPCensor/View/User/profile.phtml b/src/PHPCensor/View/User/profile.phtml index 0c29451e..a9f92352 100644 --- a/src/PHPCensor/View/User/profile.phtml +++ b/src/PHPCensor/View/User/profile.phtml @@ -3,7 +3,7 @@

-
+

diff --git a/src/PHPCensor/View/UserForm.phtml b/src/PHPCensor/View/UserForm.phtml index 4a83e7ec..96234e36 100644 --- a/src/PHPCensor/View/UserForm.phtml +++ b/src/PHPCensor/View/UserForm.phtml @@ -1,9 +1,9 @@
-
-
+
+
-
+