[Gemstracker-svn] SF.net SVN: gemstracker:[277] trunk/library

[<gem...@li...>]

Revision: 277
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=277&view=rev
Author:   matijsdejong
Date:     2011-11-23 14:20:20 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Added model 'description' as title to sort fields.
Small fixes for organization.
Corrected translation

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/OrganizationAction.php
    trunk/library/classes/MUtil/Model/TableBridge.php
    trunk/library/languages/default-nl.mo
    trunk/library/languages/default-nl.po
    trunk/library/snippets/Organization/OrganizationTableSnippet.php

Modified: trunk/library/classes/Gems/Default/OrganizationAction.php
===================================================================
--- trunk/library/classes/Gems/Default/OrganizationAction.php	2011-11-23 14:19:16 UTC (rev 276)
+++ trunk/library/classes/Gems/Default/OrganizationAction.php	2011-11-23 14:20:20 UTC (rev 277)
@@ -174,12 +174,12 @@
         $tp = new MUtil_Model_Type_ConcatenatedRow(':', ', ');
         $tp->apply($model, 'gor_accessible_by');
 
-        if ($this->project->multiLocale) {
+        if ($detailed && $this->project->multiLocale) {
             $model->set('gor_name', 'description', 'ENGLISH please! Use translation file to translate.');
             $model->set('gor_url',  'description', 'ENGLISH link preferred. Use translation file to translate.');
             $model->set('gor_task', 'description', 'ENGLISH please! Use translation file to translate.');
-            $model->set('gor_code', 'label', $this->_('Code name'), 'size', 10, 'description', $this->_('Only for programmers.'));
         }
+        $model->setIfExists('gor_code', 'label', $this->_('Code name'), 'size', 10, 'description', $this->_('Only for programmers.'));
 
         $model->addColumn("CASE WHEN gor_active = 1 THEN '' ELSE 'deleted' END", 'row_class');
 

Modified: trunk/library/classes/MUtil/Model/TableBridge.php
===================================================================
--- trunk/library/classes/MUtil/Model/TableBridge.php	2011-11-23 14:19:16 UTC (rev 276)
+++ trunk/library/classes/MUtil/Model/TableBridge.php	2011-11-23 14:20:20 UTC (rev 277)
@@ -36,7 +36,7 @@
  */
 
 /**
- * 
+ *
  * @package    MUtil
  * @subpackage Model
  * @copyright  Copyright (c) 2011 Erasmus MC
@@ -214,7 +214,7 @@
         // $sortUrl['RouteReset'] = false; // Prevents tabs from being communicated
         $sortUrl = $sortUrl + $this->baseUrl;
 
-        return MUtil_Html::create()->a($sortUrl, array('class' => $class), $label);
+        return MUtil_Html::create()->a($sortUrl, array('class' => $class, 'title' => $this->model->get($name, 'description')), $label);
     }
 
     /**

Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)

Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po	2011-11-23 14:19:16 UTC (rev 276)
+++ trunk/library/languages/default-nl.po	2011-11-23 14:20:20 UTC (rev 277)
@@ -1547,7 +1547,7 @@
 
 #: classes/Gems/Default/OrganizationAction.php:162
 msgid "Can the organization be used?"
-msgstr "Is de organisatie in gebruik"
+msgstr "Is de organisatie in gebruik?"
 
 #: classes/Gems/Default/OrganizationAction.php:163
 msgid "Accepting"

Modified: trunk/library/snippets/Organization/OrganizationTableSnippet.php
===================================================================
--- trunk/library/snippets/Organization/OrganizationTableSnippet.php	2011-11-23 14:19:16 UTC (rev 276)
+++ trunk/library/snippets/Organization/OrganizationTableSnippet.php	2011-11-23 14:20:20 UTC (rev 277)
@@ -80,7 +80,7 @@
         $BR = $HTML->br();
 
         $orgName[] = MUtil_Lazy::iff($bridge->gor_url,
-                MUtil_Html_AElement::a($bridge->gor_name, array('href' => $bridge->gor_url, 'target' => '_blank')),
+                MUtil_Html_AElement::a($bridge->gor_name, array('href' => $bridge->gor_url, 'target' => '_blank', 'class' => 'globe')),
                 $bridge->gor_name);
         $orgName[] = $bridge->createSortLink('gor_name');
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.