Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Minor changes to the issue view

  • Loading branch information...
commit 072edc4efe5636896f766324dabeba142673f8a1 1 parent 17d928e
Filippo authored
View
9 apps/fe/modules/sfGuardAuth/templates/signinSuccess.php
@@ -1,13 +1,6 @@
<?php slot('title') ?><?php echo __('Signin') ?><?php end_slot() ?>
-<?php if ($form->hasGlobalErrors()): ?>
- <div class="flash">
- <div class="message error">
- <?php echo $form->renderGlobalErrors() ?>
- </div>
- </div>
-<?php endif;?>
-<form action="<?php echo url_for('@sf_guard_signin') ?>" method="post" class="form login">
+<form id="form-login" action="<?php echo url_for('@sf_guard_signin') ?>" method="post" class="form login">
<?php echo $form ?>
<input type="submit" class="button" value="<?php echo __('Login') ?>" />
</form>
View
BIN  data/phpcollab_unit_test.db
Binary file not shown
View
6 plugins/idProjectManagementPlugin/lib/form/idIssueForm.class.php
@@ -152,8 +152,8 @@ public function configure()
$this->widgetSchema['project_id'] = new sfWidgetFormInputHidden();
$this->widgetSchema['users_list'] = new sfWidgetFormDoctrineChoiceMany(array('model' => 'Profile', 'query' => $this->getQueryForUsers()));
$this->widgetSchema['milestone_id'] = new sfWidgetFormDoctrineSelect(array('model' => 'Milestone', 'add_empty' => true, 'query' => $this->getQueryForMilestones()));
- $this->widgetSchema['related_issue_list'] = new sfWidgetFormDoctrineChoiceMany(array('model' => 'Issue', 'query' => $this->getQueryForRelatedIssue()));
- $this->widgetSchema['related_issue_list']->setAttribute('size', 5);
+ $this->widgetSchema['issues_list'] = new sfWidgetFormDoctrineChoiceMany(array('model' => 'Issue', 'query' => $this->getQueryForRelatedIssue()));
+ $this->widgetSchema['issues_list']->setAttribute('size', 5);
$this->validatorSchema['status_id'] = new sfValidatorDoctrineChoice(array('model' => 'Status', 'column' => 'id', 'required' => true));
@@ -164,7 +164,7 @@ public function configure()
$this->validatorSchema['users_list'] = new sfValidatorDoctrineChoiceMany(array('model' => 'Profile', 'query' => $this->getQueryForUsers(), 'required' => false));
$this->validatorSchema['milestone_id'] = new sfValidatorDoctrineChoice(array('model' => 'Milestone', 'query' => $this->getQueryForMilestones(), 'required' => false));
$this->validatorSchema['title'] = new sfValidatorString(array('required' => true,'max_length' => 256), array('required' => 'Title is mandatory'));
- $this->validatorSchema['related_issue_list'] = new sfValidatorDoctrineChoiceMany(array('model' => 'Issue', 'required' => false, 'query' => $this->getQueryForRelatedIssue()));
+ $this->validatorSchema['issues_list'] = new sfValidatorDoctrineChoiceMany(array('model' => 'Issue', 'required' => false, 'query' => $this->getQueryForRelatedIssue()));
$this->validatorSchema['estimated_time'] = new sfValidatorNumber(array('min' => '0', 'required' => false), array('min' => 'You cannot set a negative estimated time'));
unset($this['created_at']);
View
1  plugins/idProjectManagementPlugin/modules/idDashboard/templates/_milestone_boxes.php
@@ -1,3 +1,4 @@
+<?php use_helper('Dashboard') ?>
<?php if(count($milestones) > 0): ?>
<?php foreach($milestones as $milestone): ?>
<?php if (empty($color)): ?>
View
5 plugins/idProjectManagementPlugin/modules/idIssue/actions/components.class.php
@@ -23,5 +23,10 @@ public function executeSidebar()
$this->project_report = (count($reports) > 0) ? $reports[$this->project->id] : null;
}
+
+ public function executeShowSidebar()
+ {
+ $this->issue = Doctrine::getTable('Issue')->getIssueById($this->getRequest()->getParameter('issue_id'));
+ }
}
?>
View
4 plugins/idProjectManagementPlugin/modules/idIssue/config/view.yml
@@ -2,6 +2,10 @@ indexSuccess:
components:
sidebar: [idIssue, sidebar]
+showSuccess:
+ components:
+ sidebar: [idIssue, showSidebar]
+
default:
components:
sidebar: []
View
19 plugins/idProjectManagementPlugin/modules/idIssue/templates/_showSidebar.php
@@ -0,0 +1,19 @@
+<div class="span-8 prepend-1 last" id="sidebar">
+ <?php if(count($issue->issues) > 0): ?>
+ <div class="title"><span>Related issues</span></div>
+ <?php foreach($issue->issues as $related_isue):?>
+ <div class="span-2">
+ <?php echo link_to('#'.$related_isue->id, '@show_issue?project_id='.$issue->project_id.'&issue_id='.$related_isue->getId())?>
+ </div>
+ <div class="span-6 last">
+ <?php echo $related_isue->getTitle() ?>
+ </div>
+ <?php endforeach; ?>
+ <div class="clear"></div>
+ <?php endif; ?>
+ <?php $milestone = $issue->getMilestone();
+ if($milestone): ?>
+ <div class="title"><span>Milestone</span></div>
+ <?php include_partial('idDashboard/milestone_boxes', array('milestones' => array($milestone), 'color' => null, 'label' => null, 'days_message' => '%d days')); ?>
+ <?php endif; ?>
+</div>
View
15 plugins/idProjectManagementPlugin/modules/idIssue/templates/showSuccess.php
@@ -84,21 +84,6 @@
</div>
<div class="clear"></div>
- <div class="span-full">
- <?php if(count($issue->issues) > 0): ?>
- <h3>Related issues</h3>
- <ul>
- <?php foreach($issue->issues as $related_isue):?>
- <li>
- <?php echo link_to('#'.$related_isue->id, '@show_issue?project_id='.$issue->project_id.'&issue_id='.$related_isue->getId())?>
- <?php echo $related_isue->getTitle() ?>
- </li>
- <?php endforeach; ?>
- </ul>
- <?php endif; ?>
-
- </div>
-
<hr/>
<div class="span-full">
<h3>
View
2  plugins/idProjectManagementPlugin/modules/idMessage/templates/indexSuccess.php
@@ -1,4 +1,4 @@
-<?php slot('title', __('Messages for project').' '.$project->getName()) ?>
+<?php slot('title', __('Messages for project')) ?>
<div id="content" class="span-23">
<?php include_partial('idProject/sub_menu', array('project' => $project))?>
View
4 test/functional/fe/idProjectIssueCreateTest.php
@@ -70,9 +70,9 @@
'starting_date' => array('day' => $some_day[2], 'month' => $some_day[1], 'year' => $some_day[0]),
'ending_date' => array('day' => date('d', strtotime('+1 month')), 'month' => date('n', strtotime('+1 month')), 'year' => date('Y', strtotime('+1 month'))),
'users_list' => array('3'),
- 'related_issue_list' => array('51')
+ 'issues_list' => array('51')
)), array('methos'=>'post'))->
-
+
followRedirect()->
with('request')->begin()->
View
10 test/functional/fe/idProjectIssueShowTest.php
@@ -46,10 +46,10 @@
checkElement('h4:contains("pippo2")')->
checkElement('p:contains("pippo2")')->
- checkElement('li a[href*="en/idProject/3/idIssue/show/2"]', '#2')->
- checkElement('li a[href*="en/idProject/3/idIssue/show/3"]', '#3')->
- checkElement('li a[href*="en/idProject/3/idIssue/show/4"]', '#4')->
- checkElement('li a[href*="en/idProject/3/idIssue/show/6"]', false)->
+ checkElement('a[href*="en/idProject/3/idIssue/show/2"]', '#2')->
+ checkElement('a[href*="en/idProject/3/idIssue/show/3"]', '#3')->
+ checkElement('a[href*="en/idProject/3/idIssue/show/4"]', '#4')->
+ checkElement('a[href*="en/idProject/3/idIssue/show/6"]', false)->
end()->
click('Issues')->
@@ -59,7 +59,7 @@
with('response')->begin()->
isStatusCode('200')->
- checkElement('li a[href="/index.php/en/idProject/3/idIssue/show/1"]', '#1')->
+ checkElement('a[href="/index.php/en/idProject/3/idIssue/show/1"]', '#1')->
end()->
View
5 web/css/custom-prod.css
@@ -173,3 +173,8 @@ input[type="text"]
{
float: right;
}
+
+#form-login input[type="text"], #form-login input[type="password"]
+{
+ width: 20%;
+}
Please sign in to comment.
Something went wrong with that request. Please try again.