From 616d52e02509fc7be218e854c3d5f499490914e7 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 30 Apr 2014 14:13:07 +0100 Subject: [PATCH] UI updates --- PHPCI/View/Build/view.phtml | 59 +++-- PHPCI/View/BuildsTable.phtml | 4 +- PHPCI/View/Home/index.phtml | 68 +++--- PHPCI/View/Project/view.phtml | 83 ++++--- PHPCI/View/ProjectForm.phtml | 32 ++- PHPCI/View/SummaryTable.phtml | 2 +- PHPCI/View/User/index.phtml | 18 +- PHPCI/View/layout.phtml | 4 +- public/assets/css/bootstrap-theme.min.css | 7 + public/assets/css/bootstrap.min.css | 14 +- public/assets/css/phpci.css | 200 ++++----------- .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes .../fonts/glyphicons-halflings-regular.svg | 229 ++++++++++++++++++ .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes public/assets/js/bootstrap.min.js | 13 +- public/assets/js/build-plugins/phpcs.js | 72 ++++++ public/assets/js/build-plugins/phpmd.js | 1 + public/assets/js/phpci.js | 12 +- 19 files changed, 537 insertions(+), 281 deletions(-) create mode 100755 public/assets/css/bootstrap-theme.min.css mode change 100644 => 100755 public/assets/css/bootstrap.min.css create mode 100755 public/assets/fonts/glyphicons-halflings-regular.eot create mode 100755 public/assets/fonts/glyphicons-halflings-regular.svg create mode 100755 public/assets/fonts/glyphicons-halflings-regular.ttf create mode 100755 public/assets/fonts/glyphicons-halflings-regular.woff mode change 100644 => 100755 public/assets/js/bootstrap.min.js create mode 100644 public/assets/js/build-plugins/phpcs.js diff --git a/PHPCI/View/Build/view.phtml b/PHPCI/View/Build/view.phtml index 52d4db80..567df543 100644 --- a/PHPCI/View/Build/view.phtml +++ b/PHPCI/View/Build/view.phtml @@ -1,48 +1,47 @@ -
+

- getProject()->getTitle(); ?> + + getProject()->getTitle(); ?> #getId(); ?>

+
+
+ getCommitMessage()): ?> +
+ getCommitMessage(); ?> +
+ -
- getCommitMessage()): ?> -
- getCommitMessage(); ?> + Branch: getBranch(); ?>
+ Committer: getCommitterEmail(); ?> + + getCommitId() != 'Manual'): ?> +
Commit ID: getCommitId(); ?>
+
- - - Branch: getBranch(); ?>
- Committer: getCommitterEmail(); ?> - - getCommitId() != 'Manual'): ?> -
Commit ID: getCommitId(); ?>
-
- - - -
Options
- - +
+
+

Options

+
+ +
@@ -104,14 +103,14 @@ foreach ($plugins as $plugin) { break; } - $('#title') + $('.build-info-panel') .removeClass('panel-info') .removeClass('panel-warning') .removeClass('panel-success') .removeClass('panel-danger') .addClass('panel-' + statusClass); - $('#title .label') + $('.build-info-panel .label') .removeClass('label-info') .removeClass('label-warning') .removeClass('label-success') diff --git a/PHPCI/View/BuildsTable.phtml b/PHPCI/View/BuildsTable.phtml index 9c1b3aea..da67e087 100644 --- a/PHPCI/View/BuildsTable.phtml +++ b/PHPCI/View/BuildsTable.phtml @@ -79,9 +79,9 @@ switch($build->getStatus())
- View + View User()->getIsAdmin()): ?> -