Menu
▾
▴
gemstracker-svn — Receive updates on svn commits
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(84) |
Oct
(70) |
Nov
(164) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(52) |
Feb
(77) |
Mar
(70) |
Apr
(58) |
May
(81) |
Jun
(74) |
Jul
(87) |
Aug
(30) |
Sep
(45) |
Oct
(37) |
Nov
(51) |
Dec
(31) |
| 2013 |
Jan
(47) |
Feb
(29) |
Mar
(40) |
Apr
(33) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gem...@li...> - 2012-08-29 13:55:09
|
Revision: 907
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=907&view=rev
Author: michieltcs
Date: 2012-08-29 13:54:59 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Add coverage logging
Modified Paths:
--------------
trunk/test/phpunit.xml
Modified: trunk/test/phpunit.xml
===================================================================
--- trunk/test/phpunit.xml 2012-08-29 13:39:59 UTC (rev 906)
+++ trunk/test/phpunit.xml 2012-08-29 13:54:59 UTC (rev 907)
@@ -20,4 +20,7 @@
<directory suffix=".php">../library/classes/MUtil</directory>
</whitelist>
</filter>
+ <logging>
+ <log type="coverage-clover" target="reports/coverage.xml"/>
+ </logging>
</phpunit>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-29 13:40:08
|
Revision: 906
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=906&view=rev
Author: mennodekker
Date: 2012-08-29 13:39:59 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Cleanup TestModel (created a mock)
Modified Paths:
--------------
trunk/test/classes/MUtil/Model/FormBridgeTest.php
Modified: trunk/test/classes/MUtil/Model/FormBridgeTest.php
===================================================================
--- trunk/test/classes/MUtil/Model/FormBridgeTest.php 2012-08-29 13:00:30 UTC (rev 905)
+++ trunk/test/classes/MUtil/Model/FormBridgeTest.php 2012-08-29 13:39:59 UTC (rev 906)
@@ -24,7 +24,8 @@
parent::setUp();
require_once GEMS_WEB_DIR . '/data/TestModel.php';
- $this->model = new TestModel('testModel');
+ $this->model = $this->getMockForAbstractClass('MUtil_Model_ModelAbstract', array('testModel'));
+
$this->options = array(
'date' => array(
'dateFormat' => 'dd-MM-yyyy',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-29 13:00:39
|
Revision: 905
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=905&view=rev
Author: michieltcs
Date: 2012-08-29 13:00:30 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Add phpunit config
Added Paths:
-----------
trunk/test/phpunit.xml
Added: trunk/test/phpunit.xml
===================================================================
--- trunk/test/phpunit.xml (rev 0)
+++ trunk/test/phpunit.xml 2012-08-29 13:00:30 UTC (rev 905)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<phpunit backupGlobals="false"
+ backupStaticAttributes="false"
+ bootstrap="bootstrap.php"
+ colors="true"
+ convertErrorsToExceptions="true"
+ convertNoticesToExceptions="true"
+ convertWarningsToExceptions="false"
+ processIsolation="false"
+ stopOnFailure="true"
+ syntaxCheck="false"
+ verbose="true"
+ strict="true">
+ <testsuite>
+ <directory>classes</directory>
+ </testsuite>
+ <filter>
+ <whitelist>
+ <directory suffix=".php">../library/classes/Gems</directory>
+ <directory suffix=".php">../library/classes/MUtil</directory>
+ </whitelist>
+ </filter>
+</phpunit>
Property changes on: trunk/test/phpunit.xml
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-29 13:00:20
|
Revision: 904
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=904&view=rev
Author: michieltcs
Date: 2012-08-29 13:00:09 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Add (fixed) Zend classes so strict db/controller tests work again
Added Paths:
-----------
trunk/test/classes/Zend/
trunk/test/classes/Zend/Test/
trunk/test/classes/Zend/Test/PHPUnit/
trunk/test/classes/Zend/Test/PHPUnit/Constraint/
trunk/test/classes/Zend/Test/PHPUnit/Constraint/Redirect.php
trunk/test/classes/Zend/Test/PHPUnit/Db/
trunk/test/classes/Zend/Test/PHPUnit/Db/Metadata/
trunk/test/classes/Zend/Test/PHPUnit/Db/Metadata/Generic.php
Added: trunk/test/classes/Zend/Test/PHPUnit/Constraint/Redirect.php
===================================================================
--- trunk/test/classes/Zend/Test/PHPUnit/Constraint/Redirect.php (rev 0)
+++ trunk/test/classes/Zend/Test/PHPUnit/Constraint/Redirect.php 2012-08-29 13:00:09 UTC (rev 904)
@@ -0,0 +1,282 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to li...@ze... so we can send you a copy immediately.
+ *
+ * @category Zend
+ * @package Zend_Test
+ * @subpackage PHPUnit
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @version $Id$
+ */
+
+/** @see PHPUnit_Framework_Constraint */
+require_once 'PHPUnit/Framework/Constraint.php';
+
+/**
+ * Redirection constraints
+ *
+ * @uses PHPUnit_Framework_Constraint
+ * @category Zend
+ * @package Zend_Test
+ * @subpackage PHPUnit
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint
+{
+ /**#@+
+ * Assertion type constants
+ */
+ const ASSERT_REDIRECT = 'assertRedirect';
+ const ASSERT_REDIRECT_TO = 'assertRedirectTo';
+ const ASSERT_REDIRECT_REGEX = 'assertRedirectRegex';
+ /**#@-*/
+
+ /**
+ * Current assertion type
+ * @var string
+ */
+ protected $_assertType = null;
+
+ /**
+ * Available assertion types
+ * @var array
+ */
+ protected $_assertTypes = array(
+ self::ASSERT_REDIRECT,
+ self::ASSERT_REDIRECT_TO,
+ self::ASSERT_REDIRECT_REGEX,
+ );
+
+ /**
+ * Pattern to match against
+ * @var string
+ */
+ protected $_match = null;
+
+ /**
+ * Whether or not assertion is negated
+ * @var bool
+ */
+ protected $_negate = false;
+
+ /**
+ * Constructor; setup constraint state
+ *
+ * @return void
+ */
+ public function __construct()
+ {
+ }
+
+ /**
+ * Indicate negative match
+ *
+ * @param bool $flag
+ * @return void
+ */
+ public function setNegate($flag = true)
+ {
+ $this->_negate = $flag;
+ }
+
+ /**
+ * Evaluate an object to see if it fits the constraints
+ *
+ * @param string $other String to examine
+ * @param null|string Assertion type
+ * @return bool
+ */
+ public function evaluate($other, $assertType = null, $returnResult = FALSE)
+ {
+ if (!$other instanceof Zend_Controller_Response_Abstract) {
+ require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
+ throw new Zend_Test_PHPUnit_Constraint_Exception('Redirect constraint assertions require a response object');
+ }
+
+ if (strstr($assertType, 'Not')) {
+ $this->setNegate(true);
+ $assertType = str_replace('Not', '', $assertType);
+ }
+
+ if (!in_array($assertType, $this->_assertTypes)) {
+ require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
+ throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__));
+ }
+
+ $this->_assertType = $assertType;
+
+ $response = $other;
+ $argv = func_get_args();
+ $argc = func_num_args();
+
+ switch ($assertType) {
+ case self::ASSERT_REDIRECT_TO:
+ if (3 > $argc) {
+ require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
+ throw new Zend_Test_PHPUnit_Constraint_Exception('No redirect URL provided against which to match');
+ }
+ $this->_match = $match = $argv[2];
+ return ($this->_negate)
+ ? $this->_notMatch($response, $match)
+ : $this->_match($response, $match);
+ case self::ASSERT_REDIRECT_REGEX:
+ if (3 > $argc) {
+ require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
+ throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match redirect');
+ }
+ $this->_match = $match = $argv[2];
+ return ($this->_negate)
+ ? $this->_notRegex($response, $match)
+ : $this->_regex($response, $match);
+ case self::ASSERT_REDIRECT:
+ default:
+ return ($this->_negate) ? !$response->isRedirect() : $response->isRedirect();
+ }
+ }
+
+ /**
+ * Report Failure
+ *
+ * @see PHPUnit_Framework_Constraint for implementation details
+ * @param mixed $other
+ * @param string $description Additional message to display
+ * @param bool $not
+ * @return void
+ * @throws PHPUnit_Framework_ExpectationFailedException
+ */
+ public function fail($other, $description, PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL)
+ {
+ require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
+ switch ($this->_assertType) {
+ case self::ASSERT_REDIRECT_TO:
+ $failure = 'Failed asserting response redirects to "%s"';
+ if ($this->_negate) {
+ $failure = 'Failed asserting response DOES NOT redirect to "%s"';
+ }
+ $failure = sprintf($failure, $this->_match);
+ break;
+ case self::ASSERT_REDIRECT_REGEX:
+ $failure = 'Failed asserting response redirects to URL MATCHING "%s"';
+ if ($this->_negate) {
+ $failure = 'Failed asserting response DOES NOT redirect to URL MATCHING "%s"';
+ }
+ $failure = sprintf($failure, $this->_match);
+ break;
+ case self::ASSERT_REDIRECT:
+ default:
+ $failure = 'Failed asserting response is a redirect';
+ if ($this->_negate) {
+ $failure = 'Failed asserting response is NOT a redirect';
+ }
+ break;
+ }
+
+ if (!empty($description)) {
+ $failure = $description . "\n" . $failure;
+ }
+
+ throw new Zend_Test_PHPUnit_Constraint_Exception($failure);
+ }
+
+ /**
+ * Complete implementation
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return '';
+ }
+
+ /**
+ * Check to see if content is matched in selected nodes
+ *
+ * @param Zend_Controller_Response_HttpTestCase $response
+ * @param string $match Content to match
+ * @return bool
+ */
+ protected function _match($response, $match)
+ {
+ if (!$response->isRedirect()) {
+ return false;
+ }
+
+ $headers = $response->sendHeaders();
+ $redirect = $headers['location'];
+ $redirect = str_replace('Location: ', '', $redirect);
+
+ return ($redirect == $match);
+ }
+
+ /**
+ * Check to see if content is NOT matched in selected nodes
+ *
+ * @param Zend_Controller_Response_HttpTestCase $response
+ * @param string $match
+ * @return bool
+ */
+ protected function _notMatch($response, $match)
+ {
+ if (!$response->isRedirect()) {
+ return true;
+ }
+
+ $headers = $response->sendHeaders();
+ $redirect = $headers['location'];
+ $redirect = str_replace('Location: ', '', $redirect);
+
+ return ($redirect != $match);
+ }
+
+ /**
+ * Check to see if content is matched by regex in selected nodes
+ *
+ * @param Zend_Controller_Response_HttpTestCase $response
+ * @param string $pattern
+ * @return bool
+ */
+ protected function _regex($response, $pattern)
+ {
+ if (!$response->isRedirect()) {
+ return false;
+ }
+
+ $headers = $response->sendHeaders();
+ $redirect = $headers['location'];
+ $redirect = str_replace('Location: ', '', $redirect);
+
+ return preg_match($pattern, $redirect);
+ }
+
+ /**
+ * Check to see if content is NOT matched by regex in selected nodes
+ *
+ * @param Zend_Controller_Response_HttpTestCase $response
+ * @param string $pattern
+ * @return bool
+ */
+ protected function _notRegex($response, $pattern)
+ {
+ if (!$response->isRedirect()) {
+ return true;
+ }
+
+ $headers = $response->sendHeaders();
+ $redirect = $headers['location'];
+ $redirect = str_replace('Location: ', '', $redirect);
+
+ return !preg_match($pattern, $redirect);
+ }
+}
Property changes on: trunk/test/classes/Zend/Test/PHPUnit/Constraint/Redirect.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Added: svn:eol-style
+ native
Added: trunk/test/classes/Zend/Test/PHPUnit/Db/Metadata/Generic.php
===================================================================
--- trunk/test/classes/Zend/Test/PHPUnit/Db/Metadata/Generic.php (rev 0)
+++ trunk/test/classes/Zend/Test/PHPUnit/Db/Metadata/Generic.php 2012-08-29 13:00:09 UTC (rev 904)
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to li...@ze... so we can send you a copy immediately.
+ *
+ * @category Zend
+ * @package Zend_Test
+ * @subpackage PHPUnit
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @version $Id$
+ */
+
+/**
+ * @see Zend_Db_Adapter_Abstract
+ */
+require_once "Zend/Db/Adapter/Abstract.php";
+
+/**
+ * @see PHPUnit_Extensions_Database_DB_IMetaData
+ */
+require_once "PHPUnit/Extensions/Database/DB/IMetaData.php";
+
+/**
+ * Generic Metadata accessor for the Zend_Db adapters
+ *
+ * @uses PHPUnit_Extensions_Database_DB_IMetaData
+ * @category Zend
+ * @package Zend_Test
+ * @subpackage PHPUnit
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+class Zend_Test_PHPUnit_Db_Metadata_Generic implements PHPUnit_Extensions_Database_DB_IMetaData
+{
+ /**
+ * Zend_Db Connection
+ *
+ * @var Zend_Db_Adapter_Abstract
+ */
+ protected $_connection;
+
+ /**
+ * Schemaname
+ *
+ * @var string
+ */
+ protected $_schema;
+
+ /**
+ * Cached Table metadata
+ *
+ * @var array
+ */
+ protected $_tableMetadata = array();
+
+ /**
+ * Creates a new database meta data object using the given pdo connection
+ * and schema name.
+ *
+ * @param PDO $pdo
+ * @param string $schema
+ */
+ public final function __construct(Zend_Db_Adapter_Abstract $db, $schema)
+ {
+ $this->_connection = $db;
+ $this->_schema = $schema;
+ }
+
+ /**
+ * List Tables
+ *
+ * @return array
+ */
+ public function getTableNames()
+ {
+ return $this->_connection->listTables();
+ }
+
+ /**
+ * Get Table information
+ *
+ * @param string $tableName
+ * @return array
+ */
+ protected function getTableDescription($tableName)
+ {
+ if(!isset($this->_tableMetadata[$tableName])) {
+ $this->_tableMetadata[$tableName] = $this->_connection->describeTable($tableName);
+ }
+ return $this->_tableMetadata[$tableName];
+ }
+
+ /**
+ * Returns an array containing the names of all the columns in the
+ * $tableName table,
+ *
+ * @param string $tableName
+ * @return array
+ */
+ public function getTableColumns($tableName)
+ {
+ $tableMeta = $this->getTableDescription($tableName);
+ $columns = array_keys($tableMeta);
+ return $columns;
+ }
+
+ /**
+ * Returns an array containing the names of all the primary key columns in
+ * the $tableName table.
+ *
+ * @param string $tableName
+ * @return array
+ */
+ public function getTablePrimaryKeys($tableName)
+ {
+ $tableMeta = $this->getTableDescription($tableName);
+
+ $primaryColumnNames = array();
+ foreach($tableMeta AS $column) {
+ if($column['PRIMARY'] == true) {
+ $primaryColumnNames[] = $column['COLUMN_NAME'];
+ }
+ }
+ return $primaryColumnNames;
+ }
+
+ /**
+ * Returns the name of the default schema.
+ *
+ * @return string
+ */
+ public function getSchema()
+ {
+ return $this->_schema;
+ }
+
+ /**
+ * Returns a quoted schema object. (table name, column name, etc)
+ *
+ * @param string $object
+ * @return string
+ */
+ public function quoteSchemaObject($object)
+ {
+ return $this->_connection->quoteIdentifier($object);
+ }
+
+ /**
+ * Returns true if the rdbms allows cascading
+ *
+ * @return bool
+ */
+ public function allowsCascading()
+ {
+ return false;
+ }
+
+ public function disablePrimaryKeys($tableName)
+ {
+ }
+
+ public function enablePrimaryKeys($tableName)
+ {
+ }
+}
\ No newline at end of file
Property changes on: trunk/test/classes/Zend/Test/PHPUnit/Db/Metadata/Generic.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-29 12:22:36
|
Revision: 903
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=903&view=rev
Author: michieltcs
Date: 2012-08-29 12:22:27 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Fix notice
Modified Paths:
--------------
trunk/library/classes/Gems/User/ProjectUserDefinition.php
Modified: trunk/library/classes/Gems/User/ProjectUserDefinition.php
===================================================================
--- trunk/library/classes/Gems/User/ProjectUserDefinition.php 2012-08-28 09:14:08 UTC (rev 902)
+++ trunk/library/classes/Gems/User/ProjectUserDefinition.php 2012-08-29 12:22:27 UTC (rev 903)
@@ -79,6 +79,8 @@
*/
public function getUserData($login_name, $organization)
{
+ $orgs = null;
+
try {
$orgs = $this->db->fetchPairs("SELECT gor_id_organization, gor_name FROM gems__organizations WHERE gor_active = 1 ORDER BY gor_name");
natsort($orgs);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-28 09:14:20
|
Revision: 902
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=902&view=rev
Author: mennodekker
Date: 2012-08-28 09:14:08 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
Allow to set labelplacement for radio elements
Modified Paths:
--------------
trunk/library/classes/MUtil/Model/FormBridge.php
Modified: trunk/library/classes/MUtil/Model/FormBridge.php
===================================================================
--- trunk/library/classes/MUtil/Model/FormBridge.php 2012-08-23 13:37:41 UTC (rev 901)
+++ trunk/library/classes/MUtil/Model/FormBridge.php 2012-08-28 09:14:08 UTC (rev 902)
@@ -85,7 +85,7 @@
self::AUTO_OPTIONS => array('elementClass', 'multiOptions'),
self::CHECK_OPTIONS => array('checkedValue', 'uncheckedValue'),
self::DATE_OPTIONS => array('dateFormat', 'storageFormat'),
- self::DISPLAY_OPTIONS => array('accesskey', 'autoInsertNotEmptyValidator', 'class', 'disabled', 'description', 'escape', 'label', 'onclick', 'readonly', 'required', 'tabindex', 'value', 'showLabels'),
+ self::DISPLAY_OPTIONS => array('accesskey', 'autoInsertNotEmptyValidator', 'class', 'disabled', 'description', 'escape', 'label', 'onclick', 'readonly', 'required', 'tabindex', 'value', 'showLabels', 'labelplacement'),
self::EXHIBIT_OPTIONS => array('formatFunction'),
self::FILE_OPTIONS => array('accept', 'count', 'destination', 'valueDisabled'),
self::GROUP_OPTIONS => array('elements', 'legend', 'separator'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-23 13:37:47
|
Revision: 901
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=901&view=rev
Author: matijsdejong
Date: 2012-08-23 13:37:41 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
Added some indices for faster database access
Modified Paths:
--------------
trunk/library/classes/GemsEscort.php
trunk/library/configs/db/patches.sql
trunk/library/configs/db/tables/gems__respondent2org.50.sql
trunk/library/configs/db/tables/gems__tokens.200.sql
trunk/library/configs/db/tables/gems__tracks.30.sql
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2012-08-22 10:53:51 UTC (rev 900)
+++ trunk/library/classes/GemsEscort.php 2012-08-23 13:37:41 UTC (rev 901)
@@ -520,7 +520,12 @@
return $view;
}
- /*protected function _initZFDebug()
+ /**
+ * Add ZFDebug info to the page output.
+ *
+ * @return void
+ * /
+ protected function _initZFDebug()
{
// if ((APPLICATION_ENV === 'development') &&
if ((APPLICATION_ENV !== 'production') &&
Modified: trunk/library/configs/db/patches.sql
===================================================================
--- trunk/library/configs/db/patches.sql 2012-08-22 10:53:51 UTC (rev 900)
+++ trunk/library/configs/db/patches.sql 2012-08-23 13:37:41 UTC (rev 901)
@@ -419,4 +419,12 @@
ALTER TABLE `gems__surveys` ADD gsu_code varchar(64) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' NULL AFTER gsu_duration;
-- PATCH: Assign deletion of track parts to super role
-UPDATE gems__roles SET grl_privileges = CONCAT(grl_privileges,',pr.track-maintenance.delete') WHERE grl_privileges NOT LIKE '%pr.track-maintenance.edit%' AND grl_privileges NOT LIKE '%pr.track-maintenance.delete%';
\ No newline at end of file
+UPDATE gems__roles SET grl_privileges = CONCAT(grl_privileges,',pr.track-maintenance.delete') WHERE grl_privileges NOT LIKE '%pr.track-maintenance.edit%' AND grl_privileges NOT LIKE '%pr.track-maintenance.delete%';
+
+-- GEMS VERSION: 49
+-- PATCH: Speed up show respondent
+ALTER TABLE `gems__respondent2org` ADD INDEX ( `gr2o_reception_code` );
+ALTER TABLE `gems__tokens` ADD INDEX ( `gto_round_order` );
+ALTER TABLE `gems__tokens` ADD INDEX ( `gto_valid_from`, `gto_valid_until` );
+ALTER TABLE `gems__tokens` ADD INDEX ( `gto_completion_time` );
+ALTER TABLE `gems__tracks` ADD INDEX ( `gtr_track_name` );
\ No newline at end of file
Modified: trunk/library/configs/db/tables/gems__respondent2org.50.sql
===================================================================
--- trunk/library/configs/db/tables/gems__respondent2org.50.sql 2012-08-22 10:53:51 UTC (rev 900)
+++ trunk/library/configs/db/tables/gems__respondent2org.50.sql 2012-08-23 13:37:41 UTC (rev 901)
@@ -1,23 +1,23 @@
CREATE TABLE if not exists gems__respondent2org (
gr2o_patient_nr varchar(7) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
- gr2o_id_organization bigint unsigned not null
+ gr2o_id_organization bigint unsigned not null
references gems__organizations (gor_id_organization),
-
- gr2o_id_user bigint unsigned not null
+
+ gr2o_id_user bigint unsigned not null
references gems__respondents (grs_id_user),
-
+
-- gr2o_id_physician bigint unsigned null
-- references gems_staff (gsf_id_user),
-
+
-- gr2o_treatment varchar(200) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
-- gr2o_comments text CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
-
+
gr2o_consent varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null default 'Unknown'
references gems__consents (gco_description),
gr2o_reception_code varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' default 'OK' not null
references gems__reception_codes (grc_id_reception_code),
-
+
gr2o_opened timestamp not null default current_timestamp on update current_timestamp,
gr2o_opened_by bigint unsigned not null,
gr2o_changed timestamp not null,
@@ -25,9 +25,10 @@
gr2o_created timestamp not null,
gr2o_created_by bigint unsigned not null,
- PRIMARY KEY (gr2o_patient_nr, gr2o_id_organization),
+ PRIMARY KEY (gr2o_patient_nr, gr2o_id_organization),
UNIQUE KEY (gr2o_id_user, gr2o_id_organization),
- INDEX (gr2o_opened)
+ INDEX (gr2o_opened),
+ INDEX (gr2o_reception_code)
)
ENGINE=InnoDB
CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
Modified: trunk/library/configs/db/tables/gems__tokens.200.sql
===================================================================
--- trunk/library/configs/db/tables/gems__tokens.200.sql 2012-08-22 10:53:51 UTC (rev 900)
+++ trunk/library/configs/db/tables/gems__tokens.200.sql 2012-08-23 13:37:41 UTC (rev 901)
@@ -53,7 +53,9 @@
INDEX (gto_id_track),
INDEX (gto_id_round),
INDEX (gto_in_source),
- INDEX (gto_id_respondent_track, gto_round_order)
+ INDEX (gto_id_respondent_track, gto_round_order),
+ INDEX (gto_valid_from, gto_valid_until),
+ INDEX (gto_completion_time)
)
ENGINE=InnoDB
CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
Modified: trunk/library/configs/db/tables/gems__tracks.30.sql
===================================================================
--- trunk/library/configs/db/tables/gems__tracks.30.sql 2012-08-22 10:53:51 UTC (rev 900)
+++ trunk/library/configs/db/tables/gems__tracks.30.sql 2012-08-23 13:37:41 UTC (rev 901)
@@ -28,6 +28,7 @@
gtr_created_by bigint unsigned not null,
PRIMARY KEY (gtr_id_track),
+ INDEX (gtr_track_name),
INDEX (gtr_active)
)
ENGINE=InnoDB
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-22 10:54:05
|
Revision: 900
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=900&view=rev
Author: mennodekker
Date: 2012-08-22 10:53:51 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
bug #555: added transparent .less to .css compiling to the headlink helper
Added Paths:
-----------
trunk/library/classes/Gems/View/Helper/HeadLink.php
trunk/library/classes/Lessphp/
trunk/library/classes/Lessphp/LICENSE
trunk/library/classes/Lessphp/lessc.inc.php
Added: trunk/library/classes/Gems/View/Helper/HeadLink.php
===================================================================
--- trunk/library/classes/Gems/View/Helper/HeadLink.php (rev 0)
+++ trunk/library/classes/Gems/View/Helper/HeadLink.php 2012-08-22 10:53:51 UTC (rev 900)
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Transparent LESS compiling for all headlink files with .less extension
+ *
+ * @package Gems
+ * @subpackage View\Helper
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ */
+
+// We need to load the class first
+include_once 'Lessphp/lessc.inc.php';
+
+/**
+ * Add transparent LESS compiling to the headlink
+ *
+ * Using http://leafo.net/lessphp/ this helper compiles http://lesscss.org/ to a css file.
+ * Compiling takes some time, so it will only run when the input file is newer than
+ * the output file or when the output file doesn't exist.
+ *
+ * Append ?compilecss to the url to force it to create new css.
+ *
+ * @package Gems
+ * @subpackage View\Helper
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
+ * @deprecated Class deprecated since version 2.0
+ */
+class Gems_View_Helper_HeadLink extends Zend_View_Helper_HeadLink
+{
+ public function itemToString(\stdClass $item)
+ {
+ $attributes = (array) $item;
+
+ if (isset($attributes['type']) && $attributes['type'] == 'text/css') {
+ // This is a stylesheet, consider extension and compile .less to .css
+ if (substr($attributes['href'],-5) == '.less') {
+
+
+ // Get the baseurl, it was appende to the href in escort
+ $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
+
+ // String the baseurl and add full path to the webdir
+ $inFile = GEMS_WEB_DIR . substr($attributes['href'], strlen($baseUrl));
+ $outFile = substr($inFile, 0, -4) . 'css';
+
+ // Try compiling
+ try {
+ $params = Zend_Controller_Front::getInstance()->getRequest()->getParams();
+ if (array_key_exists('compilecss', $params)) {
+ $lessc = new lessc();
+ $result = $lessc->compileFile($inFile, $outFile);
+ } else {
+ $result = lessc::ccompile($inFile, $outFile);
+ }
+ } catch (Exception $exc) {
+ // If we have an error, present it if not in production
+ if (APPLICATION_ENV !== 'production') {
+ MUtil_Echo::pre($exc->getMessage());
+ }
+ }
+
+ // Modify object, not the derived array
+ $item->href = substr($attributes['href'], 0, -4) . 'css';
+ }
+ }
+
+ return parent::itemToString($item);
+ }
+}
\ No newline at end of file
Added: trunk/library/classes/Lessphp/LICENSE
===================================================================
--- trunk/library/classes/Lessphp/LICENSE (rev 0)
+++ trunk/library/classes/Lessphp/LICENSE 2012-08-22 10:53:51 UTC (rev 900)
@@ -0,0 +1,660 @@
+For ease of distribution, lessphp 0.2.0 is under a dual license.
+You are free to pick which one suits your needs.
+
+
+
+
+MIT LICENSE
+
+
+
+
+Copyright (c) 2010 Leaf Corcoran, http://leafo.net/lessphp
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+
+GPL VERSION 3
+
+
+
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
Added: trunk/library/classes/Lessphp/lessc.inc.php
===================================================================
--- trunk/library/classes/Lessphp/lessc.inc.php (rev 0)
+++ trunk/library/classes/Lessphp/lessc.inc.php 2012-08-22 10:53:51 UTC (rev 900)
@@ -0,0 +1,3359 @@
+<?php
+
+/**
+ * lessphp v0.3.8
+ * http://leafo.net/lessphp
+ *
+ * LESS css compiler, adapted from http://lesscss.org
+ *
+ * Copyright 2012, Leaf Corcoran <le...@gm...>
+ * Licensed under MIT or GPLv3, see LICENSE
+ */
+
+
+/**
+ * The less compiler and parser.
+ *
+ * Converting LESS to CSS is a three stage process. The incoming file is parsed
+ * by `lessc_parser` into a syntax tree, then it is compiled into another tree
+ * representing the CSS structure by `lessc`. The CSS tree is fed into a
+ * formatter, like `lessc_formatter` which then outputs CSS as a string.
+ *
+ * During the first compile, all values are *reduced*, which means that their
+ * types are brought to the lowest form before being dump as strings. This
+ * handles math equations, variable dereferences, and the like.
+ *
+ * The `parse` function of `lessc` is the entry point.
+ *
+ * In summary:
+ *
+ * The `lessc` class creates an intstance of the parser, feeds it LESS code,
+ * then transforms the resulting tree to a CSS tree. This class also holds the
+ * evaluation context, such as all available mixins and variables at any given
+ * time.
+ *
+ * The `lessc_parser` class is only concerned with parsing its input.
+ *
+ * The `lessc_formatter` takes a CSS tree, and dumps it to a formatted string,
+ * handling things like indentation.
+ */
+class lessc {
+ static public $VERSION = "v0.3.8";
+ static protected $TRUE = array("keyword", "true");
+ static protected $FALSE = array("keyword", "false");
+
+ protected $libFunctions = array();
+ protected $registeredVars = array();
+ protected $preserveComments = false;
+
+ public $vPrefix = '@'; // prefix of abstract properties
+ public $mPrefix = '$'; // prefix of abstract blocks
+ public $parentSelector = '&';
+
+ public $importDisabled = false;
+ public $importDir = '';
+
+ protected $numberPrecision = null;
+
+ // set to the parser that generated the current line when compiling
+ // so we know how to create error messages
+ protected $sourceParser = null;
+ protected $sourceLoc = null;
+
+ static public $defaultValue = array("keyword", "");
+
+ static protected $nextImportId = 0; // uniquely identify imports
+
+ // attempts to find the path of an import url, returns null for css files
+ protected function findImport($url) {
+ foreach ((array)$this->importDir as $dir) {
+ $full = $dir.(substr($dir, -1) != '/' ? '/' : '').$url;
+ if ($this->fileExists($file = $full.'.less') || $this->fileExists($file = $full)) {
+ return $file;
+ }
+ }
+
+ return null;
+ }
+
+ protected function fileExists($name) {
+ return is_file($name);
+ }
+
+ static public function compressList($items, $delim) {
+ if (!isset($items[1]) && isset($items[0])) return $items[0];
+ else return array('list', $delim, $items);
+ }
+
+ static public function preg_quote($what) {
+ return preg_quote($what, '/');
+ }
+
+ protected function tryImport($importPath, $parentBlock, $out) {
+ if ($importPath[0] == "function" && $importPath[1] == "url") {
+ $importPath = $this->flattenList($importPath[2]);
+ }
+
+ $str = $this->coerceString($importPath);
+ if ($str === null) return false;
+
+ $url = $this->compileValue($this->lib_e($str));
+
+ // don't import if it ends in css
+ if (substr_compare($url, '.css', -4, 4) === 0) return false;
+
+ $realPath = $this->findImport($url);
+ if ($realPath === null) return false;
+
+ if ($this->importDisabled) {
+ return array(false, "/* import disabled */");
+ }
+
+ $this->addParsedFile($realPath);
+ $parser = $this->makeParser($realPath);
+ $root = $parser->parse(file_get_contents($realPath));
+
+ // set the parents of all the block props
+ foreach ($root->props as $prop) {
+ if ($prop[0] == "block") {
+ $prop[1]->parent = $parentBlock;
+ }
+ }
+
+ // copy mixins into scope, set their parents
+ // bring blocks from import into current block
+ // TODO: need to mark the source parser these came from this file
+ foreach ($root->children as $childName => $child) {
+ if (isset($parentBlock->children[$childName])) {
+ $parentBlock->children[$childName] = array_merge(
+ $parentBlock->children[$childName],
+ $child);
+ } else {
+ $parentBlock->children[$childName] = $child;
+ }
+ }
+
+ $pi = pathinfo($realPath);
+ $dir = $pi["dirname"];
+
+ list($top, $bottom) = $this->sortProps($root->props, true);
+ $this->compileImportedProps($top, $parentBlock, $out, $parser, $dir);
+
+ return array(true, $bottom, $parser, $dir);
+ }
+
+ protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir) {
+ $oldSourceParser = $this->sourceParser;
+
+ $oldImport = $this->importDir;
+
+ // TODO: this is because the importDir api is stupid
+ $this->importDir = (array)$this->importDir;
+ array_unshift($this->importDir, $importDir);
+
+ foreach ($props as $prop) {
+ $this->compileProp($prop, $block, $out);
+ }
+
+ $this->importDir = $oldImport;
+ $this->sourceParser = $oldSourceParser;
+ }
+
+ /**
+ * Recursively compiles a block.
+ *
+ * A block is analogous to a CSS block in most cases. A single LESS document
+ * is encapsulated in a block when parsed, but it does not have parent tags
+ * so all of it's children appear on the root level when compiled.
+ *
+ * Blocks are made up of props and children.
+ *
+ * Props are property instructions, array tuples which describe an action
+ * to be taken, eg. write a property, set a variable, mixin a block.
+ *
+ * The children of a block are just all the blocks that are defined within.
+ * This is used to look up mixins when performing a mixin.
+ *
+ * Compiling the block involves pushing a fresh environment on the stack,
+ * and iterating through the props, compiling each one.
+ *
+ * See lessc::compileProp()
+ *
+ */
+ protected function compileBlock($block) {
+ switch ($block->type) {
+ case "root":
+ $this->compileRoot($block);
+ break;
+ case null:
+ $this->compileCSSBlock($block);
+ break;
+ case "media":
+ $this->compileMedia($block);
+ break;
+ case "directive":
+ $name = "@" . $block->name;
+ if (!empty($block->value)) {
+ $name .= " " . $this->compileValue($this->reduce($block->value));
+ }
+
+ $this->compileNestedBlock($block, array($name));
+ break;
+ default:
+ $this->throwError("unknown block type: $block->type\n");
+ }
+ }
+
+ protected function compileCSSBlock($block) {
+ $env = $this->pushEnv();
+
+ $selectors = $this->compileSelectors($block->tags);
+ $env->selectors = $this->multiplySelectors($selectors);
+ $out = $this->makeOutputBlock(null, $env->selectors);
+
+ $this->scope->children[] = $out;
+ $this->compileProps($block, $out);
+
+ $block->scope = $env; // mixins carry scope with them!
+ $this->popEnv();
+ }
+
+ protected function compileMedia($media) {
+ $env = $this->pushEnv($media);
+ $parentScope = $this->mediaParent($this->scope);
+
+ $query = $this->compileMediaQuery($this->multiplyMedia($env));
+
+ $this->scope = $this->makeOutputBlock($media->type, array($query));
+ $parentScope->children[] = $this->scope;
+
+ $this->compileProps($media, $this->scope);
+
+ if (count($this->scope->lines) > 0) {
+ $orphanSelelectors = $this->findClosestSelectors();
+ if (!is_null($orphanSelelectors)) {
+ $orphan = $this->makeOutputBlock(null, $orphanSelelectors);
+ $orphan->lines = $this->scope->lines;
+ array_unshift($this->scope->children, $orphan);
+ $this->scope->lines = array();
+ }
+ }
+
+ $this->scope = $this->scope->parent;
+ $this->popEnv();
+ }
+
+ protected function mediaParent($scope) {
+ while (!empty($scope->parent)) {
+ if (!empty($scope->type) && $scope->type != "media") {
+ break;
+ }
+ $scope = $scope->parent;
+ }
+
+ return $scope;
+ }
+
+ protected function compileNestedBlock($block, $selectors) {
+ $this->pushEnv($block);
+ $this->scope = $this->makeOutputBlock($block->type, $selectors);
+ $this->scope->parent->children[] = $this->scope;
+
+ $this->compileProps($block, $this->scope);
+
+ $this->scope = $this->scope->parent;
+ $this->popEnv();
+ }
+
+ protected function compileRoot($root) {
+ $this->pushEnv();
+ $this->scope = $this->makeOutputBlock($root->type);
+ $this->compileProps($root, $this->scope);
+ $this->popEnv();
+ }
+
+ protected function compileProps($block, $out) {
+ foreach ($this->sortProps($block->props) as $prop) {
+ $this->compileProp($prop, $block, $out);
+ }
+ }
+
+ protected function sortProps($props, $split = false) {
+ $vars = array();
+ $imports = array();
+ $other = array();
+
+ foreach ($props as $prop) {
+ switch ($prop[0]) {
+ case "assign":
+ if (isset($prop[1][0]) && $prop[1][0] == $this->vPrefix) {
+ $vars[] = $prop;
+ } else {
+ $other[] = $prop;
+ }
+ break;
+ case "import":
+ $id = self::$nextImportId++;
+ $prop[] = $id;
+ $imports[] = $prop;
+ $other[] = array("import_mixin", $id);
+ break;
+ default:
+ $other[] = $prop;
+ }
+ }
+
+ if ($split) {
+ return array(array_merge($vars, $imports), $other);
+ } else {
+ return array_merge($vars, $imports, $other);
+ }
+ }
+
+ protected function compileMediaQuery($queries) {
+ $compiledQueries = array();
+ foreach ($queries as $query) {
+ $parts = array();
+ foreach ($query as $q) {
+ switch ($q[0]) {
+ case "mediaType":
+ $parts[] = implode(" ", array_slice($q, 1));
+ break;
+ case "mediaExp":
+ if (isset($q[2])) {
+ $parts[] = "($q[1]: " .
+ $this->compileValue($this->reduce($q[2])) . ")";
+ } else {
+ $parts[] = "($q[1])";
+ }
+ break;
+ }
+ }
+
+ if (count($parts) > 0) {
+ $compiledQueries[] = implode(" and ", $parts);
+ }
+ }
+
+ $out = "@media";
+ if (!empty($parts)) {
+ $out .= " " .
+ implode($this->formatter->selectorSeparator, $compiledQueries);
+ }
+ return $out;
+ }
+
+ protected function multiplyMedia($env, $childQueries = null) {
+ if (is_null($env) ||
+ !empty($env->block->type) && $env->block->type != "media")
+ {
+ return $childQueries;
+ }
+
+ // plain old block, skip
+ if (empty($env->block->type)) {
+ return $this->multiplyMedia($env->parent, $childQueries);
+ }
+
+ $out = array();
+ $queries = $env->block->queries;
+ if (is_null($childQueries)) {
+ $out = $queries;
+ } else {
+ foreach ($queries as $parent) {
+ foreach ($childQueries as $child) {
+ $out[] = array_merge($parent, $child);
+ }
+ }
+ }
+
+ return $this->multiplyMedia($env->parent, $out);
+ }
+
+ protected function expandParentSelectors(&$tag, $replace) {
+ $parts = explode("$&$", $tag);
+ $count = 0;
+ foreach ($parts as &$part) {
+ $part = str_replace($this->parentSelector, $replace, $part, $c);
+ $count += $c;
+ }
+ $tag = implode($this->parentSelector, $parts);
+ return $count;
+ }
+
+ protected function findClosestSelectors() {
+ $env = $this->env;
+ $selectors = null;
+ while ($env !== null) {
+ if (isset($env->selectors)) {
+ $selectors = $env->selectors;
+ break;
+ }
+ $env = $env->parent;
+ }
+
+ return $selectors;
+ }
+
+
+ // multiply $selectors against the nearest selectors in env
+ protected function multiplySelectors($selectors) {
+ // find parent selectors
+
+ $parentSelectors = $this->findClosestSelectors();
+ if (is_null($parentSelectors)) {
+ // kill parent reference in top level selector
+ foreach ($selectors as &$s) {
+ $this->expandParentSelectors($s, "");
+ }
+
+ return $selectors;
+ }
+
+ $out = array();
+ foreach ($parentSelectors as $parent) {
+ foreach ($selectors as $child) {
+ $count = $this->expandParentSelectors($child, $parent);
+
+ // don't prepend the parent tag if & was used
+ if ($count > 0) {
+ $out[] = trim($child);
+ } else {
+ $out[] = trim($parent . ' ' . $child);
+ }
+ }
+ }
+
+ return $out;
+ }
+
+ // reduces selector expressions
+ protected function compileSelectors($selectors) {
+ $out = array();
+
+ foreach ($selectors as $s) {
+ if (is_array($s)) {
+ list(, $value) = $s;
+ $out[] = $this->compileValue($this->reduce($value));
+ } else {
+ $out[] = $s;
+ }
+ }
+
+ return $out;
+ }
+
+ protected function eq($left, $right) {
+ return $left == $right;
+ }
+
+ protected function patternMatch($block, $callingArgs) {
+ // match the guards if it has them
+ // any one of the groups must have all its guards pass for a match
+ if (!empty($block->guards)) {
+ $groupPassed = false;
+ foreach ($block->guards as $guardGroup) {
+ foreach ($guardGroup as $guard) {
+ $this->pushEnv();
+ $this->zipSetArgs($block->args, $callingArgs);
+
+ $negate = false;
+ if ($guard[0] == "negate") {
+ $guard = $guard[1];
+ $negate = true;
+ }
+
+ $passed = $this->reduce($guard) == self::$TRUE;
+ if ($negate) $passed = !$passed;
+
+ $this->popEnv();
+
+ if ($passed) {
+ $groupPassed = true;
+ } else {
+ $groupPassed = false;
+ break;
+ }
+ }
+
+ if ($groupPassed) break;
+ }
+
+ if (!$groupPassed) {
+ return false;
+ }
+ }
+
+ $numCalling = count($callingArgs);
+
+ if (empty($block->args)) {
+ return $block->isVararg || $numCalling == 0;
+ }
+
+ $i = -1; // no args
+ // try to match by arity or by argument literal
+ foreach ($block->args as $i => $arg) {
+ switch ($arg[0]) {
+ case "lit":
+ if (empty($callingArgs[$i]) || !$this->eq($arg[1], $callingArgs[$i])) {
+ return false;
+ }
+ break;
+ case "arg":
+ // no arg and no default value
+ if (!isset($callingArgs[$i]) && !isset($arg[2])) {
+ return false;
+ }
+ break;
+ case "rest":
+ $i--; // rest can be empty
+ break 2;
+ }
+ }
+
+ if ($block->isVararg) {
+ return true; // not having enough is handled above
+ } else {
+ $numMatched = $i + 1;
+ // greater than becuase default values always match
+ return $numMatched >= $numCalling;
+ }
+ }
+
+ protected function patternMatchAll($blocks, $callingArgs) {
+ $matches = null;
+ foreach ($blocks as $block) {
+ if ($this->patternMatch($block, $callingArgs)) {
+ $matches[] = $block;
+ }
+ }
+
+ return $matches;
+ }
+
+ // attempt to find blocks matched by path and args
+ protected function findBlocks($searchIn, $path, $args, $seen=array()) {
+ if ($searchIn == null) return null;
+ if (isset($seen[$searchIn->id])) return null;
+ $seen[$searchIn->id] = true;
+
+ $name = $path[0];
+
+ if (isset($searchIn->children[$name])) {
+ $blocks = $searchIn->children[$name];
+ if (count($path) == 1) {
+ $matches = $this->patternMatchAll($blocks, $args);
+ if (!empty($matches)) {
+ // This will return all blocks that match in the closest
+ // scope that has any matching block, like lessjs
+ return $matches;
+ }
+ } else {
+ $matches = array();
+ foreach ($blocks as $subBlock) {
+ $subMatches = $this->findBlocks($subBlock,
+ array_slice($path, 1), $args, $seen);
+
+ if (!is_null($subMatches)) {
+ foreach ($subMatches as $sm) {
+ $matches[] = $sm;
+ }
+ }
+ }
+
+ return count($matches) > 0 ? $matches : null;
+ }
+ }
+
+ if ($searchIn->parent === $searchIn) return null;
+ return $this->findBlocks($searchIn->parent, $path, $args, $seen);
+ }
+
+ // sets all argument names in $args to either the default value
+ // or the one passed in through $values
+ protected function zipSetArgs($args, $values) {
+ $i = 0;
+ $assignedValues = array();
+ foreach ($args as $a) {
+ if ($a[0] == "arg") {
+ if ($i < count($values) && !is_null($values[$i])) {
+ $value = $values[$i];
+ } elseif (isset($a[2])) {
+ $value = $a[2];
+ } else $value = null;
+
+ $value = $this->reduce($value);
+ $this->set($a[1], $value);
+ $assignedValues[] = $value;
+ }
+ $i++;
+ }
+
+ // check for a rest
+ $last = end($args);
+ if ($last[0] == "rest") {
+ $rest = array_slice($values, count($args) - 1);
+ $this->set($last[1], $this->reduce(array("list", " ", $rest)));
+ }
+
+ $this->env->arguments = $assignedValues;
+ }
+
+ // compile a prop and update $lines or $blocks appropriately
+ protected function compileProp($prop, $block, $out) {
+ // set error position context
+ $this->sourceLoc = isset($prop[-1]) ? $prop[-1] : -1;
+
+ switch ($prop[0]) {
+ case 'assign':
+ list(, $name, $value) = $prop;
+ if ($name[0] == $this->vPrefix) {
+ $this->set($name, $value);
+ } else {
+ $out->lines[] = $this->formatter->property($name,
+ $this->compileValue($this->reduce($value)));
+ }
+ break;
+ case 'block':
+ list(, $child) = $prop;
+ $this->compileBlock($child);
+ break;
+ case 'mixin':
+ list(, $path, $args, $suffix) = $prop;
+
+ $args = array_map(array($this, "reduce"), (array)$args);
+ $mixins = $this->findBlocks($block, $path, $args);
+
+ if ($mixins === null) {
+ // fwrite(STDERR,"failed to find block: ".implode(" > ", $path)."\n");
+ break; // throw error here??
+ }
+
+ foreach ($mixins as $mixin) {
+ $haveScope = false;
+ if (isset($mixin->parent->scope)) {
+ $haveScope = true;
+ $mixinParentEnv = $this->pushEnv();
+ $mixinParentEnv->storeParent = $mixin->parent->scope;
+ }
+
+ $haveArgs = false;
+ if (isset($mixin->args)) {
+ $haveArgs = true;
+ $this->pushEnv();
+ $this->zipSetArgs($mixin->args, $args);
+ }
+
+ $oldParent = $mixin->parent;
+ if ($mixin != $block) $mixin->parent = $block;
+
+ foreach ($this->sortProps($mixin->props) as $subProp) {
+ if ($suffix !== null &&
+ $subProp[0] == "assign" &&
+ is_string($subProp[1]) &&
+ $subProp[1]{0} != $this->vPrefix)
+ {
+ $subProp[2] = array(
+ 'list', ' ',
+ array($subProp[2], array('keyword', $suffix))
+ );
+ }
+
+ $this->compileProp($subProp, $mixin, $out);
+ }
+
+ $mixin->parent = $oldParent;
+
+ if ($haveArgs) $this->popEnv();
+ if ($haveScope) $this->popEnv();
+ }
+
+ break;
+ case 'raw':
+ $out->lines[] = $prop[1];
+ break;
+ case "directive":
+ list(, $name, $value) = $prop;
+ $out->lines[] = "@$name " . $this->compileValue($this->reduce($value)).';';
+ break;
+ case "comment":
+ $out->lines[] = $prop[1];
+ break;
+ case "import";
+ list(, $importPath, $importId) = $prop;
+ $importPath = $this->reduce($importPath);
+
+ if (!isset($this->env->imports)) {
+ $this->env->imports = array();
+ }
+
+ $result = $this->tryImport($importPath, $block, $out);
+
+ $this->env->imports[$importId] = $result === false ?
+ array(false, "@import " . $this->compileValue($importPath).";") :
+ $result;
+
+ break;
+ case "import_mixin":
+ list(,$importId) = $prop;
+ $import = $this->env->imports[$importId];
+ if ($import[0] === false) {
+ $out->lines[] = $import[1];
+ } else {
+ list(, $bottom, $parser, $importDir) = $import;
+ $this->compileImportedProps($bottom, $block, $out, $parser, $importDir);
+ }
+
+ break;
+ default:
+ $this->throwError("unknown op: {$prop[0]}\n");
+ }
+ }
+
+
+ /**
+ * Compiles a primitive value into a CSS property value.
+ *
+ * Values in lessphp are typed by being wrapped in arrays, their format is
+ * typically:
+ *
+ * array(type, contents [, additional_contents]*)
+ *
+ * The input is expected to be reduced. This function will not work on
+ * things like expressions and variables.
+ */
+ protected function compileValue($value) {
+ switch ($value[0]) {
+ case 'list':
+ // [1] - delimiter
+ // [2] - array of values
+ return implode($value[1], array_map(array($this, 'compileValue'), $value[2]));
+ case 'raw_color':
+ if (!empty($this->formatter->compressColors)) {
+ return $this->compileValue($this->coerceColor($value));
+ }
+ return $value[1];
+ case 'keyword':
+ // [1] - the keyword
+ return $value[1];
+ case 'number':
+ list(, $num, $unit) = $value;
+ // [1] - the number
+ // [2] - the unit
+ if ($this->numberPrecision !== null) {
+ $num = round($num, $this->numberPrecision);
+ }
+ return $num . $unit;
+ case 'string':
+ // [1] - contents of string (includes quotes)
+ list(, $delim, $content) = $value;
+ foreach ($content as &$part) {
+ if (is_array($part)) {
+ $part = $this->compileValue($part);
+ }
+ }
+ return $delim . implode($content) . $delim;
+ case 'color':
+ // [1] - red component (either number or a %)
+ // [2] - green component
+ // [3] - blue component
+ // [4] - optional alpha component
+ list(, $r, $g, $b) = $value;
+ $r = round($r);
+ $g = round($g);
+ $b = round($b);
+
+ if (count($value) == 5 && $value[4] != 1) { // rgba
+ ...
[truncated message content] |
|
From: <gem...@li...> - 2012-08-20 14:15:26
|
Revision: 899
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=899&view=rev
Author: mennodekker
Date: 2012-08-20 14:15:17 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Fixed #560: translation nl typo
+updated translations
Modified Paths:
--------------
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2012-08-20 12:28:52 UTC (rev 898)
+++ trunk/library/languages/default-en.po 2012-08-20 14:15:17 UTC (rev 899)
@@ -2,97 +2,96 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-20 18:36+0100\n"
+"POT-Creation-Date: 2012-08-20 16:12+0100\n"
"PO-Revision-Date: \n"
-"Last-Translator: Matijs de Jong <mj...@ma...>\n"
+"Last-Translator: Menno Dekker <men...@er...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Poedit-Language: English\n"
-"X-Poedit-Country: UNITED KINGDOM\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
"X-Poedit-Basepath: ../\n"
"X-Poedit-KeywordsList: plural:1,2\n"
"X-Poedit-SearchPath-0: .\n"
-#: classes/GemsEscort.php:215
+#: classes/GemsEscort.php:219
#, php-format
msgid "Path %s not writable"
msgstr "Path %s not writable"
-#: classes/GemsEscort.php:597
+#: classes/GemsEscort.php:601
msgid " > "
msgstr " > "
-#: classes/GemsEscort.php:788
+#: classes/GemsEscort.php:796
#, php-format
msgid "You are logged in as %s"
msgstr "You are logged in as %s"
-#: classes/GemsEscort.php:790
-#: classes/Gems/Menu.php:261
+#: classes/GemsEscort.php:798 classes/Gems/Menu.php:263
msgid "Logoff"
msgstr "Logoff"
-#: classes/GemsEscort.php:793
+#: classes/GemsEscort.php:801
msgid "You are not logged in"
msgstr "You are not logged in"
-#: classes/GemsEscort.php:981
+#: classes/GemsEscort.php:989
#, php-format
msgid "User: %s"
msgstr "User: %s"
-#: classes/GemsEscort.php:1006
+#: classes/GemsEscort.php:1014
msgid "version"
msgstr "version"
-#: classes/GemsEscort.php:1452
-msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
-msgstr "Take note: your session has expired, your inputs were not saved. Please check the input data and try again"
+#: classes/GemsEscort.php:1460
+msgid ""
+"Take note: your session has expired, your inputs were not saved. Please "
+"check the input data and try again"
+msgstr ""
+"Take note: your session has expired, your inputs were not saved. Please "
+"check the input data and try again"
-#: classes/GemsEscort.php:1581
+#: classes/GemsEscort.php:1589
msgid "Please check back later."
msgstr "Please check back later."
-#: classes/GemsEscort.php:1583
-#: classes/GemsEscort.php:1587
-#: classes/GemsEscort.php:1588
+#: classes/GemsEscort.php:1591 classes/GemsEscort.php:1595
+#: classes/GemsEscort.php:1596
msgid "System is in maintenance mode"
msgstr "System is in maintenance mode"
-#: classes/GemsEscort.php:1598
+#: classes/GemsEscort.php:1606
msgid "No access to site."
msgstr "No access to site."
-#: classes/GemsEscort.php:1600
-#: classes/GemsEscort.php:1643
+#: classes/GemsEscort.php:1608 classes/GemsEscort.php:1651
msgid "You have no access to this site."
msgstr "You have no access to this site."
-#: classes/GemsEscort.php:1616
+#: classes/GemsEscort.php:1624 classes/Gems/Default/StaffAction.php:317
msgid "No access to page"
msgstr "No access to page"
-#: classes/GemsEscort.php:1618
+#: classes/GemsEscort.php:1626 classes/Gems/Default/OrganizationAction.php:94
+#: classes/Gems/Default/StaffAction.php:318
+#: classes/Gems/Model/HiddenOrganizationModel.php:115
#, php-format
msgid "Access to this page is not allowed for current role: %s."
msgstr "Access to this page is not allowed for current role: %s."
-#: classes/GemsEscort.php:1628
-#: classes/GemsEscort.php:1641
+#: classes/GemsEscort.php:1636 classes/GemsEscort.php:1649
msgid "You are no longer logged in."
msgstr "You are no longer logged in."
-#: classes/GemsEscort.php:1629
+#: classes/GemsEscort.php:1637
msgid "You must login to access this page."
msgstr "You must login to access this page."
-#: classes/GemsEscort.php:1770
-#: classes/GemsEscort.php:1772
+#: classes/GemsEscort.php:1778 classes/GemsEscort.php:1780
#, php-format
msgid "%d survey"
msgid_plural "%d surveys"
@@ -148,7 +147,7 @@
msgid "Project setup"
msgstr "Project setup"
-#: classes/Gems/Menu.php:170
+#: classes/Gems/Menu.php:170 classes/Gems/Default/SourceAction.php:203
msgid "Database"
msgstr "Database"
@@ -156,11 +155,11 @@
msgid "Content"
msgstr "Content"
-#: classes/Gems/Menu.php:177
+#: classes/Gems/Menu.php:177 classes/Gems/Default/DatabaseAction.php:313
msgid "Execute"
msgstr "Execute"
-#: classes/Gems/Menu.php:182
+#: classes/Gems/Menu.php:182 classes/Gems/Default/DatabaseAction.php:289
msgid "Patches"
msgstr "Patches"
@@ -176,7 +175,7 @@
msgid "Run SQL"
msgstr "Run SQL"
-#: classes/Gems/Menu.php:190
+#: classes/Gems/Menu.php:190 classes/Gems/Default/ReceptionAction.php:132
msgid "Reception codes"
msgstr "Reception codes"
@@ -184,16 +183,16 @@
msgid "Consents"
msgstr "Consents"
-#: classes/Gems/Menu.php:196
+#: classes/Gems/Menu.php:196 classes/Gems/Default/RoleAction.php:309
msgid "Roles"
msgstr "Roles"
-#: classes/Gems/Menu.php:197
-#: classes/Gems/Menu.php:389
+#: classes/Gems/Menu.php:197 classes/Gems/Menu.php:391
msgid "Assigned"
msgstr "Assigned"
-#: classes/Gems/Menu.php:198
+#: classes/Gems/Menu.php:198 classes/Gems/Default/RoleAction.php:238
+#: classes/Gems/Default/RoleAction.php:324
msgid "Privileges"
msgstr "Privileges"
@@ -202,14 +201,20 @@
msgstr "Groups"
#: classes/Gems/Menu.php:204
+#: classes/Gems/Default/SurveyMaintenanceAction.php:202
+#: classes/Gems/Default/TrackMaintenanceAction.php:131
+#: classes/Gems/Email/MailTemplateForm.php:103
+#: classes/Gems/Tracker/Snippets/EditTrackEngineSnippetGeneric.php:140
msgid "Organizations"
msgstr "Organizations"
-#: classes/Gems/Menu.php:207
+#: classes/Gems/Menu.php:207 classes/Gems/Default/GroupAction.php:93
+#: classes/Gems/Default/LogAction.php:193
+#: classes/Gems/Default/StaffAction.php:470
msgid "Staff"
msgstr "Staff"
-#: classes/Gems/Menu.php:210
+#: classes/Gems/Menu.php:210 classes/Gems/Default/LogAction.php:213
msgid "Logging"
msgstr "Logging"
@@ -221,154 +226,211 @@
msgid "Upgrade"
msgstr "Upgrade"
-#: classes/Gems/Menu.php:220
-#: classes/Gems/Menu.php:353
+#: classes/Gems/Menu.php:220 classes/Gems/Menu.php:221
+#: classes/Gems/Default/ProjectInformationAction.php:113
+#: classes/Gems/Default/ProjectInformationAction.php:118
+#, php-format
+msgid "Changelog %s"
+msgstr "Changelog %s"
+
+#: classes/Gems/Menu.php:222 classes/Gems/Menu.php:355
+#: classes/Gems/Menu/SubMenuItem.php:551
msgid "Show"
msgstr "Show"
-#: classes/Gems/Menu.php:221
+#: classes/Gems/Menu.php:223
msgid "Execute all"
msgstr "Execute all"
-#: classes/Gems/Menu.php:222
+#: classes/Gems/Menu.php:224
msgid "Execute this"
msgstr "Execute this"
-#: classes/Gems/Menu.php:223
+#: classes/Gems/Menu.php:225
msgid "Execute from here"
msgstr "Execute from here"
-#: classes/Gems/Menu.php:224
+#: classes/Gems/Menu.php:226
msgid "Execute to here"
msgstr "Execute to here"
-#: classes/Gems/Menu.php:248
+#: classes/Gems/Menu.php:250
#, php-format
msgid "Stand-alone privilege: %s"
msgstr "Stand-alone privilege: %s"
-#: classes/Gems/Menu.php:255
+#: classes/Gems/Menu.php:257
msgid "Logon"
msgstr "Logon"
-#: classes/Gems/Menu.php:256
+#: classes/Gems/Menu.php:258 classes/Gems/User/Form/LoginForm.php:112
msgid "Lost password"
msgstr "Lost password"
-#: classes/Gems/Menu.php:257
+#: classes/Gems/Menu.php:259
msgid "Your account"
msgstr "Your account"
-#: classes/Gems/Menu.php:258
+#: classes/Gems/Menu.php:260 classes/Gems/Default/OptionAction.php:153
msgid "Activity overview"
msgstr "Activity overview"
-#: classes/Gems/Menu.php:259
+#: classes/Gems/Menu.php:261 classes/Gems/Default/OptionAction.php:78
msgid "Change password"
msgstr "Change password"
-#: classes/Gems/Menu.php:260
-#: classes/Gems/Menu.php:313
-#: classes/Gems/Menu.php:359
+#: classes/Gems/Menu.php:262 classes/Gems/Menu.php:315
+#: classes/Gems/Menu.php:361 classes/Gems/Default/MailLogAction.php:114
+#: classes/Gems/Default/TrackAction.php:459
+#: classes/Gems/Export/RespondentExport.php:150
+#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:70
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:490
+#: classes/Gems/Tracker/Form/AskTokenForm.php:77
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:195
+#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:173
+#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:182
+#: snippets/BrowseSingleSurveyTokenSnippet.php:167
+#: snippets/TrackTokenOverviewSnippet.php:132
+#: snippets/Organization/OrganizationEditSnippet.php:89
+#: snippets/Track/Token/ShowAllOpenSnippet.php:88
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:110
msgid "Token"
msgstr "Token"
-#: classes/Gems/Menu.php:301
+#: classes/Gems/Menu.php:303 classes/Gems/Export/RespondentExport.php:301
msgid "Export"
msgstr "Export"
-#: classes/Gems/Menu.php:308
+#: classes/Gems/Menu.php:310 classes/Gems/Default/MailJobAction.php:99
+#: classes/Gems/Default/ProjectTracksAction.php:64
+#: classes/Gems/Default/TrackAction.php:328
+#: classes/Gems/Default/TrackActionAbstract.php:199
+#: classes/Gems/Default/TrackFieldsAction.php:96
+#: classes/Gems/Email/OneMailForm.php:54
+#: classes/Gems/Export/RespondentExport.php:207
+#: classes/Gems/Export/RespondentExport.php:219
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:492
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:734
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:216
+#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:149
+#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:146
+#: snippets/Track/Token/ShowAllOpenSnippet.php:148
msgid "Track"
msgstr "Track"
-#: classes/Gems/Menu.php:316
-#: classes/Gems/Menu.php:341
-#: classes/Gems/Menu.php:383
+#: classes/Gems/Menu.php:318 classes/Gems/Menu.php:343
+#: classes/Gems/Menu.php:385
+#: classes/Gems/Default/TrackMaintenanceAction.php:367
+#: snippets/AddTracksSnippet.php:242
msgid "Add"
msgstr "Add"
-#: classes/Gems/Menu.php:322
-#: classes/Gems/Menu.php:422
+#: classes/Gems/Menu.php:324 classes/Gems/Menu.php:424
+#: classes/Gems/Email/EmailFormAbstract.php:282
+#: classes/Gems/Email/EmailFormAbstract.php:293
+#: classes/Gems/Menu/MenuAbstract.php:367
+#: classes/Gems/Menu/MenuAbstract.php:380
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:331
+#: classes/Gems/Menu.php:333 classes/Gems/Default/ExportAction.php:149
+#: classes/Gems/Default/TrackMaintenanceAction.php:314
+#: classes/Gems/Menu/MenuAbstract.php:376
+#: classes/Gems/Menu/MenuAbstract.php:457 snippets/AddTracksSnippet.php:239
msgid "Tracks"
msgstr "Tracks"
-#: classes/Gems/Menu.php:347
+#: classes/Gems/Menu.php:349
msgid "Assignments"
msgstr "Assignments"
-#: classes/Gems/Menu.php:363
+#: classes/Gems/Menu.php:365 classes/Gems/Menu/SubMenuItem.php:417
msgid "Edit"
msgstr "Edit"
-#: classes/Gems/Menu.php:369
+#: classes/Gems/Menu.php:371 classes/Gems/Menu/SubMenuItem.php:398
msgid "Delete"
msgstr "Delete"
-#: classes/Gems/Menu.php:376
+#: classes/Gems/Menu.php:378
+#: classes/Gems/Default/SurveyMaintenanceAction.php:561
+#: classes/Gems/Menu/MenuAbstract.php:383
+#: classes/Gems/Menu/MenuAbstract.php:445
+#: classes/Gems/Tracker/Model/TrackModel.php:100
msgid "Surveys"
msgstr "Surveys"
-#: classes/Gems/Menu.php:413
+#: classes/Gems/Menu.php:415
msgid "Fill in"
msgstr "Fill in"
-#: classes/Gems/Menu.php:416
+#: classes/Gems/Menu.php:418
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:419
+#: classes/Gems/Menu.php:421
msgid "E-Mail now!"
msgstr "E-Mail now!"
-#: classes/Gems/Menu.php:425
+#: classes/Gems/Menu.php:427
+#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:489
msgid "Answers"
msgstr "Answers"
-#: classes/Gems/Menu.php:577
+#: classes/Gems/Menu.php:579 classes/Gems/Default/GroupAction.php:94
+#: classes/Gems/Default/OrganizationAction.php:142
+#: classes/Gems/Default/RespondentAction.php:403
msgid "Respondents"
msgstr "Patients"
-#: classes/Gems/Menu.php:585
+#: classes/Gems/Menu.php:587
msgid "Overview"
msgstr "Overview"
-#: classes/Gems/Menu.php:592
+#: classes/Gems/Menu.php:594 classes/Gems/Menu/MenuAbstract.php:340
msgid "Project"
msgstr "Project"
-#: classes/Gems/Menu.php:595
+#: classes/Gems/Menu.php:597
msgid "Setup"
msgstr "Setup"
-#: classes/Gems/Menu.php:598
+#: classes/Gems/Menu.php:600
msgid "Track Builder"
msgstr "Track Builder"
-#: classes/Gems/Menu.php:601
+#: classes/Gems/Menu.php:603
msgid "Mail"
msgstr "Mail"
-#: classes/Gems/Menu.php:607
+#: classes/Gems/Menu.php:609 classes/Gems/Default/RespondentAction.php:511
+#: classes/Gems/Default/RespondentExportAction.php:60
msgid "Export respondent"
msgstr "Export respondent"
-#: classes/Gems/Menu.php:613
+#: classes/Gems/Menu.php:615 classes/Gems/Default/ContactAction.php:101
+#: snippets/Organization/OrganizationEditSnippet.php:82
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:627
+#: classes/Gems/Menu.php:629
msgid "Changelog"
msgstr "Changelog"
#: classes/Gems/Model.php:206
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:213
msgid "Respondent nr"
msgstr "Patient nr"
-#: classes/Gems/Model.php:209
+#: classes/Gems/Model.php:209 classes/Gems/Default/ExportAction.php:172
+#: classes/Gems/Default/IndexAction.php:229
+#: classes/Gems/Default/LogAction.php:197
+#: classes/Gems/Default/MailJobAction.php:98
+#: classes/Gems/Default/StaffAction.php:340
+#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:63
+#: classes/Gems/User/Form/LayeredLoginForm.php:254
+#: classes/Gems/User/Form/OrganizationFormAbstract.php:166
+#: snippets/Organization/OrganizationEditSnippet.php:80
msgid "Organization"
msgstr "Organization"
@@ -380,27 +442,43 @@
msgid "Consent"
msgstr "Consent"
-#: classes/Gems/Model.php:214
+#: classes/Gems/Model.php:214 classes/Gems/Default/OptionAction.php:130
+#: classes/Gems/Default/StaffAction.php:330
msgid "E-Mail"
msgstr "E-Mail"
-#: classes/Gems/Model.php:219
+#: classes/Gems/Model.php:219 classes/Gems/Default/OptionAction.php:134
+#: classes/Gems/Default/StaffAction.php:343
msgid "Gender"
msgstr "Gender"
-#: classes/Gems/Model.php:220
+#: classes/Gems/Model.php:220 classes/Gems/Default/OptionAction.php:131
+#: classes/Gems/Default/StaffAction.php:185
msgid "First name"
msgstr "First name"
-#: classes/Gems/Model.php:221
+#: classes/Gems/Model.php:221 classes/Gems/Default/OptionAction.php:132
+#: classes/Gems/Default/StaffAction.php:187
msgid "Surname prefix"
msgstr "Surname prefix"
-#: classes/Gems/Model.php:222
+#: classes/Gems/Model.php:222 classes/Gems/Default/OptionAction.php:133
+#: classes/Gems/Default/StaffAction.php:188
msgid "Last name"
msgstr "Last name"
-#: classes/Gems/Model.php:224
+#: classes/Gems/Model.php:224 classes/Gems/Default/DatabaseAction.php:135
+#: classes/Gems/Default/DatabaseAction.php:335
+#: classes/Gems/Default/GroupAction.php:87
+#: classes/Gems/Default/OrganizationAction.php:114
+#: classes/Gems/Default/RoleAction.php:231
+#: classes/Gems/Default/SourceAction.php:195
+#: classes/Gems/Default/StaffAction.php:328
+#: classes/Gems/Default/SurveyMaintenanceAction.php:411
+#: classes/Gems/Default/TokenPlanAction.php:121
+#: classes/Gems/Default/TrackFieldsAction.php:98
+#: classes/Gems/Default/TrackMaintenanceAction.php:227
+#: classes/Gems/Tracker/Model/TrackModel.php:98
msgid "Name"
msgstr "Name"
@@ -413,6 +491,7 @@
msgstr "Zipcode"
#: classes/Gems/Model.php:229
+#: classes/Gems/Default/RespondentPlanAction.php:134
msgid "City"
msgstr "City"
@@ -421,6 +500,7 @@
msgstr "Phone"
#: classes/Gems/Model.php:233
+#: classes/Gems/Default/RespondentPlanAction.php:133
msgid "Birthday"
msgstr "Birthday"
@@ -444,80 +524,133 @@
msgid "Unable to run PDF conversion (%s): \"%s\""
msgstr "Unable to run PDF conversion (%s): \"%s\""
-#: classes/Gems/Upgrades.php:79
+#: classes/Gems/Upgrades.php:89
msgid "Syncing surveys for all sources"
msgstr "Syncing surveys for all sources"
-#: classes/Gems/UpgradesAbstract.php:154
+#: classes/Gems/Upgrades.php:149
+msgid "Make sure to read the changelog as it contains important instructions"
+msgstr "Make sure to read the changelog as it contains important instructions"
+
+#: classes/Gems/UpgradesAbstract.php:172
msgid "Already at max. level."
msgstr "Already at max. level."
-#: classes/Gems/UpgradesAbstract.php:161
+#: classes/Gems/UpgradesAbstract.php:179
#, php-format
msgid "Trying upgrade for %s from level %s to level %s"
msgstr "Trying upgrade for %s from level %s to level %s"
-#: classes/Gems/UpgradesAbstract.php:169
+#: classes/Gems/UpgradesAbstract.php:187
#, php-format
msgid "Trying upgrade for %s to level %s: %s"
msgstr "Trying upgrade for %s to level %s: %s"
#: classes/Gems/Controller/BrowseEditAction.php:358
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:239
+#: classes/Gems/Default/StaffAction.php:228
+#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:186
#, php-format
msgid "New %s..."
msgstr "New %s..."
#: classes/Gems/Controller/BrowseEditAction.php:391
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:259
+#: classes/Gems/Default/TrackFieldsAction.php:130
+#: classes/Gems/Default/TrackRoundsAction.php:171
#, php-format
msgid "Delete %s"
msgstr "Delete %s"
#: classes/Gems/Controller/BrowseEditAction.php:395
+#: classes/Gems/Default/TrackFieldsAction.php:137
+#: classes/Gems/Default/TrackRoundsAction.php:186
+#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:134
+#: snippets/DeleteTrackTokenSnippet.php:152
#, php-format
msgid "%2$u %1$s deleted"
msgstr "%2$u %1$s deleted"
#: classes/Gems/Controller/BrowseEditAction.php:412
+#: classes/Gems/Default/OrganizationAction.php:200
#, php-format
msgid "Edit %s %s"
msgstr "Edit %s %s"
#: classes/Gems/Controller/BrowseEditAction.php:414
+#: classes/Gems/Controller/ModelSnippetActionAbstract.php:269
+#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:188
#, php-format
msgid "Edit %s"
msgstr "Edit %s"
#: classes/Gems/Controller/BrowseEditAction.php:515
+#: snippets/Generic/AutosearchFormSnippet.php:134
msgid "Free search text"
msgstr "Free search text"
#: classes/Gems/Controller/BrowseEditAction.php:586
+#: snippets/Generic/AutosearchFormSnippet.php:209
msgid "Search"
msgstr "Search"
#: classes/Gems/Controller/BrowseEditAction.php:602
+#: classes/Gems/Default/TrackMaintenanceAction.php:361
#, php-format
msgid "No %s found"
msgstr "No %s found"
#: classes/Gems/Controller/BrowseEditAction.php:686
+#: classes/Gems/Default/ExportAction.php:245
#, php-format
msgid "No %s found."
msgstr "No %s found."
#: classes/Gems/Controller/BrowseEditAction.php:804
+#: classes/Gems/Default/TrackRoundsAction.php:244
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:94
msgid "Are you sure?"
msgstr "Are you sure?"
#: classes/Gems/Controller/BrowseEditAction.php:820
+#: classes/Gems/Default/DatabaseAction.php:187
+#: classes/Gems/Default/DatabaseAction.php:499
+#: classes/Gems/Default/StaffAction.php:276
+#: classes/Gems/Default/TrackAction.php:419
+#: classes/Gems/Default/TrackRoundsAction.php:264
+#: classes/Gems/Snippets/ModelItemYesNoDeleteSnippetAbstract.php:181
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:143
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:147
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:166
+#: classes/Gems/Util/Translated.php:263
+#: classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php:192
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:124
msgid "Yes"
msgstr "Yes"
#: classes/Gems/Controller/BrowseEditAction.php:821
+#: classes/Gems/Default/DatabaseAction.php:188
+#: classes/Gems/Default/DatabaseAction.php:500
+#: classes/Gems/Default/StaffAction.php:277
+#: classes/Gems/Default/TrackAction.php:420
+#: classes/Gems/Default/TrackRoundsAction.php:265
+#: classes/Gems/Snippets/ModelItemYesNoDeleteSnippetAbstract.php:183
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:144
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:148
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:167
+#: classes/Gems/Util/ReceptionCodeLibrary.php:99
+#: classes/Gems/Util/ReceptionCodeLibrary.php:123
+#: classes/Gems/Util/Translated.php:263
+#: classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php:194
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:125
msgid "No"
msgstr "No"
#: classes/Gems/Controller/BrowseEditAction.php:874
+#: classes/Gems/Default/RespondentAction.php:246
+#: classes/Gems/Default/RespondentAction.php:456
+#: classes/Gems/Default/RespondentAction.php:494
+#: classes/Gems/Default/TrackAction.php:547
#, php-format
msgid "Unknown %s requested"
msgstr "Unknown %s requested"
@@ -528,10 +661,15 @@
msgstr "New %1$s..."
#: classes/Gems/Controller/BrowseEditAction.php:905
+#: classes/Gems/Email/MailTemplateForm.php:110
+#: classes/Gems/User/Form/ChangePasswordForm.php:341
+#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:245
msgid "Save"
msgstr "Save"
#: classes/Gems/Controller/BrowseEditAction.php:941
+#: classes/Gems/Default/MailTemplateAction.php:118
+#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:209
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s saved"
@@ -541,21 +679,31 @@
msgstr "No changes to save."
#: classes/Gems/Controller/BrowseEditAction.php:953
+#: classes/Gems/Default/RespondentAction.php:307
msgid "Input error! No changes saved!"
msgstr "Input error! No changes saved!"
#: classes/Gems/Controller/BrowseEditAction.php:981
+#: classes/Gems/Default/SurveyMaintenanceAction.php:590
#, php-format
msgid "Show %s"
msgstr "Show %s"
#: classes/Gems/Controller/BrowseEditAction.php:988
+#: classes/Gems/Default/SurveyMaintenanceAction.php:599
#, php-format
msgid "Unknown %s."
msgstr "Unknown %s."
#: classes/Gems/Controller/ModelActionAbstract.php:97
#: classes/Gems/Default/DatabaseAction.php:503
+#: classes/Gems/Default/SourceAction.php:292
+#: classes/Gems/Default/UpgradeAction.php:184
+#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:171
+#: classes/Gems/Snippets/ModelItemTableSnippetAbstract.php:180
+#: classes/Gems/Tracker/Snippets/ShowRoundSnippetAbstract.php:193
+#: snippets/Generic/CurrentButtonRowSnippet.php:77
+#: snippets/Track/Token/ShowFirstOpenSnippet.php:133
msgid "Cancel"
msgstr "Cancel"
@@ -579,6 +727,8 @@
msgstr "Showing %s"
#: classes/Gems/Controller/ModelSnippetActionAbstract.php:390
+#: classes/Gems/Default/OptionAction.php:181
+#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:341
msgid "item"
msgid_plural "items"
msgstr[0] "item"
@@ -615,22 +765,36 @@
msgstr "After answering the survey you will be logged off automatically."
#: classes/Gems/Default/AskAction.php:100
-msgid "A token consists of two groups of four letters and numbers, separated by an optional hyphen. Tokens are case insensitive."
-msgstr "A token consists of two groups of four letters and numbers, separated by an optional hyphen. Tokens are case insensitive."
+msgid ""
+"A token consists of two groups of four letters and numbers, separated by an "
+"optional hyphen. Tokens are case insensitive."
+msgstr ""
+"A token consists of two groups of four letters and numbers, separated by an "
+"optional hyphen. Tokens are case insensitive."
#: classes/Gems/Default/AskAction.php:101
-msgid "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
-msgstr "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
+msgid ""
+"The number zero and the letter O are treated as the same; the same goes for "
+"the number one and the letter L."
+msgstr ""
+"The number zero and the letter O are treated as the same; the same goes for "
+"the number one and the letter L."
#: classes/Gems/Default/AskAction.php:136
#, php-format
-msgid "Thank you for answering. At the moment we have no further surveys for you to take."
-msgstr "Thank you for answering. At the moment we have no further surveys for you to take."
+msgid ""
+"Thank you for answering. At the moment we have no further surveys for you to "
+"take."
+msgstr ""
+"Thank you for answering. At the moment we have no further surveys for you to "
+"take."
#: classes/Gems/Default/AskAction.php:138
#, php-format
-msgid "The survey for token %s has been answered and no further surveys are open."
-msgstr "The survey for token %s has been answered and no further surveys are open."
+msgid ""
+"The survey for token %s has been answered and no further surveys are open."
+msgstr ""
+"The survey for token %s has been answered and no further surveys are open."
#: classes/Gems/Default/AskAction.php:145
#, php-format
@@ -644,11 +808,26 @@
#: classes/Gems/Default/ConsentAction.php:68
#: classes/Gems/Default/GroupAction.php:88
+#: classes/Gems/Default/ReceptionAction.php:81
+#: classes/Gems/Default/RoleAction.php:232
+#: classes/Gems/Default/SurveyMaintenanceAction.php:198
+#: classes/Gems/Default/SurveyMaintenanceAction.php:412
+#: classes/Gems/Default/TrackActionAbstract.php:200
+#: classes/Gems/Default/TrackFieldsAction.php:101
+#: classes/Gems/Default/UpgradeAction.php:176
+#: classes/Gems/Export/RespondentExport.php:208
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:740
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:214
+#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:150
+#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:147
+#: snippets/TrackSurveyOverviewSnippet.php:115
msgid "Description"
msgstr "Description"
#: classes/Gems/Default/ConsentAction.php:70
#: classes/Gems/Default/DatabaseAction.php:139
+#: classes/Gems/Default/TrackFieldsAction.php:97
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:739
msgid "Order"
msgstr "Order"
@@ -661,8 +840,12 @@
msgstr "Consent code"
#: classes/Gems/Default/ConsentAction.php:75
-msgid "Internal code, not visible to users, copied with the token information to the source."
-msgstr "Internal code, not visible to users, copied with the token information to the source."
+msgid ""
+"Internal code, not visible to users, copied with the token information to "
+"the source."
+msgstr ""
+"Internal code, not visible to users, copied with the token information to "
+"the source."
#: classes/Gems/Default/ConsentAction.php:92
msgid "respondent consent"
@@ -702,19 +885,23 @@
msgid "Links concerning this web application:"
msgstr "Links concerning this web application:"
-#: classes/Gems/Default/CronAction.php:148
+#: classes/Gems/Default/CronAction.php:138
msgid "Cron jobs turned off."
msgstr "Cron jobs turned off."
-#: classes/Gems/Default/CronAction.php:223
+#: classes/Gems/Default/CronAction.php:211
msgid "No mails sent."
msgstr "No mails sent."
-#: classes/Gems/Default/CronAction.php:226
+#: classes/Gems/Default/CronAction.php:214
+#: classes/Gems/Email/MultiMailForm.php:49
+#: classes/Gems/Email/OneMailForm.php:47
msgid "On this test system all mail will be delivered to the from address."
msgstr "On this test system all mail will be delivered to the from address."
#: classes/Gems/Default/DatabaseAction.php:75
+#: classes/Gems/Default/ProjectInformationAction.php:192
+#: classes/Gems/Task/CleanCache.php:58
msgid "Cache cleaned"
msgstr "Cache cleaned"
@@ -724,18 +911,26 @@
msgstr "No rows in %s."
#: classes/Gems/Default/DatabaseAction.php:134
+#: classes/Gems/Default/MailTemplateAction.php:70
+#: classes/Gems/Default/TrackFieldsAction.php:104
+#: classes/Gems/Default/TrackMaintenanceAction.php:229
msgid "Type"
msgstr "Type"
#: classes/Gems/Default/DatabaseAction.php:138
+#: classes/Gems/Default/SurveyMaintenanceAction.php:433
msgid "Group"
msgstr "Group"
#: classes/Gems/Default/DatabaseAction.php:140
+#: classes/Gems/Default/OrganizationAction.php:115
msgid "Location"
msgstr "Location"
#: classes/Gems/Default/DatabaseAction.php:143
+#: classes/Gems/Default/SourceAction.php:210
+#: classes/Gems/Export/RespondentExport.php:151
+#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:149
msgid "Status"
msgstr "Status"
@@ -746,6 +941,7 @@
#: classes/Gems/Default/DatabaseAction.php:148
#: classes/Gems/Default/DatabaseAction.php:293
#: classes/Gems/Default/DatabaseAction.php:340
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:204
msgid "Changed on"
msgstr "Changed on"
@@ -816,6 +1012,9 @@
#: classes/Gems/Default/DatabaseAction.php:287
#: classes/Gems/Default/DatabaseAction.php:333
+#: classes/Gems/Default/UpgradeAction.php:126
+#: classes/Gems/Default/UpgradeAction.php:153
+#: classes/Gems/Default/UpgradeAction.php:175
msgid "Level"
msgstr "Level"
@@ -848,6 +1047,7 @@
msgstr "%d new or changed patch(es)."
#: classes/Gems/Default/DatabaseAction.php:303
+#: classes/Gems/Default/ProjectInformationAction.php:137
msgid "Gems build"
msgstr "Gems build"
@@ -872,6 +1072,7 @@
msgstr "Show patches"
#: classes/Gems/Default/DatabaseAction.php:326
+#: classes/Gems/Task/Db/ExecutePatch.php:68
#, php-format
msgid "%d patch(es) executed."
msgstr "%d patch(es) executed."
@@ -915,6 +1116,7 @@
msgstr "Starting %d object creation scripts."
#: classes/Gems/Default/DatabaseAction.php:474
+#: classes/Gems/Task/Db/CreateNewTable.php:73
#, php-format
msgid "Finished %s creation script for object %d of %d"
msgstr "Finished %s creation script for object %d of %d"
@@ -949,6 +1151,7 @@
msgstr "Separate multiple commands with semicolons (;)."
#: classes/Gems/Default/DatabaseAction.php:522
+#: classes/Gems/Menu/MenuAbstract.php:275
msgid "Run"
msgstr "Run"
@@ -992,6 +1195,14 @@
msgstr "Not patient nr, but respondent id as exported here."
#: classes/Gems/Default/ExportAction.php:154
+#: classes/Gems/Default/MailJobAction.php:100
+#: classes/Gems/Default/ProjectSurveysAction.php:67
+#: classes/Gems/Default/SurveyAction.php:191
+#: classes/Gems/Email/OneMailForm.php:57
+#: classes/Gems/Export/RespondentExport.php:148
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:737
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:215
+#: snippets/TrackSurveyOverviewSnippet.php:111
msgid "Survey"
msgstr "Survey"
@@ -1014,20 +1225,34 @@
#: classes/Gems/Default/GroupAction.php:89
#: classes/Gems/Default/LogAction.php:201
+#: classes/Gems/Default/RoleAction.php:298
msgid "Role"
msgstr "Role"
#: classes/Gems/Default/GroupAction.php:92
+#: classes/Gems/Default/MailJobAction.php:82
+#: classes/Gems/Default/OrganizationAction.php:139
+#: classes/Gems/Default/ReceptionAction.php:88
+#: classes/Gems/Default/SourceAction.php:101
+#: classes/Gems/Default/SurveyMaintenanceAction.php:424
+#: classes/Gems/Default/SurveyMaintenanceAction.php:478
+#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:742
+#: classes/Gems/Tracker/Model/TrackModel.php:102
+#: classes/Gems/Util/TrackData.php:147
msgid "Active"
msgstr "Active"
#: classes/Gems/Default/GroupAction.php:97
+#: classes/Gems/Default/OrganizationAction.php:163
msgid "Allowed IP Ranges"
msgstr "Allowed IP Ranges"
#: classes/Gems/Default/GroupAction.php:98
-msgid "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
-msgstr "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
+#: classes/Gems/Default/OrganizationAction.php:164
+msgid ""
+"Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
+msgstr ""
+"Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)"
#: classes/Gems/Default/GroupAction.php:108
msgid "group"
@@ -1052,8 +1277,12 @@
msgstr "Please enter your username or e-mail address. "
#: classes/Gems/Default/IndexAction.php:182
-msgid "We will then send you an e-mail with a link. The link will bring you to a page where you can set a new password of your choice."
-msgstr "We will then send you an e-mail with a link. The link will bring you to a page where you can set a new password of your choice."
+msgid ""
+"We will then send you an e-mail with a link. The link will bring you to a "
+"page where you can set a new password of your choice."
+msgstr ""
+"We will then send you an e-mail with a link. The link will bring you to a "
+"page where you can set a new password of your choice."
#: classes/Gems/Default/IndexAction.php:188
msgid "Execute password reset"
@@ -1077,6 +1306,7 @@
msgstr "Please enter your password of choice twice."
#: classes/Gems/Default/IndexAction.php:218
+#: classes/Gems/User/Form/LayeredLoginForm.php:258
msgid "Department"
msgstr "Department"
@@ -1095,18 +1325,26 @@
msgstr "Good bye: %s."
#: classes/Gems/Default/IndexAction.php:339
-msgid "Your password reset request is no longer valid, please request a new link."
-msgstr "Your password reset request is no longer valid, please request a new link."
+msgid ""
+"Your password reset request is no longer valid, please request a new link."
+msgstr ""
+"Your password reset request is no longer valid, please request a new link."
#: classes/Gems/Default/IndexAction.php:341
-msgid "Your password input request is no longer valid, please request a new link."
-msgstr "Your password input request is no longer valid, please request a new link."
+msgid ""
+"Your password input request is no longer valid, please request a new link."
+msgstr ""
+"Your password input request is no longer valid, please request a new link."
#: classes/Gems/Default/IndexAction.php:360
-msgid "We sent you an e-mail with a reset link. Click on the link in the e-mail."
-msgstr "We sent you an e-mail with a reset link. Click on the link in the e-mail."
+msgid ""
+"We sent you an e-mail with a reset link. Click on the link in the e-mail."
+msgstr ""
+"We sent you an e-mail with a reset link. Click on the link in the e-mail."
#: classes/Gems/Default/IndexAction.php:369
+#: classes/Gems/Default/OptionAction.php:94
+#: classes/Gems/Default/StaffAction.php:510
msgid "New password is active."
msgstr "New password is active."
@@ -1119,7 +1357,9 @@
"Dear {greeting},\n"
"\n"
"\n"
-"A new password was requested for your [b]{organization}[/b] account on the [b]{project}[/b] site, please click within {reset_in_hours} hours on [url={reset_url}]this link[/url] to enter the password of your choice.\n"
+"A new password was requested for your [b]{organization}[/b] account on the "
+"[b]{project}[/b] site, please click within {reset_in_hours} hours on [url="
+"{reset_url}]this link[/url] to enter the password of your choice.\n"
"\n"
"\n"
"{organization_signature}\n"
@@ -1129,7 +1369,9 @@
"Dear {greeting},\n"
"\n"
"\n"
-"A new password was requested for your [b]{organization}[/b] account on the [b]{project}[/b] site, please click within {reset_in_hours} hours on [url={reset_url}]this link[/url] to enter the password of your choice.\n"
+"A new password was requested for your [b]{organization}[/b] account on the "
+"[b]{project}[/b] site, please click within {reset_in_hours} hours on [url="
+"{reset_url}]this link[/url] to enter the password of your choice.\n"
"\n"
"\n"
"{organization_signature}\n"
@@ -1149,26 +1391,32 @@
msgstr "Invalid language setting."
#: classes/Gems/Default/LogAction.php:78
+#: classes/Gems/Default/TokenPlanAction.php:243
msgid "from"
msgstr "from"
#: classes/Gems/Default/LogAction.php:83
+#: classes/Gems/Default/TokenPlanAction.php:248
msgid "until"
msgstr "until"
#: classes/Gems/Default/LogAction.php:89
+#: classes/Gems/Default/TokenPlanAction.php:254
msgid "days"
msgstr "days"
#: classes/Gems/Default/LogAction.php:90
+#: classes/Gems/Default/TokenPlanAction.php:255
msgid "weeks"
msgstr "weeks"
#: classes/Gems/Default/LogAction.php:91
+#: classes/Gems/Default/TokenPlanAction.php:256
msgid "months"
msgstr "months"
#: classes/Gems/Default/LogAction.php:92
+#: classes/Gems/Default/TokenPlanAction.php:257
msgid "years"
msgstr "years"
@@ -1205,23 +1453,33 @@
msgstr "All actions"
#: classes/Gems/Default/LogAction.php:190
+#: classes/Gems/Default/TrackFieldsAction.php:92
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:472
msgid "Date"
msgstr "Date"
#: classes/Gems/Default/LogAction.php:191
#: classes/Gems/Default/LogMaintenanceAction.php:52
+#: classes/Gems/Default/UpgradeAction.php:177
msgid "Action"
msgstr "Action"
#: classes/Gems/Default/LogAction.php:192
+#: classes/Gems/Default/MailTemplateAction.php:66
+#: classes/Gems/Email/EmailFormAbstract.php:170
msgid "Message"
msgstr "Message"
#: classes/Gems/Default/LogAction.php:198
+#: classes/Gems/Default/TokenPlanAction.php:116
+#: snippets/RespondentDetailsSnippet.php:74
+#: snippets/RespondentDetailsWithAssignmentsSnippet.php:148
msgid "Respondent"
msgstr "Patient"
#: classes/Gems/Default/LogAction.php:202
+#: classes/Gems/Default/OptionAction.php:175
+#: classes/Gems/User/RadiusUserDefinition.php:163
msgid "IP address"
msgstr "IP address"
@@ -1235,6 +1493,7 @@
msgstr "Log:"
#: classes/Gems/Default/LogMaintenanceAction.php:72
+#: snippets/RespondentTokenTabsSnippet.php:69
msgid "All"
msgstr "All"
@@ -1248,6 +1507,7 @@
#: classes/Gems/Default/MailJobAction.php:78
#: classes/Gems/Default/MailLogAction.php:118
+#: classes/Gems/Email/EmailFormAbstract.php:310
msgid "Template"
msgstr "Template"
@@ -1314,6 +1574,10 @@
msgstr "Use the 'By staff member' address"
#: classes/Gems/Default/MailJobAction.php:133
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:290
+#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:338
+#: snippets/Organization/OrganizationEditSnippet.php:85
+#: snippets/Organization/OrganizationEditSnippet.php:131
msgid "Other"
msgstr "Other"
@@ -1337,8 +1601,12 @@
msgstr "Turn Automatic Mail Jobs ON"
#: classes/Gems/Default/MailJobAction.php:176
-msgid "With automatic mail jobs and a cron job on the server, mails can be sent without manual user action."
-msgstr "With automatic mail jobs and a cron job on the server, mails can be sent without manual user action."
+msgid ""
+"With automatic mail jobs and a cron job on the server, mails can be sent "
+"without manual user action."
+msgstr ""
+"With automatic mail jobs and a cron job on the server, mails can be sent "
+"without manual user action."
#: classes/Gems/Default/MailLogAction.php:109
msgid "Date sent"
@@ -1362,6 +1630,7 @@
#: classes/Gems/Default/MailLogAction.php:115
#: classes/Gems/Default/MailTemplateAction.php:62
+#: classes/Gems/Email/EmailFormAbstract.php:351
msgid "Subject"
msgstr "Subject"
@@ -1404,6 +1673,7 @@
msgstr "TLS"
#: classes/Gems/Default/MailServerAction.php:80
+#: classes/Gems/User/RadiusUserDefinition.php:164
msgid "Port"
msgstr "Port"
@@ -1416,16 +1686,20 @@
msgstr "User ID"
#: classes/Gems/Default/MailServerAction.php:88
+#: classes/Gems/User/Form/LoginForm.php:127
msgid "Password"
msgstr "Password"
#: classes/Gems/Default/MailServerAction.php:90
#: classes/Gems/Default/SourceAction.php:95
+#: classes/Gems/User/Form/ChangePasswordForm.php:241
+#: classes/Gems/User/Form/ChangePasswordForm.php:287
msgid "Repeat password"
msgstr "Repeat password"
#: classes/Gems/Default/MailServerAction.php:91
#: classes/Gems/Default/SourceAction.php:74
+#: classes/Gems/User/RadiusUserDefinition.php:169
msgid "Enter only when changing"
msgstr "Enter only when changing the password"
@@ -1439,18 +1713,20 @@
msgid "Email servers"
msgstr "Email servers"
-#: classes/Gems/Default/MailTemplateAction.php:76
-#: classes/Gems/Default/RespondentAction.php:338
+#: classes/Gems/Default/MailTemplateAction.php:78
+#: classes/Gems/Default/RespondentAction.php:349
+#: classes/Gems/Default/StaffAction.php:335
+#: classes/Gems/Default/StaffAction.php:405
msgid "(all organizations)"
msgstr "(all organizations)"
-#: classes/Gems/Default/MailTemplateAction.php:95
+#: classes/Gems/Default/MailTemplateAction.php:97
msgid "email template"
msgid_plural "email templates"
msgstr[0] "email template"
msgstr[1] "email templates"
-#: classes/Gems/Default/MailTemplateAction.php:100
+#: classes/Gems/Default/MailTemplateAction.php:102
msgid "Email templates"
msgstr "Email templates"
@@ -1464,7 +1740,8 @@
#: classes/Gems/Default/OptionAction.php:136
#: classes/Gems/Default/OrganizationAction.php:135
-#: classes/Gems/Default/RespondentAction.php:186
+#: classes/Gems/Default/RespondentAction.php:195
+#: classes/Gems/Default/StaffAction.php:351
msgid "Language"
msgstr "Language"
@@ -1474,8 +1751,12 @@
msgstr "Options"
#: classes/Gems/Default/OptionAction.php:155
-msgid "This overview provides information about the last login activity on your account."
-msgstr "This overview provides information about the last login activity on your account."
+msgid ""
+"This overview provides information about the last login activity on your "
+"account."
+msgstr ""
+"This overview provides information about the last login activity on your "
+"account."
#: classes/Gems/Default/OptionAction.php:175
msgid "Date / time"
@@ -1486,6 +1767,7 @@
msgstr "Item"
#: classes/Gems/Default/OrganizationAction.php:92
+#: classes/Gems/Model/HiddenOrganizationModel.php:113
msgid "Inaccessible or unknown organization"
msgstr "Inaccessible or unknown organization"
@@ -1515,14 +1797,19 @@
#: classes/Gems/Default/OrganizationAction.php:129
#, php-format
-msgid "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
-msgstr "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
+msgid ""
+"Always switch to this organization when %s is accessed from one of these "
+"space separated url's. The first is used for mails."
+msgstr ""
+"Always switch to this organization when %s is accessed from one of these "
+"space separated url's. The first is used for mails."
#: classes/Gems/Default/OrganizationAction.php:139
msgid "Can the organization be used?"
msgstr "Can the organization be used?"
#: classes/Gems/Default/OrganizationAction.php:140
+#: classes/Gems/User/Form/LoginForm.php:151 views/scripts/index/login.phtml:7
msgid "Login"
msgstr "Login"
@@ -1572,10 +1859,12 @@
msgstr "Checked organizations see this organizations patients."
#: classes/Gems/Default/OrganizationAction.php:160
+#: classes/Gems/Default/SurveyMaintenanceAction.php:441
msgid "Code name"
msgstr "Code name"
#: classes/Gems/Default/OrganizationAction.php:160
+#: classes/Gems/Default/SurveyMaintenanceAction.php:441
msgid "Only for programmers."
msgstr "Only for programmers."
@@ -1584,6 +1873,7 @@
msgstr "This can not be changed yet"
#: classes/Gems/Default/OrganizationAction.php:180
+#: classes/Gems/Default/StaffAction.php:158
msgid "User Definition"
msgstr "User Definition"
@@ -1599,6 +1889,9 @@
#: classes/Gems/Default/OverviewPlanAction.php:115
#: classes/Gems/Default/ProjectSurveysAction.php:88
+#: classes/Gems/Default/SurveyAction.php:207
+#: classes/Gems/Default/SurveyMaintenanceAction.php:556
+#: classes/Gems/Tracker/Snippets/EditSingleSurveyTokenSnippetAbstract.php:157
msgid "survey"
msgid_plural "surveys"
msgstr[0] "survey"
@@ -1616,121 +1909,132 @@
msgid "file not found"
msgstr "file not found"
-#: classes/Gems/Default/ProjectInformationAction.php:120
+#: classes/Gems/Default/ProjectInformationAction.php:125
msgid "Logged errors"
msgstr "Logged errors"
-#: classes/Gems/Default/ProjectInformationAction.php:120
+#: classes/Gems/Default/ProjectInformationAction.php:125
msgid "Empty logfile"
msgstr "Empty logfile"
-#: classes/Gems/Default/ProjectInformationAction.php:125
+#: classes/Gems/Default/ProjectInformationAction.php:130
msgid "Project information"
msgstr "Project information"
-#: classes/Gems/Default/ProjectInformationAction.php:129
+#: classes/Gems/Default/ProjectInformationAction.php:134
msgid "Project name"
msgstr "Project name"
-#: classes/Gems/Default/ProjectInformationAction.php:130
+#: classes/Gems/Default/ProjectInformationAction.php:135
msgid "Project version"
msgstr "Project version"
-#: classes/Gems/Default/ProjectInformationAction.php:131
+#: classes/Gems/Default/ProjectInformationAction.php:136
msgid "Gems version"
msgstr "Gems version"
-#: classes/Gems/Default/ProjectInformationAction.php:133
+#: classes/Gems/Default/ProjectInformationAction.php:138
msgid "Gems project"
msgstr "Gems project"
-#: classes/Gems/Default/ProjectInformationAction.php:134
+#: classes/Gems/Default/ProjectInformationAction.php:139
msgid "Gems web directory"
msgstr "Gems web directory"
-#: classes/Gems/Default/ProjectInformationAction.php:135
+#: classes/Gems/Default/ProjectInformationAction.php:140
msgid "Gems code directory"
msgstr "Gems code directory"
-#: classes/Gems/Default/ProjectInformationAction.php:136
+#: classes/Gems/Default/ProjectInformationAction.php:141
msgid "Gems project path"
msgstr "Gems project path"
-#: classes/Gems/Default/ProjectInformationAction.php:137
+#: classes/Gems/Default/ProjectInformationAction.php:142
msgid "MUtil version"
msgstr "MUtil version"
-#: classes/Gems/Default/ProjectInformationAction.php:138
+#: classes/Gems/Default/ProjectInformationAction.php:143
msgid "Zend version"
msgstr "Zend version"
-#: classes/Gems/Default/ProjectInformationAction.php:139
+#: classes/Gems/Default/ProjectInformationAction.php:144
msgid "Application environment"
msgstr "Application environment"
-#: classes/Gems/Default/ProjectInformationAction.php:140
+#: classes/Gems/Default/ProjectInformationAction.php:145
msgid "Application baseuri"
msgstr "Application baseuri"
-#: classes/Gems/Default/ProjectInformationAction.php:141
+#: classes/Gems/Default/ProjectInformationAction.php:146
msgid "Application directory"
msgstr "Application directory"
-#: classes/Gems/Default/ProjectInformationAction.php:142
+#: classes/Gems/Default/ProjectInformationAction.php:147
msgid "PHP version"
msgstr "PHP version"
-#: classes/Gems/Default/ProjectInformationAction.php:143
+#: classes/Gems/Default/ProjectInformationAction.php:148
msgid "Server Hostname"
msgstr "Server Hostname"
-#: classes/Gems/Default/ProjectInformationAction.php:144
+#: classes/Gems/Default/ProjectInformationAction.php:149
msgid "Server OS"
msgstr "Server OS"
-#: classes/Gems/Default/ProjectInformationAction.php:145
+#: classes/Gems/Default/ProjectInformationAction.php:150
msgid "Time on server"
msgstr "Time on server"
-#: classes/Gems/Default/ProjectInformationAction.php:149
+#: classes/Gems/Default/ProjectInformationAction.php:154
msgid "Turn Maintenance Mode OFF"
msgstr "Turn Maintenance Mode OFF"
-#: classes/Gems/Default/ProjectInformationAction.php:151
+#: classes/Gems/Default/ProjectInformationAction.php:156
msgid "Turn Maintenance Mode ON"
msgstr "Turn Maintenance Mode ON"
-#: classes/Gems/Default/ProjectInformationAction.php:161
+#: classes/Gems/Default/ProjectInformationAction.php:166
msgid "Version information"
msgstr "Version information"
-#: classes/Gems/Default/ProjectInformationAction.php:195
+#: classes/Gems/Default/ProjectInformationAction.php:200
msgid "Server PHP Info"
msgstr "Server PHP Info"
-#: classes/Gems/Default/ProjectInformationAction.php:212
+#: classes/Gems/Default/ProjectInformationAction.php:217
msgid "Project settings"
msgstr "Project settings"
-#: classes/Gems/Default/ProjectInformationAction.php:219
+#: classes/Gems/Default/ProjectInformationAction.php:224
msgid "Session content"
msgstr "Session content"
-#: classes/Gems/Default/ProjectInformationAction.php:220
+#: classes/Gems/Default/ProjectInformationAction.php:225
+#: classes/Gems/Menu/MenuAbstract.php:341
msgid "Session"
msgstr "Session"
#: classes/Gems/Default/ProjectSurveysAction.php:68
+#: classes/Gems/Default/SurveyAction.php:192
+#: snippets/TrackSurveyOverviewSnippet.php:113
msgid "By"
msgstr "By"
#: classes/Gems/Default/ProjectSurveysAction.php:69
#: classes/Gems/Default/ProjectTracksAction.php:67
+#: classes/Gems/Default/SurveyAction.php:193
+#: classes/Gems/Default/TrackAction.php:330
+#: classes/Gems/Email/EmailFormAbstract.php:195
+#: classes/Gems/Email/EmailFormAbstract.php:253
+#: classes/Gems/Email/MailTemplateForm.php:83
+#: classes/Gems/Tracker/Model/TrackModel.php:103
msgid "From"
msgstr "From"
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
+#: classes/Gems/Default/SurveyAction.php:197
+#: classes/Gems/Default/TrackAction.php:332
msgid "Until"
msgstr "Until"
@@ -1739,10 +2043,15 @@
msgstr "Active surveys"
#: classes/Gems/Default/ProjectTracksAction.php:65
+#: classes/Gems/Default/TrackAction.php:329
msgid "Survey #"
msgstr "Survey #"
#: classes/Gems/Default/ProjectTracksAction.php:85
+#: classes/Gems/Default/TrackAction.php:452
+#: classes/Gems/Default/TrackMaintenanceAction.php:309
+#: classes/Gems/Tracker/Snippets/EditTrackEngineSnippetGeneric.php:191
+#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:170
msgid "track"
msgid_plural "tracks"
msgstr[0] "track"
@@ -1758,6 +2067,7 @@
msgstr "Questions in survey %s"
#: classes/Gems/Default/ProjectTracksAction.php:118
+#: classes/Gems/Default/SurveyAction.php:85
#, php-format
msgid "Survey %s does not exist."
msgstr "Survey %s does not exist."
@@ -1767,6 +2077,7 @@
msgstr "Survey not specified."
#: classes/Gems/Default/ProjectTracksAction.php:132
+#: classes/Gems/Default/TrackActionAbstract.php:492
#, php-format
msgid "Track %s does not exist."
msgstr "Track %s does not exist."
@@ -1841,98 +2152,107 @@
msgstr[0] "reception code"
msgstr[1] "reception codes"
-#: classes/Gems/Default/RespondentAction.php:125
+#: classes/Gems/Default/RespondentAction.php:127
#, php-format
msgid "Random Example BSN: %s"
msgstr "Random Example BSN: %s"
-#: classes/Gems/Default/RespondentAction.php:127
+#: classes/Gems/Default/RespondentAction.php:129
msgid "Enter a 9-digit SSN number."
msgstr "Enter a 9-digit BSN number."
-#: classes/Gems/Default/RespondentAction.php:134
+#: classes/Gems/Default/RespondentAction.php:143
msgid "Identification"
msgstr "Identification"
-#: classes/Gems/Default/RespondentAction.php:145
+#: classes/Gems/Default/RespondentAction.php:154
msgid "SSN"
msgstr "BSN"
-#: classes/Gems/Default/RespondentAction.php:149
+#: classes/Gems/Default/RespondentAction.php:158
msgid "Patient number"
msgstr "Patient number"
-#: classes/Gems/Default/RespondentAction.php:158
+#: classes/Gems/Default/RespondentAction.php:167
msgid "Medical data"
msgstr "Medical data"
-#: classes/Gems/Default/RespondentAction.php:165
+#: classes/Gems/Default/RespondentAction.php:174
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:168
+#: classes/Gems/Default/RespondentAction.php:177
msgid "Contact information"
msgstr "Contact information"
-#: classes/Gems/Default/RespondentAction.php:173
+#: classes/Gems/Default/RespondentAction.php:182
msgid "Respondent has no e-mail"
msgstr "Patient has no e-mail"
-#: classes/Gems/Default/RespondentAction.php:174
+#: classes/Gems/Default/RespondentAction.php:183
msgid "With housenumber"
msgstr "With housenumber"
-#: classes/Gems/Default/RespondentAction.php:181
+#: classes/Gems/Default/RespondentAction.php:190
msgid "Country"
msgstr "Country"
-#: classes/Gems/Default/RespondentAction.php:185
+#: classes/Gems/Default/RespondentAction.php:194
msgid "Settings"
msgstr "Settings"
-#: classes/Gems/Default/RespondentAction.php:187
+#: classes/Gems/Default/RespondentAction.php:196
msgid "Has the respondent signed the informed consent letter?"
msgstr "Has the patient signed the informed consent letter?"
-#: classes/Gems/Default/RespondentAction.php:217
+#: classes/Gems/Default/RespondentAction.php:228
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:203
msgid "Comments"
msgstr "Comments"
-#: classes/Gems/Default/RespondentAction.php:218
+#: classes/Gems/Default/RespondentAction.php:229
msgid "Treatment"
msgstr "Treatment"
-#: classes/Gems/Default/RespondentAction.php:246
+#: classes/Gems/Default/RespondentAction.php:257
+#: classes/Gems/Default/TrackAction.php:132
+#: classes/Gems/Default/TrackAction.php:479
+#: classes/Gems/Tracker/Model/StandardTokenModel.php:212
+#: snippets/DeleteInSourceTrackSnippet.php:112
+#: snippets/EditTrackSnippet.php:94
msgid "Rejection code"
msgstr "Rejection code"
-#: classes/Gems/Default/RespondentAction.php:253
+#: classes/Gems/Default/RespondentAction.php:264
msgid "Delete respondent"
msgstr "Delete patient"
-#: classes/Gems/Default/RespondentAction.php:285
+#: classes/Gems/Default/RespondentAction.php:296
msgid "Respondent deleted."
msgstr "Patient deleted"
-#: classes/Gems/Default/RespondentAction.php:289
+#: classes/Gems/Default/RespondentAction.php:300
msgid "Respondent tracks stopped."
msgstr "Patient tracks stopped."
-#: classes/Gems/Default/RespondentAction.php:293
+#: classes/Gems/Default/RespondentAction.php:304
+#: classes/Gems/Default/TrackAction.php:405
msgid "Choose a reception code to delete."
msgstr "Choose a reception code to delete."
-#: classes/Gems/Default/RespondentAction.php:387
+#: classes/Gems/Default/RespondentAction.php:398
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patient"
msgstr[1] "patients"
-#: classes/Gems/Default/RespondentAction.php:462
+#: classes/Gems/Default/RespondentAction.php:473
msgid "Please settle the informed consent form for this respondent."
msgstr "Please settle the informed consent form for this patient."
#: classes/Gems/Default/RespondentExportAction.php:54
+#: classes/Gems/Default/TrackAction.php:121
+#: snippets/DeleteInSourceTrackSnippet.php:82 snippets/EditTrackSnippet.php:72
msgid "Respondent number"
msgstr "Patient number"
@@ -1941,18 +2261,37 @@
msgstr "Separate multiple respondents with a comma (,)"
#: classes/Gems/Default/RespondentPlanAction.php:67
+#: classes/Gems/Default/SurveyAction.php:171
+#: classes/Gems/Default/TrackAction.php:297
+#: snippets/DeleteInSourceTrackSnippet.php:132
+#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:174
+#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:145
+#: snippets/DeleteTrackTokenSnippet.php:195
+#: snippets/EditSingleSurveyTokenSnippet.php:134
+#: snippets/EditTrackSnippet.php:109 snippets/EditTrackTokenSnippet.php:144
+#: snippets/ShowSingleSurveyTokenSnippet.php:140
+#: snippets/ShowTrackTokenSnippet.php:146
msgid "Show respondent"
msgstr "Show patient"
#: classes/Gems/Default/RespondentPlanAction.php:73
+#: classes/Gems/Default/TrackAction.php:266
+#: classes/Gems/Default/TrackAction.php:285
+#: snippets/DeleteInSourceTrackSnippet.php:129
+#: snippets/EditTrackSnippet.php:107 snippets/EditTrackTokenSnippet.php:142
+#: snippets/ShowTrackTokenSnippet.php:145
msgid "Show track"
msgstr "Show track"
#: classes/Gems/Default/RespondentPlanAction.php:136
+#: classes/Gems/Default/TrackAction.php:317
+#: snippets/ShowTrackUsageSnippet.php:103
msgid " of "
msgstr " of "
#: classes/Gems/Default/RespondentPlanAction.php:137
+#: classes/Gems/Default/TrackAction.php:318
+#: snippets/ShowTrackUsageSnippet.php:104
msgid "Progress"
msgstr "Progress"
@@ -2051,20 +2390,40 @@
msgstr "Database Password"
#: classes/Gems/Default/SourceAction.php:115
-msgid "Check tokens for being answered or not, reruns survey and round event code on completed tokens and recalculates the start and end times of all tokens in tracks that have completed tokens."
-msgstr "Check tokens for being answered or not, reruns survey and round event code on completed tokens and recalculates the start and end times of all tokens in tracks that have completed tokens."
+msgid ""
+"Check tokens for being answered or not, reruns survey and round event code "
+"on completed tokens and recalculates the start and end times of all tokens "
+"in tracks that have completed tokens."
+msgstr ""
+"Check tokens for being answered or not, reruns survey and round event code "
+"on completed tokens and recalculates the start and end times of all tokens "
+"in tracks that have completed tokens."
#: classes/Gems/Default/SourceAction.php:116
-msgid "Run this code when survey result fields, survey or round events or the event code has changed or after bulk changes in a survey source."
-msgstr "Run this code when survey result fields, survey or round events or the event code has changed or after bulk changes in a survey source."
+msgid ""
+"Run this code when survey result fields, survey or round events or the event "
+"code has changed or after bulk changes in a survey source."
+msgstr ""
+"Run this code when survey result fields, survey or round events or the event "
+"code has changed or after bulk changes in a survey source."
#: classes/Gems/Default/SourceAction.php:126
-msgid "Check source for new surveys, changes in survey status and survey deletion. Can also perform maintenance on some sources, e.g. by changing the number of attributes."
-msgstr "Check source for new surveys, changes in survey status and survey deletion. Can also perform maintenance on some sources, e.g. by changing the number of attributes."
+msgid ""
+"Check source for new surveys, changes in survey status and survey deletion. "
+"Can also perform maintenance on some sources, e.g. by changing the number of "
+"attributes."
+msgstr ""
+"Check source for new surveys, changes in survey status and survey deletion. "
+"Can also perform maintenance on some sources, e.g. by changing the number of "
+"attributes."
#: classes/Gems/Default/SourceAction.php:127
-msgid "Run this code when the status of a survey in a source has changed or when the code has changed and the source must be adapted."
-msgstr "Run this code when the status of a survey in a source has changed or when the code has changed and the source must be adapted."
+msgid ""
+"Run this code when the status of a survey in a source has changed or when "
+"the code has changed and the source must be adapted."
+msgstr ""
+"Run this code when the status of a survey in a source has changed or when "
+"the code has changed and the source must be adapted."
#: classes/Gems/Default/SourceAction.php:140
#, php-format
@@ -2076,8 +2435,12 @@
msgstr "Refreshes the attributes for a token as stored in the source."
#: classes/Gems/Default/SourceAction.php:146
-msgid "Run this code when the number of attributes has changed or when you suspect the attributes have been corrupted somehow."
-msgstr "Run this code when the number of attributes has changed or when you suspect the attributes have been corrupted somehow."
+msgid ""
+"Run this code when the number of attributes has changed or when you suspect "
+"the attributes have been corrupted somehow."
+msgstr ""
+"Run this code when the number of attributes has changed or when you suspect "
+"the attributes have been corrupted somehow."
#: classes/Gems/Default/SourceAction.php:159
#, php-format
@@ -2131,6 +2494,7 @@
msgstr[1] "sources"
#: classes/Gems/Default/SourceAction.php:249
+#: classes/Gems/Menu/MenuAbstract.php:436
msgid "Survey Sources"
msgstr "Survey Sources"
@@ -2173,10 +2537,15 @@
#: classes/Gems/Default/StaffAction.php:268
#, php-format
-msgid "User with id %s already exists but is deleted, do you want to reactivate the account?"
-msgstr "User with id %s already exists but is deleted, do you want to reactivate the account?"
+msgid ""
+"User with id %s already exists but is deleted, do you want to reactivate the "
+"account?"
+msgstr ""
+"User with id %s already exists but is deleted, do you want to reactivate the "
+"account?"
-#: classes/Gems/Default/StaffAction.php:327
+#: classes/Gems/Default/Staf...
[truncated message content] |
|
From: <gem...@li...> - 2012-08-20 12:29:01
|
Revision: 898
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=898&view=rev
Author: mennodekker
Date: 2012-08-20 12:28:52 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Allow better ordering on derived models
Modified Paths:
--------------
trunk/library/classes/MUtil/Model/ModelAbstract.php
Modified: trunk/library/classes/MUtil/Model/ModelAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/ModelAbstract.php 2012-08-20 11:09:25 UTC (rev 897)
+++ trunk/library/classes/MUtil/Model/ModelAbstract.php 2012-08-20 12:28:52 UTC (rev 898)
@@ -73,7 +73,12 @@
private $_model_order;
private $_model_used = false;
- public $orderIncrement = 10; //The default increment for item ordering
+ /**
+ * The increment for item ordering, default is 10
+ *
+ * @var int
+ */
+ public $orderIncrement = 10;
public function __construct($modelName)
{
@@ -679,6 +684,18 @@
return $value;
}
+ /**
+ * Find out the order of the requested $name in the model
+ *
+ * @param string $name
+ * @return int|null The order value of the requeste item or null if not defined
+ */
+ public function getOrder($name) {
+ if (isset($this->_model_order[$name])) {
+ return $this->_model_order[$name];
+ }
+ }
+
public function getRequestSort(Zend_Controller_Request_Abstract $request, $ascParam = null, $descParam = null)
{
// DEPRECIATED
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-20 11:09:32
|
Revision: 897
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=897&view=rev
Author: mennodekker
Date: 2012-08-20 11:09:25 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Fix for exists = true when not found using tracker->getSurveyBySourceId
Modified Paths:
--------------
trunk/library/classes/Gems/Tracker/Survey.php
Modified: trunk/library/classes/Gems/Tracker/Survey.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Survey.php 2012-08-14 10:41:38 UTC (rev 896)
+++ trunk/library/classes/Gems/Tracker/Survey.php 2012-08-20 11:09:25 UTC (rev 897)
@@ -101,6 +101,13 @@
} else {
$this->_surveyId = $gemsSurveyData;
}
+
+ // If loaded using tracker->getSurveyBySourceId the id can be negative if not found
+ if ($this->_surveyId > 0) {
+ $this->exists = true;
+ } else {
+ $this->exists = false;
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-14 10:41:45
|
Revision: 896
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=896&view=rev
Author: mennodekker
Date: 2012-08-14 10:41:38 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Some optimization:
Round table link is optional (when adding extra rounds) so joinleft
We don't need all info, just the totals
Modified Paths:
--------------
trunk/library/classes/Gems/Selector/TokenDateSelector.php
Modified: trunk/library/classes/Gems/Selector/TokenDateSelector.php
===================================================================
--- trunk/library/classes/Gems/Selector/TokenDateSelector.php 2012-08-13 14:00:13 UTC (rev 895)
+++ trunk/library/classes/Gems/Selector/TokenDateSelector.php 2012-08-14 10:41:38 UTC (rev 896)
@@ -136,13 +136,13 @@
*/
protected function processSelect(Zend_Db_Select $select)
{
- $select->join('gems__rounds', 'gto_id_round = gro_id_round');
- $select->join('gems__tracks', 'gro_id_track = gtr_id_track');
- $select->join('gems__surveys', 'gto_id_survey = gsu_id_survey');
- $select->join('gems__groups', 'gsu_id_primary_group = ggp_id_group');
- $select->join('gems__respondents', 'gto_id_respondent = grs_id_user');
- $select->join('gems__respondent2track','gr2t_id_respondent_track = gto_id_respondent_track');
- $select->join('gems__reception_codes', 'gto_reception_code = grc_id_reception_code');
+ $select->joinLeft('gems__rounds', 'gto_id_round = gro_id_round', array());
+ $select->join('gems__tracks', 'gto_id_track = gtr_id_track', array());
+ $select->join('gems__surveys', 'gto_id_survey = gsu_id_survey', array());
+ $select->join('gems__groups', 'gsu_id_primary_group = ggp_id_group', array());
+ $select->join('gems__respondents', 'gto_id_respondent = grs_id_user', array());
+ $select->join('gems__respondent2track','gto_id_respondent_track = gr2t_id_respondent_track', array());
+ $select->join('gems__reception_codes', 'gto_reception_code = grc_id_reception_code', array());
}
protected function setTableBody(MUtil_Model_TableBridge $bridge, MUtil_Lazy_RepeatableInterface $repeater, $columnClass)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-13 14:00:24
|
Revision: 895
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=895&view=rev
Author: mennodekker
Date: 2012-08-13 14:00:13 +0000 (Mon, 13 Aug 2012)
Log Message:
-----------
Fixed bug #559: Paginator broken in respondent -> show
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RespondentAction.php
Modified: trunk/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentAction.php 2012-08-13 11:48:54 UTC (rev 894)
+++ trunk/library/classes/Gems/Default/RespondentAction.php 2012-08-13 14:00:13 UTC (rev 895)
@@ -474,7 +474,7 @@
}
$params['model'] = $model;
- $params['baseUrl'] = array(MUtil_Model::REQUEST_ID => $this->_getParam(MUtil_Model::REQUEST_ID));
+ $params['baseUrl'] = array(MUtil_Model::REQUEST_ID1 => $this->_getParam(MUtil_Model::REQUEST_ID1), MUtil_Model::REQUEST_ID2 => $this->_getParam(MUtil_Model::REQUEST_ID2));
$params['buttons'] = $this->createMenuLinks();
$params['onclick'] = $this->findAllowedMenuItem('edit');
if ($params['onclick']) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-13 11:49:00
|
Revision: 894
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=894&view=rev
Author: mennodekker
Date: 2012-08-13 11:48:54 +0000 (Mon, 13 Aug 2012)
Log Message:
-----------
Fixed bug #558: when editing a round, the crumbs don't work
Modified Paths:
--------------
trunk/library/classes/GemsEscort.php
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2012-08-13 08:12:00 UTC (rev 893)
+++ trunk/library/classes/GemsEscort.php 2012-08-13 11:48:54 UTC (rev 894)
@@ -600,8 +600,11 @@
$content = $div->seq();
$content->setGlue(MUtil_Html::raw($this->_(' > ')));
+ // Add request to existing menu parameter sources
+ $source = array($this->menu->getParameterSource(), $this->request);
+
foreach ($path as $menuItem) {
- $content->a($menuItem->toHRefAttribute($this->request), $menuItem->get('label'));
+ $content->a($menuItem->toHRefAttribute($source), $menuItem->get('label'));
}
$content->append($last->get('label'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-13 08:12:07
|
Revision: 893
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=893&view=rev
Author: mennodekker
Date: 2012-08-13 08:12:00 +0000 (Mon, 13 Aug 2012)
Log Message:
-----------
Make sure logLevel is interpreted as integer
Modified Paths:
--------------
trunk/library/classes/Gems/Project/ProjectSettings.php
Modified: trunk/library/classes/Gems/Project/ProjectSettings.php
===================================================================
--- trunk/library/classes/Gems/Project/ProjectSettings.php 2012-08-07 11:17:16 UTC (rev 892)
+++ trunk/library/classes/Gems/Project/ProjectSettings.php 2012-08-13 08:12:00 UTC (rev 893)
@@ -365,7 +365,7 @@
}
}
- return $logLevel;
+ return (int) $logLevel;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-07 11:17:22
|
Revision: 892
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=892&view=rev
Author: michieltcs
Date: 2012-08-07 11:17:16 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
Fix visibility
Modified Paths:
--------------
trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php
Modified: trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php 2012-08-01 13:24:30 UTC (rev 891)
+++ trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php 2012-08-07 11:17:16 UTC (rev 892)
@@ -207,7 +207,7 @@
/**
* If menu item does not exist or is not allowed, redirect to index
*/
- public function setAfterSaveRoute()
+ protected function setAfterSaveRoute()
{
parent::setAfterSaveRoute();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-01 13:24:39
|
Revision: 891
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=891&view=rev
Author: mennodekker
Date: 2012-08-01 13:24:30 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
(testing sync job)
Modified Paths:
--------------
trunk/library/configs/db/patches.sql
Modified: trunk/library/configs/db/patches.sql
===================================================================
--- trunk/library/configs/db/patches.sql 2012-08-01 11:20:30 UTC (rev 890)
+++ trunk/library/configs/db/patches.sql 2012-08-01 13:24:30 UTC (rev 891)
@@ -419,4 +419,4 @@
ALTER TABLE `gems__surveys` ADD gsu_code varchar(64) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' NULL AFTER gsu_duration;
-- PATCH: Assign deletion of track parts to super role
-UPDATE gems__roles SET grl_privileges = CONCAT(grl_privileges,',pr.track-maintenance.delete') WHERE grl_privileges NOT LIKE '%pr.track-maintenance.edit%' AND grl_privileges NOT LIKE '%pr.track-maintenance.delete%';
+UPDATE gems__roles SET grl_privileges = CONCAT(grl_privileges,',pr.track-maintenance.delete') WHERE grl_privileges NOT LIKE '%pr.track-maintenance.edit%' AND grl_privileges NOT LIKE '%pr.track-maintenance.delete%';
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-08-01 11:20:39
|
Revision: 890
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=890&view=rev
Author: mennodekker
Date: 2012-08-01 11:20:30 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
Allow projects to implement their own _updateToken
Modified Paths:
--------------
trunk/library/classes/Gems/Tracker/Token.php
Modified: trunk/library/classes/Gems/Tracker/Token.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token.php 2012-07-31 14:51:22 UTC (rev 889)
+++ trunk/library/classes/Gems/Tracker/Token.php 2012-08-01 11:20:30 UTC (rev 890)
@@ -205,7 +205,7 @@
* @param int $userId The current user
* @return int 1 if data changed, 0 otherwise
*/
- private function _updateToken(array $values, $userId)
+ protected function _updateToken(array $values, $userId)
{
if ($this->tracker->filterChangesOnly($this->_gemsData, $values)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-31 14:51:28
|
Revision: 889
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=889&view=rev
Author: mennodekker
Date: 2012-07-31 14:51:22 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
If (show) not found or allowed, redirect to index (assuming create/edit are clicked from index)
Modified Paths:
--------------
trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php
Modified: trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php 2012-07-31 11:12:12 UTC (rev 888)
+++ trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php 2012-07-31 14:51:22 UTC (rev 889)
@@ -203,4 +203,25 @@
return parent::getTopic($count);
}
}
+
+ /**
+ * If menu item does not exist or is not allowed, redirect to index
+ */
+ public function setAfterSaveRoute()
+ {
+ parent::setAfterSaveRoute();
+
+ if (is_array($this->afterSaveRouteUrl)) {
+ // Make sure controller is set
+ if (!array_key_exists('controller', $this->afterSaveRouteUrl)) {
+ $this->afterSaveRouteUrl['controller'] = $this->request->getControllerName();
+ }
+
+ // If not allowed, redirect to index
+ if (null == $this->menu->find($this->afterSaveRouteUrl)) {
+ $this->afterSaveRouteUrl['action'] = 'index';
+ $this->resetRoute = true;
+ }
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-31 11:12:21
|
Revision: 888
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=888&view=rev
Author: michieltcs
Date: 2012-07-31 11:12:12 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
Set jQuery UI minimum required version to fix datepicker popup bug
Modified Paths:
--------------
trunk/library/classes/GemsEscort.php
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2012-07-31 10:59:06 UTC (rev 887)
+++ trunk/library/classes/GemsEscort.php 2012-07-31 11:12:12 UTC (rev 888)
@@ -700,6 +700,7 @@
if (MUtil_JQuery::usesJQuery($this->view)) {
$jquery = $this->view->jQuery();
$jquery->uiEnable(); // enable user interface
+ $jquery->setUiVersion('1.8.9');
if (MUtil_Https::on()) {
$jquery->setCdnSsl(true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-31 10:59:13
|
Revision: 887
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=887&view=rev
Author: mennodekker
Date: 2012-07-31 10:59:06 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
Added renderClosingTag to get good rendering when no description available
Modified Paths:
--------------
trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php
Modified: trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php 2012-07-30 14:47:40 UTC (rev 886)
+++ trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php 2012-07-31 10:59:06 UTC (rev 887)
@@ -52,7 +52,7 @@
{
$html = $this->getHtmlSequence();
$html->div($this->token->getSurveyName(), array('class'=>'surveyTitle'));
- $html->div($this->token->getRoundDescription(), array('class'=>'roundDescription'));
+ $html->div($this->token->getRoundDescription(), array('class'=>'roundDescription', 'renderClosingTag'=>true));
return $html;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-30 14:47:49
|
Revision: 886
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=886&view=rev
Author: mennodekker
Date: 2012-07-30 14:47:40 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Allow upgrades to run in each environment
Modified Paths:
--------------
trunk/library/classes/Gems/UpgradesAbstract.php
Modified: trunk/library/classes/Gems/UpgradesAbstract.php
===================================================================
--- trunk/library/classes/Gems/UpgradesAbstract.php 2012-07-30 08:43:21 UTC (rev 885)
+++ trunk/library/classes/Gems/UpgradesAbstract.php 2012-07-30 14:47:40 UTC (rev 886)
@@ -51,6 +51,18 @@
protected $_messages = array();
+ /**
+ * Holds the inital config file
+ *
+ * @var Zend_Config
+ */
+ protected $originalFile;
+
+ /**
+ * Holds the config file specific to this environment
+ *
+ * @var Zend_Config
+ */
protected $upgradeFile;
/**
@@ -93,11 +105,17 @@
//First get a GemsEscort instance, as we might need that a lot (and it can not be injected)
$this->escort = GemsEscort::getInstance();
- $this->upgradeFile = GEMS_ROOT_DIR . str_replace('/', DIRECTORY_SEPARATOR , '/var/settings/upgrades.ini');
+ $this->originalFile = GEMS_ROOT_DIR . str_replace('/', DIRECTORY_SEPARATOR , '/var/settings/upgrades.ini');
+ $this->upgradeFile = GEMS_ROOT_DIR . str_replace('/', DIRECTORY_SEPARATOR , '/var/settings/upgrades_' . APPLICATION_ENV . '.ini');
+ if(!file_exists($this->originalFile)) {
+ touch($this->originalFile);
+ }
if(!file_exists($this->upgradeFile)) {
touch($this->upgradeFile);
}
- $this->_info = new Zend_Config_Ini($this->upgradeFile, null, array('allowModifications' => true));
+ $this->_info = new Zend_Config_Ini($this->originalFile, null, array('allowModifications' => true));
+ // Merge the environment config file
+ $this->_info->merge(new Zend_Config_Ini($this->upgradeFile, null, array('allowModifications' => true)));
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-30 08:43:27
|
Revision: 885
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=885&view=rev
Author: mennodekker
Date: 2012-07-30 08:43:21 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Updated styles for new .roundDescription
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems-new.css
trunk/new_project/htdocs/gems/css/gems_print.css
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2012-07-30 08:42:58 UTC (rev 884)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2012-07-30 08:43:21 UTC (rev 885)
@@ -426,6 +426,11 @@
margin-left: 0.4em;
}
+.roundDescription {
+ float: left;
+ font-style: italic;
+}
+
.search {
line-height: 250%;
margin: 0.5em 0;
@@ -496,6 +501,8 @@
.surveyTitle {
font-weight: bold;
+ float: left;
+ margin-right: 2em;
}
table, td, th {
Modified: trunk/new_project/htdocs/gems/css/gems_print.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems_print.css 2012-07-30 08:42:58 UTC (rev 884)
+++ trunk/new_project/htdocs/gems/css/gems_print.css 2012-07-30 08:43:21 UTC (rev 885)
@@ -60,8 +60,15 @@
.print-only { display: inline; }
+ .roundDescription {
+ float: left;
+ font-style: italic;
+ }
+
.surveyTitle {
font-weight: bold;
page-break-before: always; /* left would be even nicer, but mostly unsupported in browsers */
+ float: left;
+ margin-right: 2em;
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-30 08:43:09
|
Revision: 884
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=884&view=rev
Author: mennodekker
Date: 2012-07-30 08:42:58 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Created extra snippet for export: SurveyHeaderSnippet to allow having more or less information on a survey. Added round description.
Modified Paths:
--------------
trunk/library/classes/Gems/Export/RespondentExport.php
Added Paths:
-----------
trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php
Modified: trunk/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- trunk/library/classes/Gems/Export/RespondentExport.php 2012-07-27 12:08:05 UTC (rev 883)
+++ trunk/library/classes/Gems/Export/RespondentExport.php 2012-07-30 08:42:58 UTC (rev 884)
@@ -170,7 +170,7 @@
}
if ($engine->getTrackType() == 'S' || !$groupSurveys) {
- $this->html->div($token->getSurveyName(), array('class'=>'surveyTitle'));
+ $this->html->snippet('Export_SurveyHeaderSnippet', 'token', $token);
$this->html->snippet($this->_singleSurveySnippet, 'token', $token, 'tokenId', $token->getTokenId(),
'showHeaders', false, 'showButtons', false, 'showSelected', false, 'showTakeButton', false);
@@ -179,7 +179,7 @@
if (!isset($surveys[$token->getSurveyId()])) {
$surveys[$token->getSurveyId()] = true;
- $this->html->div($token->getSurveyName(), array('class'=>'surveyTitle'));
+ $this->html->snippet('Export_SurveyHeaderSnippet', 'token', $token);
$this->html->snippet($this->_groupedSurveySnippet, 'token', $token, 'tokenId', $token->getTokenId(),
'showHeaders', false, 'showButtons', false, 'showSelected', false, 'showTakeButton', false);
Added: trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php (rev 0)
+++ trunk/library/classes/Gems/Snippets/Export/SurveyHeaderSnippet.php 2012-07-30 08:42:58 UTC (rev 884)
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package Gems
+ * @subpackage Snippets
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: Sample.php 215 2011-07-12 08:52:54Z michiel $
+ */
+
+/**
+ * Header for html/pdf export of a survey
+ *
+ * @package Gems
+ * @subpackage Snippets
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.6
+ */
+class Gems_Snippets_Export_SurveyHeaderSnippet extends MUtil_Snippets_SnippetAbstract
+{
+ /**
+ * @var Gems_Tracker_Token
+ */
+ public $token;
+
+ public function getHtmlOutput(Zend_View_Abstract $view)
+ {
+ $html = $this->getHtmlSequence();
+ $html->div($this->token->getSurveyName(), array('class'=>'surveyTitle'));
+ $html->div($this->token->getRoundDescription(), array('class'=>'roundDescription'));
+
+ return $html;
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-07-27 12:08:11
|
Revision: 883
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=883&view=rev
Author: mennodekker
Date: 2012-07-27 12:08:05 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
Fixing previous commit
Modified Paths:
--------------
trunk/library/classes/MUtil/Model/FormBridge.php
Modified: trunk/library/classes/MUtil/Model/FormBridge.php
===================================================================
--- trunk/library/classes/MUtil/Model/FormBridge.php 2012-07-27 11:57:32 UTC (rev 882)
+++ trunk/library/classes/MUtil/Model/FormBridge.php 2012-07-27 12:08:05 UTC (rev 883)
@@ -786,7 +786,7 @@
if (is_null($key)) return $this->_allowedOptions;
if (array_key_exists($key, $this->_allowedOptions)) {
- return $key;
+ return $this->_allowedOptions[$key];
} else {
return array();
}
@@ -832,7 +832,7 @@
*/
public function setAllowedOptions($key, $options)
{
- if (!is_string($options)) {
+ if (is_string($options)) {
$options = array($options);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
