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...> - 2013-02-28 11:02:58
|
Revision: 1165
http://sourceforge.net/p/gemstracker/code/1165
Author: matijsdejong
Date: 2013-02-28 11:02:53 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
SSN = BSN and not SSN in Dutch
Modified Paths:
--------------
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2013-02-28 11:02:02 UTC (rev 1164)
+++ trunk/library/languages/default-nl.po 2013-02-28 11:02:53 UTC (rev 1165)
@@ -2344,7 +2344,7 @@
#: classes/Gems/Default/RespondentAction.php:154
msgid "SSN"
-msgstr "SSN"
+msgstr "BSN"
#: classes/Gems/Default/RespondentAction.php:158
msgid "Patient number"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-28 11:02:06
|
Revision: 1164
http://sourceforge.net/p/gemstracker/code/1164
Author: matijsdejong
Date: 2013-02-28 11:02:02 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
Moved GEMS_PROJECT_NAME_UC to pre_bootstrap
Adapted .ini's to maximum GEMS_PROJECT_NAME_UC use
Modified Paths:
--------------
trunk/new_project/application/configs/application.ini
trunk/new_project/application/configs/project.ini
trunk/new_project/htdocs/index.php
Modified: trunk/new_project/application/configs/application.ini
===================================================================
--- trunk/new_project/application/configs/application.ini 2013-02-28 11:00:48 UTC (rev 1163)
+++ trunk/new_project/application/configs/application.ini 2013-02-28 11:02:02 UTC (rev 1164)
@@ -3,9 +3,9 @@
phpSettings.display_startup_errors = 0
phpSettings.display_errors = 0
-bootstrap.path = "NewProject/Escort.php"
-bootstrap.class = "NewProject_Escort"
-loaderDirs.NewProject = APPLICATION_PATH "/classes/NewProject"
+bootstrap.path = GEMS_PROJECT_NAME_UC "/Escort.php"
+bootstrap.class = GEMS_PROJECT_NAME_UC "_Escort"
+; loaderDirs.NEWPROJECT = APPLICATION_PATH "/classes/" GEMS_PROJECT_NAME_UC
loaderDirs.Gems = GEMS_LIBRARY_DIR "/classes/Gems"
; resources.db.adapter = PDO_MYSQL
resources.db.adapter = Mysqli
Modified: trunk/new_project/application/configs/project.ini
===================================================================
--- trunk/new_project/application/configs/project.ini 2013-02-28 11:00:48 UTC (rev 1163)
+++ trunk/new_project/application/configs/project.ini 2013-02-28 11:02:02 UTC (rev 1164)
@@ -1,6 +1,6 @@
[production]
-name = "New"
-description = "New"
+name = GEMS_PROJECT_NAME_UC
+description = GEMS_PROJECT_NAME_UC
;longDescr = ""
;longDescrNl = ""
Modified: trunk/new_project/htdocs/index.php
===================================================================
--- trunk/new_project/htdocs/index.php 2013-02-28 11:00:48 UTC (rev 1163)
+++ trunk/new_project/htdocs/index.php 2013-02-28 11:02:02 UTC (rev 1164)
@@ -53,7 +53,6 @@
// Internal pretty project name - no spaces etc., will be used for tags and IDs!
define('GEMS_PROJECT_NAME', 'newProject');
-defined('GEMS_PROJECT_NAME_UC') || define('GEMS_PROJECT_NAME_UC', ucfirst(GEMS_PROJECT_NAME));
/**
* Define application environment
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-28 11:00:51
|
Revision: 1163
http://sourceforge.net/p/gemstracker/code/1163
Author: matijsdejong
Date: 2013-02-28 11:00:48 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
Moved GEMS_PROJECT_NAME_UC to pre_bootstrap
Modified Paths:
--------------
trunk/library/pre_bootstrap.php
Modified: trunk/library/pre_bootstrap.php
===================================================================
--- trunk/library/pre_bootstrap.php 2013-02-28 10:59:23 UTC (rev 1162)
+++ trunk/library/pre_bootstrap.php 2013-02-28 11:00:48 UTC (rev 1163)
@@ -46,9 +46,10 @@
// ZEND FRAMEWORK STARTS HERE
/**
- * Define path to application directory
+ * Define path to application directory and UC project name if it does not yet exist
*/
defined('APPLICATION_PATH') || define('APPLICATION_PATH', GEMS_ROOT_DIR . '/application');
+defined('GEMS_PROJECT_NAME_UC') || define('GEMS_PROJECT_NAME_UC', ucfirst(GEMS_PROJECT_NAME));
/**
* Set path to Zend Framework
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-28 10:59:28
|
Revision: 1162
http://sourceforge.net/p/gemstracker/code/1162
Author: mennodekker
Date: 2013-02-28 10:59:23 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
Added ini changes to changelog
Modified Paths:
--------------
trunk/library/changelog.txt
Modified: trunk/library/changelog.txt
===================================================================
--- trunk/library/changelog.txt 2013-02-28 10:29:51 UTC (rev 1161)
+++ trunk/library/changelog.txt 2013-02-28 10:59:23 UTC (rev 1162)
@@ -8,6 +8,18 @@
The global variable $GEMS_DIRS is deprecated, redefine it the application.ini using loaderDirs.Gems = .... (see NewProject)
ZFDebug is now activated in the application.ini using: zfdebug.activate = 1
+New project.ini settings:
+longDescr = ""
+longDescrNl = "" ; Append language for localised long decription
+
+contact.docsUrl = "" ; The path to the documentation of the project
+contact.forumUrl = "" ; The path to the forum if available
+contact.gemsUrl = "http://gemstracker.org/"
+
+New application.ini settings (add before the first resource and change NewProject to your own project prefix):
+loaderDirs.NewProject = APPLICATION_PATH "/classes/NewProject"
+loaderDirs.Gems = GEMS_LIBRARY_DIR "/classes/Gems"
+
Important changes from 1.5.6 => 1.5.7
============================================================
In LimeSurvey tokenanswerpersistence must be set to true for all surveys
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-28 10:29:55
|
Revision: 1161
http://sourceforge.net/p/gemstracker/code/1161
Author: mennodekker
Date: 2013-02-28 10:29:51 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
Preparing for release 1.6 instead of 1.5.8
Modified Paths:
--------------
trunk/library/classes/Gems/Upgrades.php
trunk/library/classes/Gems/Versions.php
Modified: trunk/library/classes/Gems/Upgrades.php
===================================================================
--- trunk/library/classes/Gems/Upgrades.php 2013-02-28 10:22:25 UTC (rev 1160)
+++ trunk/library/classes/Gems/Upgrades.php 2013-02-28 10:29:51 UTC (rev 1161)
@@ -64,6 +64,7 @@
$this->register(array($this, 'Upgrade154to155'), 'Upgrade from 1.5.4 to 1.5.5');
$this->register(array($this, 'Upgrade155to156'), 'Upgrade from 1.5.5 to 1.5.6');
$this->register(array($this, 'Upgrade156to157'), 'Upgrade from 1.5.6 to 1.5.7');
+ $this->register(array($this, 'Upgrade157to16'), 'Upgrade from 1.5.7 to 1.6');
/**
* To have the new_project updated to the highest level, update
@@ -174,4 +175,16 @@
return true;
}
+
+ /**
+ * To upgrade to 1.6 just execute patchlevel 51
+ */
+ public function Upgrade157to16()
+ {
+ $this->_batch->addTask('Db_ExecutePatch', 51);
+
+ $this->_batch->addTask('Echo', $this->_('Make sure to read the changelog as it contains important instructions'));
+
+ return true;
+ }
}
\ No newline at end of file
Modified: trunk/library/classes/Gems/Versions.php
===================================================================
--- trunk/library/classes/Gems/Versions.php 2013-02-28 10:22:25 UTC (rev 1160)
+++ trunk/library/classes/Gems/Versions.php 2013-02-28 10:29:51 UTC (rev 1161)
@@ -69,7 +69,7 @@
*/
public final function getGemsVersion()
{
- return '1.5.8';
+ return '1.6';
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-28 10:22:29
|
Revision: 1160
http://sourceforge.net/p/gemstracker/code/1160
Author: mennodekker
Date: 2013-02-28 10:22:25 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
Added compliance css to gemsfluid
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems-fluid.css
Modified: trunk/new_project/htdocs/gems/css/gems-fluid.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-fluid.css 2013-02-28 09:03:05 UTC (rev 1159)
+++ trunk/new_project/htdocs/gems/css/gems-fluid.css 2013-02-28 10:22:25 UTC (rev 1160)
@@ -692,4 +692,53 @@
/* fixes for tabrow with browsetable */
#autofilter_target { clear: both;}
.tabrow { clear: both; padding-top: 0.5em; }
-.tabrow .tab { width: auto;}
\ No newline at end of file
+.tabrow .tab { width: auto;}
+
+.compliance .rounds {
+ overflow: hidden;
+ white-space: pre;
+}
+
+.compliance .rounds th {
+ border-top: transparent none;
+}
+
+.compliance td.answered {
+ background: transparent url(../icons/ok.png) no-repeat center center;
+}
+
+.compliance td.missed {
+ background: transparent url(../icons/nav_plain_red.png) no-repeat center center;
+}
+
+.compliance td.newRound, .compliance th.newRound {
+ border-left-width: 3px;
+}
+
+.compliance td.open {
+ background: transparent url(../icons/nav_up_blue.png) no-repeat center center;
+}
+
+.compliance td.round, .compliance td.round a {
+ color: transparent;
+}
+
+.compliance td.round, .compliance th.round {
+ min-width: 14px;
+ max-width: 14px;
+ overflow: hidden;
+ text-align: center;
+ width: 14px;
+}
+
+.compliance td.unknown {
+ background: transparent url(../icons/nav_flat_blue.png) no-repeat center center;
+}
+
+.compliance td.waiting {
+ background: transparent url(../icons/nav_plain_blue.png) no-repeat center center;
+}
+
+.compliance td.empty {
+ background: transparent url(../icons/empty.png) no-repeat center center;
+}
\ 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...> - 2013-02-28 09:03:08
|
Revision: 1159
http://sourceforge.net/p/gemstracker/code/1159
Author: mennodekker
Date: 2013-02-28 09:03:05 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
Use project name in changelog menu-item instead of project prefix
Modified Paths:
--------------
trunk/library/classes/Gems/Menu.php
Modified: trunk/library/classes/Gems/Menu.php
===================================================================
--- trunk/library/classes/Gems/Menu.php 2013-02-27 18:20:27 UTC (rev 1158)
+++ trunk/library/classes/Gems/Menu.php 2013-02-28 09:03:05 UTC (rev 1159)
@@ -167,7 +167,7 @@
//UPGRADES CONTROLLER
$page = $cont->addPage($this->_('Upgrade'), 'pr.upgrade', 'upgrade', 'index');
$page->addPage(sprintf($this->_('Changelog %s'), 'GemsTracker'), 'pr.upgrade', 'project-information', 'changeloggt');
- $page->addPage(sprintf($this->_('Changelog %s'), GEMS_PROJECT_NAME), 'pr.upgrade', 'project-information', 'changelog');
+ $page->addPage(sprintf($this->_('Changelog %s'), $this->escort->project->getName()), 'pr.upgrade', 'project-information', 'changelog');
$show = $page->addAction($this->_('Show'), null, 'show')->setNamedParameters('id','context');
$page->addAction($this->_('Execute all'), 'pr.upgrade.all', 'execute-all')->setModelParameters(1);
$show->addActionButton($this->_('Execute this'), 'pr.upgrade.one', 'execute-one')->setModelParameters(1)->addNamedParameters('from','from','to','to');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-27 18:20:30
|
Revision: 1158
http://sourceforge.net/p/gemstracker/code/1158
Author: matijsdejong
Date: 2013-02-27 18:20:27 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
A better sort for these display types (apparently)
Modified Paths:
--------------
trunk/library/classes/Gems/Event/Survey/Display/AllSingleTrack.php
trunk/library/classes/Gems/Snippets/Tracker/Answers/SurveyAnswersModelSnippet.php
Modified: trunk/library/classes/Gems/Event/Survey/Display/AllSingleTrack.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/AllSingleTrack.php 2013-02-27 12:26:06 UTC (rev 1157)
+++ trunk/library/classes/Gems/Event/Survey/Display/AllSingleTrack.php 2013-02-27 18:20:27 UTC (rev 1158)
@@ -47,7 +47,20 @@
class Gems_Event_Survey_Display_AllSingleTrack extends Gems_Registry_TargetAbstract implements Gems_Event_SurveyDisplayEventInterface
{
/**
+ * Set a fixed model sort.
*
+ * Leading _ means not overwritten by sources.
+ *
+ * @var array
+ */
+ protected $_fixedSort = array(
+ 'grc_success' => SORT_DESC,
+ 'gto_valid_from' => SORT_ASC,
+ 'gto_completion_time' => SORT_ASC,
+ 'gto_round_order' => SORT_ASC);
+
+ /**
+ *
* @var Zend_Translate
*/
protected $translate;
Modified: trunk/library/classes/Gems/Snippets/Tracker/Answers/SurveyAnswersModelSnippet.php
===================================================================
--- trunk/library/classes/Gems/Snippets/Tracker/Answers/SurveyAnswersModelSnippet.php 2013-02-27 12:26:06 UTC (rev 1157)
+++ trunk/library/classes/Gems/Snippets/Tracker/Answers/SurveyAnswersModelSnippet.php 2013-02-27 18:20:27 UTC (rev 1158)
@@ -47,6 +47,19 @@
class Gems_Snippets_Tracker_Answers_SurveyAnswersModelSnippet extends Gems_Tracker_Snippets_AnswerModelSnippetGeneric
{
/**
+ * Set a fixed model sort.
+ *
+ * Leading _ means not overwritten by sources.
+ *
+ * @var array
+ */
+ protected $_fixedSort = array(
+ 'grc_success' => SORT_DESC,
+ 'gto_valid_from' => SORT_ASC,
+ 'gto_completion_time' => SORT_ASC,
+ 'gto_round_order' => SORT_ASC);
+
+ /**
* Use compact view and show all tokens of the same surveyId in
* one view. Property used by respondent export
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-27 12:26:10
|
Revision: 1157
http://sourceforge.net/p/gemstracker/code/1157
Author: mennodekker
Date: 2013-02-27 12:26:06 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
Improved filtering for empty values (leave more 0 values in)
Modified Paths:
--------------
trunk/library/classes/Gems/Event/Survey/Display/OnlyAnswered.php
Modified: trunk/library/classes/Gems/Event/Survey/Display/OnlyAnswered.php
===================================================================
--- trunk/library/classes/Gems/Event/Survey/Display/OnlyAnswered.php 2013-02-26 12:52:26 UTC (rev 1156)
+++ trunk/library/classes/Gems/Event/Survey/Display/OnlyAnswered.php 2013-02-27 12:26:06 UTC (rev 1157)
@@ -71,7 +71,7 @@
while ($row = $repeater->__next()) {
// Add the keys that contain values.
// We don't care about the values in the array.
- $keys += array_filter($row->getArrayCopy());
+ $keys += $this->array_filter($row->getArrayCopy(), $model);
}
$results = array_intersect($currentNames, array_keys($keys), array_keys($this->token->getRawAnswers()));
@@ -95,4 +95,33 @@
{
return $this->translate->_('Display only the questions with an answer.');
}
+
+ /**
+ * Strip elements from the array that are considered empty
+ *
+ * Empty is NULL or empty string, values of 0 are NOT empty unless they are a checkbox
+ *
+ * @param type $inputArray
+ * @param type $model
+ * @return boolean
+ */
+ public function array_filter($inputArray, $model)
+ {
+ $outputArray = array();
+ foreach ($inputArray as $key => $value) {
+ // Null and empty string are skipped
+ if (is_null($value) || $value === '') {
+ continue;
+ }
+ // Maybe do a check on multiOptions for checkboxes etc. to disable some 0 values $model->get($key, 'multiOptions');
+ if ($value == '0' && $options = $model->get($key, 'multiOptions')) {
+ if (count($options) == 2) {
+ // Probably a checkbox (multi flexi in limesurvey)
+ continue;
+ }
+ }
+ $outputArray[$key] = $value;
+ }
+ return $outputArray;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-26 12:52:31
|
Revision: 1156
http://sourceforge.net/p/gemstracker/code/1156
Author: mennodekker
Date: 2013-02-26 12:52:26 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
Fixed display error for first tab in respondent screen
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems-fluid.css
trunk/new_project/htdocs/gems/css/gems-new.css
Modified: trunk/new_project/htdocs/gems/css/gems-fluid.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-fluid.css 2013-02-25 14:28:18 UTC (rev 1155)
+++ trunk/new_project/htdocs/gems/css/gems-fluid.css 2013-02-26 12:52:26 UTC (rev 1156)
@@ -691,5 +691,5 @@
/* fixes for tabrow with browsetable */
#autofilter_target { clear: both;}
-.tabrow { clear: both; }
+.tabrow { clear: both; padding-top: 0.5em; }
.tabrow .tab { width: auto;}
\ No newline at end of file
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2013-02-25 14:28:18 UTC (rev 1155)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2013-02-26 12:52:26 UTC (rev 1156)
@@ -768,5 +768,5 @@
/* fixes for tabrow with browsetable */
#autofilter_target { clear: both;}
-.tabrow { clear: both; }
+.tabrow { clear: both; padding-top: 0.5em; }
.tabrow .tab { width: auto;}
\ 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...> - 2013-02-25 14:28:22
|
Revision: 1155
http://sourceforge.net/p/gemstracker/code/1155
Author: michieltcs
Date: 2013-02-25 14:28:18 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
Properly andle single string value
Modified Paths:
--------------
trunk/library/classes/Gems/Export/RespondentExport.php
Modified: trunk/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- trunk/library/classes/Gems/Export/RespondentExport.php 2013-02-25 08:34:41 UTC (rev 1154)
+++ trunk/library/classes/Gems/Export/RespondentExport.php 2013-02-25 14:28:18 UTC (rev 1155)
@@ -201,12 +201,14 @@
'grouped' => $groupSurveys);
$snippets = $token->getAnswerSnippetNames();
-
- if (is_array($snippets)) {
- list($snippets, $snippetParams) = MUtil_Ra::keySplit($snippets);
- $params = $params + $snippetParams;
+
+ if (!is_array($snippets)) {
+ $snippets = array($snippets);
}
+ list($snippets, $snippetParams) = MUtil_Ra::keySplit($snippets);
+ $params = $params + $snippetParams;
+
$this->html->snippet('Export_SurveyHeaderSnippet', 'token', $token);
foreach($snippets as $snippet) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-25 08:34:50
|
Revision: 1154
http://sourceforge.net/p/gemstracker/code/1154
Author: mennodekker
Date: 2013-02-25 08:34:41 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
Quick fix for unable to load events
Modified Paths:
--------------
trunk/library/classes/Gems/Events.php
Modified: trunk/library/classes/Gems/Events.php
===================================================================
--- trunk/library/classes/Gems/Events.php 2013-02-22 14:37:27 UTC (rev 1153)
+++ trunk/library/classes/Gems/Events.php 2013-02-25 08:34:41 UTC (rev 1154)
@@ -45,7 +45,7 @@
* @since Class available since version 1.4
*/
class Gems_Events extends Gems_Loader_TargetLoaderAbstract
-{
+{
const TRACK_COMPLETION_EVENT = 'Track/Completed';
const ROUND_CHANGED_EVENT = 'Round/Changed';
const SURVEY_BEFORE_ANSWERING_EVENT = 'Survey/BeforeAnswering';
@@ -102,8 +102,8 @@
$eventClass = str_replace('/', '_', $eventType);
foreach ($this->_dirs as $name => $dir) {
- $prefix = $name . '_' . $eventClass . '_';
- $paths[$prefix] = $dir . DIRECTORY_SEPARATOR . $eventType;
+ $prefix = $name . '_Event_'. $eventClass . '_';
+ $paths[$prefix] = $dir . DIRECTORY_SEPARATOR . 'Event' . DIRECTORY_SEPARATOR . $eventType;
}
$paths[''] = APPLICATION_PATH . '/events/' . strtolower($eventType);
// MUtil_Echo::track($paths);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-22 14:37:31
|
Revision: 1153
http://sourceforge.net/p/gemstracker/code/1153
Author: mennodekker
Date: 2013-02-22 14:37:27 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
Full paths for css/js added to a form
Modified Paths:
--------------
trunk/library/classes/Gems/Form/Decorator/Form.php
Modified: trunk/library/classes/Gems/Form/Decorator/Form.php
===================================================================
--- trunk/library/classes/Gems/Form/Decorator/Form.php 2013-02-21 16:56:30 UTC (rev 1152)
+++ trunk/library/classes/Gems/Form/Decorator/Form.php 2013-02-22 14:37:27 UTC (rev 1153)
@@ -76,14 +76,14 @@
$css = $form->getCss();
if (!is_null($scripts) && is_array($scripts)) {
- $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
+ $baseUrl = $view->serverUrl() . GemsEscort::getInstance()->basepath->getBasePath();
$headscript = $view->headScript();
foreach ($scripts as $script) {
$headscript->appendFile($baseUrl . $script);
}
}
if (!is_null($css) && is_array($css)) {
- $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
+ $baseUrl = $view->serverUrl() . GemsEscort::getInstance()->basepath->getBasePath();
$headLink = $view->headLink();
foreach($css as $cssFile => $media) {
$headLink->appendStylesheet($baseUrl . $cssFile, $media);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-21 16:56:32
|
Revision: 1152
http://sourceforge.net/p/gemstracker/code/1152
Author: matijsdejong
Date: 2013-02-21 16:56:30 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
A better language default
Modified Paths:
--------------
trunk/library/classes/Gems/Default/StaffAction.php
Modified: trunk/library/classes/Gems/Default/StaffAction.php
===================================================================
--- trunk/library/classes/Gems/Default/StaffAction.php 2013-02-21 15:49:51 UTC (rev 1151)
+++ trunk/library/classes/Gems/Default/StaffAction.php 2013-02-21 16:56:30 UTC (rev 1152)
@@ -59,6 +59,13 @@
public $defaultStaffDefinition = Gems_User_UserLoader::USER_STAFF;
public $filterStandard = array('gsf_active' => 1);
+
+ /**
+ *
+ * @var Gems_Project_ProjectSettings
+ */
+ public $project;
+
public $sortKey = array('name' => SORT_ASC);
/**
@@ -348,7 +355,11 @@
$org = $this->loader->getOrganization($this->menu->getParameterSource()->getMenuParameter('gsf_id_organization', $this->loader->getCurrentUser()->getCurrentOrganizationId()));
$orgDef = $org->get('gor_user_class', $this->defaultStaffDefinition);
$model->set('gul_user_class', 'default', $orgDef, 'multiOptions', $this->loader->getUserLoader()->getAvailableStaffDefinitions());
- $model->set('gsf_iso_lang', 'label', $this->_('Language'), 'multiOptions', $this->util->getLocalized()->getLanguages());
+ $model->set('gsf_iso_lang',
+ 'label', $this->_('Language'),
+ 'multiOptions', $this->util->getLocalized()->getLanguages(),
+ 'default', $this->project->locale['default']
+ );
$model->set('gul_can_login', 'label', $this->_('Can login'), 'multiOptions', $this->util->getTranslated()->getYesNo(), 'default', 1);
$model->set('gsf_logout_on_survey', 'label', $this->_('Logout on survey'), 'multiOptions', $this->util->getTranslated()->getYesNo());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-21 15:49:55
|
Revision: 1151
http://sourceforge.net/p/gemstracker/code/1151
Author: matijsdejong
Date: 2013-02-21 15:49:51 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
Standardized for neater multi id
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RespondentExportAction.php
Modified: trunk/library/classes/Gems/Default/RespondentExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentExportAction.php 2013-02-20 16:12:24 UTC (rev 1150)
+++ trunk/library/classes/Gems/Default/RespondentExportAction.php 2013-02-21 15:49:51 UTC (rev 1151)
@@ -69,8 +69,7 @@
$form->populate($request->getParams());
if ($request->isPost()) {
- $respondents = preg_split('/[\s,]/', $request->getParam('id'));
- $respondents = array_filter(array_map('trim', $respondents));
+ $respondents = preg_split('/[\s,;]+/', $request->getParam('id'), -1, PREG_SPLIT_NO_EMPTY);
$export->render($respondents, $this->getRequest()->getParam('group'), $this->getRequest()->getParam('format'));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-20 16:12:29
|
Revision: 1150
http://sourceforge.net/p/gemstracker/code/1150
Author: michieltcs
Date: 2013-02-20 16:12:24 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
Fix multiple tables of same survey even if groupsurveys is true
Modified Paths:
--------------
trunk/library/classes/Gems/Export/RespondentExport.php
Modified: trunk/library/classes/Gems/Export/RespondentExport.php
===================================================================
--- trunk/library/classes/Gems/Export/RespondentExport.php 2013-02-20 15:16:59 UTC (rev 1149)
+++ trunk/library/classes/Gems/Export/RespondentExport.php 2013-02-20 16:12:24 UTC (rev 1150)
@@ -186,6 +186,7 @@
// as the snippet takes care of showing the other tokens
if (!isset($surveys[$token->getSurveyId()])) {
$showToken = true;
+ $surveys[$token->getSurveyId()] = 1;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-20 15:17:02
|
Revision: 1149
http://sourceforge.net/p/gemstracker/code/1149
Author: matijsdejong
Date: 2013-02-20 15:16:59 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
New validator for not allowed values
Added Paths:
-----------
trunk/library/classes/MUtil/Validate/IsNot.php
Copied: trunk/library/classes/MUtil/Validate/IsNot.php (from rev 1148, trunk/library/classes/MUtil/Validate/IsConfirmed.php)
===================================================================
--- trunk/library/classes/MUtil/Validate/IsNot.php (rev 0)
+++ trunk/library/classes/MUtil/Validate/IsNot.php 2013-02-20 15:16:59 UTC (rev 1149)
@@ -0,0 +1,94 @@
+<?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 MUtil
+ * @subpackage Validate
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
+/**
+ *
+ * @package MUtil
+ * @subpackage Validate
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since MUtil version 1.2
+ */
+class MUtil_Validate_IsNot extends Zend_Validate_Abstract
+{
+ /**
+ * Error codes
+ * @const string
+ */
+ const NOT_ONE = 'notOne';
+
+ protected $_messageTemplates = array(
+ self::NOT_ONE => "This value is not allowed.",
+ );
+
+ /**
+ * The field name against which to validate
+ *
+ * @var mixed
+ */
+ protected $values;
+
+ /**
+ * Sets validator options
+ *
+ * @param string $values On or more values that this element should not have
+ */
+ public function __construct($values)
+ {
+ $this->values = MUtil_Ra::flatten(func_get_args());
+ }
+
+ /**
+ * Defined by Zend_Validate_Interface
+ *
+ * Returns true if and only if a token has been set and the provided value
+ * matches that token.
+ *
+ * @param mixed $value
+ * @return boolean
+ */
+ public function isValid($value, $context = array())
+ {
+ if (in_array($value, $this->values)) {
+ $this->_setValue((string) $value);
+ $this->_error(self::NOT_ONE);
+ return false;
+ }
+
+ return true;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-19 17:11:10
|
Revision: 1148
http://sourceforge.net/p/gemstracker/code/1148
Author: matijsdejong
Date: 2013-02-19 17:11:09 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
Whitespace can be used to separate respondent ids during export
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RespondentExportAction.php
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/classes/Gems/Default/RespondentExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentExportAction.php 2013-02-19 10:32:35 UTC (rev 1147)
+++ trunk/library/classes/Gems/Default/RespondentExportAction.php 2013-02-19 17:11:09 UTC (rev 1148)
@@ -56,7 +56,7 @@
->setAttrib('cols', 60)
->setAttrib('rows', 4)
->setOrder(-1)
- ->setDescription($this->_('Separate multiple respondents with a comma (,)'));
+ ->setDescription($this->_('Separate multiple respondents with a comma (,) or whitespace'));
$form->addElement($element);
@@ -69,8 +69,8 @@
$form->populate($request->getParams());
if ($request->isPost()) {
- $respondents = explode(',', $request->getParam('id'));
- $respondents = array_map('trim', $respondents);
+ $respondents = preg_split('/[\s,]/', $request->getParam('id'));
+ $respondents = array_filter(array_map('trim', $respondents));
$export->render($respondents, $this->getRequest()->getParam('group'), $this->getRequest()->getParam('format'));
}
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2013-02-19 10:32:35 UTC (rev 1147)
+++ trunk/library/languages/default-en.po 2013-02-19 17:11:09 UTC (rev 1148)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-15 18:23+0100\n"
+"POT-Creation-Date: 2013-02-19 18:03+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -2428,8 +2428,8 @@
msgstr "Patient numbers"
#: classes/Gems/Default/RespondentExportAction.php:59
-msgid "Separate multiple respondents with a comma (,)"
-msgstr "Separate multiple respondents with a comma (,)"
+msgid "Separate multiple respondents with a comma (,) or whitespace"
+msgstr "Separate multiple patients with a comma (,) or whitespace"
#: classes/Gems/Default/RespondentPlanAction.php:67
#: classes/Gems/Default/SurveyAction.php:181
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2013-02-19 10:32:35 UTC (rev 1147)
+++ trunk/library/languages/default-nl.po 2013-02-19 17:11:09 UTC (rev 1148)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-15 18:22+0100\n"
+"POT-Creation-Date: 2013-02-19 18:03+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -2437,8 +2437,10 @@
msgstr "Patiënt nummers"
#: classes/Gems/Default/RespondentExportAction.php:59
-msgid "Separate multiple respondents with a comma (,)"
-msgstr "Scheid meerdere patienten met een comma (,)"
+msgid "Separate multiple respondents with a comma (,) or whitespace"
+msgstr ""
+"Scheid verschillende patiënten met een comma (,), spatie, tab of een nieuwe "
+"regel"
#: classes/Gems/Default/RespondentPlanAction.php:67
#: classes/Gems/Default/SurveyAction.php:181
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-19 10:32:44
|
Revision: 1147
http://sourceforge.net/p/gemstracker/code/1147
Author: mennodekker
Date: 2013-02-19 10:32:35 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
Used forward slash
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ProjectInformationAction.php
Modified: trunk/library/classes/Gems/Default/ProjectInformationAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ProjectInformationAction.php 2013-02-15 17:26:04 UTC (rev 1146)
+++ trunk/library/classes/Gems/Default/ProjectInformationAction.php 2013-02-19 10:32:35 UTC (rev 1147)
@@ -182,7 +182,7 @@
$data[$this->_('Gems web directory')] = $this->getDirInfo(GEMS_WEB_DIR);
$data[$this->_('Gems root directory')] = $this->getDirInfo(GEMS_ROOT_DIR);
$data[$this->_('Gems code directory')] = $this->getDirInfo(GEMS_LIBRARY_DIR);
- $data[$this->_('Gems variable directory')] = $this->getDirInfo(GEMS_ROOT_DIR . '\var');
+ $data[$this->_('Gems variable directory')] = $this->getDirInfo(GEMS_ROOT_DIR . '/var');
$data[$this->_('MUtil version')] = MUtil_Version::get();
$data[$this->_('Zend version')] = Zend_Version::VERSION;
$data[$this->_('Application environment')] = APPLICATION_ENV;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-15 17:26:06
|
Revision: 1146
http://sourceforge.net/p/gemstracker/code/1146
Author: matijsdejong
Date: 2013-02-15 17:26:04 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Wrong ini strings used
Modified Paths:
--------------
trunk/new_project/application/configs/project.ini
Modified: trunk/new_project/application/configs/project.ini
===================================================================
--- trunk/new_project/application/configs/project.ini 2013-02-15 17:24:54 UTC (rev 1145)
+++ trunk/new_project/application/configs/project.ini 2013-02-15 17:26:04 UTC (rev 1146)
@@ -1,8 +1,8 @@
[production]
name = "New"
description = "New"
-;descrLong = ""
-;descrLongNl = ""
+;longDescr = ""
+;longDescrNl = ""
;---------------------------------------------------
; Hash encryption salt. REQUIRED!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-15 17:24:57
|
Revision: 1145
http://sourceforge.net/p/gemstracker/code/1145
Author: matijsdejong
Date: 2013-02-15 17:24:54 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Translations updated
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ContactAction.php
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/classes/Gems/Default/ContactAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ContactAction.php 2013-02-15 16:57:18 UTC (rev 1144)
+++ trunk/library/classes/Gems/Default/ContactAction.php 2013-02-15 17:24:54 UTC (rev 1145)
@@ -142,8 +142,7 @@
$this->html->h3()->sprintf($this->_('About %s'), $this->_('GemsTracker'));
$this->html->pInfo($this->_(
- 'GemsTracker (GEneric Medical Survey Tracker) is a software package for (complex) distribution
- of questionnaires and forms during clinical research and for quality registration in healthcare.'));
+ 'GemsTracker (GEneric Medical Survey Tracker) is a software package for (complex) distribution of questionnaires and forms during clinical research and for quality registration in healthcare.'));
$this->html->pInfo()->sprintf(
$this->_('%s is a project built using GemsTracker as a foundation.'),
$this->project->getName());
@@ -196,21 +195,21 @@
);
if ($url = $this->project->getDocumentationUrl()) {
- $this->html->h4('Documentation');
+ $this->html->h4($this->_('Documentation'));
$this->html->pInfo()->sprintf($this->_('All available documentation is gathered at: %s'))
->a($url, array('rel' => 'external', 'target' => 'documentation'));
}
if ($url = $this->project->getManualUrl()) {
- $this->html->h4('Manual');
+ $this->html->h4($this->_('Manual'));
$this->html->pInfo()->sprintf($this->_('The manual is available here: %s'))
->a($url, array('rel' => 'external', 'target' => 'manual'));
}
if ($url = $this->project->getForumUrl()) {
- $this->html->h4('The forum');
+ $this->html->h4($this->_('The forum'));
$this->html->pInfo()->sprintf($this->_(
'You will find questions asked by other users and ask new questions at our forum site: %s'
@@ -218,7 +217,7 @@
}
if ($url = $this->project->getSupportUrl()) {
- $this->html->h4('Support site');
+ $this->html->h4($this->_('Support site'));
$this->html->pInfo()->sprintf($this->_('Check our support site at %s.'))
->a($url, array('rel' => 'external', 'target' => 'support'));
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2013-02-15 16:57:18 UTC (rev 1144)
+++ trunk/library/languages/default-en.po 2013-02-15 17:24:54 UTC (rev 1145)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-07 18:05+0100\n"
+"POT-Creation-Date: 2013-02-15 18:23+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -31,7 +31,7 @@
msgid "You are logged in as %s"
msgstr "You are logged in as %s"
-#: classes/GemsEscort.php:895 classes/Gems/Menu.php:265
+#: classes/GemsEscort.php:895 classes/Gems/Menu.php:264
msgid "Logoff"
msgstr "Logoff"
@@ -131,118 +131,124 @@
msgid "of"
msgstr "of"
-#: classes/Gems/Menu.php:139
+#: classes/Gems/Menu.php:138 classes/Gems/Menu.php:139
+#: classes/Gems/Default/ContactAction.php:123
+#: classes/Gems/Default/ContactAction.php:143
#, php-format
msgid "About %s"
msgstr "About %s"
-#: classes/Gems/Menu.php:143
+#: classes/Gems/Menu.php:139 classes/Gems/Default/ContactAction.php:143
+msgid "GemsTracker"
+msgstr "GemsTracker"
+
+#: classes/Gems/Menu.php:142
msgid "Reporting bugs"
msgstr "Reporting bugs"
-#: classes/Gems/Menu.php:146
+#: classes/Gems/Menu.php:145 classes/Gems/Default/ContactAction.php:191
msgid "Support"
msgstr "Support"
-#: classes/Gems/Menu.php:167
+#: classes/Gems/Menu.php:166
msgid "Project setup"
msgstr "Project setup"
-#: classes/Gems/Menu.php:169
+#: classes/Gems/Menu.php:168
msgid "Upgrade"
msgstr "Upgrade"
-#: classes/Gems/Menu.php:170 classes/Gems/Menu.php:171
+#: classes/Gems/Menu.php:169 classes/Gems/Menu.php:170
#: classes/Gems/Default/ProjectInformationAction.php:113
#: classes/Gems/Default/ProjectInformationAction.php:118
#, php-format
msgid "Changelog %s"
msgstr "Changelog %s"
-#: classes/Gems/Menu.php:172 classes/Gems/Menu.php:356
+#: classes/Gems/Menu.php:171 classes/Gems/Menu.php:358
#: classes/Gems/Menu/SubMenuItem.php:551
msgid "Show"
msgstr "Show"
-#: classes/Gems/Menu.php:173
+#: classes/Gems/Menu.php:172
msgid "Execute all"
msgstr "Execute all"
-#: classes/Gems/Menu.php:174
+#: classes/Gems/Menu.php:173
msgid "Execute this"
msgstr "Execute this"
-#: classes/Gems/Menu.php:175
+#: classes/Gems/Menu.php:174
msgid "Execute from here"
msgstr "Execute from here"
-#: classes/Gems/Menu.php:176
+#: classes/Gems/Menu.php:175
msgid "Execute to here"
msgstr "Execute to here"
-#: classes/Gems/Menu.php:179 classes/Gems/Default/SourceAction.php:203
+#: classes/Gems/Menu.php:178 classes/Gems/Default/SourceAction.php:203
msgid "Database"
msgstr "Database"
-#: classes/Gems/Menu.php:183
+#: classes/Gems/Menu.php:182
msgid "Content"
msgstr "Content"
-#: classes/Gems/Menu.php:186 classes/Gems/Default/DatabaseAction.php:313
+#: classes/Gems/Menu.php:185 classes/Gems/Default/DatabaseAction.php:313
msgid "Execute"
msgstr "Execute"
-#: classes/Gems/Menu.php:191 classes/Gems/Default/DatabaseAction.php:289
+#: classes/Gems/Menu.php:190 classes/Gems/Default/DatabaseAction.php:289
msgid "Patches"
msgstr "Patches"
-#: classes/Gems/Menu.php:192
+#: classes/Gems/Menu.php:191
msgid "Execute new"
msgstr "Execute new"
-#: classes/Gems/Menu.php:194
+#: classes/Gems/Menu.php:193
msgid "Refresh translateables"
msgstr "Refresh translateables"
-#: classes/Gems/Menu.php:196
+#: classes/Gems/Menu.php:195
msgid "Run SQL"
msgstr "Run SQL"
-#: classes/Gems/Menu.php:199
+#: classes/Gems/Menu.php:198
msgid "Codes"
msgstr "Codes"
-#: classes/Gems/Menu.php:200 classes/Gems/Default/ReceptionAction.php:131
+#: classes/Gems/Menu.php:199 classes/Gems/Default/ReceptionAction.php:131
msgid "Reception codes"
msgstr "Reception codes"
-#: classes/Gems/Menu.php:201
+#: classes/Gems/Menu.php:200
msgid "Consents"
msgstr "Consents"
-#: classes/Gems/Menu.php:204
+#: classes/Gems/Menu.php:203
#: snippets/Organization/OrganizationEditSnippet.php:94
msgid "Access"
msgstr "Access"
-#: classes/Gems/Menu.php:206 classes/Gems/Default/RoleAction.php:309
+#: classes/Gems/Menu.php:205 classes/Gems/Default/RoleAction.php:330
msgid "Roles"
msgstr "Roles"
-#: classes/Gems/Menu.php:207 classes/Gems/Menu.php:392
+#: classes/Gems/Menu.php:206 classes/Gems/Menu.php:394
msgid "Assigned"
msgstr "Assigned"
-#: classes/Gems/Menu.php:208 classes/Gems/Default/RoleAction.php:238
-#: classes/Gems/Default/RoleAction.php:324
+#: classes/Gems/Menu.php:207 classes/Gems/Default/RoleAction.php:259
+#: classes/Gems/Default/RoleAction.php:345
msgid "Privileges"
msgstr "Privileges"
-#: classes/Gems/Menu.php:210
+#: classes/Gems/Menu.php:209
msgid "Groups"
msgstr "Groups"
-#: classes/Gems/Menu.php:212
+#: classes/Gems/Menu.php:211
#: classes/Gems/Default/SurveyMaintenanceAction.php:210
#: classes/Gems/Default/TrackMaintenanceAction.php:139
#: classes/Gems/Email/MailTemplateForm.php:101
@@ -250,51 +256,51 @@
msgid "Organizations"
msgstr "Organizations"
-#: classes/Gems/Menu.php:214 classes/Gems/Default/GroupAction.php:121
+#: classes/Gems/Menu.php:213 classes/Gems/Default/GroupAction.php:121
#: classes/Gems/Default/LogAction.php:193
#: classes/Gems/Default/StaffAction.php:470
msgid "Staff"
msgstr "Staff"
-#: classes/Gems/Menu.php:217
+#: classes/Gems/Menu.php:216
msgid "Mail"
msgstr "Mail"
-#: classes/Gems/Menu.php:221 classes/Gems/Default/LogAction.php:213
+#: classes/Gems/Menu.php:220 classes/Gems/Default/LogAction.php:213
msgid "Logging"
msgstr "Logging"
-#: classes/Gems/Menu.php:225
+#: classes/Gems/Menu.php:224
msgid "Maintenance"
msgstr "Maintenance"
-#: classes/Gems/Menu.php:252
+#: classes/Gems/Menu.php:251
#, php-format
msgid "Stand-alone privilege: %s"
msgstr "Stand-alone privilege: %s"
-#: classes/Gems/Menu.php:259
+#: classes/Gems/Menu.php:258
msgid "Logon"
msgstr "Logon"
-#: classes/Gems/Menu.php:260 classes/Gems/User/Form/LoginForm.php:112
+#: classes/Gems/Menu.php:259 classes/Gems/User/Form/LoginForm.php:112
msgid "Lost password"
msgstr "Lost password"
-#: classes/Gems/Menu.php:261
+#: classes/Gems/Menu.php:260
msgid "Your account"
msgstr "Your account"
-#: classes/Gems/Menu.php:262 classes/Gems/Default/OptionAction.php:153
+#: classes/Gems/Menu.php:261 classes/Gems/Default/OptionAction.php:153
msgid "Activity overview"
msgstr "Activity overview"
-#: classes/Gems/Menu.php:263 classes/Gems/Default/OptionAction.php:78
+#: classes/Gems/Menu.php:262 classes/Gems/Default/OptionAction.php:78
msgid "Change password"
msgstr "Change password"
-#: classes/Gems/Menu.php:264 classes/Gems/Menu.php:316
-#: classes/Gems/Menu.php:362 classes/Gems/Default/MailLogAction.php:114
+#: classes/Gems/Menu.php:263 classes/Gems/Menu.php:318
+#: classes/Gems/Menu.php:364 classes/Gems/Default/MailLogAction.php:114
#: classes/Gems/Default/TrackAction.php:459
#: classes/Gems/Export/RespondentExport.php:158
#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:70
@@ -311,11 +317,7 @@
msgid "Token"
msgstr "Token"
-#: classes/Gems/Menu.php:304
-msgid "Export archive"
-msgstr "Export archive"
-
-#: classes/Gems/Menu.php:311 classes/Gems/Default/MailJobAction.php:99
+#: classes/Gems/Menu.php:313 classes/Gems/Default/MailJobAction.php:99
#: classes/Gems/Default/ProjectTracksAction.php:64
#: classes/Gems/Default/TrackAction.php:328
#: classes/Gems/Default/TrackActionAbstract.php:219
@@ -332,14 +334,14 @@
msgid "Track"
msgstr "Track"
-#: classes/Gems/Menu.php:319 classes/Gems/Menu.php:344
-#: classes/Gems/Menu.php:386
+#: classes/Gems/Menu.php:321 classes/Gems/Menu.php:346
+#: classes/Gems/Menu.php:388
#: classes/Gems/Default/TrackMaintenanceAction.php:458
#: snippets/AddTracksSnippet.php:241
msgid "Add"
msgstr "Add"
-#: classes/Gems/Menu.php:325 classes/Gems/Menu.php:425
+#: classes/Gems/Menu.php:327 classes/Gems/Menu.php:427
#: classes/Gems/Email/EmailFormAbstract.php:280
#: classes/Gems/Email/EmailFormAbstract.php:291
#: classes/Gems/Menu/MenuAbstract.php:406
@@ -347,26 +349,26 @@
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:334 classes/Gems/Default/ExportAction.php:149
+#: classes/Gems/Menu.php:336 classes/Gems/Default/ExportAction.php:149
#: classes/Gems/Default/TrackMaintenanceAction.php:405
#: classes/Gems/Menu/MenuAbstract.php:415
#: classes/Gems/Menu/MenuAbstract.php:497 snippets/AddTracksSnippet.php:238
msgid "Tracks"
msgstr "Tracks"
-#: classes/Gems/Menu.php:350
+#: classes/Gems/Menu.php:352
msgid "Assignments"
msgstr "Assignments"
-#: classes/Gems/Menu.php:366 classes/Gems/Menu/SubMenuItem.php:417
+#: classes/Gems/Menu.php:368 classes/Gems/Menu/SubMenuItem.php:417
msgid "Edit"
msgstr "Edit"
-#: classes/Gems/Menu.php:372 classes/Gems/Menu/SubMenuItem.php:398
+#: classes/Gems/Menu.php:374 classes/Gems/Menu/SubMenuItem.php:398
msgid "Delete"
msgstr "Delete"
-#: classes/Gems/Menu.php:379
+#: classes/Gems/Menu.php:381
#: classes/Gems/Default/SurveyMaintenanceAction.php:586
#: classes/Gems/Menu/MenuAbstract.php:422
#: classes/Gems/Menu/MenuAbstract.php:484
@@ -374,55 +376,59 @@
msgid "Surveys"
msgstr "Surveys"
-#: classes/Gems/Menu.php:416
+#: classes/Gems/Menu.php:418
msgid "Fill in"
msgstr "Fill in"
-#: classes/Gems/Menu.php:419
+#: classes/Gems/Menu.php:421
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:422
+#: classes/Gems/Menu.php:424
msgid "E-Mail now!"
msgstr "E-Mail now!"
-#: classes/Gems/Menu.php:428
+#: classes/Gems/Menu.php:430
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:481
msgid "Answers"
msgstr "Answers"
-#: classes/Gems/Menu.php:580 classes/Gems/Default/GroupAction.php:122
+#: classes/Gems/Menu.php:436
+msgid "Export archive"
+msgstr "Export archive"
+
+#: classes/Gems/Menu.php:586 classes/Gems/Default/GroupAction.php:122
#: classes/Gems/Default/OrganizationAction.php:154
#: classes/Gems/Default/RespondentAction.php:462
msgid "Respondents"
msgstr "Patients"
-#: classes/Gems/Menu.php:588
+#: classes/Gems/Menu.php:594
msgid "Overview"
msgstr "Overview"
-#: classes/Gems/Menu.php:595 classes/Gems/Menu/MenuAbstract.php:379
+#: classes/Gems/Menu.php:601 classes/Gems/Menu/MenuAbstract.php:379
msgid "Project"
msgstr "Project"
-#: classes/Gems/Menu.php:598
+#: classes/Gems/Menu.php:604
msgid "Setup"
msgstr "Setup"
-#: classes/Gems/Menu.php:601
+#: classes/Gems/Menu.php:607
msgid "Track Builder"
msgstr "Track Builder"
-#: classes/Gems/Menu.php:604 classes/Gems/Export/RespondentExport.php:341
+#: classes/Gems/Menu.php:610 classes/Gems/Export/RespondentExport.php:341
msgid "Export"
msgstr "Export"
-#: classes/Gems/Menu.php:610 classes/Gems/Default/ContactAction.php:101
+#: classes/Gems/Menu.php:616 classes/Gems/Default/ContactAction.php:170
#: snippets/Organization/OrganizationEditSnippet.php:82
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:624
+#: classes/Gems/Menu.php:630
msgid "Changelog"
msgstr "Changelog"
@@ -480,7 +486,7 @@
#: classes/Gems/Default/DatabaseAction.php:335
#: classes/Gems/Default/GroupAction.php:115
#: classes/Gems/Default/OrganizationAction.php:126
-#: classes/Gems/Default/RoleAction.php:231
+#: classes/Gems/Default/RoleAction.php:252
#: classes/Gems/Default/SourceAction.php:195
#: classes/Gems/Default/StaffAction.php:328
#: classes/Gems/Default/SurveyMaintenanceAction.php:435
@@ -847,7 +853,7 @@
#: classes/Gems/Default/ConsentAction.php:68
#: classes/Gems/Default/GroupAction.php:116
#: classes/Gems/Default/ReceptionAction.php:81
-#: classes/Gems/Default/RoleAction.php:232
+#: classes/Gems/Default/RoleAction.php:253
#: classes/Gems/Default/SurveyMaintenanceAction.php:206
#: classes/Gems/Default/SurveyMaintenanceAction.php:436
#: classes/Gems/Default/TrackActionAbstract.php:220
@@ -895,34 +901,122 @@
msgid "Respondent consents"
msgstr "Patient consents"
-#: classes/Gems/Default/ContactAction.php:71
+#: classes/Gems/Default/ContactAction.php:75
#, php-format
-msgid "%s is a web application."
-msgstr "%s is a web application."
+msgid "%s is still under development."
+msgstr "%s is still under development."
-#: classes/Gems/Default/ContactAction.php:76
+#: classes/Gems/Default/ContactAction.php:80
#, php-format
-msgid "The %s project is run by: "
-msgstr "The %s project is run by: "
+msgid "%s is run by: "
+msgstr "%s is run by: "
-#: classes/Gems/Default/ContactAction.php:82
+#: classes/Gems/Default/ContactAction.php:85
#, php-format
+msgid "Please contact the %s if you have any questions regarding %s."
+msgstr "Please contact the %s if you have any questions regarding %s."
+
+#: classes/Gems/Default/ContactAction.php:95
+#, php-format
msgid "%s is a collaboration of these organizations:"
msgstr "%s is a collaboration of these organizations:"
-#: classes/Gems/Default/ContactAction.php:103
+#: classes/Gems/Default/ContactAction.php:108
#, php-format
+msgid ""
+"You can contact any of these organizations if you have questions regarding "
+"%s."
+msgstr ""
+"You can contact any of these organizations if you have questions regarding "
+"%s."
+
+#: classes/Gems/Default/ContactAction.php:145
+msgid ""
+"GemsTracker (GEneric Medical Survey Tracker) is a software package for "
+"(complex) distribution of questionnaires and forms during clinical research "
+"and for quality registration in healthcare."
+msgstr ""
+"GemsTracker (GEneric Medical Survey Tracker) is a software package for "
+"(complex) distribution of questionnaires and forms during clinical research "
+"and for quality registration in healthcare."
+
+#: classes/Gems/Default/ContactAction.php:147
+#, php-format
+msgid "%s is a project built using GemsTracker as a foundation."
+msgstr "%s is a project built using GemsTracker as a foundation."
+
+#: classes/Gems/Default/ContactAction.php:149
+#, php-format
+msgid "GemsTracker is an open source project hosted on %s."
+msgstr "GemsTracker is an open source project hosted on %s."
+
+#: classes/Gems/Default/ContactAction.php:155
+#, php-format
+msgid "More information about GemsTracker is available on the %s website."
+msgstr "More information about GemsTracker is available on the %s website."
+
+#: classes/Gems/Default/ContactAction.php:172
+#, php-format
msgid "The %s project"
msgstr "The %s project"
-#: classes/Gems/Default/ContactAction.php:106
+#: classes/Gems/Default/ContactAction.php:175
msgid "Information on this application"
msgstr "Information on this application"
-#: classes/Gems/Default/ContactAction.php:107
+#: classes/Gems/Default/ContactAction.php:176
msgid "Links concerning this web application:"
msgstr "Links concerning this web application:"
+#: classes/Gems/Default/ContactAction.php:193
+#, php-format
+msgid "There is more than one way to get support for %s."
+msgstr "There is more than one way to get support for %s."
+
+#: classes/Gems/Default/ContactAction.php:198
+msgid "Documentation"
+msgstr "Documentation"
+
+#: classes/Gems/Default/ContactAction.php:200
+#, php-format
+msgid "All available documentation is gathered at: %s"
+msgstr "All available documentation is gathered at: %s"
+
+#: classes/Gems/Default/ContactAction.php:205
+msgid "Manual"
+msgstr "Manual"
+
+#: classes/Gems/Default/ContactAction.php:207
+#, php-format
+msgid "The manual is available here: %s"
+msgstr "The manual is available here: %s"
+
+#: classes/Gems/Default/ContactAction.php:212
+msgid "The forum"
+msgstr "The forum"
+
+#: classes/Gems/Default/ContactAction.php:215
+#, php-format
+msgid ""
+"You will find questions asked by other users and ask new questions at our "
+"forum site: %s"
+msgstr ""
+"You will find questions asked by other users and ask new questions at our "
+"forum site: %s"
+
+#: classes/Gems/Default/ContactAction.php:220
+msgid "Support site"
+msgstr "Support site"
+
+#: classes/Gems/Default/ContactAction.php:222
+#, php-format
+msgid "Check our support site at %s."
+msgstr "Check our support site at %s."
+
+#: classes/Gems/Default/ContactAction.php:226
+msgid "Or contact"
+msgstr "Or contact"
+
#: classes/Gems/Default/CronAction.php:133
msgid "Cron jobs turned off."
msgstr "Cron jobs turned off."
@@ -938,7 +1032,7 @@
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:193
+#: classes/Gems/Default/ProjectInformationAction.php:248
#: classes/Gems/Task/CleanCache.php:58
msgid "Cache cleaned"
msgstr "Cache cleaned"
@@ -1084,7 +1178,7 @@
msgstr "%d new or changed patch(es)."
#: classes/Gems/Default/DatabaseAction.php:303
-#: classes/Gems/Default/ProjectInformationAction.php:137
+#: classes/Gems/Default/ProjectInformationAction.php:180
msgid "Gems build"
msgstr "Gems build"
@@ -1268,7 +1362,7 @@
#: classes/Gems/Default/GroupAction.php:117
#: classes/Gems/Default/LogAction.php:201
-#: classes/Gems/Default/RoleAction.php:298
+#: classes/Gems/Default/RoleAction.php:319
msgid "Role"
msgstr "Role"
@@ -1969,103 +2063,134 @@
msgid "Empty logfile"
msgstr "Empty logfile"
-#: classes/Gems/Default/ProjectInformationAction.php:130
+#: classes/Gems/Default/ProjectInformationAction.php:150
+#, php-format
+msgid "%s - does not exist"
+msgstr "%s - does not exist"
+
+#: classes/Gems/Default/ProjectInformationAction.php:157
+#, php-format
+msgid "%s - no disk information available"
+msgstr "%s - no disk information available"
+
+#: classes/Gems/Default/ProjectInformationAction.php:163
+#, php-format
+msgid "%s - %s free of %s = %d%% available"
+msgstr "%s - %s free of %s = %d%% available"
+
+#: classes/Gems/Default/ProjectInformationAction.php:173
msgid "Project information"
msgstr "Project information"
-#: classes/Gems/Default/ProjectInformationAction.php:134
+#: classes/Gems/Default/ProjectInformationAction.php:177
msgid "Project name"
msgstr "Project name"
-#: classes/Gems/Default/ProjectInformationAction.php:135
+#: classes/Gems/Default/ProjectInformationAction.php:178
msgid "Project version"
msgstr "Project version"
-#: classes/Gems/Default/ProjectInformationAction.php:136
+#: classes/Gems/Default/ProjectInformationAction.php:179
msgid "Gems version"
msgstr "Gems version"
-#: classes/Gems/Default/ProjectInformationAction.php:138
+#: classes/Gems/Default/ProjectInformationAction.php:181
msgid "Gems project"
msgstr "Gems project"
-#: classes/Gems/Default/ProjectInformationAction.php:139
+#: classes/Gems/Default/ProjectInformationAction.php:182
msgid "Gems web directory"
msgstr "Gems web directory"
-#: classes/Gems/Default/ProjectInformationAction.php:140
+#: classes/Gems/Default/ProjectInformationAction.php:183
msgid "Gems root directory"
msgstr "Gems root directory"
-#: classes/Gems/Default/ProjectInformationAction.php:141
+#: classes/Gems/Default/ProjectInformationAction.php:184
msgid "Gems code directory"
msgstr "Gems code directory"
-#: classes/Gems/Default/ProjectInformationAction.php:142
+#: classes/Gems/Default/ProjectInformationAction.php:185
+msgid "Gems variable directory"
+msgstr "Gems variable directory"
+
+#: classes/Gems/Default/ProjectInformationAction.php:186
msgid "MUtil version"
msgstr "MUtil version"
-#: classes/Gems/Default/ProjectInformationAction.php:143
+#: classes/Gems/Default/ProjectInformationAction.php:187
msgid "Zend version"
msgstr "Zend version"
-#: classes/Gems/Default/ProjectInformationAction.php:144
+#: classes/Gems/Default/ProjectInformationAction.php:188
msgid "Application environment"
msgstr "Application environment"
-#: classes/Gems/Default/ProjectInformationAction.php:145
+#: classes/Gems/Default/ProjectInformationAction.php:189
msgid "Application baseuri"
msgstr "Application baseuri"
-#: classes/Gems/Default/ProjectInformationAction.php:146
+#: classes/Gems/Default/ProjectInformationAction.php:190
msgid "Application directory"
msgstr "Application directory"
-#: classes/Gems/Default/ProjectInformationAction.php:147
+#: classes/Gems/Default/ProjectInformationAction.php:191
msgid "Application encoding"
msgstr "Application encoding"
-#: classes/Gems/Default/ProjectInformationAction.php:148
+#: classes/Gems/Default/ProjectInformationAction.php:192
msgid "PHP version"
msgstr "PHP version"
-#: classes/Gems/Default/ProjectInformationAction.php:149
+#: classes/Gems/Default/ProjectInformationAction.php:193
msgid "Server Hostname"
msgstr "Server Hostname"
-#: classes/Gems/Default/ProjectInformationAction.php:150
+#: classes/Gems/Default/ProjectInformationAction.php:194
msgid "Server OS"
msgstr "Server OS"
-#: classes/Gems/Default/ProjectInformationAction.php:151
+#: classes/Gems/Default/ProjectInformationAction.php:195
msgid "Time on server"
msgstr "Time on server"
-#: classes/Gems/Default/ProjectInformationAction.php:155
+#: classes/Gems/Default/ProjectInformationAction.php:198
+msgid "Session directory"
+msgstr "Session directory"
+
+#: classes/Gems/Default/ProjectInformationAction.php:199
+msgid "Temporary files directory"
+msgstr "Temporary files directory"
+
+#: classes/Gems/Default/ProjectInformationAction.php:202
+msgid "System Drive"
+msgstr "System Drive"
+
+#: classes/Gems/Default/ProjectInformationAction.php:210
msgid "Turn Maintenance Mode OFF"
msgstr "Turn Maintenance Mode OFF"
-#: classes/Gems/Default/ProjectInformationAction.php:157
+#: classes/Gems/Default/ProjectInformationAction.php:212
msgid "Turn Maintenance Mode ON"
msgstr "Turn Maintenance Mode ON"
-#: classes/Gems/Default/ProjectInformationAction.php:167
+#: classes/Gems/Default/ProjectInformationAction.php:222
msgid "Version information"
msgstr "Version information"
-#: classes/Gems/Default/ProjectInformationAction.php:201
+#: classes/Gems/Default/ProjectInformationAction.php:256
msgid "Server PHP Info"
msgstr "Server PHP Info"
-#: classes/Gems/Default/ProjectInformationAction.php:218
+#: classes/Gems/Default/ProjectInformationAction.php:273
msgid "Project settings"
msgstr "Project settings"
-#: classes/Gems/Default/ProjectInformationAction.php:225
+#: classes/Gems/Default/ProjectInformationAction.php:280
msgid "Session content"
msgstr "Session content"
-#: classes/Gems/Default/ProjectInformationAction.php:226
+#: classes/Gems/Default/ProjectInformationAction.php:281
#: classes/Gems/Menu/MenuAbstract.php:380
msgid "Session"
msgstr "Session"
@@ -2345,65 +2470,65 @@
msgid "Respondent planning"
msgstr "Patient planning"
-#: classes/Gems/Default/RoleAction.php:97
+#: classes/Gems/Default/RoleAction.php:106
msgid "child of current role"
msgstr "child of current role"
-#: classes/Gems/Default/RoleAction.php:105
+#: classes/Gems/Default/RoleAction.php:115
#, php-format
msgid "inherited from %s"
msgstr "inherited from %s"
-#: classes/Gems/Default/RoleAction.php:113
+#: classes/Gems/Default/RoleAction.php:127
msgid "this role"
msgstr "this role"
-#: classes/Gems/Default/RoleAction.php:144
-#: classes/Gems/Default/RoleAction.php:302
+#: classes/Gems/Default/RoleAction.php:162
+#: classes/Gems/Default/RoleAction.php:323
msgid "Inherited"
msgstr "Inherited"
-#: classes/Gems/Default/RoleAction.php:209
+#: classes/Gems/Default/RoleAction.php:230
msgid "Illegal name"
msgstr "Illegal name"
-#: classes/Gems/Default/RoleAction.php:233
-#: classes/Gems/Default/RoleAction.php:299
+#: classes/Gems/Default/RoleAction.php:254
+#: classes/Gems/Default/RoleAction.php:320
msgid "Parents"
msgstr "Parents"
-#: classes/Gems/Default/RoleAction.php:255
+#: classes/Gems/Default/RoleAction.php:276
msgid "Editing `master` is not allowed"
msgstr "Editing `master` is not allowed"
-#: classes/Gems/Default/RoleAction.php:273
+#: classes/Gems/Default/RoleAction.php:294
msgid "role"
msgid_plural "roles"
msgstr[0] "role"
msgstr[1] "roles"
-#: classes/Gems/Default/RoleAction.php:278
+#: classes/Gems/Default/RoleAction.php:299
msgid "Administrative roles"
msgstr "Administrative roles"
-#: classes/Gems/Default/RoleAction.php:300
-#: classes/Gems/Default/RoleAction.php:318
+#: classes/Gems/Default/RoleAction.php:321
+#: classes/Gems/Default/RoleAction.php:339
msgid "Allowed"
msgstr "Allowed"
-#: classes/Gems/Default/RoleAction.php:307
+#: classes/Gems/Default/RoleAction.php:328
msgid "Project role overview"
msgstr "Project role overview"
-#: classes/Gems/Default/RoleAction.php:317
+#: classes/Gems/Default/RoleAction.php:338
msgid "Privilege"
msgstr "Privilege"
-#: classes/Gems/Default/RoleAction.php:319
+#: classes/Gems/Default/RoleAction.php:340
msgid "Denied"
msgstr "Denied"
-#: classes/Gems/Default/RoleAction.php:323
+#: classes/Gems/Default/RoleAction.php:344
msgid "Project privileges"
msgstr "Project privileges"
@@ -5328,6 +5453,9 @@
msgstr[1] ""
"After this survey there are another %d surveys we would like you to answer."
+#~ msgid "%s is a web application."
+#~ msgstr "%s is a web application."
+
#~ msgid "Success"
#~ msgstr "Success"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2013-02-15 16:57:18 UTC (rev 1144)
+++ trunk/library/languages/default-nl.po 2013-02-15 17:24:54 UTC (rev 1145)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-07 18:05+0100\n"
+"POT-Creation-Date: 2013-02-15 18:22+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -31,7 +31,7 @@
msgid "You are logged in as %s"
msgstr "Ingelogd als %s"
-#: classes/GemsEscort.php:895 classes/Gems/Menu.php:265
+#: classes/GemsEscort.php:895 classes/Gems/Menu.php:264
msgid "Logoff"
msgstr "Uitloggen"
@@ -131,118 +131,124 @@
msgid "of"
msgstr "van"
-#: classes/Gems/Menu.php:139
+#: classes/Gems/Menu.php:138 classes/Gems/Menu.php:139
+#: classes/Gems/Default/ContactAction.php:123
+#: classes/Gems/Default/ContactAction.php:143
#, php-format
msgid "About %s"
msgstr "Over %s"
-#: classes/Gems/Menu.php:143
+#: classes/Gems/Menu.php:139 classes/Gems/Default/ContactAction.php:143
+msgid "GemsTracker"
+msgstr "GemsTracker"
+
+#: classes/Gems/Menu.php:142
msgid "Reporting bugs"
msgstr "Meld een bug"
-#: classes/Gems/Menu.php:146
+#: classes/Gems/Menu.php:145 classes/Gems/Default/ContactAction.php:191
msgid "Support"
msgstr "Ondersteuning"
-#: classes/Gems/Menu.php:167
+#: classes/Gems/Menu.php:166
msgid "Project setup"
msgstr "Projectinfo"
-#: classes/Gems/Menu.php:169
+#: classes/Gems/Menu.php:168
msgid "Upgrade"
msgstr "Upgrade"
-#: classes/Gems/Menu.php:170 classes/Gems/Menu.php:171
+#: classes/Gems/Menu.php:169 classes/Gems/Menu.php:170
#: classes/Gems/Default/ProjectInformationAction.php:113
#: classes/Gems/Default/ProjectInformationAction.php:118
#, php-format
msgid "Changelog %s"
msgstr "Wijzigingen %s"
-#: classes/Gems/Menu.php:172 classes/Gems/Menu.php:356
+#: classes/Gems/Menu.php:171 classes/Gems/Menu.php:358
#: classes/Gems/Menu/SubMenuItem.php:551
msgid "Show"
msgstr "Toon"
-#: classes/Gems/Menu.php:173
+#: classes/Gems/Menu.php:172
msgid "Execute all"
msgstr "Alles uitvoeren"
-#: classes/Gems/Menu.php:174
+#: classes/Gems/Menu.php:173
msgid "Execute this"
msgstr "Dit uitvoeren"
-#: classes/Gems/Menu.php:175
+#: classes/Gems/Menu.php:174
msgid "Execute from here"
msgstr "Uitvoeren vanaf hier"
-#: classes/Gems/Menu.php:176
+#: classes/Gems/Menu.php:175
msgid "Execute to here"
msgstr "Uitvoeren tot hier"
-#: classes/Gems/Menu.php:179 classes/Gems/Default/SourceAction.php:203
+#: classes/Gems/Menu.php:178 classes/Gems/Default/SourceAction.php:203
msgid "Database"
msgstr "Database"
-#: classes/Gems/Menu.php:183
+#: classes/Gems/Menu.php:182
msgid "Content"
msgstr "Inhoud"
-#: classes/Gems/Menu.php:186 classes/Gems/Default/DatabaseAction.php:313
+#: classes/Gems/Menu.php:185 classes/Gems/Default/DatabaseAction.php:313
msgid "Execute"
msgstr "Uitvoeren"
-#: classes/Gems/Menu.php:191 classes/Gems/Default/DatabaseAction.php:289
+#: classes/Gems/Menu.php:190 classes/Gems/Default/DatabaseAction.php:289
msgid "Patches"
msgstr "Patches"
-#: classes/Gems/Menu.php:192
+#: classes/Gems/Menu.php:191
msgid "Execute new"
msgstr "Nieuwe aanmaken"
-#: classes/Gems/Menu.php:194
+#: classes/Gems/Menu.php:193
msgid "Refresh translateables"
msgstr "Ververs vertaalbaren"
-#: classes/Gems/Menu.php:196
+#: classes/Gems/Menu.php:195
msgid "Run SQL"
msgstr "SQL uitvoeren"
-#: classes/Gems/Menu.php:199
+#: classes/Gems/Menu.php:198
msgid "Codes"
msgstr "Codes"
-#: classes/Gems/Menu.php:200 classes/Gems/Default/ReceptionAction.php:131
+#: classes/Gems/Menu.php:199 classes/Gems/Default/ReceptionAction.php:131
msgid "Reception codes"
msgstr "Ontvangst codes"
-#: classes/Gems/Menu.php:201
+#: classes/Gems/Menu.php:200
msgid "Consents"
msgstr "Toestemmingen"
-#: classes/Gems/Menu.php:204
+#: classes/Gems/Menu.php:203
#: snippets/Organization/OrganizationEditSnippet.php:94
msgid "Access"
msgstr "Toegang"
-#: classes/Gems/Menu.php:206 classes/Gems/Default/RoleAction.php:309
+#: classes/Gems/Menu.php:205 classes/Gems/Default/RoleAction.php:330
msgid "Roles"
msgstr "Rollen"
-#: classes/Gems/Menu.php:207 classes/Gems/Menu.php:392
+#: classes/Gems/Menu.php:206 classes/Gems/Menu.php:394
msgid "Assigned"
msgstr "Toegewezen"
-#: classes/Gems/Menu.php:208 classes/Gems/Default/RoleAction.php:238
-#: classes/Gems/Default/RoleAction.php:324
+#: classes/Gems/Menu.php:207 classes/Gems/Default/RoleAction.php:259
+#: classes/Gems/Default/RoleAction.php:345
msgid "Privileges"
msgstr "Priviléges"
-#: classes/Gems/Menu.php:210
+#: classes/Gems/Menu.php:209
msgid "Groups"
msgstr "Groepen"
-#: classes/Gems/Menu.php:212
+#: classes/Gems/Menu.php:211
#: classes/Gems/Default/SurveyMaintenanceAction.php:210
#: classes/Gems/Default/TrackMaintenanceAction.php:139
#: classes/Gems/Email/MailTemplateForm.php:101
@@ -250,51 +256,51 @@
msgid "Organizations"
msgstr "Organisaties"
-#: classes/Gems/Menu.php:214 classes/Gems/Default/GroupAction.php:121
+#: classes/Gems/Menu.php:213 classes/Gems/Default/GroupAction.php:121
#: classes/Gems/Default/LogAction.php:193
#: classes/Gems/Default/StaffAction.php:470
msgid "Staff"
msgstr "Medewerkers"
-#: classes/Gems/Menu.php:217
+#: classes/Gems/Menu.php:216
msgid "Mail"
msgstr "Email"
-#: classes/Gems/Menu.php:221 classes/Gems/Default/LogAction.php:213
+#: classes/Gems/Menu.php:220 classes/Gems/Default/LogAction.php:213
msgid "Logging"
msgstr "Logboek"
-#: classes/Gems/Menu.php:225
+#: classes/Gems/Menu.php:224
msgid "Maintenance"
msgstr "Onderhoud"
-#: classes/Gems/Menu.php:252
+#: classes/Gems/Menu.php:251
#, php-format
msgid "Stand-alone privilege: %s"
msgstr "Zelfstandig privilege: %s"
-#: classes/Gems/Menu.php:259
+#: classes/Gems/Menu.php:258
msgid "Logon"
msgstr "Login"
-#: classes/Gems/Menu.php:260 classes/Gems/User/Form/LoginForm.php:112
+#: classes/Gems/Menu.php:259 classes/Gems/User/Form/LoginForm.php:112
msgid "Lost password"
msgstr "Wachtwoord vergeten"
-#: classes/Gems/Menu.php:261
+#: classes/Gems/Menu.php:260
msgid "Your account"
msgstr "Uw account"
-#: classes/Gems/Menu.php:262 classes/Gems/Default/OptionAction.php:153
+#: classes/Gems/Menu.php:261 classes/Gems/Default/OptionAction.php:153
msgid "Activity overview"
msgstr "Activiteiten overzicht"
-#: classes/Gems/Menu.php:263 classes/Gems/Default/OptionAction.php:78
+#: classes/Gems/Menu.php:262 classes/Gems/Default/OptionAction.php:78
msgid "Change password"
msgstr "Uw wachtwoord"
-#: classes/Gems/Menu.php:264 classes/Gems/Menu.php:316
-#: classes/Gems/Menu.php:362 classes/Gems/Default/MailLogAction.php:114
+#: classes/Gems/Menu.php:263 classes/Gems/Menu.php:318
+#: classes/Gems/Menu.php:364 classes/Gems/Default/MailLogAction.php:114
#: classes/Gems/Default/TrackAction.php:459
#: classes/Gems/Export/RespondentExport.php:158
#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:70
@@ -311,11 +317,7 @@
msgid "Token"
msgstr "Kenmerk"
-#: classes/Gems/Menu.php:304
-msgid "Export archive"
-msgstr "Dossier export"
-
-#: classes/Gems/Menu.php:311 classes/Gems/Default/MailJobAction.php:99
+#: classes/Gems/Menu.php:313 classes/Gems/Default/MailJobAction.php:99
#: classes/Gems/Default/ProjectTracksAction.php:64
#: classes/Gems/Default/TrackAction.php:328
#: classes/Gems/Default/TrackActionAbstract.php:219
@@ -332,14 +334,14 @@
msgid "Track"
msgstr "Traject"
-#: classes/Gems/Menu.php:319 classes/Gems/Menu.php:344
-#: classes/Gems/Menu.php:386
+#: classes/Gems/Menu.php:321 classes/Gems/Menu.php:346
+#: classes/Gems/Menu.php:388
#: classes/Gems/Default/TrackMaintenanceAction.php:458
#: snippets/AddTracksSnippet.php:241
msgid "Add"
msgstr "Voeg toe"
-#: classes/Gems/Menu.php:325 classes/Gems/Menu.php:425
+#: classes/Gems/Menu.php:327 classes/Gems/Menu.php:427
#: classes/Gems/Email/EmailFormAbstract.php:280
#: classes/Gems/Email/EmailFormAbstract.php:291
#: classes/Gems/Menu/MenuAbstract.php:406
@@ -347,26 +349,26 @@
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:334 classes/Gems/Default/ExportAction.php:149
+#: classes/Gems/Menu.php:336 classes/Gems/Default/ExportAction.php:149
#: classes/Gems/Default/TrackMaintenanceAction.php:405
#: classes/Gems/Menu/MenuAbstract.php:415
#: classes/Gems/Menu/MenuAbstract.php:497 snippets/AddTracksSnippet.php:238
msgid "Tracks"
msgstr "Trajecten"
-#: classes/Gems/Menu.php:350
+#: classes/Gems/Menu.php:352
msgid "Assignments"
msgstr "Toewijzingen"
-#: classes/Gems/Menu.php:366 classes/Gems/Menu/SubMenuItem.php:417
+#: classes/Gems/Menu.php:368 classes/Gems/Menu/SubMenuItem.php:417
msgid "Edit"
msgstr "Wijzig"
-#: classes/Gems/Menu.php:372 classes/Gems/Menu/SubMenuItem.php:398
+#: classes/Gems/Menu.php:374 classes/Gems/Menu/SubMenuItem.php:398
msgid "Delete"
msgstr "Verwijder"
-#: classes/Gems/Menu.php:379
+#: classes/Gems/Menu.php:381
#: classes/Gems/Default/SurveyMaintenanceAction.php:586
#: classes/Gems/Menu/MenuAbstract.php:422
#: classes/Gems/Menu/MenuAbstract.php:484
@@ -374,55 +376,59 @@
msgid "Surveys"
msgstr "Vragenlijsten"
-#: classes/Gems/Menu.php:416
+#: classes/Gems/Menu.php:418
msgid "Fill in"
msgstr "Vul in"
-#: classes/Gems/Menu.php:419
+#: classes/Gems/Menu.php:421
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:422
+#: classes/Gems/Menu.php:424
msgid "E-Mail now!"
msgstr "Email nu!"
-#: classes/Gems/Menu.php:428
+#: classes/Gems/Menu.php:430
#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:481
msgid "Answers"
msgstr "Antwoorden"
-#: classes/Gems/Menu.php:580 classes/Gems/Default/GroupAction.php:122
+#: classes/Gems/Menu.php:436
+msgid "Export archive"
+msgstr "Dossier export"
+
+#: classes/Gems/Menu.php:586 classes/Gems/Default/GroupAction.php:122
#: classes/Gems/Default/OrganizationAction.php:154
#: classes/Gems/Default/RespondentAction.php:462
msgid "Respondents"
msgstr "Patiënten"
-#: classes/Gems/Menu.php:588
+#: classes/Gems/Menu.php:594
msgid "Overview"
msgstr "Overzicht"
-#: classes/Gems/Menu.php:595 classes/Gems/Menu/MenuAbstract.php:379
+#: classes/Gems/Menu.php:601 classes/Gems/Menu/MenuAbstract.php:379
msgid "Project"
msgstr "Project"
-#: classes/Gems/Menu.php:598
+#: classes/Gems/Menu.php:604
msgid "Setup"
msgstr "Beheer"
-#: classes/Gems/Menu.php:601
+#: classes/Gems/Menu.php:607
msgid "Track Builder"
msgstr "Traject bouwer"
-#: classes/Gems/Menu.php:604 classes/Gems/Export/RespondentExport.php:341
+#: classes/Gems/Menu.php:610 classes/Gems/Export/RespondentExport.php:341
msgid "Export"
msgstr "Exporteer"
-#: classes/Gems/Menu.php:610 classes/Gems/Default/ContactAction.php:101
+#: classes/Gems/Menu.php:616 classes/Gems/Default/ContactAction.php:170
#: snippets/Organization/OrganizationEditSnippet.php:82
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:624
+#: classes/Gems/Menu.php:630
msgid "Changelog"
msgstr "Changelog"
@@ -480,7 +486,7 @@
#: classes/Gems/Default/DatabaseAction.php:335
#: classes/Gems/Default/GroupAction.php:115
#: classes/Gems/Default/OrganizationAction.php:126
-#: classes/Gems/Default/RoleAction.php:231
+#: classes/Gems/Default/RoleAction.php:252
#: classes/Gems/Default/SourceAction.php:195
#: classes/Gems/Default/StaffAction.php:328
#: classes/Gems/Default/SurveyMaintenanceAction.php:435
@@ -849,7 +855,7 @@
#: classes/Gems/Default/ConsentAction.php:68
#: classes/Gems/Default/GroupAction.php:116
#: classes/Gems/Default/ReceptionAction.php:81
-#: classes/Gems/Default/RoleAction.php:232
+#: classes/Gems/Default/RoleAction.php:253
#: classes/Gems/Default/SurveyMaintenanceAction.php:206
#: classes/Gems/Default/SurveyMaintenanceAction.php:436
#: classes/Gems/Default/TrackActionAbstract.php:220
@@ -897,34 +903,120 @@
msgid "Respondent consents"
msgstr "Patiënt toestemming"
-#: classes/Gems/Default/ContactAction.php:71
+#: classes/Gems/Default/ContactAction.php:75
#, php-format
-msgid "%s is a web application."
-msgstr "%s is een web applicatie."
+msgid "%s is still under development."
+msgstr "%s wordt nog ontwikkeld."
-#: classes/Gems/Default/ContactAction.php:76
+#: classes/Gems/Default/ContactAction.php:80
#, php-format
-msgid "The %s project is run by: "
+msgid "%s is run by: "
msgstr "%s is een project van: "
-#: classes/Gems/Default/ContactAction.php:82
+#: classes/Gems/Default/ContactAction.php:85
#, php-format
+msgid "Please contact the %s if you have any questions regarding %s."
+msgstr "%s is de organisatie om contact mee op te nemen met vragen over %s."
+
+#: classes/Gems/Default/ContactAction.php:95
+#, php-format
msgid "%s is a collaboration of these organizations:"
msgstr "Deze organisaties werken samen voor het %s project:"
-#: classes/Gems/Default/ContactAction.php:103
+#: classes/Gems/Default/ContactAction.php:108
#, php-format
+msgid ""
+"You can contact any of these organizations if you have questions regarding "
+"%s."
+msgstr "U kan elk van deze organisaties benaderen met vragen over %s."
+
+#: classes/Gems/Default/ContactAction.php:145
+msgid ""
+"GemsTracker (GEneric Medical Survey Tracker) is a software package for "
+"(complex) distribution of questionnaires and forms during clinical research "
+"and for quality registration in healthcare."
+msgstr ""
+"GemsTracker (GEneric Medical Survey Tracker) is een software pakket voor de "
+"(complexe) distributie van vragenlijsten en formulieren voor klinisch "
+"onderzoek en kwaliteitsregistratie in de gezondheidszorg."
+
+#: classes/Gems/Default/ContactAction.php:147
+#, php-format
+msgid "%s is a project built using GemsTracker as a foundation."
+msgstr "%s is een project gebouwt met GemsTracker als basis fundament."
+
+#: classes/Gems/Default/ContactAction.php:149
+#, php-format
+msgid "GemsTracker is an open source project hosted on %s."
+msgstr "GemsTracker is een %s open source project."
+
+#: classes/Gems/Default/ContactAction.php:155
+#, php-format
+msgid "More information about GemsTracker is available on the %s website."
+msgstr "Meer informatie over GemsTracker vindt u op de %s site."
+
+#: classes/Gems/Default/ContactAction.php:172
+#, php-format
msgid "The %s project"
msgstr "Het %s project"
-#: classes/Gems/Default/ContactAction.php:106
+#: classes/Gems/Default/ContactAction.php:175
msgid "Information on this application"
-msgstr "Information over deze website"
+msgstr "Informatie over deze website"
-#: classes/Gems/Default/ContactAction.php:107
+#: classes/Gems/Default/ContactAction.php:176
msgid "Links concerning this web application:"
msgstr "Links met informatie over deze website:"
+#: classes/Gems/Default/ContactAction.php:193
+#, php-format
+msgid "There is more than one way to get support for %s."
+msgstr "U kan op meerdere manieren ondersteuning krijgen voor %s."
+
+#: classes/Gems/Default/ContactAction.php:198
+msgid "Documentation"
+msgstr "Documentatie"
+
+#: classes/Gems/Default/ContactAction.php:200
+#, php-format
+msgid "All available documentation is gathered at: %s"
+msgstr "Alle beschikbare documentatie staat op: %s."
+
+#: classes/Gems/Default/ContactAction.php:205
+msgid "Manual"
+msgstr "Handleiding"
+
+#: classes/Gems/Default/ContactAction.php:207
+#, php-format
+msgid "The manual is available here: %s"
+msgstr "De handleiding vindt u hier: %s"
+
+#: classes/Gems/Default/ContactAction.php:212
+msgid "The forum"
+msgstr "Forum"
+
+#: classes/Gems/Default/ContactAction.php:215
+#, php-format
+msgid ""
+"You will find questions asked by other users and ask new questions at our "
+"forum site: %s"
+msgstr ""
+"Via ons forum op %s kan u vragen en antwoorden van andere gebruikers vinden "
+"en nieuwe vragen stellen."
+
+#: classes/Gems/Default/ContactAction.php:220
+msgid "Support site"
+msgstr "Ondersteuning"
+
+#: classes/Gems/Default/ContactAction.php:222
+#, php-format
+msgid "Check our support site at %s."
+msgstr "Kijk op onze ondersteunings site op %s."
+
+#: classes/Gems/Default/ContactAction.php:226
+msgid "Or contact"
+msgstr "Of neem contact op met"
+
#: classes/Gems/Default/CronAction.php:133
msgid "Cron jobs turned off."
msgstr "Cron opdrachten uitgezet."
@@ -941,7 +1033,7 @@
"Op dit test systeem worden alle emails gestuurd naar het \"van\" adres."
#: classes/Gems/Default/DatabaseAction.php:75
-#: classes/Gems/Default/ProjectInformationAction.php:193
+#: classes/Gems/Default/ProjectInformationAction.php:248
#: classes/Gems/Task/CleanCache.php:58
msgid "Cache cleaned"
msgstr "Cache opgeschoond"
@@ -1087,7 +1179,7 @@
msgstr "%d nieuwe of veranderde patch(es)."
#: classes/Gems/Default/DatabaseAction.php:303
-#: classes/Gems/Default/ProjectInformationAction.php:137
+#: classes/Gems/Default/ProjectInformationAction.php:180
msgid "Gems build"
msgstr "Gems bouwnummer"
@@ -1273,7 +1365,7 @@
#: classes/Gems/Default/GroupAction.php:117
#: classes/Gems/Default/LogAction.php:201
-#: classes/Gems/Default/RoleAction.php:298
+#: classes/Gems/Default/RoleAction.php:319
msgid "Role"
msgstr "Rol"
@@ -1980,103 +2072,134 @@
msgid "Empty logfile"
msgstr "Verwijder alle foutmeldingen"
-#: classes/Gems/Default/ProjectInformationAction.php:130
+#: classes/Gems/Default/ProjectInformationAction.php:150
+#, php-format
+msgid "%s - does not exist"
+msgstr "%s - bestaat niet"
+
+#: classes/Gems/Default/ProjectInformationAction.php:157
+#, php-format
+msgid "%s - no disk information available"
+msgstr "%s - informatie over schijf niet beschikbaar"
+
+#: classes/Gems/Default/ProjectInformationAction.php:163
+#, php-format
+msgid "%s - %s free of %s = %d%% available"
+msgstr "%s - %s vrij van %s = %d%% beschikbaar"
+
+#: classes/Gems/Default/ProjectInformationAction.php:173
msgid "Project information"
msgstr "Project informatie"
-#: classes/Gems/Default/ProjectInformationAction.php:134
+#: classes/Gems/Default/ProjectInformationAction.php:177
msgid "Project name"
msgstr "Project naam"
-#: classes/Gems/Default/ProjectInformationAction.php:135
+#: classes/Gems/Default/ProjectInformationAction.php:178
msgid "Project version"
msgstr "Project versie"
-#: classes/Gems/Default/ProjectInformationAction.php:136
+#: classes/Gems/Default/ProjectInformationAction.php:179
msgid "Gems version"
msgstr "Gems versie"
-#: classes/Gems/Default/ProjectInformationAction.php:138
+#: classes/Gems/Default/ProjectInformationAction.php:181
msgid "Gems project"
msgstr "Gems project"
-#: classes/Gems/Default/ProjectInformationAction.php:139
+#: classes/Gems/Default/ProjectInformationAction.php:182
msgid "Gems web directory"
msgstr "Gems web folder"
-#: classes/Gems/Default/ProjectInformationAction.php:140
+#: classes/Gems/Default/ProjectInformationAction.php:183
msgid "Gems root directory"
msgstr "Gems start folder"
-#: classes/Gems/Default/ProjectInformationAction.php:141
+#: classes/Gems/Default/ProjectInformationAction.php:184
msgid "Gems code directory"
msgstr "Gems code folder"
-#: classes/Gems/Default/ProjectInformationAction.php:142
+#: classes/Gems/Default/ProjectInformationAction.php:185
+msgid "Gems variable directory"
+msgstr "Gems variabelen folder"
+
+#: classes/Gems/Default/ProjectInformationAction.php:186
msgid "MUtil version"
msgstr "MUtil versie"
-#: classes/Gems/Default/ProjectInformationAction.php:143
+#: classes/Gems/Default/ProjectInformationAction.php:187
msgid "Zend version"
msgstr "Zend versie"
-#: classes/Gems/Default/ProjectInformationAction.php:144
+#: classes/Gems/Default/ProjectInformationAction.php:188
msgid "Application environment"
msgstr "Applicatie omgeving"
-#: classes/Gems/Default/ProjectInformationAction.php:145
+#: classes/Gems/Default/ProjectInformationAction.php:189
msgid "Application baseuri"
msgstr "Applicatie baseuri"
-#: classes/Gems/Default/ProjectInformationAction.php:146
+#: classes/Gems/Default/ProjectInformationAction.php:190
msgid "Application directory"
msgstr "Applicatie folder"
-#: classes/Gems/Default/ProjectInformationAction.php:147
+#: classes/Gems/Default/ProjectInformationAction.php:191
msgid "Application encoding"
msgstr "Applicatie tekenset"
-#: classes/Gems/Default/ProjectInformationAction.php:148
+#: classes/Gems/Default/ProjectInformationAction.php:192
msgid "PHP version"
msgstr "PHP versie"
-#: classes/Gems/Default/ProjectInformationAction.php:149
+#: classes/Gems/Default/ProjectInformationAction.php:193
msgid "Server Hostname"
msgstr "Webserver naam"
-#: classes/Gems/Default/ProjectInformationAction.php:150
+#: classes/Gems/Default/ProjectInformationAction.php:194
msgid "Server OS"
msgstr "Server besturingssysteem"
-#: classes/Gems/Default/ProjectInformationAction.php:151
+#: classes/Gems/Default/ProjectInformationAction.php:195
msgid "Time on server"
msgstr "De tijd op de server"
-#: classes/Gems/Default/ProjectInformationAction.php:155
+#: classes/Gems/Default/ProjectInformationAction.php:198
+msgid "Session directory"
+msgstr "Sessie opslag folder"
+
+#: classes/Gems/Default/ProjectInformationAction.php:199
+msgid "Temporary files directory"
+msgstr "Tijdelijke bestanden folder"
+
+#: classes/Gems/Default/ProjectInformationAction.php:202
+msgid "System Drive"
+msgstr "Systeem Schijf"
+
+#: classes/Gems/Default/ProjectInformationAction.php:210
msgid "Turn Maintenance Mode OFF"
msgstr "Onderhoudsmodus UITzetten"
-#: classes/Gems/Default/ProjectInformationAction.php:157
+#: classes/Gems/Default/ProjectInformationAction.php:212
msgid "Turn Maintenance Mode ON"
msgstr "Onderhoudsmodus AANzetten"
-#: classes/Gems/Default/ProjectInformationAction.php:167
+#: classes/Gems/Default/ProjectInformationAction.php:222
msgid "Version information"
msgstr "Versie informatie"
-#: classes/Gems/Default/ProjectInformationAction.php:201
+#: classes/Gems/Default/ProjectInformationAction.php:256
msgid "Server PHP Info"
msgstr "Server PHP Info"
-#: classes/Gems/Default/ProjectInformationAction.php:218
+#: classes/Gems/Default/ProjectInformationAction.php:273
msgid "Project settings"
msgstr "Project instellingen"
-#: classes/Gems/Default/ProjectInformationAction.php:225
+#: classes/Gems/Default/ProjectInformationAction.php:280
msgid "Session content"
msgstr "Sessie inhoud"
-#: classes/Gems/Default/ProjectInformationAction.php:226
+#: classes/Gems/Default/ProjectInformationAction.php:281
#: classes/Gems/Menu/MenuAbstract.php:380
msgid "Session"
msgstr "Sessie"
@@ -2356,65 +2479,65 @@
msgid "Respondent planning"
msgstr "Per patiënt plannen"
-#: classes/Gems/Default/RoleAction.php:97
+#: classes/Gems/Default/RoleAction.php:106
msgid "child of current role"
msgstr "afgeleid van huidige rol"
-#: classes/Gems/Default/RoleAction.php:105
+#: classes/Gems/Default/RoleAction.php:115
#, php-format
msgid "inherited from %s"
msgstr "overerfd van %s"
-#: classes/Gems/Default/RoleAction.php:113
+#: classes/Gems/Default/RoleAction.php:127
msgid "this role"
msgstr "deze rol"
-#: classes/Gems/Default/RoleAction.php:144
-#: classes/Gems/Default/RoleAction.php:302
+#: classes/Gems/Default/RoleAction.php:162
+#: classes/Gems/Default/RoleAction.php:323
msgid "Inherited"
msgstr "Overerfd"
-#: classes/Gems/Default/RoleAction.php:209
+#: classes/Gems/Default/RoleAction.php:230
msgid "Illegal name"
msgstr "Naam niet toegestaan"
-#: classes/Gems/Default/RoleAction.php:233
-#: classes/Gems/Default/RoleAction.php:299
+#: classes/Gems/Default/RoleAction.php:254
+#: classes/Gems/Default/RoleAction.php:320
msgid "Parents"
msgstr "Afgeleid van"
-#: classes/Gems/Default/RoleAction.php:255
+#: classes/Gems/Default/RoleAction.php:276
msgid "Editing `master` is not allowed"
msgstr "Het wijzigen van `master` is niet toegestaan"
-#: classes/Gems/Default/RoleAction.php:273
+#: classes/Gems/Default/RoleAction.php:294
msgid "role"
msgid_plural "roles"
msgstr[0] "Rol"
msgstr[1] "Rollen"
-#: classes/Gems/Default/RoleAction.php:278
+#: classes/Gems/Default/RoleAction.php:299
msgid "Administrative roles"
msgstr "Beheer rollen en rechten"
-#: classes/Gems/Default/RoleAction.php:300
-#: classes/Gems/Default/RoleAction.php:318
+#: classes/Gems/Default/RoleAction.php:321
+#: classes/Gems/Default/RoleAction.php:339
msgid "Allowed"
msgstr "Toegestaan"
-#: classes/Gems/Default/RoleAction.php:307
+#: classes/Gems/Default/RoleAction.php:328
msgid "Project role overview"
msgstr "Project rollen"
-#: classes/Gems/Default/RoleAction.php:317
+#: classes/Gems/Default/RoleAction.php:338
msgid "Privilege"
msgstr "Privilége"
-#: classes/Gems/Default/RoleAction.php:319
+#: classes/Gems/Default/RoleAction.php:340
msgid "Denied"
msgstr "Geweigerd"
-#: classes/Gems/Default/RoleAction.php:323
+#: classes/Gems/Default/RoleAction.php:344
msgid "Project privileges"
msgstr "Project priviléges"
@@ -5384,6 +5507,9 @@
msgstr[0] "Na deze vragenlijst hebben we nog één andere vragenlijst voor u."
msgstr[1] "Na deze vragenlijst hebben we nog %d andere vragenlijsten voor u."
+#~ msgid "%s is a web application."
+#~ msgstr "%s is een web applicatie."
+
#~ msgid "Success"
#~ msgstr "Succes"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-15 16:57:20
|
Revision: 1144
http://sourceforge.net/p/gemstracker/code/1144
Author: matijsdejong
Date: 2013-02-15 16:57:18 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Added new contact info to default project.ini
Modified Paths:
--------------
trunk/new_project/application/configs/project.ini
Modified: trunk/new_project/application/configs/project.ini
===================================================================
--- trunk/new_project/application/configs/project.ini 2013-02-15 16:53:06 UTC (rev 1143)
+++ trunk/new_project/application/configs/project.ini 2013-02-15 16:57:18 UTC (rev 1144)
@@ -1,6 +1,8 @@
[production]
name = "New"
description = "New"
+;descrLong = ""
+;descrLongNl = ""
;---------------------------------------------------
; Hash encryption salt. REQUIRED!
@@ -31,8 +33,13 @@
favicon = basic/basic.ico
jquerycss = basic/jquery-basic.css
-contact.bugsUrl = https://sourceforge.net/apps/trac/gemstracker/wiki
-contact.supportUrl = https://sourceforge.net/projects/gemstracker/support
+contact.bugsUrl = http://gemstracker.org/mantis
+contact.docsUrl = http://gemstracker.org/wiki/doku.php
+;contact.forumUrl = http://gemstracker.org/wiki/doku.php
+contact.gemsUrl = http://gemstracker.org/
+contact.manualUrl = "http://gemstracker.org/wiki/doku.php?id=userzone:userdoc:start"
+;contact.supportUrl = http://gemstracker.org/wiki/doku.php
+
databaseFileEncoding = ISO-8859-1
;-------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-15 16:53:12
|
Revision: 1143
http://sourceforge.net/p/gemstracker/code/1143
Author: matijsdejong
Date: 2013-02-15 16:53:06 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Fixed bug in RoleAction.php when parents / children are missing
Reorganized ContactAction.php with extra support urls from project.ini and About GemsTracker page
New Sprintf.php Html class that is an array object that renders the input to sprintf before sprintf-ing it
Documented Raw.php and Sequence.php
Modified Paths:
--------------
trunk/library/changelog.txt
trunk/library/classes/Gems/Default/ContactAction.php
trunk/library/classes/Gems/Default/RoleAction.php
trunk/library/classes/Gems/Menu.php
trunk/library/classes/Gems/Project/ProjectSettings.php
trunk/library/classes/MUtil/Html/Creator.php
trunk/library/classes/MUtil/Html/Raw.php
trunk/library/classes/MUtil/Html/Sequence.php
trunk/library/configs/db/patches.sql
trunk/library/configs/db/tables/gems__roles.20.sql
trunk/library/views/scripts/contact/bugs.phtml
Added Paths:
-----------
trunk/library/classes/MUtil/Html/Sprintf.php
Removed Paths:
-------------
trunk/library/views/scripts/contact/support.phtml
Modified: trunk/library/changelog.txt
===================================================================
--- trunk/library/changelog.txt 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/changelog.txt 2013-02-15 16:53:06 UTC (rev 1143)
@@ -2,6 +2,9 @@
============================================================
Defined constant GEMS_PROJECT_PATH removed from code (update at least your application.ini and use APPLICATION_PATH instead)
Moved date_default_timezone_set to index.php (can generate warnings)
+longDescr in project.ini enables more project specific information on the about pages
+New "About GemsTracker" page, implemented as menu item
+Support can now be provided through support, manuals, documentation or forum url's.
The global variable $GEMS_DIRS is deprecated, redefine it the application.ini using loaderDirs.Gems = .... (see NewProject)
ZFDebug is now activated in the application.ini using: zfdebug.activate = 1
@@ -14,7 +17,7 @@
Many small bugs fixed and display improvements made
Implemented many speed optimizations in both database access and code speed
New DEMO application environment
-Simplefied writing project level unit test
+Simplified writing project level unit test
Important changes from 1.5.5 => 1.5.6
============================================================
Modified: trunk/library/classes/Gems/Default/ContactAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ContactAction.php 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/classes/Gems/Default/ContactAction.php 2013-02-15 16:53:06 UTC (rev 1143)
@@ -1,86 +1,101 @@
<?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.
- */
-
/**
- *
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package Gems
+ * 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 Default
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
- *
- * @author Matijs de Jong
- * @package Gems
+ *
+ * @package Gems
* @subpackage Default
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
*/
-class Gems_Default_ContactAction extends Gems_Controller_Action
+class Gems_Default_ContactAction extends Gems_Controller_Action
{
- public function aboutAction()
- {
- $this->_forward('support');
- }
+ /**
+ *
+ * @var Gems_Project_ProjectSettings
+ */
+ public $project;
- public function bugsAction()
- { }
-
- private function getOrganizationsList()
+ /**
+ * A list of all participating organizations.
+ *
+ * @return MUtil_Html_HtmlElement
+ */
+ private function _getOrganizationsList()
{
- $html = Gems_Html::init();
- $sql = '
+ $html = new MUtil_Html_Sequence();
+ $sql = '
SELECT *
FROM gems__organizations
WHERE gor_active=1 AND gor_url IS NOT NULL AND gor_task IS NOT NULL
ORDER BY gor_name';
+ // $organizations = array();
+ // $organizations = array(key($organizations) => reset($organizations));
$organizations = $this->db->fetchAll($sql);
- $orgCount = count($organizations);
+ $orgCount = count($organizations);
switch ($orgCount) {
case 0:
- return $html->pInfo(sprintf($this->_('%s is a web application.'), $this->project->name));
+ return $html->pInfo(sprintf($this->_('%s is still under development.'), $this->project->getName()));
case 1:
$organization = reset($organizations);
- $p = $html->pInfo(sprintf($this->_('The %s project is run by: '), $this->project->name));
+ $p = $html->pInfo(sprintf($this->_('%s is run by: '), $this->project->getName()));
$p->a($organization['gor_url'], $organization['gor_name']);
+ $p->append('.');
- return $p;
+ $html->pInfo()->sprintf(
+ $this->_('Please contact the %s if you have any questions regarding %s.'),
+ $organization['gor_name'],
+ $this->project->getName()
+ );
+ return $html;
+
default:
- $p = $html->pInfo(sprintf($this->_('%s is a collaboration of these organizations:'), $this->project->name));
+ $p = $html->pInfo(sprintf(
+ $this->_('%s is a collaboration of these organizations:'),
+ $this->project->getName()
+ ));
+
$data = MUtil_Lazy::repeat($organizations);
$ul = $p->ul($data, array('class' => 'indent'));
$li = $ul->li();
@@ -89,19 +104,74 @@
$li->append($data->gor_task->call(array($this, '_')));
$li->append(')');
- return $p;
+ $html->pInfo()->sprintf(
+ $this->_('You can contact any of these organizations if you have questions regarding %s.'),
+ $this->project->getName()
+ );
+
+ return $html;
}
}
+ /**
+ * Shows an about page
+ */
+ public function aboutAction()
+ {
+ $this->initHtml();
+
+ $this->html->h3()->sprintf($this->_('About %s'), $this->project->getName());
+ $this->html->pInfo($this->project->getLongDescription($this->locale->getLanguage()));
+ $this->html->append($this->_getOrganizationsList());
+ }
+
+ /**
+ * Show screen telling people how to report bugs
+ */
+ public function bugsAction()
+ {
+ // Uses just view/script/bugs.html
+ }
+
+ /**
+ * Show screen telling people about gems
+ */
+ public function gemsAction()
+ {
+ $this->initHtml();
+
+ $this->html->h3()->sprintf($this->_('About %s'), $this->_('GemsTracker'));
+ $this->html->pInfo($this->_(
+ 'GemsTracker (GEneric Medical Survey Tracker) is a software package for (complex) distribution
+ of questionnaires and forms during clinical research and for quality registration in healthcare.'));
+ $this->html->pInfo()->sprintf(
+ $this->_('%s is a project built using GemsTracker as a foundation.'),
+ $this->project->getName());
+ $this->html->pInfo()->sprintf($this->_('GemsTracker is an open source project hosted on %s.'))
+ ->a(
+ 'http://sourceforge.net/projects/gemstracker/',
+ 'SourceForge',
+ array('rel' => 'external', 'target' => 'sourceforge')
+ );
+ $this->html->pInfo()->sprintf($this->_('More information about GemsTracker is available on the %s website.'))
+ ->a(
+ 'http://gemstracker.org/',
+ 'GemsTracker.org',
+ array('rel' => 'external', 'target' => 'gemstracker')
+ );
+ }
+
+ /**
+ * Genaral contact page
+ */
public function indexAction()
{
$this->initHtml();
- Gems_Html::init();
$this->html->h3($this->_('Contact'));
- $this->html->h4(sprintf($this->_('The %s project'), $this->project->name));
- $this->html->append($this->getOrganizationsList());
+ $this->html->h4(sprintf($this->_('The %s project'), $this->project->getName()));
+ $this->html->append($this->_getOrganizationsList());
$this->html->h4($this->_('Information on this application'));
$this->html->pInfo($this->_('Links concerning this web application:'));
@@ -112,18 +182,50 @@
$this->html[] = $ul;
}
- /*
- public function requestAccountAction()
+ /**
+ * Shows a support page
+ */
+ public function supportAction()
{
$this->initHtml();
- $this->html->h3($this->_('Request account'));
+ $this->html->h3($this->_('Support'));
+ $this->html->pInfo()->sprintf(
+ $this->_('There is more than one way to get support for %s.'),
+ $this->project->getName()
+ );
+ if ($url = $this->project->getDocumentationUrl()) {
+ $this->html->h4('Documentation');
- } */
+ $this->html->pInfo()->sprintf($this->_('All available documentation is gathered at: %s'))
+ ->a($url, array('rel' => 'external', 'target' => 'documentation'));
+ }
- public function supportAction()
- {
- $this->view->organizationsList = $this->getOrganizationsList();
+ if ($url = $this->project->getManualUrl()) {
+ $this->html->h4('Manual');
+
+ $this->html->pInfo()->sprintf($this->_('The manual is available here: %s'))
+ ->a($url, array('rel' => 'external', 'target' => 'manual'));
+ }
+
+ if ($url = $this->project->getForumUrl()) {
+ $this->html->h4('The forum');
+
+ $this->html->pInfo()->sprintf($this->_(
+ 'You will find questions asked by other users and ask new questions at our forum site: %s'
+ ))->a($url, array('rel' => 'external', 'target' => 'forum'));
+ }
+
+ if ($url = $this->project->getSupportUrl()) {
+ $this->html->h4('Support site');
+
+ $this->html->pInfo()->sprintf($this->_('Check our support site at %s.'))
+ ->a($url, array('rel' => 'external', 'target' => 'support'));
+ }
+
+ $this->html->h4($this->_('Or contact'));
+ $this->html->append($this->_getOrganizationsList());
}
+
}
Modified: trunk/library/classes/Gems/Default/RoleAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RoleAction.php 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/classes/Gems/Default/RoleAction.php 2013-02-15 16:53:06 UTC (rev 1143)
@@ -82,8 +82,16 @@
$bridge->addText('grl_description', 'size', 40);
$roles = $this->acl->getRoles();
- $possibleParents = array_combine($roles, $roles);
- $currentParents = array_combine($data['grl_parents'], $data['grl_parents']);
+ if ($roles) {
+ $possibleParents = array_combine($roles, $roles);
+ } else {
+ $possibleParents = array();
+ }
+ if (isset($data['grl_parents']) && $data['grl_parents']) {
+ $currentParents = array_combine($data['grl_parents'], $data['grl_parents']);
+ } else {
+ $currentParents = array();
+ }
// Don't allow master, nologin or itself as parents
unset($possibleParents['master']);
@@ -94,7 +102,8 @@
foreach ($possibleParents as $parent) {
if ($this->acl->hasRole($data['grl_name']) && $this->acl->inheritsRole($parent, $data['grl_name'])) {
$disabled[] = $parent;
- $possibleParents[$parent] .= ' ' . MUtil_Html::create('small', $this->_('child of current role'), $this->view);
+ $possibleParents[$parent] .= ' ' .
+ MUtil_Html::create('small', $this->_('child of current role'), $this->view);
unset($currentParents[$parent]);
} else {
foreach ($currentParents as $p2) {
@@ -102,7 +111,10 @@
$disabled[] = $parent;
$possibleParents[$parent] .= ' ' . MUtil_Html::create(
'small',
- MUtil_Html::raw(sprintf($this->_('inherited from %s'), MUtil_Html::create('em', $p2, $this->view))),
+ MUtil_Html::raw(sprintf(
+ $this->_('inherited from %s'),
+ MUtil_Html::create('em', $p2, $this->view)
+ )),
$this->view);
$currentParents[$parent] = $parent;
}
@@ -110,7 +122,10 @@
}
}
$disabled[] = $data['grl_name'];
- $possibleParents[$data['grl_name']] .= ' ' . MUtil_Html::create('small', $this->_('this role'), $this->view);
+ if (isset($possibleParents[$data['grl_name']])) {
+ $possibleParents[$data['grl_name']] .= ' ' .
+ MUtil_Html::create('small', $this->_('this role'), $this->view);
+ }
}
$bridge->addMultiCheckbox('grl_parents', 'multiOptions', $possibleParents,
'disable', $disabled,
@@ -126,7 +141,8 @@
foreach ((array) $data['grl_parents'] as $parent) {
if (isset($rolePrivileges[$parent])) {
$inherited = $inherited + array_flip($rolePrivileges[$parent][Zend_Acl::TYPE_ALLOW]);
- $inherited = $inherited + array_flip($rolePrivileges[$parent][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW]);
+ $inherited = $inherited +
+ array_flip($rolePrivileges[$parent][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW]);
}
}
// Sneaks in:
@@ -141,7 +157,12 @@
$checkbox->setAttrib('escape', false); //Don't use escaping, so the line breaks work
if ($inheritedPrivileges) {
- $checkbox = $bridge->addMultiCheckbox('inherited', 'label', $this->_('Inherited'), 'multiOptions', $inheritedPrivileges, 'required', false, 'disabled', 'disabled');
+ $checkbox = $bridge->addMultiCheckbox(
+ 'inherited',
+ 'label', $this->_('Inherited'),
+ 'multiOptions', $inheritedPrivileges,
+ 'required', false,
+ 'disabled', 'disabled');
$checkbox->setAttrib('escape', false); //Don't use escaping, so the line breaks work
$checkbox->setValue(array_keys($inheritedPrivileges)); //To check the boxes
}
Modified: trunk/library/classes/Gems/Menu.php
===================================================================
--- trunk/library/classes/Gems/Menu.php 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/classes/Gems/Menu.php 2013-02-15 16:53:06 UTC (rev 1143)
@@ -135,14 +135,13 @@
$page = $this->addPage($label, null, 'contact');
- if (isset($project->contact, $project->contact['supportUrl'])) {
- $page->addAction(sprintf($this->_('About %s'), $project->name), null, 'about');
- }
- // $page->addAction($this->_('Request account'), null, 'request-account');
- if (isset($project->contact, $project->contact['bugsUrl'])) {
+ $page->addAction(sprintf($this->_('About %s'), $project->getName()), null, 'about');
+ $page->addAction(sprintf($this->_('About %s'), $this->_('GemsTracker')), 'pr.contact.gems', 'gems');
+
+ if ($project->hasBugsUrl()) {
$page->addAction($this->_('Reporting bugs'), 'pr.contact.bugs', 'bugs');
}
- if (isset($project->contact, $project->contact['supportUrl'])) {
+ if ($project->hasAnySupportUrl()) {
$page->addAction($this->_('Support'), 'pr.contact.support', 'support');
}
Modified: trunk/library/classes/Gems/Project/ProjectSettings.php
===================================================================
--- trunk/library/classes/Gems/Project/ProjectSettings.php 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/classes/Gems/Project/ProjectSettings.php 2013-02-15 16:53:06 UTC (rev 1143)
@@ -292,6 +292,18 @@
}
/**
+ * Returns the documentation url
+ *
+ * @return string
+ */
+ public function getDocumentationUrl()
+ {
+ if (isset($this['contact'], $this['contact']['docsUrl'])) {
+ return $this['contact']['docsUrl'];
+ }
+ }
+
+ /**
* The the email BCC address - if any
*
* @return string
@@ -317,6 +329,18 @@
}
/**
+ * Returns the forum url
+ *
+ * @return string
+ */
+ public function getForumUrl()
+ {
+ if (isset($this['contact'], $this['contact']['forumUrl'])) {
+ return $this['contact']['forumUrl'];
+ }
+ }
+
+ /**
* Returns the from address
*
* @return string E-Mail address
@@ -385,6 +409,23 @@
}
/**
+ * Return a long description, in the correct language if available
+ *
+ * @param string $language Iso code languahe
+ * @return string
+ */
+ public function getLongDescription($language)
+ {
+ if (isset($this['longDescr' . ucfirst($language)])) {
+ return $this['longDescr' . ucfirst($language)];
+ }
+
+ if (isset($this['longDescr'])) {
+ return $this['longDescr'];
+ }
+ }
+
+ /**
* Array of field name => values for sending E-Mail
*
* @return array
@@ -400,6 +441,18 @@
}
/**
+ * Returns the manual url
+ *
+ * @return string
+ */
+ public function getManualUrl()
+ {
+ if (isset($this['contact'], $this['contact']['manualUrl'])) {
+ return $this['contact']['manualUrl'];
+ }
+ }
+
+ /**
* Returns the public name of this project.
*
* @return string
@@ -492,6 +545,18 @@
}
/**
+ * Returns the support url
+ *
+ * @return string
+ */
+ public function getSupportUrl()
+ {
+ if (isset($this['contact'], $this['contact']['supportUrl'])) {
+ return $this['contact']['supportUrl'];
+ }
+ }
+
+ /**
* Returns a salted hash on the
*
* @param string $value The value to hash
@@ -513,13 +578,38 @@
}
/**
+ * True at least one support url exists.
+ *
+ * @return boolean
+ */
+ public function hasAnySupportUrl()
+ {
+ return isset($this['contact']) && (
+ isset($this['contact']['docsUrl']) ||
+ isset($this['contact']['forumUrl']) ||
+ isset($this['contact']['manualUrl']) ||
+ isset($this['contact']['supportUrl'])
+ );
+ }
+
+ /**
+ * True the bugs url exists.
+ *
+ * @return boolean
+ */
+ public function hasBugsUrl()
+ {
+ return isset($this['contact'], $this['contact']['bugsUrl']);
+ }
+
+ /**
* True if an initial password was specified for users.
*
* @return boolean
*/
public function hasInitialPassword()
{
- return isset($this['password']['initialPassword']);
+ return isset($this['password'], $this['password']['initialPassword']);
}
/**
Modified: trunk/library/classes/MUtil/Html/Creator.php
===================================================================
--- trunk/library/classes/MUtil/Html/Creator.php 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/classes/MUtil/Html/Creator.php 2013-02-15 16:53:06 UTC (rev 1143)
@@ -124,7 +124,7 @@
'seq' => 'MUtil_Html_Sequence::createSequence',
'sequence' => 'MUtil_Html_Sequence::createSequence', // A sequence can contain another sequence, so other function name used
'snippet' => 'MUtil_Html::snippet',
- 'sprintf' => 'sprintf',
+ 'sprintf' => 'MUtil_Html_Sprintf::sprintf',
'spaced' => 'MUtil_Html_Sequence::createSpaced', // A sequence can contain another sequence, so other function name used
'table' => 'MUtil_Html_TableElement::table',
'tbody' => 'MUtil_Html_TBodyElement::tbody',
Modified: trunk/library/classes/MUtil/Html/Raw.php
===================================================================
--- trunk/library/classes/MUtil/Html/Raw.php 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/classes/MUtil/Html/Raw.php 2013-02-15 16:53:06 UTC (rev 1143)
@@ -1,65 +1,65 @@
<?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.
- */
-
/**
- *
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package MUtil
+ * 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 MUtil
* @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
* The Raw class is used to output html without character encoding or escaping.
- *
- * Use this class when you have a string containg html or escaped texts that you
+ *
+ * Use this class when you have a string containg html or escaped texts that you
* want to output without further processing.
- *
- * @author Matijs de Jong
- * @package MUtil
+ *
+ * @package MUtil
* @subpackage Html
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since MUtil version 1.0
*/
class MUtil_Html_Raw implements MUtil_Html_HtmlInterface
{
/**
* Whatever should be the output
- *
+ *
* @var string
*/
private $_value;
/**
* Create the class with the specified string content.
- *
- * @param string $value
+ *
+ * @param string $value
*/
public function __construct($value)
{
@@ -68,7 +68,7 @@
/**
* Simple helper function
- *
+ *
* @return string
*/
public function __toString()
@@ -77,17 +77,17 @@
}
/**
- * Splits the content into an array where each items either contains
+ * Splits the content into an array where each items either contains
* - a tag (starts with '<' and ends with '>'
* - an entity (starts with '&' and ends with ';'
* - other string content (not starting with '<' or '&'
- *
+ *
* This is a utility function that simplifies e.g. search and replace
- * without messing up the markup, e.g. in the Marker class
- *
+ * without messing up the markup, e.g. in the Marker class
+ *
* @see MUtil_Html_Marker
- *
- * @return array
+ *
+ * @return array
*/
public function getElements()
{
@@ -177,7 +177,7 @@
/**
* The current content
- *
+ *
* @return string
*/
public function getValue()
@@ -187,7 +187,7 @@
/**
* Static helper function for creation, used by @see MUtil_Html_Creator.
- *
+ *
* @param string $value
* @return MUtil_Html_Raw
*/
@@ -199,7 +199,7 @@
/**
* Echo the content.
- *
+ *
* The $view is not used but required by the interface definition
*
* @param Zend_View_Abstract $view
@@ -212,9 +212,9 @@
/**
* Change the content.
- *
+ *
* @param string $value
- * @return MUtil_Html_Raw
+ * @return MUtil_Html_Raw
*/
public function setValue($value)
{
Modified: trunk/library/classes/MUtil/Html/Sequence.php
===================================================================
--- trunk/library/classes/MUtil/Html/Sequence.php 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/classes/MUtil/Html/Sequence.php 2013-02-15 16:53:06 UTC (rev 1143)
@@ -1,10 +1,9 @@
<?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
@@ -15,7 +14,7 @@
* * 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
@@ -26,37 +25,38 @@
* 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.
- */
-
-/**
- *
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package MUtil
+ *
+ *
+ * @package MUtil
* @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
* The Sequence class is for sequentional Html content, kind of like a DOM document fragment.
- *
+ *
* It usual use is where you should return a single ElementInterface object but want to return a
- * sequence of objects. While implementing the MUtil_Html_ElementInterface it does have attributes
+ * sequence of objects. While implementing the MUtil_Html_ElementInterface it does have attributes
* nor does it return a tagname so it is not really an element, just treated as one.
- *
- * This object also contains functions for processing parameters of special types. E.g. when a
+ *
+ * This object also contains functions for processing parameters of special types. E.g. when a
* Zend_View object is passed it should be stored in $this->view, not added to the core array.
- *
- * @author Matijs de Jong
- * @package MUtil
+ *
+ * @package MUtil
* @subpackage Html
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since MUtil version 1.0
*/
class MUtil_Html_Sequence extends MUtil_ArrayString implements MUtil_Html_ElementInterface
{
/**
* Object classes that should not be added to the core array, but should be set using
* a setXxx() function.
- *
+ *
* This parameter enables sub-classes to define their own special types.
*
* @var array Null or array containing className => setFunction()
@@ -65,7 +65,7 @@
/**
* The default special types that are always valid for children of this class.
- *
+ *
* @var array
*/
private $_specialTypesDefault = array(
@@ -79,6 +79,15 @@
*/
public $view = null;
+ /**
+ * Adds an HtmlElement to this element
+ *
+ * @see MUtil_Html_Creator
+ *
+ * @param string $name Function name becomes tagname (unless specified otherwise in MUtil_Html_Creator)
+ * @param array $arguments The content and attributes values
+ * @return MUtil_Html_HtmlElement With '$name' tagName
+ */
public function __call($name, array $arguments)
{
$elem = MUtil_Html::createArray($name, $arguments);
@@ -88,6 +97,10 @@
return $elem;
}
+ /**
+ *
+ * @param mixed $arg_array MUtil_Ra::args parameter passing
+ */
public function __construct($arg_array = null)
{
parent::__construct();
@@ -139,16 +152,29 @@
return $seq;
}
+ /**
+ * Interface required function, not in real use
+ *
+ * @return null
+ */
public function getTagName()
{
return null;
}
+ /**
+ * Get the current view
+ *
+ * @return Zend_View
+ */
public function getView()
{
return $this->view;
}
+ /**
+ * Initiator functions - to prevent constructor overloading
+ */
protected function init()
{
if ($this->_specialTypes) {
@@ -185,7 +211,7 @@
/**
* Renders the element into a html string
- *
+ *
* The $view is used to correctly encode and escape the output
*
* @param Zend_View_Abstract $view
Copied: trunk/library/classes/MUtil/Html/Sprintf.php (from rev 1141, trunk/library/classes/MUtil/Html/Raw.php)
===================================================================
--- trunk/library/classes/MUtil/Html/Sprintf.php (rev 0)
+++ trunk/library/classes/MUtil/Html/Sprintf.php 2013-02-15 16:53:06 UTC (rev 1143)
@@ -0,0 +1,220 @@
+<?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 MUtil
+ * @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
+/**
+ * Sprintf class is used to use sprintf with renderable content .
+ *
+ * @package MUtil
+ * @subpackage Html
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since MUtil version 1.2
+ */
+class MUtil_Html_Sprintf extends ArrayObject implements MUtil_Html_ElementInterface
+{
+ /**
+ * Object classes that should not be added to the core array, but should be set using
+ * a setXxx() function.
+ *
+ * This parameter enables sub-classes to define their own special types.
+ *
+ * @var array Null or array containing className => setFunction()
+ */
+ protected $_specialTypes;
+
+ /**
+ * The default special types that are always valid for children of this class.
+ *
+ * @var array
+ */
+ private $_specialTypesDefault = array(
+ 'Zend_View' => 'setView',
+ );
+
+ /**
+ * View object
+ *
+ * @var Zend_View_Interface
+ */
+ public $view = null;
+
+ /**
+ * Adds an HtmlElement to this element
+ *
+ * @see MUtil_Html_Creator
+ *
+ * @param string $name Function name becomes tagname (unless specified otherwise in MUtil_Html_Creator)
+ * @param array $arguments The content and attributes values
+ * @return MUtil_Html_HtmlElement With '$name' tagName
+ */
+ public function __call($name, array $arguments)
+ {
+ $elem = MUtil_Html::createArray($name, $arguments);
+
+ $this[] = $elem;
+
+ return $elem;
+ }
+
+ /**
+ *
+ * @param mixed $arg_array MUtil_Ra::args parameter passing
+ */
+ public function __construct($arg_array = null)
+ {
+ parent::__construct();
+
+ $args = MUtil_Ra::args(func_get_args());
+
+ $this->init();
+
+ // Passing the $args to parent::__construct()
+ // means offsetSet() is not called.
+ foreach ($args as $key => $arg) {
+ $this->offsetSet($key, $arg);
+ }
+ }
+
+ /**
+ * Interface required function, not in real use
+ *
+ * @return null
+ */
+ public function getTagName()
+ {
+ return null;
+ }
+
+ /**
+ * Get the current view
+ *
+ * @return Zend_View
+ */
+ public function getView()
+ {
+ return $this->view;
+ }
+
+ /**
+ * Initiator functions - to prevent constructor overloading
+ */
+ protected function init()
+ {
+ if ($this->_specialTypes) {
+ $this->_specialTypes = $this->_specialTypes + $this->_specialTypesDefault;
+ } else {
+ $this->_specialTypes = $this->_specialTypesDefault;
+ }
+ }
+
+ public function offsetSet($index, $newval)
+ {
+ if ($index && (! is_numeric($index))) {
+ if (method_exists($this, $fname = 'set' . $index)) {
+ $this->$fname($newval);
+
+ return;
+ }
+ }
+
+ /*
+ if (! $this->_specialTypes) {
+ MUtil_Echo::backtrace();
+ } // */
+ foreach ($this->_specialTypes as $class => $method) {
+ if ($newval instanceof $class) {
+ $this->$method($newval, $index);
+
+ return;
+ }
+ }
+
+ return parent::offsetSet($index, $newval);
+ }
+
+ /**
+ * Renders the element into a html string
+ *
+ * The $view is used to correctly encode and escape the output
+ *
+ * @param Zend_View_Abstract $view
+ * @return string Correctly encoded and escaped html output
+ */
+ public function render(Zend_View_Abstract $view)
+ {
+ if (null !== $view) {
+ $this->setView($view);
+ }
+
+ $view = $this->getView();
+
+ $renderer = MUtil_Html::getRenderer();
+ $params = array();
+ foreach ($this->getIterator() as $item) {
+ $params[] = $renderer->renderAny($view, $item);
+ }
+
+ if ($params) {
+ return call_user_func_array('sprintf', $params);
+ }
+
+ return '';
+ }
+
+ /**
+ * Set the View object
+ *
+ * @param Zend_View_Interface $view
+ * @return Zend_View_Helper_Abstract
+ */
+ public function setView(Zend_View_Interface $view)
+ {
+ $this->view = $view;
+ return $this;
+ }
+
+ /**
+ *
+ * @param mixed $arg_array MUtil_Ra::args parameter passing
+ */
+ public static function sprintf($arg_array = null)
+ {
+ $args = MUtil_Ra::args(func_get_args());
+
+ return new self($args);
+ }
+}
Modified: trunk/library/configs/db/patches.sql
===================================================================
--- trunk/library/configs/db/patches.sql 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/configs/db/patches.sql 2013-02-15 16:53:06 UTC (rev 1143)
@@ -473,3 +473,6 @@
UPDATE gems__roles SET grl_privileges = CONCAT(grl_privileges, ',pr.plan.summary.excel')
WHERE grl_privileges LIKE '%pr.plan.%' AND grl_privileges NOT LIKE '%pr.plan.summary.excel%';
+
+UPDATE gems__roles SET grl_privileges = CONCAT(grl_privileges, ',pr.contact.gems')
+ WHERE grl_privileges LIKE '%pr.plan.%' AND grl_privileges NOT LIKE '%pr.contact%';
Modified: trunk/library/configs/db/tables/gems__roles.20.sql
===================================================================
--- trunk/library/configs/db/tables/gems__roles.20.sql 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/configs/db/tables/gems__roles.20.sql 2013-02-15 16:53:06 UTC (rev 1143)
@@ -26,7 +26,7 @@
INSERT INTO gems__roles (grl_name, grl_description, grl_privileges, grl_parents, grl_changed, grl_changed_by, grl_created, grl_created_by)
VALUES
('nologin','nologin','pr.contact.bugs,pr.contact.support,pr.nologin','', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
- ('guest','guest','pr.ask,pr.contact.bugs,pr.contact.support,pr.islogin,pr.respondent','', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
+ ('guest','guest','pr.ask,pr.contact.bugs,pr.contact.gems,pr.contact.support,pr.islogin,pr.respondent','', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('respondent','respondent','','guest', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('security','security','','guest', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
('staff','staff','pr.option.edit,pr.option.password,pr.plan,pr.plan.overview,pr.plan.token,pr.project,pr.project.questions,pr.respondent.create,pr.respondent.edit,pr.respondent.who,pr.setup,pr.staff,pr.survey,pr.survey.create,pr.token,pr.token.answers,pr.token.delete,pr.token.edit,pr.token.mail,pr.token.print,pr.track,pr.track.create,pr.track.delete,pr.track.edit,pr.respondent.reportdeath','guest', CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1),
Modified: trunk/library/views/scripts/contact/bugs.phtml
===================================================================
--- trunk/library/views/scripts/contact/bugs.phtml 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/views/scripts/contact/bugs.phtml 2013-02-15 16:53:06 UTC (rev 1143)
@@ -1,12 +1,12 @@
-<?php
+<?php
// ENGLISH
-if ('en' == $this->locale->getLanguage()):
+if ('en' == $this->locale->getLanguage()):
?>
<h3>Reporting bugs</h3>
<p class="info">
- <?php echo $this->project->name; ?> uses the <a href="http://www.mantisbt.org/" rel="external">Mantis Bug Tracker</a>
- for reporting and solving bugs.
+ <?php echo $this->project->name; ?> uses the <a href="http://www.mantisbt.org/" rel="external">Mantis Bug Tracker</a>
+ for reporting and solving bugs.
<br/>
To help us to quickly solve bugs we request you read the suggestions below.
</p>
@@ -14,8 +14,8 @@
<div class="indent">
<h4>Report each bug by itself</h4>
<p class="info">
- Every bug has to be assigned to someone to solve it.
- Combining multiple problems in a single report can obstruct this process.
+ Every bug has to be assigned to someone to solve it.
+ Combining multiple problems in a single report can obstruct this process.
</p>
<h4>Add a link</h4>
<p class="info">
@@ -40,31 +40,17 @@
<div class="centerAlign">
<a href="<?php echo $this->project->contact['bugsUrl'] ?>" class="actionlink" rel="external" target="pulse_bugs">Report a bug</a>
-</div><?php
- if (isset($this->project->contact['supportUrl'])):
-?>
-<h3>Support</h3>
-
-<p class="info">
- When you have questions about using <?php echo $this->project->name; ?> the place to look for answers is the
- <strong>forum</strong> on
- <a href="<?php echo $this->project->contact['supportUrl'] ?>" rel="external" target="pulse_support">our support site</a>.
-</p>
-
-<div class="centerAlign">
- <a href="<?php echo $this->project->contact['supportUrl'] ?>" class="actionlink" rel="external" target="pulse_support">Go to the support site</a>
-</div><?php
- endif;
+</div><?php
endif;
// NEDERLANDS
-if ('nl' == $this->locale->getLanguage()):
+if ('nl' == $this->locale->getLanguage()):
?>
<h3>Problemen melden</h3>
<p class="info">
<?php echo $this->project->name; ?> gebruikt de <a href="http://www.mantisbt.org/" rel="external">Mantis Bug Tracker</a>
- voor de rapportage en verwerking van problemen.
+ voor de rapportage en verwerking van problemen.
<br/>
Voor een snelle verwerking van problemen verzoeken wij u de onderstaande suggesties te lezen.
</p>
@@ -72,8 +58,8 @@
<div class="indent">
<h4>Meld elk probleem apart</h4>
<p class="info">
- Elk probleem moet aan iemand toegewezen worden voor behandeling.
- Dit kan lastig zijn als verschillende problemen in één melding staan.
+ Elk probleem moet aan iemand toegewezen worden voor behandeling.
+ Dit kan lastig zijn als verschillende problemen in één melding staan.
</p>
<h4>Voeg een link toe</h4>
<p class="info">
@@ -98,19 +84,5 @@
<div class="centerAlign">
<a href="<?php echo $this->project->contact['bugsUrl'] ?>" class="actionlink" rel="external" target="pulse_bugs">Meld een probleem</a>
-</div><?php
- if (isset($this->project->contact['supportUrl'])):
-?>
-<h3>Ondersteuning</h3>
-
-<p class="info">
- Als u vragen heeft over het gebruik van <?php echo $this->project->name; ?> dan kan u die beter stellen op het
- <strong>forum</strong> van de
- <a href="<?php echo $this->project->contact['supportUrl'] ?>" rel="external" target="pulse_support">onze support site</a>.
-</p>
-
-<div class="centerAlign">
- <a href="<?php echo $this->project->contact['supportUrl'] ?>" class="actionlink" rel="external" target="pulse_support">Ga naar de support site</a>
-</div><?php
- endif;
+</div><?php
endif; ?>
Deleted: trunk/library/views/scripts/contact/support.phtml
===================================================================
--- trunk/library/views/scripts/contact/support.phtml 2013-02-15 16:49:21 UTC (rev 1142)
+++ trunk/library/views/scripts/contact/support.phtml 2013-02-15 16:53:06 UTC (rev 1143)
@@ -1,56 +0,0 @@
-<?php
-if ('en' == $this->locale->getLanguage()):
-?><h3><?php echo $this->project->name; ?> support</h3>
-
-<?php echo $this->organizationsList->render($this); ?>
-
-<p class="info">
- When you have questions about using <?php echo $this->project->name; ?> the place to look for answers is the
- <strong>forum</strong> on
- <a href="<?php echo $this->project->contact['supportUrl'] ?>" rel="external" target="pulse_support">support site</a>:
-</p>
-
-<div class="centerAlign">
- <a href="<?php echo $this->project->contact['supportUrl'] ?>" class="actionlink" rel="external" target="pulse_support">Go to the support site</a>
-</div><?php
- if (isset($this->project->contact['bugsUrl'])):
-?>
-<h3>Reporting bugs</h3>
-
-<p class="info">
- If you encountered a bug while using <?php echo $this->project->name; ?> please report in on our
- <a href="<?php echo $this->project->contact['bugsUrl'] ?>" rel="external" target="pulse_bugs">bug tracker site</a>.
-</p>
-
-<div class="centerAlign">
- <a href="<?php echo $this->project->contact['bugsUrl'] ?>" class="actionlink" rel="external" target="pulse_bugs">Report a bug</a>
-</div><?php
- endif;
-endif; ?>
-<?php
-if ('nl' == $this->locale->getLanguage()):
-?><h3><?php echo $this->project->name; ?> ondersteuning</h3>
-<?php
- echo $this->organizationsList->render($this);
-?>
-<p class="info">
- Vragen over het gebruik van <?php echo $this->project->name; ?> kan u het beste stellen op het <strong>forum</strong> van de
- <a href="<?php echo $this->project->contact['supportUrl'] ?>" rel="external" target="pulse_support">support site</a>:
-</p>
-<div class="centerAlign">
- <a href="<?php echo $this->project->contact['supportUrl'] ?>" class="actionlink" rel="external" target="pulse_support">Ga naar de support site</a>
-</div><?php
- if (isset($this->project->contact['bugsUrl'])):
-?>
-<h3>Problemen melden</h3>
-
-<p class="info">
- Als u een fout of probleem tegengekomen bent tijdens het gebruik van <?php echo $this->project->name; ?> dan kan u die beter melden op onze
- <a href="<?php echo $this->project->contact['bugsUrl'] ?>" rel="external" target="pulse_bugs">bug tracker</a>.
-</p>
-
-<div class="centerAlign">
- <a href="<?php echo $this->project->contact['bugsUrl'] ?>" class="actionlink" rel="external" target="pulse_bugs">Meld een probleem</a>
-</div><?php
- endif;
-endif; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-15 16:49:24
|
Revision: 1142
http://sourceforge.net/p/gemstracker/code/1142
Author: matijsdejong
Date: 2013-02-15 16:49:21 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Added max-width to pInfo
Modified Paths:
--------------
trunk/new_project/htdocs/basic/basic.css
Modified: trunk/new_project/htdocs/basic/basic.css
===================================================================
--- trunk/new_project/htdocs/basic/basic.css 2013-02-14 17:54:50 UTC (rev 1141)
+++ trunk/new_project/htdocs/basic/basic.css 2013-02-15 16:49:21 UTC (rev 1142)
@@ -101,6 +101,9 @@
color: black;
}
+p.info {
+ max-width: 60em;
+}
.tab {
background: lightgrey;
border-top-left-radius: 4px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2013-02-14 17:54:52
|
Revision: 1141
http://sourceforge.net/p/gemstracker/code/1141
Author: matijsdejong
Date: 2013-02-14 17:54:50 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Added drive size information
Modified Paths:
--------------
trunk/library/classes/Gems/Default/ProjectInformationAction.php
Modified: trunk/library/classes/Gems/Default/ProjectInformationAction.php
===================================================================
--- trunk/library/classes/Gems/Default/ProjectInformationAction.php 2013-02-14 16:54:06 UTC (rev 1140)
+++ trunk/library/classes/Gems/Default/ProjectInformationAction.php 2013-02-14 17:54:50 UTC (rev 1141)
@@ -125,6 +125,49 @@
$this->_showText($this->_('Logged errors'), GEMS_ROOT_DIR . '/var/logs/errors.log', $this->_('Empty logfile'));
}
+ /**
+ * Format in drive units
+ *
+ * @param int $size
+ * @return string
+ */
+ protected function getByteSized($size)
+ {
+ $units = array( '', 'Kb', 'Mb', 'Gb', 'Tb', 'Pb', 'Eb', 'Zb', 'Yb');
+ $power = $size > 0 ? floor(log($size, 1024)) : 0;
+ return Zend_Locale_Format::toInteger($size / pow(1024, $power)) . ' ' . $units[$power];
+ }
+
+ /**
+ * Tell all about it
+ *
+ * @param string $directory
+ * @return string
+ */
+ protected function getDirInfo($directory)
+ {
+ if (! is_dir($directory)) {
+ return sprintf($this->_('%s - does not exist'), $directory);
+ }
+
+ $free = disk_free_space($directory);
+ $total = disk_total_space($directory);
+
+ if ((false === $free) || (false === $total)) {
+ return sprintf($this->_('%s - no disk information available'), $directory);
+ }
+
+ $percent = intval($free / $total * 100);
+
+ return sprintf(
+ $this->_('%s - %s free of %s = %d%% available'),
+ $directory,
+ $this->getByteSized($free),
+ $this->getByteSized($total),
+ $percent
+ );
+ }
+
public function indexAction()
{
$this->html->h2($this->_('Project information'));
@@ -136,20 +179,32 @@
$data[$this->_('Gems version')] = $versions->getGemsVersion();
$data[$this->_('Gems build')] = $versions->getBuild();
$data[$this->_('Gems project')] = GEMS_PROJECT_NAME;
- $data[$this->_('Gems web directory')] = GEMS_WEB_DIR;
- $data[$this->_('Gems root directory')] = GEMS_ROOT_DIR;
- $data[$this->_('Gems code directory')] = GEMS_LIBRARY_DIR;
+ $data[$this->_('Gems web directory')] = $this->getDirInfo(GEMS_WEB_DIR);
+ $data[$this->_('Gems root directory')] = $this->getDirInfo(GEMS_ROOT_DIR);
+ $data[$this->_('Gems code directory')] = $this->getDirInfo(GEMS_LIBRARY_DIR);
+ $data[$this->_('Gems variable directory')] = $this->getDirInfo(GEMS_ROOT_DIR . '\var');
$data[$this->_('MUtil version')] = MUtil_Version::get();
$data[$this->_('Zend version')] = Zend_Version::VERSION;
$data[$this->_('Application environment')] = APPLICATION_ENV;
$data[$this->_('Application baseuri')] = $this->loader->getUtil()->getCurrentURI();
- $data[$this->_('Application directory')] = APPLICATION_PATH;
+ $data[$this->_('Application directory')] = $this->getDirInfo(APPLICATION_PATH);
$data[$this->_('Application encoding')] = APPLICATION_ENCODING;
$data[$this->_('PHP version')] = phpversion();
$data[$this->_('Server Hostname')] = php_uname('n');
$data[$this->_('Server OS')] = php_uname('s');
$data[$this->_('Time on server')] = date('r');
+ $driveVars = array(
+ $this->_('Session directory') => Zend_Session::getOptions('save_path'),
+ $this->_('Temporary files directory') => realpath(getenv('TMP')),
+ );
+ if ($system = getenv('SystemDrive')) {
+ $driveVars[$this->_('System Drive')] = realpath($system);
+ }
+ foreach ($driveVars as $name => $drive) {
+ $data[$name] = $this->getDirInfo($drive);
+ }
+
$lock = $this->util->getMaintenanceLock();
if ($lock->isLocked()) {
$label = $this->_('Turn Maintenance Mode OFF');
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.
