From 4f86a98b5e320fd8092393e92466e9d1f509a13a Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Sun, 9 Apr 2017 22:51:03 +0700
Subject: [PATCH] Build and Project pages UI fixes

---
 src/PHPCensor/Languages/lang.en.php          |  3 ++-
 src/PHPCensor/Languages/lang.ru.php          |  3 ++-
 src/PHPCensor/View/Build/view.phtml          | 26 +++++++++++---------
 src/PHPCensor/View/Project/ajax-builds.phtml |  8 +++---
 src/PHPCensor/View/Project/view.phtml        |  4 +--
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/PHPCensor/Languages/lang.en.php b/src/PHPCensor/Languages/lang.en.php
index 86a85d74..31b229c3 100644
--- a/src/PHPCensor/Languages/lang.en.php
+++ b/src/PHPCensor/Languages/lang.en.php
@@ -331,7 +331,8 @@ PHP Censor',
     
     'build_details'  => 'Build Details',
     'commit_details' => 'Commit Details',
-    'committer'      => 'Committer', 
+    'committer'      => 'Committer',
+    'commit_message' => 'Commit Message',
     'timing'         => 'Timing',
     'created'        => 'Created',
     'started'        => 'Started',
diff --git a/src/PHPCensor/Languages/lang.ru.php b/src/PHPCensor/Languages/lang.ru.php
index 9a113cdb..8a06099e 100644
--- a/src/PHPCensor/Languages/lang.ru.php
+++ b/src/PHPCensor/Languages/lang.ru.php
@@ -319,8 +319,9 @@ PHP Censor',
     'severity'       => 'Важность',
 
     'build_details'  => 'Информация о сборке',
-    'commit_details' => 'Информация о коммита',
+    'commit_details' => 'Информация о коммитe',
     'committer'      => 'Автор коммита',
+    'commit_message' => 'Сообщение в коммите',
     'timing'         => 'Тайминг',
     'created'        => 'Создана',
     'started'        => 'Началась',
diff --git a/src/PHPCensor/View/Build/view.phtml b/src/PHPCensor/View/Build/view.phtml
index 2978398d..75600153 100644
--- a/src/PHPCensor/View/Build/view.phtml
+++ b/src/PHPCensor/View/Build/view.phtml
@@ -21,10 +21,22 @@
                         </td>
                     </tr>
 
+                    <tr>
+                        <th><?php Lang::out('branch'); ?></th>
+                        <td style="text-align: right">
+                            <a target="_blank" href="<?php print $build->getBranchLink(); ?>">
+                                <span class="label label-default"><?php print $build->getBranch(); ?></span>
+                            </a>
+                        </td>
+                    </tr>
+
                     <tr>
                         <th><?php Lang::out('environment'); ?></th>
                         <td style="text-align: right">
-                            <span class="label label-default"><?php print $build->getEnvironment(); ?></span>
+                            <?php
+                                $environment = $build->getEnvironment();
+                                echo !empty($environment) ? ('<span class="label label-default">' . $environment . '</span>') : '—' ;
+                            ?>
                         </td>
                     </tr>
 
@@ -59,15 +71,6 @@
 
             <div class="box-body no-padding">
                 <table class="table">
-                    <tr>
-                        <th><?php Lang::out('branch'); ?></th>
-                        <td style="text-align: right">
-                            <a target="_blank" href="<?php print $build->getBranchLink(); ?>">
-                                <span class="label label-default"><?php print $build->getBranch(); ?></span>
-                            </a>
-                        </td>
-                    </tr>
-
                     <tr>
                         <th><?php Lang::out('commit'); ?></th>
                         <td style="text-align: right">
@@ -85,7 +88,8 @@
                     </tr>
 
                     <tr>
-                        <td colspan="2">
+                        <th><?php Lang::out('commit_message'); ?></th>
+                        <td style="text-align: right">
                             <?php print $build->getCommitMessage(); ?>
                         </td>
                     </tr>
diff --git a/src/PHPCensor/View/Project/ajax-builds.phtml b/src/PHPCensor/View/Project/ajax-builds.phtml
index 8e1f7639..4b800e49 100644
--- a/src/PHPCensor/View/Project/ajax-builds.phtml
+++ b/src/PHPCensor/View/Project/ajax-builds.phtml
@@ -41,6 +41,7 @@ $branches = $build->getExtra('branches');
 ?>
 <tr>
     <td><a href="<?php echo APP_URL ?>build/view/<?php print $build->getId(); ?>">#<?php print str_pad($build->getId(), 6, '0', STR_PAD_LEFT); ?></a></td>
+    <td><span class='label label-<?php echo $subcls ?>'><?php echo $status ?></span></td>
     <td><?php print $build->getCreated()->format('Y-m-d H:i:s'); ?></td>
     <td class="hidden-md hidden-sm hidden-xs">
         <?php
@@ -56,14 +57,15 @@ $branches = $build->getExtra('branches');
             }
         ?>
     </td>
-
-    <td><?php print $build->getEnvironment(); ?></td>
     <td>
         <a href="<?php print $build->getBranchLink(); ?>" target="_blank"><?php print $build->getBranch(); ?></a>
         <?php print $branches ? ' + '.implode(', ', $branches) : ''; ?>
     </td>
     <td>
-        <span class='label label-<?php echo $subcls ?>'><?php echo $status ?></span>
+        <?php
+            $environment = $build->getEnvironment();
+            echo !empty($environment) ? $environment : '—' ;
+        ?>
     </td>
     <td>
         <?php print $build->getDuration(); ?> <?= Lang::get('seconds'); ?>
diff --git a/src/PHPCensor/View/Project/view.phtml b/src/PHPCensor/View/Project/view.phtml
index 384e8144..2f6a8419 100644
--- a/src/PHPCensor/View/Project/view.phtml
+++ b/src/PHPCensor/View/Project/view.phtml
@@ -97,11 +97,11 @@
                 <thead>
                 <tr>
                     <th><?php Lang::out('id'); ?></th>
+                    <th><?php Lang::out('status'); ?></th>
                     <th><?php Lang::out('date'); ?></th>
                     <th class="hidden-md hidden-sm hidden-xs"><?php Lang::out('commit'); ?></th>
-                    <th><?php Lang::out('environment'); ?></th>
                     <th><?php Lang::out('branch'); ?></th>
-                    <th><?php Lang::out('status'); ?></th>
+                    <th><?php Lang::out('environment'); ?></th>
                     <th><?php Lang::out('duration'); ?></th>
                     <th></th>
                 </tr>