Author: sevein
Date: Fri Oct 29 14:35:22 2010
New Revision: 8679
Log:
Cosmetic changes and generate urls correctly.
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/templates/_termAclForm.php
Modified: trunk/plugins/qbAclPlugin/modules/aclGroup/templates/_termAclForm.php
==============================================================================
--- trunk/plugins/qbAclPlugin/modules/aclGroup/templates/_termAclForm.php
Fri Oct 29 14:24:30 2010 (r8678)
+++ trunk/plugins/qbAclPlugin/modules/aclGroup/templates/_termAclForm.php
Fri Oct 29 14:35:22 2010 (r8679)
@@ -5,86 +5,93 @@
<?php $sf_response->addJavaScript('/vendor/yui/container/container-min') ?>
<?php $sf_response->addJavaScript('aclDialog') ?>
-<form method="post" action="<?php echo url_for(array($resource, 'module' =>
$sf_context->getModuleName(), 'action' => 'editTermAcl')) ?>" id="editForm">
+<?php echo $form->renderFormTag(url_for(array($resource, 'module' =>
$sf_context->getModuleName(), 'action' => 'editTermAcl')), array('id' =>
'editForm')) ?>
-<fieldset class="collapsible" id="allTermsArea">
- <legend><?php echo __('Permissions for all %1%', array('%1%' =>
sfConfig::get('app_ui_label_term'))) ?></legend>
+ <fieldset class="collapsible" id="allTermsArea">
-<div class="form-item">
- <table id="allTerms">
- <caption><em><?php echo __('All %1%', array('%1%' =>
sfConfig::get('app_ui_label_term'))) ?></em></caption>
-
- <thead>
- <tr>
- <th scope="col"><?php echo __('Action') ?></th>
- <th scope="col"><?php echo __('Permission') ?></th>
- </tr>
- </thead>
-
- <tbody>
- <?php foreach ($termActions as $action => $label): ?>
- <tr class="<?php echo (0 == $row++ % 2) ? 'even' : 'odd' ?>">
- <td><?php echo __($label) ?></td>
- <td>
- <ul class="radio inline">
- <?php if (isset($rootPermissions[$action])): ?>
- <li><input type="radio" name="termAcl[<?php echo
$rootPermissions[$action]->id ?>]" value="<?php echo QubitAcl::GRANT ?>"<?php
echo (1 == $rootPermissions[$action]->grantDeny) ? ' checked="checked"' : ''
?>><?php echo __('Grant') ?></li>
- <li><input type="radio" name="termAcl[<?php echo
$rootPermissions[$action]->id ?>]" value="<?php echo QubitAcl::DENY ?>"<?php
echo (0 == $rootPermissions[$action]->grantDeny) ? ' checked="checked"' : ''
?>><?php echo __('Deny') ?></li>
- <li><input type="radio" name="termAcl[<?php echo
$rootPermissions[$action]->id ?>]" value="<?php echo QubitAcl::INHERIT?>"><?php
echo __('Inherit') ?></li>
- <?php else: ?>
- <li><input type="radio" name="termAcl[<?php echo
$action.'_'.url_for(array('module' => 'term', 'id' => QubitTerm::ROOT_ID),
true) ?>]" value="<?php echo QubitAcl::GRANT ?>"><?php echo __('Grant') ?></li>
- <li><input type="radio" name="termAcl[<?php echo
$action.'_'.url_for(array('module' => 'term', 'id' => QubitTerm::ROOT_ID),
true) ?>]" value="<?php echo QubitAcl::DENY ?>"><?php echo __('Deny') ?></li>
- <li><input type="radio" name="termAcl[<?php echo
$action.'_'.url_for(array('module' => 'term', 'id' => QubitTerm::ROOT_ID),
true) ?>]" value="<?php echo QubitAcl::INHERIT ?>" checked="checked"><?php echo
__('Inherit') ?></li>
- <?php endif; ?>
- </ul>
- </td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
-</div>
-</fieldset>
+ <legend><?php echo __('Permissions for all %1%', array('%1%' =>
sfConfig::get('app_ui_label_term'))) ?></legend>
-<fieldset class="collapsible collapsed" id="taxonomyArea">
- <legend><?php echo __('Permissions by taxonomy') ?></legend>
-
- <?php if (0 < count($taxonomyPermissions)): ?>
- <?php foreach ($taxonomyPermissions as $taxonomyId => $actions): ?>
<div class="form-item">
- <table id="taxonomyAcl_<?php echo $taxonomyId ?>">
- <caption><?php echo render_title(QubitTaxonomy::getById($taxonomyId))
?></caption>
- <thead>
- <tr>
- <th scope="col"><?php echo __('Action') ?></th>
- <th scope="col"><?php echo __('Permission') ?></th>
- </tr>
- </thead>
-
- <tbody>
- <?php foreach ($termActions as $action => $label): ?>
- <tr class="<?php echo (0 == $row++ % 2) ? 'even' : 'odd' ?>">
- <td><?php echo __($label) ?></td>
- <td id="<?php echo 'repo_'.$taxonomyId.'_'.$action ?>">
- <ul class="radio inline">
- <?php if (isset($actions[$action])): ?>
- <li><input type="radio" name="taxonomyAcl[<?php echo
$actions[$action]->id ?>]" value="<?php echo QubitAcl::GRANT ?>"<?php echo (1
== $actions[$action]->grantDeny) ? ' checked="checked"' : '' ?>><?php echo
__('Grant') ?></li>
- <li><input type="radio" name="taxonomyAcl[<?php echo
$actions[$action]->id ?>]" value="<?php echo QubitAcl::DENY ?>"<?php echo (0 ==
$actions[$action]->grantDeny) ? ' checked="checked"' : '' ?>><?php echo
__('Deny') ?></li>
- <li><input type="radio" name="taxonomyAcl[<?php echo
$actions[$action]->id ?>]" value="<?php echo QubitAcl::INHERIT?>"><?php echo
__('Inherit') ?></li>
- <?php else: ?>
- <li><input type="radio" name="taxonomyAcl[<?php echo
$action.'_'.url_for(array('module' => 'term', 'id' => QubitTerm::ROOT_ID),
true) ?>]" value="<?php echo QubitAcl::GRANT ?>"><?php echo __('Grant') ?></li>
- <li><input type="radio" name="taxonomyAcl[<?php echo
$action.'_'.url_for(array('module' => 'term', 'id' => QubitTerm::ROOT_ID),
true) ?>]" value="<?php echo QubitAcl::DENY ?>"><?php echo __('Deny') ?></li>
- <li><input type="radio" name="taxonomyAcl[<?php echo
$action.'_'.url_for(array('module' => 'term', 'id' => QubitTerm::ROOT_ID),
true) ?>]" value="<?php echo QubitAcl::INHERIT ?>" checked="checked"><?php echo
__('Inherit') ?></li>
- <?php endif; ?>
- </ul>
- </td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
+ <table id="allTerms">
+ <caption><em><?php echo __('All %1%', array('%1%' =>
sfConfig::get('app_ui_label_term'))) ?></em></caption>
+ <thead>
+ <tr>
+ <th scope="col"><?php echo __('Action') ?></th>
+ <th scope="col"><?php echo __('Permission') ?></th>
+ </tr>
+ </thead><tbody>
+ <?php foreach ($termActions as $key => $item): ?>
+ <tr class="<?php echo (0 == $row++ % 2) ? 'even' : 'odd' ?>">
+ <td><?php echo __($item) ?></td>
+ <td>
+ <ul class="radio inline">
+ <?php if (isset($rootPermissions[$key])): ?>
+ <li><input type="radio" name="termAcl[<?php echo
$rootPermissions[$key]->id ?>]" value="<?php echo QubitAcl::GRANT ?>"<?php echo
(1 == $rootPermissions[$key]->grantDeny) ? ' checked="checked"' : '' ?>><?php
echo __('Grant') ?></li>
+ <li><input type="radio" name="termAcl[<?php echo
$rootPermissions[$key]->id ?>]" value="<?php echo QubitAcl::DENY ?>"<?php echo
(0 == $rootPermissions[$key]->grantDeny) ? ' checked="checked"' : '' ?>><?php
echo __('Deny') ?></li>
+ <li><input type="radio" name="termAcl[<?php echo
$rootPermissions[$key]->id ?>]" value="<?php echo QubitAcl::INHERIT?>"><?php
echo __('Inherit') ?></li>
+ <?php else: ?>
+ <?php $rootTermUrl =
url_for(array(QubitTerm::getById(QubitTerm::ROOT_ID), 'module' => 'term')) ?>
+ <li><input type="radio" name="termAcl[<?php echo
$key.'_'.$rootTermUrl ?>]" value="<?php echo QubitAcl::GRANT ?>"><?php echo
__('Grant') ?></li>
+ <li><input type="radio" name="termAcl[<?php echo
$key.'_'.$rootTermUrl ?>]" value="<?php echo QubitAcl::DENY ?>"><?php echo
__('Deny') ?></li>
+ <li><input type="radio" name="termAcl[<?php echo
$key.'_'.$rootTermUrl ?>]" value="<?php echo QubitAcl::INHERIT ?>"
checked="checked"><?php echo __('Inherit') ?></li>
+ <?php endif; ?>
+ </ul>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
</div>
- <?php endforeach; ?>
- <?php endif; ?>
+
+ </fieldset> <!-- /#allTermsArea -->
+
+ <fieldset class="collapsible collapsed" id="taxonomyArea">
+
+ <legend><?php echo __('Permissions by taxonomy') ?></legend>
+
+ <?php if (0 < count($taxonomyPermissions)): ?>
+
+ <?php foreach ($taxonomyPermissions as $key => $item): ?>
+
+ <div class="form-item">
+
+ <table id="taxonomyAcl_<?php echo $key ?>">
+ <caption><?php echo render_title(QubitTaxonomy::getById($key))
?></caption>
+ <thead>
+ <tr>
+ <th scope="col"><?php echo __('Action') ?></th>
+ <th scope="col"><?php echo __('Permission') ?></th>
+ </tr>
+ </thead><tbody>
+ <?php foreach ($termActions as $action => $label): ?>
+ <tr class="<?php echo (0 == $row++ % 2) ? 'even' : 'odd' ?>">
+ <td><?php echo __($label) ?></td>
+ <td id="<?php echo 'repo_'.$key.'_'.$action ?>">
+ <ul class="radio inline">
+ <?php if (isset($item[$action])): ?>
+ <li><input type="radio" name="taxonomyAcl[<?php echo
$item[$action]->id ?>]" value="<?php echo QubitAcl::GRANT ?>"<?php echo (1 ==
$item[$action]->grantDeny) ? ' checked="checked"' : '' ?>><?php echo
__('Grant') ?></li>
+ <li><input type="radio" name="taxonomyAcl[<?php echo
$item[$action]->id ?>]" value="<?php echo QubitAcl::DENY ?>"<?php echo (0 ==
$item[$action]->grantDeny) ? ' checked="checked"' : '' ?>><?php echo __('Deny')
?></li>
+ <li><input type="radio" name="taxonomyAcl[<?php echo
$item[$action]->id ?>]" value="<?php echo QubitAcl::INHERIT?>"><?php echo
__('Inherit') ?></li>
+ <?php else: ?>
+ <?php $rootTermUrl =
url_for(array(QubitTerm::getById(QubitTerm::ROOT_ID), 'module' => 'term')) ?>
+ <li><input type="radio" name="taxonomyAcl[<?php echo
$action.'_'.$rootTermUrl ?>]" value="<?php echo QubitAcl::GRANT ?>"><?php echo
__('Grant') ?></li>
+ <li><input type="radio" name="taxonomyAcl[<?php echo
$action.'_'.$rootTermUrl ?>]" value="<?php echo QubitAcl::DENY ?>"><?php echo
__('Deny') ?></li>
+ <li><input type="radio" name="taxonomyAcl[<?php echo
$action.'_'.$rootTermUrl ?>]" value="<?php echo QubitAcl::INHERIT ?>"
checked="checked"><?php echo __('Inherit') ?></li>
+ <?php endif; ?>
+ </ul>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+ </div>
+
+ <?php endforeach; ?>
+
+ <?php endif; ?>
<?php
// Build dialog for adding new table
@@ -100,14 +107,14 @@
$tableTemplate .= '<tbody>';
$row = 0;
-foreach ($termActions as $action => $label)
+foreach ($termActions as $key => $item)
{
$tableTemplate .= '<tr class="'.((0 == $row++ % 2) ? 'even' : 'odd').'">';
- $tableTemplate .= '<td>'.__($label).'</th>';
+ $tableTemplate .= '<td>'.__($item).'</th>';
$tableTemplate .= '<td><ul class="radio inline">';
- $tableTemplate .= '<li><input type="radio"
name="taxonomyAcl['.$action.'_{objectId}]"
value="'.QubitAcl::GRANT.'"/>'.__('Grant').'</li>';
- $tableTemplate .= '<li><input type="radio"
name="taxonomyAcl['.$action.'_{objectId}]"
value="'.QubitAcl::DENY.'"/>'.__('Deny').'</li>';
- $tableTemplate .= '<li><input type="radio"
name="taxonomyAcl['.$action.'_{objectId}]" value="'.QubitAcl::INHERIT.'"
checked/>'.__('Inherit').'</li>';
+ $tableTemplate .= '<li><input type="radio"
name="taxonomyAcl['.$key.'_{objectId}]"
value="'.QubitAcl::GRANT.'"/>'.__('Grant').'</li>';
+ $tableTemplate .= '<li><input type="radio"
name="taxonomyAcl['.$key.'_{objectId}]"
value="'.QubitAcl::DENY.'"/>'.__('Deny').'</li>';
+ $tableTemplate .= '<li><input type="radio"
name="taxonomyAcl['.$key.'_{objectId}]" value="'.QubitAcl::INHERIT.'"
checked/>'.__('Inherit').'</li>';
$tableTemplate .= '</ul></td>';
$tableTemplate .= "</tr>";
$tableTemplate .= "</div>";
@@ -140,7 +147,7 @@
<a id="addTaxonomyLink"
href="javascript:Qubit.taxonomyDialog.show()"><?php echo __('Add taxonomy')
?></a>
</div>
-</fieldset>
+ </fieldset> <!-- /#taxonomyArea -->
<div class="actions section">
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
