Skip to Content.
Sympa Menu

comanage-dev - [comanage-dev] r543 - in registry/trunk/app: Lib Plugin/LdapProvisioner/View/CoLdapProvisionerTargets View/CoPersonRoles View/CoProvisioningTargets View/Cos View/Cous View/EmailAddresses View/Identifiers View/OrgIdentities View/Organizations View/TelephoneNumbers

Subject: COmanage Developers List

List archive

[comanage-dev] r543 - in registry/trunk/app: Lib Plugin/LdapProvisioner/View/CoLdapProvisionerTargets View/CoPersonRoles View/CoProvisioningTargets View/Cos View/Cous View/EmailAddresses View/Identifiers View/OrgIdentities View/Organizations View/TelephoneNumbers


Chronological Thread 
  • From:
  • To:
  • Subject: [comanage-dev] r543 - in registry/trunk/app: Lib Plugin/LdapProvisioner/View/CoLdapProvisionerTargets View/CoPersonRoles View/CoProvisioningTargets View/Cos View/Cous View/EmailAddresses View/Identifiers View/OrgIdentities View/Organizations View/TelephoneNumbers
  • Date: Wed, 19 Jun 2013 04:29:27 -0400
  • Authentication-results: sfpop-ironport01.merit.edu; dkim=neutral (message not signed) header.i=none
Author: marie
Date: 2013-06-19 04:29:27 -0400 (Wed, 19 Jun 2013)
New Revision: 543

Modified:
registry/trunk/app/Lib/lang.php

registry/trunk/app/Plugin/LdapProvisioner/View/CoLdapProvisionerTargets/fields.inc
registry/trunk/app/View/CoPersonRoles/fields.inc
registry/trunk/app/View/CoProvisioningTargets/fields.inc
registry/trunk/app/View/Cos/fields.inc
registry/trunk/app/View/Cous/fields.inc
registry/trunk/app/View/EmailAddresses/fields.inc
registry/trunk/app/View/Identifiers/fields.inc
registry/trunk/app/View/OrgIdentities/fields.inc
registry/trunk/app/View/Organizations/fields.inc
registry/trunk/app/View/TelephoneNumbers/fields.inc
Log:
co70 - removing back/cancel buttons for form reset button

Modified: registry/trunk/app/Lib/lang.php
===================================================================
--- registry/trunk/app/Lib/lang.php 2013-06-19 07:46:16 UTC (rev 542)
+++ registry/trunk/app/Lib/lang.php 2013-06-19 08:29:27 UTC (rev 543)
@@ -597,6 +597,7 @@
'op.prov.view' => 'Provisioned Services',
'op.prov.wait' => 'Requesting provisioning, please wait...',
'op.remove' => 'Remove',
+ 'op.reset' => 'Reset Form',
'op.save' => 'Save',
'op.select' => 'Select',
'op.select-a' => 'Select a %1$s',

Modified:
registry/trunk/app/Plugin/LdapProvisioner/View/CoLdapProvisionerTargets/fields.inc
===================================================================
---
registry/trunk/app/Plugin/LdapProvisioner/View/CoLdapProvisionerTargets/fields.inc
2013-06-19 07:46:16 UTC (rev 542)
+++
registry/trunk/app/Plugin/LdapProvisioner/View/CoLdapProvisionerTargets/fields.inc
2013-06-19 08:29:27 UTC (rev 543)
@@ -77,21 +77,6 @@
$ptid =
$co_ldap_provisioner_targets[0]['CoLdapProvisionerTarget']['co_provisioning_target_id'];
}

- if($e) {
- print $this->Html->link(_txt('op.cancel'),
- array('plugin' => null, 'controller' =>
'co_provisioning_targets', 'action' => 'edit', $ptid, 'co' =>
$cur_co['Co']['id']),
- array('class' => 'cancelbutton'));
- } else {
- print $this->Html->link(_txt('op.back'),
- array('plugin' => null, 'controller' =>
'co_provisioning_targets', 'action' => 'edit', $ptid, 'co' =>
$cur_co['Co']['id']),
- array('class' => 'backbutton'));
- }
-
- print '
- <br />
- <br />
- ';
-
print $this->Form->hidden('co_id', array('default' =>
$cur_co['Co']['id'])) . "\n";
print $this->Form->hidden('co_provisioning_target_id', array('default' =>
$ptid)) . "\n";

@@ -425,8 +410,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/CoPersonRoles/fields.inc
===================================================================
--- registry/trunk/app/View/CoPersonRoles/fields.inc 2013-06-19 07:46:16
UTC (rev 542)
+++ registry/trunk/app/View/CoPersonRoles/fields.inc 2013-06-19 08:29:27
UTC (rev 543)
@@ -267,15 +267,10 @@
</td>
<td>
<?php
- if($e)
- {
- print '<div style="float:left; margin:0 10px 0 0;">';
- print $this->Form->submit($submit_label);
- print '</div>';
-
- print $this->Html->link(_txt('op.cancel'),
- array('controller' => 'co_people',
'action' => 'edit', $co_people[0]['CoPerson']['id'], 'co' =>
$cur_co['Co']['id']),
- array('class' => 'cancelbutton'));
+ if($e) {
+ echo $this->Form->submit($submit_label);
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
}
?>
</td>

Modified: registry/trunk/app/View/CoProvisioningTargets/fields.inc
===================================================================
--- registry/trunk/app/View/CoProvisioningTargets/fields.inc 2013-06-19
07:46:16 UTC (rev 542)
+++ registry/trunk/app/View/CoProvisioningTargets/fields.inc 2013-06-19
08:29:27 UTC (rev 543)
@@ -33,22 +33,7 @@

if(!$e && !$permissions['view'])
return false;
-
- if($e) {
- print $this->Html->link(_txt('op.cancel'),
- array('controller' => 'co_provisioning_targets',
'action' => 'index', 'co' => $cur_co['Co']['id']),
- array('class' => 'cancelbutton'));
- } else {
- print $this->Html->link(_txt('op.back'),
- array('controller' => 'co_provisioning_targets',
'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";
?>
<?php if(empty($plugins)): ?>
@@ -142,8 +127,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/Cos/fields.inc
===================================================================
--- registry/trunk/app/View/Cos/fields.inc 2013-06-19 07:46:16 UTC (rev
542)
+++ registry/trunk/app/View/Cos/fields.inc 2013-06-19 08:29:27 UTC (rev
543)
@@ -34,15 +34,6 @@
if(!$e && !$permissions['view'])
return(false);

- if($e)
- echo $this->Html->link(_txt('op.cancel'),
- array('controller' => 'cos', 'action' => 'index'),
- array('class' => 'cancelbutton'));
-
- echo '
- <br />
- <br />
- ';
?>
<table id="<?php echo $this->action; ?>_co" class="ui-widget">
<tbody>
@@ -92,8 +83,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/Cous/fields.inc
===================================================================
--- registry/trunk/app/View/Cous/fields.inc 2013-06-19 07:46:16 UTC (rev
542)
+++ registry/trunk/app/View/Cous/fields.inc 2013-06-19 08:29:27 UTC (rev
543)
@@ -35,18 +35,6 @@
if(!$e && !$permissions['view'])
return(false);

- if($e)
- print $this->Html->link(
- _txt('op.cancel'),
- array('controller' => 'cous', 'action' => 'index', 'co' =>
$cur_co['Co']['id']),
- array('class' => 'cancelbutton')
- );
-
- echo '
- <br />
- <br />
- ';
-
if(isset($cur_co))
print $this->Form->hidden('co_id', array('default' =>
$cur_co['Co']['id'])) . "\n";
?>
@@ -99,8 +87,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/EmailAddresses/fields.inc
===================================================================
--- registry/trunk/app/View/EmailAddresses/fields.inc 2013-06-19 07:46:16
UTC (rev 542)
+++ registry/trunk/app/View/EmailAddresses/fields.inc 2013-06-19 08:29:27
UTC (rev 543)
@@ -33,16 +33,6 @@

if(!$e && !$permissions['view'])
return(false);
-
- if($e)
- echo $this->Html->link(_txt('op.cancel'),
- isset($redirect) ? $redirect : array('controller'
=> 'email_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']['copersonid']))
@@ -112,8 +102,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/Identifiers/fields.inc
===================================================================
--- registry/trunk/app/View/Identifiers/fields.inc 2013-06-19 07:46:16
UTC (rev 542)
+++ registry/trunk/app/View/Identifiers/fields.inc 2013-06-19 08:29:27
UTC (rev 543)
@@ -33,20 +33,6 @@

if(!$e && !$permissions['view'])
return(false);
-
- if($e)
- echo $this->Html->link(_txt('op.cancel'),
- isset($redirect) ? $redirect : array('controller' =>
'identifiers', 'action' => 'index'),
- array('class' => 'cancelbutton'));
- else
- echo $this->Html->link(_txt('op.back'),
- isset($redirect) ? $redirect : array('controller'
=> 'identifiers', 'action' => 'index'),
- array('class' => 'backbutton'));
-
- echo '
- <br />
- <br />
- ';

// Migrate the target person from a named argument to a form field
if(isset($this->request->params['named']['copersonid']))
@@ -136,8 +122,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/OrgIdentities/fields.inc
===================================================================
--- registry/trunk/app/View/OrgIdentities/fields.inc 2013-06-19 07:46:16
UTC (rev 542)
+++ registry/trunk/app/View/OrgIdentities/fields.inc 2013-06-19 08:29:27
UTC (rev 543)
@@ -256,14 +256,8 @@
print '<div style="float:left; margin:0 10px 0 0;">';
print $this->Form->submit($submit_label);
print '</div>';
- print $this->Html->link(_txt('op.cancel'),
- isset($redirect) ? $redirect
- :
array('controller' => 'org_identities',
- 'action'
=> 'index',
- 'co' =>
($pool_org_identities ? false : $cur_co['Co']['id'])
- ),
- array('class' => 'cancelbutton')
- );
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
}
?>
</td>

Modified: registry/trunk/app/View/Organizations/fields.inc
===================================================================
--- registry/trunk/app/View/Organizations/fields.inc 2013-06-19 07:46:16
UTC (rev 542)
+++ registry/trunk/app/View/Organizations/fields.inc 2013-06-19 08:29:27
UTC (rev 543)
@@ -73,12 +73,9 @@
<td>
<?php
if($e) {
- print $this->Form->submit($submit_label);
- print $this->Html->link(
- _txt('op.cancel'),
- array('controller' => 'organizations', 'action' => 'index'),
- array('class' => 'cancelbutton')
- );
+ echo $this->Form->submit($submit_label);
+ print $this->Form->button(_txt('op.reset'),
+ array('type'=>'reset'));
}
?>
</td>

Modified: registry/trunk/app/View/TelephoneNumbers/fields.inc
===================================================================
--- registry/trunk/app/View/TelephoneNumbers/fields.inc 2013-06-19 07:46:16
UTC (rev 542)
+++ registry/trunk/app/View/TelephoneNumbers/fields.inc 2013-06-19 08:29:27
UTC (rev 543)
@@ -33,17 +33,6 @@

if(!$e && !$permissions['view'])
return(false);
-
- if($e)
- echo $this->Html->link(_txt('op.cancel'),
- isset($redirect) ? $redirect : array('controller'
=> 'telephone_numbers', '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']))
@@ -98,8 +87,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>


  • [comanage-dev] r543 - in registry/trunk/app: Lib Plugin/LdapProvisioner/View/CoLdapProvisionerTargets View/CoPersonRoles View/CoProvisioningTargets View/Cos View/Cous View/EmailAddresses View/Identifiers View/OrgIdentities View/Organizations View/TelephoneNumbers, svnlog, 06/19/2013

Archive powered by MHonArc 2.6.16.

Top of Page