deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Finishing updates to make PHPCI use Bootstrap v3, as per issue #99

Browse source
This commit is contained in:
Dan Cryer 2013-07-31 21:04:34 +01:00
commit eac86ff2bd
7 changed files with 29 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

15
PHPCI/Controller/ProjectController.php
View file

@ -262,13 +262,15 @@ class ProjectController extends \PHPCI\Controller
$field->setPattern('^(github|bitbucket|remote|local)');
$field->setOptions($options);
$field->setLabel('Where is your project hosted?');
$field->setClass('col-lg-4 form-control');
$field->setClass('form-control');
$field->setContainerClass('form-group');
$form->addField($field);
if (isset($_SESSION['github_token'])) {
$field = new Form\Element\Select('github');
$field->setLabel('Choose a Github repository:');
$field->setClass('col-lg-4 form-control');
$field->setClass('form-control');
$field->setContainerClass('form-group');
$field->setOptions($this->getGithubRepositories());
$form->addField($field);
}
@ -302,19 +304,22 @@ class ProjectController extends \PHPCI\Controller
$field->setRequired(true);
$field->setValidator($referenceValidator);
$field->setLabel('Repository Name / URL (Remote) or Path (Local)');
$field->setClass('col-lg-4 form-control');
$field->setClass('form-control');
$field->setContainerClass('form-group');
$form->addField($field);
$field = new Form\Element\Text('title');
$field->setRequired(true);
$field->setLabel('Project Title');
$field->setClass('col-lg-4 form-control');
$field->setClass('form-control');
$field->setContainerClass('form-group');
$form->addField($field);
$field = new Form\Element\TextArea('key');
$field->setRequired(false);
$field->setLabel('Private key to use to access repository (leave blank for local and/or anonymous remotes)');
$field->setClass('col-lg-7 form-control');
$field->setClass('form-control');
$field->setContainerClass('form-group');
$field->setRows(6);
$form->addField($field);

2
PHPCI/Controller/SessionController.php
View file

@ -48,12 +48,14 @@ class SessionController extends \PHPCI\Controller
$email->setLabel('Email Address');
$email->setRequired(true);
$email->setContainerClass('form-group');
$email->setClass('form-control');
$form->addField($email);
$pwd = new b8\Form\Element\Password('password');
$pwd->setLabel('Password');
$pwd->setRequired(true);
$pwd->setContainerClass('form-group');
$pwd->setClass('form-control');
$form->addField($pwd);
$pwd = new b8\Form\Element\Submit();

10
PHPCI/Controller/UserController.php
View file

@ -135,25 +135,29 @@ class UserController extends \PHPCI\Controller
$field = new Form\Element\Email('email');
$field->setRequired(true);
$field->setLabel('Email Address');
$field->setClass('span4');
$field->setClass('form-control');
$field->setContainerClass('form-group');
$form->addField($field);
$field = new Form\Element\Text('name');
$field->setRequired(true);
$field->setLabel('Name');
$field->setClass('span4');
$field->setClass('form-control');
$field->setContainerClass('form-group');
$form->addField($field);
$field = new Form\Element\Password('password');
$field->setRequired(true);
$field->setLabel('Password' . ($type == 'edit' ? ' (leave blank to keep current password)' : ''));
$field->setClass('span4');
$field->setClass('form-control');
$field->setContainerClass('form-group');
$form->addField($field);
$field = new Form\Element\Checkbox('admin');
$field->setRequired(false);
$field->setCheckedValue(1);
$field->setLabel('Is this user an administrator?');
$field->setContainerClass('form-group');
$form->addField($field);
$field = new Form\Element\Submit();