COmanage Developers List

Author: marie
Date: 2013-09-11 16:58:37 -0400 (Wed, 11 Sep 2013)
New Revision: 589

Modified:
   registry/trunk/app/Lib/lang.php
   registry/trunk/app/View/CoPeople/index.ctp
Log:
CO643 - adjustment of spacing and onclick propogation for copeople's index

Modified: registry/trunk/app/Lib/lang.php
===================================================================
--- registry/trunk/app/Lib/lang.php     2013-09-11 19:06:28 UTC (rev 588)
+++ registry/trunk/app/Lib/lang.php     2013-09-11 20:58:37 UTC (rev 589)
@@ -609,6 +609,7 @@
   'fd.telephone_number.number' => 'Phone',
   'fd.timestamp' =>   'Timestamp',
   'fd.title' =>       'Title',
+  'fd.title.none' =>  'No Title',
   'fd.true' =>        'True',
   'fd.type' =>        'Type',
   'fd.type.warn' =>   'After an extended attribute is created, its type may 
not be changed',

Modified: registry/trunk/app/View/CoPeople/index.ctp
===================================================================
--- registry/trunk/app/View/CoPeople/index.ctp  2013-09-11 19:06:28 UTC (rev 
588)
+++ registry/trunk/app/View/CoPeople/index.ctp  2013-09-11 20:58:37 UTC (rev 
589)
@@ -73,9 +73,8 @@
     }
 
     .email {
-      margin-right: 15px;
-      float: right !important;
-
+      position: absolute;
+      left: 330px;
     }
 
     .admin {
@@ -83,8 +82,8 @@
     }
 
     .status{
-      float: right !important;
-      margin-right: 15px;
+      position: absolute;
+      left: 440px;
     }
 
   .roles{
@@ -136,7 +135,6 @@
       active     : false
     });
 
-
   });
 
 </script>
@@ -252,11 +250,10 @@
             foreach ($p['CoPersonRole'] as $pr) {
               print '<div class = "role">';
                 print '<div class = "rolestatus">';
-
-                // Print Status
-                if(!empty($pr['status']) ) {
-                  print _txt('en.status', null, $pr['status']);
-                }
+                  // Print Status
+                  if(!empty($pr['status']) ) {
+                    print _txt('en.status', null, $pr['status']);
+                  }
                 print '</div>';
 
                 print '<div class = "roleinfo">';
@@ -307,6 +304,11 @@
                     } else{
                       print $pr['title'];
                     }
+
+                    // Insert placeholder when no title exists for display
+                    if(empty($pr['title'])) {
+                      print _txt('fd.title.none');
+                    }
                     
                     if(isset($pr['Cou']['name']))
                       print " (" . $pr['Cou']['name'] . ")";
@@ -323,12 +325,14 @@
 </div>
 
 <script>
-jQuery( document ).ready(function(){
-  jQuery( ".comparebutton" ).click( function( e ){
-   window.location = $(this).prop("href");
-  });
+  $( document ).ready(function() {
+    $( ".comparebutton, .editbutton" ).click( function( e ) {
+      event.stopPropagation();
+      window.location = $(this).prop("href");
+    });
 
-  jQuery( ".editbutton" ).click( function( e ){
-   window.location = $(this).prop("href");
-  });} );
+    $( ".deletebutton, .invitebutton" ).click( function( e ) {
+      event.stopPropagation();
+    } );
+  } );
 </script>
\ No newline at end of file