comanage-dev - [comanage-dev] r542 - in registry/trunk/app/View: Addresses CmpEnrollmentConfigurations CoEnrollmentAttributes CoEnrollmentFlows CoExtendedAttributes CoExtendedTypes CoGroupMembers CoGroups CoIdentifierAssignments CoNsfDemographics CoPeople
Subject: COmanage Developers List
List archive
[comanage-dev] r542 - in registry/trunk/app/View: Addresses CmpEnrollmentConfigurations CoEnrollmentAttributes CoEnrollmentFlows CoExtendedAttributes CoExtendedTypes CoGroupMembers CoGroups CoIdentifierAssignments CoNsfDemographics CoPeople
Chronological Thread
- From:
- To:
- Subject: [comanage-dev] r542 - in registry/trunk/app/View: Addresses CmpEnrollmentConfigurations CoEnrollmentAttributes CoEnrollmentFlows CoExtendedAttributes CoExtendedTypes CoGroupMembers CoGroups CoIdentifierAssignments CoNsfDemographics CoPeople
- Date: Wed, 19 Jun 2013 03:46:17 -0400
- Authentication-results: sfpop-ironport02.merit.edu; dkim=neutral (message not signed) header.i=none
Author: marie
Date: 2013-06-19 03:46:16 -0400 (Wed, 19 Jun 2013)
New Revision: 542
Modified:
registry/trunk/app/View/Addresses/fields.inc
registry/trunk/app/View/CmpEnrollmentConfigurations/fields.inc
registry/trunk/app/View/CoEnrollmentAttributes/fields.inc
registry/trunk/app/View/CoEnrollmentFlows/fields.inc
registry/trunk/app/View/CoExtendedAttributes/fields.inc
registry/trunk/app/View/CoExtendedTypes/fields.inc
registry/trunk/app/View/CoGroupMembers/fields.inc
registry/trunk/app/View/CoGroups/fields.inc
registry/trunk/app/View/CoGroups/index.ctp
registry/trunk/app/View/CoIdentifierAssignments/fields.inc
registry/trunk/app/View/CoNsfDemographics/fields.inc
registry/trunk/app/View/CoPeople/fields.inc
Log:
co70 - removing back/cancel buttons for form reset button
Modified: registry/trunk/app/View/Addresses/fields.inc
===================================================================
--- registry/trunk/app/View/Addresses/fields.inc 2013-06-17 00:26:41
UTC (rev 541)
+++ registry/trunk/app/View/Addresses/fields.inc 2013-06-19 07:46:16
UTC (rev 542)
@@ -32,16 +32,6 @@
if(!$e && !$permissions['view'])
return(false);
-
- if($e)
- echo $this->Html->link(_txt('op.cancel'),
- isset($redirect) ? $redirect : array('controller'
=> 'addresses', 'action' => 'index'),
- array('class' => 'cancelbutton'));
-
- echo '
- <br />
- <br />
- ';
// Migrate the target person from a named argument to a form field
if(isset($this->request->params['named']['copersonroleid']))
@@ -136,8 +126,11 @@
</td>
<td>
<?php
- if($e)
+ if($e) {
echo $this->Form->submit($submit_label);
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
+ }
?>
</td>
</tr>
Modified: registry/trunk/app/View/CmpEnrollmentConfigurations/fields.inc
===================================================================
--- registry/trunk/app/View/CmpEnrollmentConfigurations/fields.inc
2013-06-17 00:26:41 UTC (rev 541)
+++ registry/trunk/app/View/CmpEnrollmentConfigurations/fields.inc
2013-06-19 07:46:16 UTC (rev 542)
@@ -246,6 +246,9 @@
</div>
</div>
<?php
- if($e)
+ if($e) {
print $this->Form->submit($submit_label, array('onClick' =>
'on_submit()'));
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
+ }
?>
\ No newline at end of file
Modified: registry/trunk/app/View/CoEnrollmentAttributes/fields.inc
===================================================================
--- registry/trunk/app/View/CoEnrollmentAttributes/fields.inc 2013-06-17
00:26:41 UTC (rev 541)
+++ registry/trunk/app/View/CoEnrollmentAttributes/fields.inc 2013-06-19
07:46:16 UTC (rev 542)
@@ -37,19 +37,6 @@
// Add buttons to sidebar
$sidebarButtons = $this->get('sidebarButtons');
- if($e) {
- // Cancel Button
- $sidebarButtons[] = array(
- 'icon' => 'circle-close',
- 'title' => _txt('op.cancel'),
- 'url' => array(
- 'controller' => 'co_enrollment_attributes',
- 'action' => 'index',
- 'coef' => Sanitize::html($this->request->params['named']['coef'])
- )
- );
- }
-
$this->set('sidebarButtons', $sidebarButtons);
print $this->Form->hidden('co_enrollment_flow_id', array('default' =>
Sanitize::html($this->request->params['named']['coef']))) . "\n";
@@ -143,6 +130,9 @@
</tbody>
</table>
<?php
- if($e)
+ if($e) {
print $this->Form->submit($submit_label, array('onClick' =>
'on_submit()'));
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
+ }
?>
Modified: registry/trunk/app/View/CoEnrollmentFlows/fields.inc
===================================================================
--- registry/trunk/app/View/CoEnrollmentFlows/fields.inc 2013-06-17
00:26:41 UTC (rev 541)
+++ registry/trunk/app/View/CoEnrollmentFlows/fields.inc 2013-06-19
07:46:16 UTC (rev 542)
@@ -39,16 +39,6 @@
if($e)
{
- // Cancel Button
- $sidebarButtons[] = array(
- 'icon' => 'circle-close',
- 'title' => _txt('op.cancel'),
- 'url' => array(
- 'controller' => 'co_enrollment_flows',
- 'action' => 'index',
- 'co' => $cur_co['Co']['id']
- )
- );
// Edit button
if($this->action == "edit" && $permissions['edit']){
@@ -338,6 +328,9 @@
</tbody>
</table>
<?php
- if($e)
+ if($e) {
print $this->Form->submit($submit_label, array('onClick' =>
'on_submit()'));
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
+ }
?>
Modified: registry/trunk/app/View/CoExtendedAttributes/fields.inc
===================================================================
--- registry/trunk/app/View/CoExtendedAttributes/fields.inc 2013-06-17
00:26:41 UTC (rev 541)
+++ registry/trunk/app/View/CoExtendedAttributes/fields.inc 2013-06-19
07:46:16 UTC (rev 542)
@@ -33,24 +33,7 @@
if(!$e && !$permissions['view'])
return(false);
-
- // Add buttons to sidebar
- $sidebarButtons = $this->get('sidebarButtons');
-
- if($e) {
- $sidebarButtons[] = array(
- 'icon' => 'circle-close',
- 'title' => _txt('op.cancel'),
- 'url' => array(
- 'controller' => 'co_extended_attributes',
- 'action' => 'index',
- 'co' => $cur_co['Co']['id']
- )
- );
- }
- $this->set('sidebarButtons', $sidebarButtons);
-
echo $this->Form->hidden('co_id', array('default' => $cur_co['Co']['id']))
. "\n";
?>
<table id="<?php echo $this->action; ?>_co_extended_attribute"
class="ui-widget">
@@ -118,8 +101,11 @@
</td>
<td>
<?php
- if($e)
+ if($e) {
echo $this->Form->submit($submit_label);
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
+ }
?>
</td>
</tr>
Modified: registry/trunk/app/View/CoExtendedTypes/fields.inc
===================================================================
--- registry/trunk/app/View/CoExtendedTypes/fields.inc 2013-06-17 00:26:41
UTC (rev 541)
+++ registry/trunk/app/View/CoExtendedTypes/fields.inc 2013-06-19 07:46:16
UTC (rev 542)
@@ -40,20 +40,7 @@
} else {
$attr = $this->request->data['CoExtendedType']['attribute'];
}
-
- if($e)
- print $this->Html->link(_txt('op.cancel'),
- array('controller' => 'co_extended_types',
- 'action' => 'index',
- 'co' => $cur_co['Co']['id'],
- 'attr' => Sanitize::html($attr)),
- array('class' => 'cancelbutton'));
- print '
- <br />
- <br />
- ';
-
print $this->Form->hidden('co_id', array('default' =>
$cur_co['Co']['id'])) . "\n";
print $this->Form->hidden('attribute', array('default' =>
Sanitize::html($attr))) . "\n";
?>
@@ -117,8 +104,11 @@
</td>
<td>
<?php
- if($e)
- print $this->Form->submit($submit_label);
+ if($e) {
+ echo $this->Form->submit($submit_label);
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
+ }
?>
</td>
</tr>
Modified: registry/trunk/app/View/CoGroupMembers/fields.inc
===================================================================
--- registry/trunk/app/View/CoGroupMembers/fields.inc 2013-06-17 00:26:41
UTC (rev 541)
+++ registry/trunk/app/View/CoGroupMembers/fields.inc 2013-06-19 07:46:16
UTC (rev 542)
@@ -33,14 +33,6 @@
return(false);
if($e)
- echo $this->Html->link(_txt('op.cancel'),
- array('controller' => 'co_groups',
- 'action' => 'edit',
-
$this->request->data['CoGroupMember']['co_group_id'],
- 'co' => $cur_co['Co']['id']),
- array('class' => 'cancelbutton'));
-
- if($e)
{
// Populate the references
echo $this->Form->hidden('co_id', array('default' =>
$cur_co['Co']['id'])). "\n";
@@ -48,11 +40,6 @@
echo $this->Form->hidden('co_group_id', array('default' =>
$this->request->data['CoGroupMember']['co_group_id'])). "\n";
echo $this->Form->hidden('co_person_id', array('default' =>
$this->request->data['CoGroupMember']['co_person_id'])). "\n";
}
-
- echo '
- <br />
- <br />
- ';
?>
<table id="<?php echo $this->action; ?>_co_group_member" class="ui-widget">
<tbody>
Modified: registry/trunk/app/View/CoGroups/fields.inc
===================================================================
--- registry/trunk/app/View/CoGroups/fields.inc 2013-06-17 00:26:41 UTC (rev
541)
+++ registry/trunk/app/View/CoGroups/fields.inc 2013-06-19 07:46:16 UTC (rev
542)
@@ -54,18 +54,9 @@
if(!$e && !$v)
return(false);
- if($e)
- echo $this->Html->link(_txt('op.cancel'),
- array('controller' => 'co_groups', 'action' =>
'index', 'co' => $cur_co['Co']['id']),
- array('class' => 'cancelbutton'));
-
// Populate the reference
echo $this->Form->hidden('co_id', array('default' =>
$cur_co['Co']['id'])). "\n";
- echo '
- <br />
- <br />
- ';
?>
<table id="<?php echo $this->action; ?>_co_group" class="ui-widget">
<tbody>
@@ -123,8 +114,11 @@
</td>
<td>
<?php
- if($e)
+ if($e) {
echo $this->Form->submit($submit_label);
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
+ }
?>
</td>
</tr>
Modified: registry/trunk/app/View/CoGroups/index.ctp
===================================================================
--- registry/trunk/app/View/CoGroups/index.ctp 2013-06-17 00:26:41 UTC (rev
541)
+++ registry/trunk/app/View/CoGroups/index.ctp 2013-06-19 07:46:16 UTC (rev
542)
@@ -192,6 +192,9 @@
<?php
if($this->action == 'select') {
print $this->Form->submit(_txt('op.save'));
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
+
}
print $this->Form->end();
Modified: registry/trunk/app/View/CoIdentifierAssignments/fields.inc
===================================================================
--- registry/trunk/app/View/CoIdentifierAssignments/fields.inc 2013-06-17
00:26:41 UTC (rev 541)
+++ registry/trunk/app/View/CoIdentifierAssignments/fields.inc 2013-06-19
07:46:16 UTC (rev 542)
@@ -33,22 +33,7 @@
if(!$e && !$permissions['view'])
return(false);
-
- if($e) {
- print $this->Html->link(_txt('op.cancel'),
- array('controller' =>
'co_identifier_assignments', 'action' => 'index', 'co' =>
$cur_co['Co']['id']),
- array('class' => 'cancelbutton'));
- } else {
- print $this->Html->link(_txt('op.back'),
- array('controller' =>
'co_identifier_assignments', 'action' => 'index', 'co' =>
$cur_co['Co']['id']),
- array('class' => 'backbutton'));
- }
- print '
- <br />
- <br />
- ';
-
print $this->Form->hidden('co_id', array('default' =>
$cur_co['Co']['id'])) . "\n";
?>
<script type="text/javascript">
@@ -234,6 +219,9 @@
</tbody>
</table>
<?php
- if($e)
+ if($e) {
print $this->Form->submit($submit_label, array('onClick' =>
'on_submit()'));
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
+ }
?>
Modified: registry/trunk/app/View/CoNsfDemographics/fields.inc
===================================================================
--- registry/trunk/app/View/CoNsfDemographics/fields.inc 2013-06-17
00:26:41 UTC (rev 541)
+++ registry/trunk/app/View/CoNsfDemographics/fields.inc 2013-06-19
07:46:16 UTC (rev 542)
@@ -34,17 +34,6 @@
if(!$e && !$permissions['view'])
return false;
- if($e)
- {
- $linkArgs = array(
- 'controller' => 'co_nsf_demographics',
- 'action' => 'index');
- $classArgs = array('class' => 'cancelbutton');
- print $this->Html->link(_txt('op.cancel'),
- $linkArgs,
- $classArgs);
- }
-
// Set hidden defaults for CO and CoPerson id so users don't need to see it
$args = array('default' => $cur_co['Co']['id']);
print $this->Form->hidden('co_id', $args). "\n";
@@ -56,11 +45,6 @@
print $this->Form->hidden('co_person_id', $args). "\n";
- print "
- <br />
- <br />
- ";
-
//globals
global $cm_lang, $cm_texts;
@@ -194,6 +178,9 @@
</table>
<?php
- if($e)
- print $this->Form->submit($submit_label);
+ if($e) {
+ echo $this->Form->submit($submit_label);
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
+ }
?>
Modified: registry/trunk/app/View/CoPeople/fields.inc
===================================================================
--- registry/trunk/app/View/CoPeople/fields.inc 2013-06-17 00:26:41 UTC (rev
541)
+++ registry/trunk/app/View/CoPeople/fields.inc 2013-06-19 07:46:16 UTC (rev
542)
@@ -48,14 +48,6 @@
if($e)
{
// Add related links to the sidebar
- $sidebarButtons[] = array(
- 'icon' => 'circle-close',
- 'title' => _txt('op.back'),
- 'url' => array(
- 'controller' => 'co_people',
- 'action' => 'index',
- 'co' => $cur_co['Co']['id'])
- );
if($this->action != "invite")
{
@@ -340,8 +332,11 @@
</th>
<td>
<?php
- if($e)
- print $this->Form->submit($submit_label);
+ if($e) {
+ echo $this->Form->submit($submit_label);
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
+ }
?>
</td>
</tr>
- [comanage-dev] r542 - in registry/trunk/app/View: Addresses CmpEnrollmentConfigurations CoEnrollmentAttributes CoEnrollmentFlows CoExtendedAttributes CoExtendedTypes CoGroupMembers CoGroups CoIdentifierAssignments CoNsfDemographics CoPeople, svnlog, 06/19/2013
Archive powered by MHonArc 2.6.16.