Skip to Content.
Sympa Menu

comanage-dev - [comanage-dev] r302 - in registry/trunk/app/View: Addresses CoEnrollmentAttributes CoEnrollmentFlows CoExtendedAttributes CoGroupMembers CoGroups CoNsfDemographics CoPeople CoPersonRoles CoPetitions Cos Cous EmailAddresses Identifiers OrgIdentities Organizations TelephoneNumbers

Subject: COmanage Developers List

List archive

[comanage-dev] r302 - in registry/trunk/app/View: Addresses CoEnrollmentAttributes CoEnrollmentFlows CoExtendedAttributes CoGroupMembers CoGroups CoNsfDemographics CoPeople CoPersonRoles CoPetitions Cos Cous EmailAddresses Identifiers OrgIdentities Organizations TelephoneNumbers


Chronological Thread 
  • From:
  • To:
  • Subject: [comanage-dev] r302 - in registry/trunk/app/View: Addresses CoEnrollmentAttributes CoEnrollmentFlows CoExtendedAttributes CoGroupMembers CoGroups CoNsfDemographics CoPeople CoPersonRoles CoPetitions Cos Cous EmailAddresses Identifiers OrgIdentities Organizations TelephoneNumbers
  • Date: Thu, 5 Jul 2012 03:56:45 -0400
Author: marie
Date: 2012-07-05 03:56:45 -0400 (Thu, 05 Jul 2012)
New Revision: 302

Modified:
registry/trunk/app/View/Addresses/fields.inc
registry/trunk/app/View/CoEnrollmentAttributes/fields.inc
registry/trunk/app/View/CoEnrollmentAttributes/index.ctp
registry/trunk/app/View/CoEnrollmentFlows/fields.inc
registry/trunk/app/View/CoExtendedAttributes/fields.inc
registry/trunk/app/View/CoGroupMembers/fields.inc
registry/trunk/app/View/CoGroups/fields.inc
registry/trunk/app/View/CoNsfDemographics/fields.inc
registry/trunk/app/View/CoPeople/fields.inc
registry/trunk/app/View/CoPersonRoles/fields.inc
registry/trunk/app/View/CoPetitions/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 change back buttons to cancel or remove for duplicates

Modified: registry/trunk/app/View/Addresses/fields.inc
===================================================================
--- registry/trunk/app/View/Addresses/fields.inc 2012-06-19 21:08:15
UTC (rev 301)
+++ registry/trunk/app/View/Addresses/fields.inc 2012-07-05 07:56:45
UTC (rev 302)
@@ -37,10 +37,6 @@
echo $this->Html->link(_txt('op.cancel'),
isset($redirect) ? $redirect : array('controller'
=> 'addresses', 'action' => 'index'),
array('class' => 'cancelbutton'));
- else
- echo $this->Html->link(_txt('op.back'),
- isset($redirect) ? $redirect : array('controller'
=> 'addresses', 'action' => 'index'),
- array('class' => 'backbutton'));

echo '
<br />
@@ -146,4 +142,4 @@
</td>
</tr>
</tbody>
-</table>
\ No newline at end of file
+</table>

Modified: registry/trunk/app/View/CoEnrollmentAttributes/fields.inc
===================================================================
--- registry/trunk/app/View/CoEnrollmentAttributes/fields.inc 2012-06-19
21:08:15 UTC (rev 301)
+++ registry/trunk/app/View/CoEnrollmentAttributes/fields.inc 2012-07-05
07:56:45 UTC (rev 302)
@@ -40,13 +40,7 @@
'action' => 'index',
'coef' =>
Sanitize::html($this->request->params['named']['coef'])),
array('class' => 'cancelbutton'));
- else
- print $this->Html->link(_txt('op.back'),
- array('controller' => 'co_enrollment_attributes',
- 'action' => 'index',
- 'coef' =>
Sanitize::html($this->request->params['named']['coef'])),
- array('class' => 'backbutton'));
-
+
print '
<br />
<br />

Modified: registry/trunk/app/View/CoEnrollmentAttributes/index.ctp
===================================================================
--- registry/trunk/app/View/CoEnrollmentAttributes/index.ctp 2012-06-19
21:08:15 UTC (rev 301)
+++ registry/trunk/app/View/CoEnrollmentAttributes/index.ctp 2012-07-05
07:56:45 UTC (rev 302)
@@ -26,13 +26,6 @@
$params = array('title' => $title_for_layout);
print $this->element("pageTitle", $params);

- print $this->Html->link(_txt('op.back'),
- array('controller' => 'co_enrollment_flows',
- 'action' => ($permissions['edit'] ? 'edit' :
'view'),
-
Sanitize::html($this->request->params['named']['coef']),
- 'co' => $coid),
- array('class' => 'backbutton'));
-
if($permissions['add'])
print $this->Html->link(_txt('op.add') . ' ' .
_txt('ct.co_enrollment_attributes.1'),
array('controller' =>
'co_enrollment_attributes', 'action' => 'add', 'coef' =>
Sanitize::html($this->request->params['named']['coef'])),

Modified: registry/trunk/app/View/CoEnrollmentFlows/fields.inc
===================================================================
--- registry/trunk/app/View/CoEnrollmentFlows/fields.inc 2012-06-19
21:08:15 UTC (rev 301)
+++ registry/trunk/app/View/CoEnrollmentFlows/fields.inc 2012-07-05
07:56:45 UTC (rev 302)
@@ -47,11 +47,7 @@
'coef' =>
$co_enrollment_flows[0]['CoEnrollmentFlow']['id']),
array('class' => 'linkbutton'));
}
- else
- echo $this->Html->link(_txt('op.back'),
- array('controller' => 'co_enrollment_flows',
'action' => 'index'),
- array('class' => 'backbutton'));
-
+
echo '
<br />
<br />

Modified: registry/trunk/app/View/CoExtendedAttributes/fields.inc
===================================================================
--- registry/trunk/app/View/CoExtendedAttributes/fields.inc 2012-06-19
21:08:15 UTC (rev 301)
+++ registry/trunk/app/View/CoExtendedAttributes/fields.inc 2012-07-05
07:56:45 UTC (rev 302)
@@ -38,17 +38,13 @@
echo $this->Html->link(_txt('op.cancel'),
array('controller' => 'co_extended_attributes',
'action' => 'index', 'co' => $cur_co['Co']['Id']),
array('class' => 'cancelbutton'));
- else
- echo $this->Html->link(_txt('op.back'),
- array('controller' => 'co_extended_attributes',
'action' => 'index', 'co' => $cur_co['Co']['Id']),
- array('class' => 'backbutton'));
-
+
echo '
<br />
<br />
';

- echo $this->Form->hidden('co_id', array('default' => $cur_co['Co']['id']))
. "\n";
+ echo $this->Form->hidden('co_id', array('default' => $cur_co['Co']['Id']))
. "\n";
?>
<table id="<?php echo $this->action; ?>_co" class="ui-widget">
<tbody>
@@ -121,4 +117,4 @@
</td>
</tr>
</tbody>
-</table>
\ No newline at end of file
+</table>

Modified: registry/trunk/app/View/CoGroupMembers/fields.inc
===================================================================
--- registry/trunk/app/View/CoGroupMembers/fields.inc 2012-06-19 21:08:15
UTC (rev 301)
+++ registry/trunk/app/View/CoGroupMembers/fields.inc 2012-07-05 07:56:45
UTC (rev 302)
@@ -39,14 +39,7 @@

$this->request->data['CoGroupMember']['co_group_id'],
'co' => $cur_co['Co']['id']),
array('class' => 'cancelbutton'));
- else
- echo $this->Html->link(_txt('op.back'),
- array('controller' => 'co_groups',
- 'action' => 'view',
-
$this->request->data['CoGroupMember']['co_group_id'],
- 'co' => $cur_co['Co']['id']),
- array('class' => 'backbutton'));
-
+
if($e)
{
// Populate the references
@@ -91,4 +84,4 @@
</td>
</tr>
</tbody>
-</table>
\ No newline at end of file
+</table>

Modified: registry/trunk/app/View/CoGroups/fields.inc
===================================================================
--- registry/trunk/app/View/CoGroups/fields.inc 2012-06-19 21:08:15 UTC (rev
301)
+++ registry/trunk/app/View/CoGroups/fields.inc 2012-07-05 07:56:45 UTC (rev
302)
@@ -58,10 +58,6 @@
echo $this->Html->link(_txt('op.cancel'),
array('controller' => 'co_groups', 'action' =>
'index', 'co' => $cur_co['Co']['id']),
array('class' => 'cancelbutton'));
- else
- echo $this->Html->link(_txt('op.back'),
- array('controller' => 'co_groups', 'action' =>
'index', 'co' => $cur_co['Co']['id']),
- array('class' => 'backbutton'));

// Populate the reference
echo $this->Form->hidden('co_id', array('default' =>
$cur_co['Co']['id'])). "\n";
@@ -176,4 +172,4 @@
</td>
</tr>
</tbody>
-</table>
\ No newline at end of file
+</table>

Modified: registry/trunk/app/View/CoNsfDemographics/fields.inc
===================================================================
--- registry/trunk/app/View/CoNsfDemographics/fields.inc 2012-06-19
21:08:15 UTC (rev 301)
+++ registry/trunk/app/View/CoNsfDemographics/fields.inc 2012-07-05
07:56:45 UTC (rev 302)
@@ -44,16 +44,6 @@
$linkArgs,
$classArgs);
}
- else
- {
- $linkArgs = array(
- 'controller' => 'co_nsf_demographics',
- 'action' => 'index');
- $classArgs = array('class' => 'backbutton');
- print $this->Html->link(_txt('op.back'),
- $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']);

Modified: registry/trunk/app/View/CoPeople/fields.inc
===================================================================
--- registry/trunk/app/View/CoPeople/fields.inc 2012-06-19 21:08:15 UTC (rev
301)
+++ registry/trunk/app/View/CoPeople/fields.inc 2012-07-05 07:56:45 UTC (rev
302)
@@ -45,7 +45,7 @@

if($e)
{
- echo $this->Html->link(_txt('op.back'),
+ echo $this->Html->link(_txt('op.cancel'),
array('controller' => 'co_people', 'action' =>
'index', 'co' => $cur_co['Co']['id']),
array('class' => 'cancelbutton'));

@@ -80,15 +80,6 @@
<br />
';
}
- else
- {
- echo $this->Html->link(_txt('op.back'),
- array('controller' => 'co_people', 'action' =>
'index', 'co' => $cur_co['Co']['id']),
- array('class' => 'backbutton')) . '
- <br />
- <br />
- ';
- }

// Line number, for rendering
$l = 1;

Modified: registry/trunk/app/View/CoPersonRoles/fields.inc
===================================================================
--- registry/trunk/app/View/CoPersonRoles/fields.inc 2012-06-19 21:08:15
UTC (rev 301)
+++ registry/trunk/app/View/CoPersonRoles/fields.inc 2012-07-05 07:56:45
UTC (rev 302)
@@ -45,7 +45,7 @@

if($e)
{
- echo $this->Html->link(_txt('op.back'),
+ echo $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'));

@@ -64,15 +64,6 @@
<br />
';
}
- else
- {
- echo $this->Html->link(_txt('op.back'),
- array('controller' => 'co_person_roles', 'action'
=> 'view', $co_people[0]['CoPerson']['id'], 'co' => $cur_co['Co']['id']),
- array('class' => 'backbutton')) . '
- <br />
- <br />
- ';
- }

// Line number, for rendering
$l = 1;

Modified: registry/trunk/app/View/CoPetitions/fields.inc
===================================================================
--- registry/trunk/app/View/CoPetitions/fields.inc 2012-06-19 21:08:15
UTC (rev 301)
+++ registry/trunk/app/View/CoPetitions/fields.inc 2012-07-05 07:56:45
UTC (rev 302)
@@ -58,13 +58,7 @@
array('controller' => 'co_people', 'action' => 'index', 'co' =>
$cur_co['Co']['id']),
array('class' => 'cancelbutton')
);
- else
- print $this->Html->link(
- _txt('op.back'),
- array('controller' => 'co_people', 'action' => 'index', 'co' =>
$cur_co['Co']['id']),
- array('class' => 'backbutton')
- );
-
+
echo '
<br />
<br />
@@ -324,4 +318,4 @@
<?php endforeach; // CoPetitionHistoryRecord ?>
</tbody>
</table>
-<?php endif; // action == add ?>
\ No newline at end of file
+<?php endif; // action == add ?>

Modified: registry/trunk/app/View/Cos/fields.inc
===================================================================
--- registry/trunk/app/View/Cos/fields.inc 2012-06-19 21:08:15 UTC (rev
301)
+++ registry/trunk/app/View/Cos/fields.inc 2012-07-05 07:56:45 UTC (rev
302)
@@ -38,10 +38,6 @@
echo $this->Html->link(_txt('op.cancel'),
array('controller' => 'cos', 'action' => 'index'),
array('class' => 'cancelbutton'));
- else
- echo $this->Html->link(_txt('op.back'),
- array('controller' => 'cos', 'action' => 'index'),
- array('class' => 'backbutton'));

echo '
<br />
@@ -102,4 +98,4 @@
</td>
</tr>
</tbody>
-</table>
\ No newline at end of file
+</table>

Modified: registry/trunk/app/View/Cous/fields.inc
===================================================================
--- registry/trunk/app/View/Cous/fields.inc 2012-06-19 21:08:15 UTC (rev
301)
+++ registry/trunk/app/View/Cous/fields.inc 2012-07-05 07:56:45 UTC (rev
302)
@@ -41,12 +41,6 @@
array('controller' => 'cous', 'action' => 'index', 'co' =>
$cur_co['Co']['id']),
array('class' => 'cancelbutton')
);
- else
- print $this->Html->link(
- _txt('op.back'),
- array('controller' => 'cous', 'action' => 'index', 'co' =>
$cur_co['Co']['id']),
- array('class' => 'backbutton')
- );

echo '
<br />

Modified: registry/trunk/app/View/EmailAddresses/fields.inc
===================================================================
--- registry/trunk/app/View/EmailAddresses/fields.inc 2012-06-19 21:08:15
UTC (rev 301)
+++ registry/trunk/app/View/EmailAddresses/fields.inc 2012-07-05 07:56:45
UTC (rev 302)
@@ -38,10 +38,6 @@
echo $this->Html->link(_txt('op.cancel'),
isset($redirect) ? $redirect : array('controller'
=> 'email_addresses', 'action' => 'index'),
array('class' => 'cancelbutton'));
- else
- echo $this->Html->link(_txt('op.back'),
- isset($redirect) ? $redirect : array('controller'
=> 'email_addresses', 'action' => 'index'),
- array('class' => 'backbutton'));

echo '
<br />
@@ -107,4 +103,4 @@
</td>
</tr>
</tbody>
-</table>
\ No newline at end of file
+</table>

Modified: registry/trunk/app/View/Identifiers/fields.inc
===================================================================
--- registry/trunk/app/View/Identifiers/fields.inc 2012-06-19 21:08:15
UTC (rev 301)
+++ registry/trunk/app/View/Identifiers/fields.inc 2012-07-05 07:56:45
UTC (rev 302)
@@ -38,10 +38,7 @@
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 />
@@ -117,4 +114,4 @@
</td>
</tr>
</tbody>
-</table>
\ No newline at end of file
+</table>

Modified: registry/trunk/app/View/OrgIdentities/fields.inc
===================================================================
--- registry/trunk/app/View/OrgIdentities/fields.inc 2012-06-19 21:08:15
UTC (rev 301)
+++ registry/trunk/app/View/OrgIdentities/fields.inc 2012-07-05 07:56:45
UTC (rev 302)
@@ -42,12 +42,13 @@
if($e)
{
print $this->Html->link(
- _txt('op.back'),
- array(
- 'controller' => 'org_identities',
- 'action' => 'index',
- 'co' => ($pool_org_identities ? false : $cur_co['Co']['id'])
- ),
+ _txt('op.cancel'),
+ isset($redirect) ? $redirect
+ : array(
+ 'controller' => 'org_identities',
+ 'action' => 'index',
+ 'co' => ($pool_org_identities ? false :
$cur_co['Co']['id'])
+ ),
array('class' => 'cancelbutton')
);

@@ -57,13 +58,6 @@
echo $this->Form->hidden('OrgIdentity.co_id',
array('default' => $cur_co['Co']['id'])).
"\n";
}
- else
- echo $this->Html->link(_txt('op.back'),
- array('controller' => 'org_identities',
- 'action' => 'index',
- 'co' => ($pool_org_identities ? false :
$cur_co['Co']['id'])),
- array('class' => 'backbutton')) . '
- ';
?>
<br />
<br />

Modified: registry/trunk/app/View/Organizations/fields.inc
===================================================================
--- registry/trunk/app/View/Organizations/fields.inc 2012-06-19 21:08:15
UTC (rev 301)
+++ registry/trunk/app/View/Organizations/fields.inc 2012-07-05 07:56:45
UTC (rev 302)
@@ -31,15 +31,6 @@
if(!$e && !$permissions['view'])
return(false);

- if(!$e)
- {
- echo $this->Html->link(_txt('op.back'),
- array('controller' => 'organizations', 'action'
=> 'index'),
- array('class' => 'backbutton')) . '
- <br />
- <br />
- ';
- }
?>
<table id="<?php echo $this->action; ?>_organization" class="ui-widget">
<tbody>
@@ -93,4 +84,4 @@
</td>
</tr>
</tbody>
-</table>
\ No newline at end of file
+</table>

Modified: registry/trunk/app/View/TelephoneNumbers/fields.inc
===================================================================
--- registry/trunk/app/View/TelephoneNumbers/fields.inc 2012-06-19 21:08:15
UTC (rev 301)
+++ registry/trunk/app/View/TelephoneNumbers/fields.inc 2012-07-05 07:56:45
UTC (rev 302)
@@ -38,10 +38,7 @@
echo $this->Html->link(_txt('op.cancel'),
isset($redirect) ? $redirect : array('controller'
=> 'telephone_numbers', 'action' => 'index'),
array('class' => 'cancelbutton'));
- else
- echo $this->Html->link(_txt('op.back'),
- isset($redirect) ? $redirect : array('controller'
=> 'telephone_numbers', 'action' => 'index'),
- array('class' => 'backbutton'));
+

echo '
<br />
@@ -107,4 +104,4 @@
</td>
</tr>
</tbody>
-</table>
\ No newline at end of file
+</table>


  • [comanage-dev] r302 - in registry/trunk/app/View: Addresses CoEnrollmentAttributes CoEnrollmentFlows CoExtendedAttributes CoGroupMembers CoGroups CoNsfDemographics CoPeople CoPersonRoles CoPetitions Cos Cous EmailAddresses Identifiers OrgIdentities Organizations TelephoneNumbers, svnlog, 07/05/2012

Archive powered by MHonArc 2.6.16.

Top of Page