Permalink
Browse files

Added views for priorities, statuses and trackers in new layout

  • Loading branch information...
1 parent 342d8bc commit 4f833d94e6be08186c09bb7211cb9720b6ffcee4 Filippo committed Aug 4, 2010
Showing with 340 additions and 370 deletions.
  1. +1 −5 apps/fe/modules/sfGuardUser/templates/indexSuccess.php
  2. +1 −5 apps/fe/modules/sfGuardUser/templates/newSuccess.php
  3. +1 −4 config/databases.yml
  4. +3 −23 config/properties.ini
  5. +1 −15 config/rsync_demo_exclude.txt
  6. BIN data/phpcollab_unit_test.db
  7. +31 −8 plugins/idProjectManagementPlugin/modules/idPriority/templates/editSuccess.php
  8. +20 −24 plugins/idProjectManagementPlugin/modules/idPriority/templates/indexSuccess.php
  9. +8 −0 plugins/idProjectManagementPlugin/modules/idProject/templates/_sub_menu_settings.php
  10. +37 −8 plugins/idProjectManagementPlugin/modules/idStatus/templates/editSuccess.php
  11. +71 −72 plugins/idProjectManagementPlugin/modules/idStatus/templates/indexSuccess.php
  12. +1 −13 plugins/idProjectManagementPlugin/modules/idTracker/templates/editSuccess.php
  13. +35 −35 plugins/idProjectManagementPlugin/modules/idTracker/templates/indexSuccess.php
  14. +31 −8 plugins/idProjectManagementPlugin/modules/idTracker/templates/newSuccess.php
  15. +5 −5 test/functional/fe/idProjectPriorityCreateTest.php
  16. +12 −12 test/functional/fe/idProjectPriorityDeleteTest.php
  17. +4 −4 test/functional/fe/idProjectPriorityEditTest.php
  18. +14 −14 test/functional/fe/idProjectPriorityOrderTest.php
  19. +2 −19 test/functional/fe/idProjectPriorityOrderValidationTest.php
  20. +8 −7 test/functional/fe/idProjectPriorityViewTest.php
  21. +7 −7 test/functional/fe/idProjectStatusCreateTest.php
  22. +8 −8 test/functional/fe/idProjectStatusDeleteTest.php
  23. +5 −5 test/functional/fe/idProjectStatusEditTest.php
  24. +14 −32 test/functional/fe/idProjectStatusOrderTest.php
  25. +2 −19 test/functional/fe/idProjectStatusOrderValidationTest.php
  26. +8 −8 test/functional/fe/idProjectStatusViewTest.php
  27. +5 −5 test/functional/fe/idProjectTrackerCreateTest.php
  28. +2 −2 test/functional/fe/idProjectTrackerDeleteTest.php
  29. +3 −3 test/functional/fe/idProjectTrackerEditTest.php
@@ -1,11 +1,7 @@
<?php slot('title', __('Manage users')) ?>
<div class="span-23" id="content">
- <div class="span-full last project-navigation">
- <ul>
- <li><?php echo link_to('Users', '@sf_guard_user'); ?></li>
- </ul>
- </div>
+ <?php include_partial('idProject/sub_menu_settings')?>
<div id="block-filters" class="span-full">
<h2 class="title"><?php echo __('User filters') ?></h2>
@@ -1,11 +1,7 @@
<?php slot('title', __('Edit user')) ?>
<div class="span-23" id="content">
- <div class="span-full last project-navigation">
- <ul>
- <li><?php echo link_to('Users', '@sf_guard_user'); ?></li>
- </ul>
- </div>
+ <?php include_partial('idProject/sub_menu_settings')?>
<div class="span-full">
<div class="title"><?php echo __('New user') ?></div>
View
@@ -17,10 +17,7 @@ prod:
doctrine:
class: sfDoctrineDatabase
param:
-# dsn: 'sqlite:%SF_DATA_DIR%/phpcollab.db'
- dsn: 'mysql:host=localhost;dbname=phpcollab'
- username: phpcollab
- password: p4pCollab
+ dsn: 'sqlite:%SF_DATA_DIR%/phpcollab_demo.db'
test:
doctrine:
View
@@ -9,27 +9,7 @@
[demo]
parameters=" -rlDczv --force --delete --progress --exclude-from=config/rsync_demo_exclude.txt"
- host=php-collab.org
+ host=collab.psedici.com
port=22
- user=phpcollab
- dir=/home/.jaymes/phpcollab/demo/
-
- [phpcollabdev]
- parameters=" -azC --force --delete --exclude-from=config/rsync_phpcollabdev_exclude.txt"
- host=php-collab.org
- port=22
- user=phpcollab
- dir=/home/.jaymes/phpcollab/phpcollab_dev/
-
- [github]
- parameters=" -azC --force --delete --exclude-from=config/rsync_github_exclude.txt"
- host=localhost
- port=22
- user=filo
- dir=/home/filippo/github_collab_version/phpcollab3/
-
- [lpt]
- host=localhost
- port=22
- user=filippo
- dir=/var/www/lpt/
+ user=wpf
+ dir=/home/wpf/collab.psedici.com
@@ -1,18 +1,4 @@
.svn
.git
-/data/phpcollab_demo.db
-/web/uploads/*
-/cache/*
/log/*
-/web/*_dev.php
-/web/index.php
-/web/sfProtoculousPlugin/*
-/web/.htaccess
-/web/phpcollabdev.php
-/data/sql/*
-/data/phpcollab.db
-/test/*
-cron.php
-patch.diff
-svnFakeRepositoryCreationScript.php
-doc/layout/*
+/cache/*
View
Binary file not shown.
@@ -1,13 +1,36 @@
<?php slot('title', __('Manage priorities')) ?>
-<div class="block" id="block-forms">
- <?php include_partial('create_priority_menu'); ?>
- <div class="content">
- <h2 class="title"><?php echo !$form->getObject()->isNew() ? __('Edit priority') : __('Create new priority'); ?></h2>
- <div class="inner">
-
- <?php include_partial('idPriority/form', array('form' => $form)) ?>
+<div class="span-23" id="content">
+ <?php include_partial('idProject/sub_menu_settings')?>
+ <div class="title">
+ <span><?php echo __('Edit priority'); ?></span>
+ </div>
- </div>
+ <div class="span-full">
+ <form action="<?php echo url_for('idPriority/'.($form->getObject()->isNew() ? 'create' : 'update').(!$form->getObject()->isNew() ? '?id='.$form->getObject()->getid() : '')) ?>" method="post">
+ <?php if ($form->hasGlobalErrors()): ?>
+ <div class="error"><?php echo $form->renderGlobalErrors() ?></div>
+ <?php endif; ?>
+ <div class="span-10 last">
+ <?php echo $form['name']->renderLabel() ?>
+ <?php echo $form['name']->renderError() ?>
+ <?php echo $form['name'] ?>
+ </div>
+ <div class="clear"></div>
+ <div class="span-3">
+ <input type="submit" value="<?php echo __('Save'); ?>" class="button block-green medium-round" />
+ <?php echo $form->renderHiddenFields() ?>
+ </div>
+ <div class="span-3">
+ <?php echo link_to(__('Cancel'), '@index_priority', array('class' => 'button block-yellow medium-round')) ?>
+ </div>
+ <div class="span-4 last">&nbsp;
+ <?php if (!$form->getObject()->isNew()): ?>
+ <?php echo link_to(__('Delete'), '@delete_priority?id='.$form->getObject()->getid(), array('method' => 'delete', 'confirm' => __('Do you really want to delete this priority?'), 'class' => 'button block-red medium-round')) ?>
+ <?php endif; ?>
+ </div>
+ <div class="clear"></div>
+ </form>
</div>
+
</div>
@@ -1,28 +1,29 @@
<?php slot('title', __('Manage priorities')) ?>
-<div class="block" id="block-tables">
- <?php include_partial('create_priority_menu'); ?>
- <div class="content">
- <div class="inner">
- <h2 class="title"><?php echo __('Priorities list') ?></h2>
-
- <div class="flash" id="feedback2">
- <?php if ($sf_user->hasFlash('notice')): ?>
- <div class="message notice">
- <?php echo __($sf_user->getFlash('notice')); ?>
- </div>
- <?php endif;?>
+<div class="span-23" id="content">
+ <?php include_partial('idProject/sub_menu_settings')?>
+ <div class="title">
+ <span><?php echo __('Priorities'); ?></span>
+ <a id="add-log-time"class="button block-green medium-round" href="<?php echo url_for('@new_priority') ?>">Add</a>
+ </div>
+
+ <div class="flash" id="feedback2">
+ <?php if ($sf_user->hasFlash('notice')): ?>
+ <div class="message notice">
+ <?php echo __($sf_user->getFlash('notice')); ?>
+ </div>
+ <?php endif;?>
- <?php if ($sf_user->hasFlash('error')): ?>
- <div class="message error">
- <?php echo __($sf_user->getFlash('error')); ?>
- </div>
- <?php endif;?>
- </div>
+ <?php if ($sf_user->hasFlash('error')): ?>
+ <div class="message error">
+ <?php echo __($sf_user->getFlash('error')); ?>
+ </div>
+ <?php endif;?>
+ </div>
<table class="table" id="priorities-list-table">
- <tr>
+ <tr class="menu">
<th class="first">&nbsp;</th>
<th><?php echo __('Id') ?></th>
<th><?php echo __('Name') ?></th>
@@ -74,7 +75,6 @@
<?php endif; ?>
</tbody>
</table>
-
<script type="text/javascript">
@@ -103,9 +103,5 @@ function()
});
//]]>
</script>
-
-
- </div>
- </div>
</div>
@@ -0,0 +1,8 @@
+<div class="span-full last project-navigation">
+ <ul>
+ <li><?php echo link_to('Users', '@sf_guard_user'); ?></li>
+ <li><?php echo link_to('Priorities', '@index_priority'); ?></li>
+ <li><?php echo link_to('Statuses', '@index_status'); ?></li>
+ <li><?php echo link_to('Trackers', '@index_trackers'); ?></li>
+ </ul>
+</div>
@@ -1,13 +1,42 @@
<?php slot('title', __('Manage statuses')) ?>
-<div class="block" id="block-forms">
- <?php include_partial('create_status_menu'); ?>
- <div class="content">
- <h2 class="title"><?php echo !$form->getObject()->isNew() ? __('Edit status') : __('Create new status'); ?></h2>
- <div class="inner">
-
- <?php include_partial('idStatus/form', array('form' => $form)) ?>
+<div class="span-23" id="content">
+ <?php include_partial('idProject/sub_menu_settings')?>
+ <div class="title">
+ <span><?php echo __('Edit status'); ?></span>
+ </div>
- </div>
+ <div class="span-full">
+ <form action="<?php echo url_for('idStatus/'.($form->getObject()->isNew() ? 'create' : 'update').(!$form->getObject()->isNew() ? '?id='.$form->getObject()->getid() : '')) ?>" method="post">
+ <?php if ($form->hasGlobalErrors()): ?>
+ <div class="error"><?php echo $form->renderGlobalErrors() ?></div>
+ <?php endif; ?>
+ <div class="span-10 last">
+ <?php echo $form['name']->renderLabel() ?>
+ <?php echo $form['name']->renderError() ?>
+ <?php echo $form['name'] ?>
+ </div>
+ <div class="clear"></div>
+ <div class="span-10 last">
+ <?php echo $form['status_type']->renderLabel() ?>
+ <?php echo $form['status_type']->renderError() ?>
+ <?php echo $form['status_type'] ?>
+ </div>
+ <div class="clear"></div>
+ <div class="span-3">
+ <input type="submit" value="<?php echo __('Save'); ?>" class="button block-green medium-round" />
+ <?php echo $form->renderHiddenFields() ?>
+ </div>
+ <div class="span-3">
+ <?php echo link_to(__('Cancel'), '@index_status', array('class' => 'button block-yellow medium-round')) ?>
+ </div>
+ <div class="span-4 last">&nbsp;
+ <?php if (!$form->getObject()->isNew()): ?>
+ <?php echo link_to(__('Delete'), '@delete_status?id='.$form->getObject()->getid(), array('method' => 'delete', 'confirm' => __('Do you really want to delete this status?'), 'class' => 'button block-red medium-round')) ?>
+ <?php endif; ?>
+ </div>
+ <div class="clear"></div>
+ </form>
</div>
+
</div>
Oops, something went wrong.

0 comments on commit 4f833d9

Please sign in to comment.