@@ -298,7 +298,7 @@ use PHPCensor\Model\BuildError;
-
+ = $data['error_html']; ?>
@@ -312,7 +312,7 @@ use PHPCensor\Model\BuildError;
-
+
-
-
-
+
+
+
+
@@ -24,8 +24,8 @@
@@ -65,23 +65,23 @@
- getProject()->getTitle(); ?> #getId(); ?> (= $statusText; ?>)
+ = $latest->getProject()->getTitle(); ?> #= $latest->getId(); ?> (= $statusText; ?>)
getCommitMessage()): ?>
- getCommitMessage(); ?>
+ = $latest->getCommitMessage(); ?>
- Branch: getBranch(); ?>
- Committer: getCommitterEmail(); ?>
+ Branch: = $latest->getBranch(); ?>
+ Committer: = $latest->getCommitterEmail(); ?>
getCommitId())): ?>
- Commit: getCommitId(); ?>
+ Commit: = $latest->getCommitId(); ?>
-
+
@@ -138,9 +138,9 @@
}
?>
- #getId(), 6, '0', STR_PAD_LEFT); ?>
+ #= str_pad($build->getId(), 6, '0', STR_PAD_LEFT); ?>
-
+ = $status; ?>
= $build->getCreateDate()->format('Y-m-d H:i:s'); ?>
diff --git a/src/View/Email/layout.phtml b/src/View/Email/layout.phtml
index b4fbad83..31b7309a 100644
--- a/src/View/Email/layout.phtml
+++ b/src/View/Email/layout.phtml
@@ -7,20 +7,20 @@
-
+
-
getTitle(); ?> - Build #getId(); ?>
+
= $project->getTitle(); ?> - Build #= $build->getId(); ?>
- Your commit getCommitId(); ?> generated a
- isSuccessful() ? 'success' : 'failed'; ?> build in project
- getTitle(); ?> .
+ Your commit = $build->getCommitId(); ?> generated a
+ = ($build->isSuccessful() ? 'success' : 'failed'); ?> build in project
+ = $project->getTitle(); ?> .
-
+ = $content; ?>
diff --git a/src/View/Email/long.phtml b/src/View/Email/long.phtml
index daef0aa2..33301747 100644
--- a/src/View/Email/long.phtml
+++ b/src/View/Email/long.phtml
@@ -1,2 +1,11 @@
-
getCommitMessage(); ?>
-
getLog()); ?>
+
+
+ = $build->getCommitMessage(); ?>
+
+
+ = AnsiConverter::convert($build->getLog()); ?>
+
diff --git a/src/View/Email/short.phtml b/src/View/Email/short.phtml
index 75df4f83..9f6475b9 100644
--- a/src/View/Email/short.phtml
+++ b/src/View/Email/short.phtml
@@ -1 +1,3 @@
-
getCommitMessage(); ?>
+
+ = $build->getCommitMessage(); ?>
+
diff --git a/src/View/Group/edit.phtml b/src/View/Group/edit.phtml
index 809fc59f..389e6f8c 100644
--- a/src/View/Group/edit.phtml
+++ b/src/View/Group/edit.phtml
@@ -1,10 +1,14 @@
-
+
\ No newline at end of file
+
diff --git a/src/View/Group/index.phtml b/src/View/Group/index.phtml
index 7d20dde3..b6008e48 100644
--- a/src/View/Group/index.phtml
+++ b/src/View/Group/index.phtml
@@ -4,7 +4,7 @@ use PHPCensor\Helper\Lang;
?>
@@ -21,17 +21,17 @@ use PHPCensor\Helper\Lang;
-
-
+ = $group['title']; ?>
+ = count($group['projects']); ?>
-
+
getUser()->getIsAdmin() && (!count($group['projects']))): ?>
diff --git a/src/View/Project/ajax-builds.phtml b/src/View/Project/ajax-builds.phtml
index 68c62af0..1ed869fc 100644
--- a/src/View/Project/ajax-builds.phtml
+++ b/src/View/Project/ajax-builds.phtml
@@ -100,13 +100,13 @@ $branches = $build->getExtra('branches');
-
+
getUser()->getIsAdmin()): ?>
diff --git a/src/View/Project/edit.phtml b/src/View/Project/edit.phtml
index 69a12fc3..4148d438 100644
--- a/src/View/Project/edit.phtml
+++ b/src/View/Project/edit.phtml
@@ -28,7 +28,7 @@
-
+ = $form; ?>
@@ -38,7 +38,7 @@
diff --git a/src/View/Session.phtml b/src/View/Session.phtml
index 411c2958..ab7a5672 100644
--- a/src/View/Session.phtml
+++ b/src/View/Session.phtml
@@ -7,23 +7,23 @@
-
-
+
+
-
+
-
+ = $content; ?>
-
-
+
+