Permalink
Browse files

Merge pull request #62 from pmartin/some-setup-infos

Some setup infos
  • Loading branch information...
2 parents b5e6edd + dfe4f49 commit d0d57010bd95bdb0c6d1679c09ba49cbe1d56566 @srogier srogier committed Apr 2, 2012
View
2 apps/front/lib/actions/baseJenkinsAction.class.php
@@ -31,7 +31,7 @@ public function preExecute()
}
else
{
- $this->getUser()->setFlash('error', 'Jenkins is not started');
+ $this->getUser()->setFlash('error', 'Jenkins is not started, or your configuration is incorrect.');
}
$this->setVar('jenkins', $jenkins);
View
14 apps/front/modules/help/templates/_helps/jenkins/createGroupRun/build-branch.php
@@ -0,0 +1,14 @@
+<h3 data-modal-title="add">Build Branch Name</h3>
+
+<p>
+ This is the name that Jenkins Khan will display for
+ your branch.
+</p>
+
+<p>
+ This name will only be used as an <strong>informative
+ label</strong>, allowing you to use something more
+ user-friendly that the technical name you might usually
+ give to your git branches <em>(because of the naming
+ conventions on your project, for example)</em>.
+</p>
View
17 apps/front/modules/help/templates/_helps/jenkins/createGroupRun/git-branch.php
@@ -0,0 +1,17 @@
+<h3 data-modal-title="add">Git Branch</h3>
+
+<p>
+ Here, you must input the name of the local git branch that
+ you want to build.
+</p>
+
+<p>
+ This branch name will be passed to Jenkins as a parameter
+ called <code>BRANCH</code>, and that git branch will be
+ cloned / updated when the build starts.
+</p>
+
+<p>
+ Note that the branch will be cloned from your local computer:
+ there is no need to push it to your remote.
+</p>
View
2 apps/front/modules/jenkins/templates/createGroupRunSuccess.php
@@ -13,12 +13,14 @@
<?php echo $form['git_branch']->renderError() ?>
<?php echo $form['git_branch']->renderLabel(); ?>
<?php echo $form['git_branch']->render() ?>
+ <?php include_partial('help/link-modal', array('name' => 'jenkins/createGroupRun/git-branch')) ?>
</div>
<div class="field">
<?php echo $form['label']->renderError() ?>
<?php echo $form['label']->renderLabel(); ?>
<?php echo $form['label']->render() ?>
+ <?php include_partial('help/link-modal', array('name' => 'jenkins/createGroupRun/build-branch')) ?>
</div>
<div class="field">

0 comments on commit d0d5701

Please sign in to comment.