COmanage Developers List

Author: marie
Date: 2013-10-18 01:53:26 -0400 (Fri, 18 Oct 2013)
New Revision: 620

Modified:
   registry/trunk/app/Lib/lang.php
   registry/trunk/app/View/Elements/dropMenu.ctp
   registry/trunk/app/View/OrgIdentities/index.ctp
Log:
co-674: adding informational blurb for org identities and shifting dropdown 
menu link

Modified: registry/trunk/app/Lib/lang.php
===================================================================
--- registry/trunk/app/Lib/lang.php     2013-10-17 00:42:21 UTC (rev 619)
+++ registry/trunk/app/Lib/lang.php     2013-10-18 05:53:26 UTC (rev 620)
@@ -651,6 +651,9 @@
   'fd.valid_through' => 'Valid Through',
   'fd.valid_through.desc' => '(leave blank for indefinite validity)',
   'fd.yes' =>         'Yes',
+
+  // Informational messages
+  'in.orgidentities'   => 'Organizational Identities represent a person\'s 
identity as asserted by a "home" institution, such as their University or a 
social identity provider.  Reading the documentation before editing them is 
advised.',
   
   // Menu
   'me.account'         => 'My Account',

Modified: registry/trunk/app/View/Elements/dropMenu.ctp
===================================================================
--- registry/trunk/app/View/Elements/dropMenu.ctp       2013-10-17 00:42:21 
UTC (rev 619)
+++ registry/trunk/app/View/Elements/dropMenu.ctp       2013-10-18 05:53:26 
UTC (rev 620)
@@ -84,7 +84,19 @@
                   print '<a>' . _txt('me.people') . '</a>
                          <span class="sf-sub-indicator"> »</span>';
                   print '<ul>';
-                  
+  
+                  if(isset($permissions['menu']['cos']) && 
$permissions['menu']['cos']) {
+                    print "<li>";
+                      $args = array();
+                      $args['plugin'] = null;
+                      $args['controller'] = 'co_people';
+                      $args['action'] = 'index';
+                      $args['co'] = $menuCoId;
+                      
+                      print $this->Html->link(_txt('me.population'), $args);
+                    print "</li>";
+                  }
+
                   if(isset($permissions['menu']['orgidentities']) && 
$permissions['menu']['orgidentities']) {
                     $args = array();
                     $args['plugin'] = null;
@@ -100,18 +112,6 @@
                     print "</li>";
                   }
   
-                  if(isset($permissions['menu']['cos']) && 
$permissions['menu']['cos']) {
-                    print "<li>";
-                      $args = array();
-                      $args['plugin'] = null;
-                      $args['controller'] = 'co_people';
-                      $args['action'] = 'index';
-                      $args['co'] = $menuCoId;
-                      
-                      print $this->Html->link(_txt('me.population'), $args);
-                    print "</li>";
-                  }
-  
                   if(isset($permissions['menu']['createpetition']) && 
$permissions['menu']['createpetition']) {
                     print "<li>";
                       $args = array();

Modified: registry/trunk/app/View/OrgIdentities/index.ctp
===================================================================
--- registry/trunk/app/View/OrgIdentities/index.ctp     2013-10-17 00:42:21 
UTC (rev 619)
+++ registry/trunk/app/View/OrgIdentities/index.ctp     2013-10-18 05:53:26 
UTC (rev 620)
@@ -46,7 +46,13 @@
   }
 ?>
 
- 
+<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; 
padding: 0 .7em;"> 
+  <p>
+    <span class="ui-icon ui-icon-info" style="float: left; margin-right: 
.3em;"></span>
+    <strong><?php print _txt('in.orgidentities'); ?></strong>
+  </p>
+</div>
+<br /> 
 <table id="org_identities" class="ui-widget" style=" width:100%;">
   <thead>
     <tr class="ui-widget-header">